mirror of
https://github.com/bpg/terraform-provider-proxmox.git
synced 2025-07-01 11:02:59 +00:00
fix(vm,lxc): file ID validator to allow .
in a storage name (#750)
fix(vm,lxc): file ID validator to allow `.` in a storage name Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
parent
298a6ed501
commit
a6fa40e177
@ -39,7 +39,7 @@ func FileID() schema.SchemaValidateDiagFunc {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v != "" {
|
if v != "" {
|
||||||
r := regexp.MustCompile(`^(?i)[a-z\d\-_]+:([a-z\d\-_]+/)?.+$`)
|
r := regexp.MustCompile(`^(?i)[a-z\d\-_\.]+:([a-z\d\-_]+/)?.+$`)
|
||||||
ok := r.MatchString(v)
|
ok := r.MatchString(v)
|
||||||
|
|
||||||
if !ok {
|
if !ok {
|
||||||
|
44
proxmoxtf/resource/validator/file_test.go
Normal file
44
proxmoxtf/resource/validator/file_test.go
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
/*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package validator
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestFileID(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
value string
|
||||||
|
valid bool
|
||||||
|
}{
|
||||||
|
{"empty", "", true},
|
||||||
|
{"invalid", "invalid", false},
|
||||||
|
{"valid", "local:vztmpl/zen-dns-0.1.tar.zst", true},
|
||||||
|
{"valid when datastore name has dots", "terraform.proxmox.storage.compute.zen:vztmpl/zen-dns-0.1.tar.zst", true},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
tt := tt
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
f := FileID()
|
||||||
|
res := f(tt.value, nil)
|
||||||
|
|
||||||
|
if tt.valid {
|
||||||
|
require.Empty(t, res, "validate: '%s'", tt.value)
|
||||||
|
} else {
|
||||||
|
require.NotEmpty(t, res, "validate: '%s'", tt.value)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user