github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108391 from humblec/pv-contrlpub

Browse Source 
csi: add unit tests for controllerPublishSecretRef name & namespace validation
This commit is contained in:
Kubernetes Prow Robot 2022-03-03 14:23:15 -08:00 committed by GitHub
commit 8c1dc25745
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 150 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/apis/core/validation/validation.go
View File

@ -1588,12 +1588,12 @@ func validateCSIPersistentVolumeSource(csi *core.CSIPersistentVolumeSource, fldP
if csi.NodePublishSecretRef != nil { if csi.NodePublishSecretRef != nil {
if len(csi.NodePublishSecretRef.Name) == 0 { if len(csi.NodePublishSecretRef.Name) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("nodePublishSecretRef ", "name"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("nodePublishSecretRef", "name"), ""))
} else { } else {
allErrs = append(allErrs, ValidateDNS1123Label(csi.NodePublishSecretRef.Name, fldPath.Child("name"))...) allErrs = append(allErrs, ValidateDNS1123Label(csi.NodePublishSecretRef.Name, fldPath.Child("name"))...)
} }
if len(csi.NodePublishSecretRef.Namespace) == 0 { if len(csi.NodePublishSecretRef.Namespace) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("nodePublishSecretRef ", "namespace"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("nodePublishSecretRef", "namespace"), ""))
} else { } else {
allErrs = append(allErrs, ValidateDNS1123Label(csi.NodePublishSecretRef.Namespace, fldPath.Child("namespace"))...) allErrs = append(allErrs, ValidateDNS1123Label(csi.NodePublishSecretRef.Namespace, fldPath.Child("namespace"))...)
} }
@ -1608,7 +1608,7 @@ func validateCSIVolumeSource(csi *core.CSIVolumeSource, fldPath *field.Path) fie
if csi.NodePublishSecretRef != nil { if csi.NodePublishSecretRef != nil {
if len(csi.NodePublishSecretRef.Name) == 0 { if len(csi.NodePublishSecretRef.Name) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("nodePublishSecretRef ", "name"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("nodePublishSecretRef", "name"), ""))
} else { } else {
for _, msg := range ValidateSecretName(csi.NodePublishSecretRef.Name, false) { for _, msg := range ValidateSecretName(csi.NodePublishSecretRef.Name, false) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), csi.NodePublishSecretRef.Name, msg)) allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), csi.NodePublishSecretRef.Name, msg))

149
pkg/apis/core/validation/validation_test.go
View File

@ -2532,6 +2532,119 @@ func TestValidateGlusterfsPersistentVolumeSource(t *testing.T) {
} }
func TestValidateCSIVolumeSource(t *testing.T) { func TestValidateCSIVolumeSource(t *testing.T) {
testCases := []struct {
name string
csi *core.CSIVolumeSource
errtype field.ErrorType
errfield string
}{
{
name: "all required fields ok",
csi: &core.CSIVolumeSource{Driver: "test-driver"},
},
{
name: "missing driver name",
csi: &core.CSIVolumeSource{Driver: ""},
errtype: field.ErrorTypeRequired,
errfield: "driver",
},
{
name: "driver name: ok no punctuations",
csi: &core.CSIVolumeSource{Driver: "comgooglestoragecsigcepd"},
},
{
name: "driver name: ok dot only",
csi: &core.CSIVolumeSource{Driver: "io.kubernetes.storage.csi.flex"},
},
{
name: "driver name: ok dash only",
csi: &core.CSIVolumeSource{Driver: "io-kubernetes-storage-csi-flex"},
},
{
name: "driver name: invalid underscore",
csi: &core.CSIVolumeSource{Driver: "io_kubernetes_storage_csi_flex"},
errtype: field.ErrorTypeInvalid,
errfield: "driver",
},
{
name: "driver name: invalid dot underscores",
csi: &core.CSIVolumeSource{Driver: "io.kubernetes.storage_csi.flex"},
errtype: field.ErrorTypeInvalid,
errfield: "driver",
},
{
name: "driver name: ok beginning with number",
csi: &core.CSIVolumeSource{Driver: "2io.kubernetes.storage-csi.flex"},
},
{
name: "driver name: ok ending with number",
csi: &core.CSIVolumeSource{Driver: "io.kubernetes.storage-csi.flex2"},
},
{
name: "driver name: invalid dot dash underscores",
csi: &core.CSIVolumeSource{Driver: "io.kubernetes-storage.csi_flex"},
errtype: field.ErrorTypeInvalid,
errfield: "driver",
},
{
name: "driver name: ok length 1",
csi: &core.CSIVolumeSource{Driver: "a"},
},
{
name: "driver name: invalid length > 63",
csi: &core.CSIVolumeSource{Driver: strings.Repeat("g", 65)},
errtype: field.ErrorTypeTooLong,
errfield: "driver",
},
{
name: "driver name: invalid start char",
csi: &core.CSIVolumeSource{Driver: "_comgooglestoragecsigcepd"},
errtype: field.ErrorTypeInvalid,
errfield: "driver",
},
{
name: "driver name: invalid end char",
csi: &core.CSIVolumeSource{Driver: "comgooglestoragecsigcepd/"},
errtype: field.ErrorTypeInvalid,
errfield: "driver",
},
{
name: "driver name: invalid separators",
csi: &core.CSIVolumeSource{Driver: "com/google/storage/csi~gcepd"},
errtype: field.ErrorTypeInvalid,
errfield: "driver",
},
{
name: "valid nodePublishSecretRef",
csi: &core.CSIVolumeSource{Driver: "com.google.gcepd", NodePublishSecretRef: &core.LocalObjectReference{Name: "foobar"}},
},
{
name: "nodePublishSecretRef: invalid name missing",
csi: &core.CSIVolumeSource{Driver: "com.google.gcepd", NodePublishSecretRef: &core.LocalObjectReference{Name: ""}},
errtype: field.ErrorTypeRequired,
errfield: "nodePublishSecretRef.name",
},
}
for i, tc := range testCases {
errs := validateCSIVolumeSource(tc.csi, field.NewPath("field"))
if len(errs) > 0 && tc.errtype == "" {
t.Errorf("[%d: %q] unexpected error(s): %v", i, tc.name, errs)
} else if len(errs) == 0 && tc.errtype != "" {
t.Errorf("[%d: %q] expected error type %v", i, tc.name, tc.errtype)
} else if len(errs) >= 1 {
if errs[0].Type != tc.errtype {
t.Errorf("[%d: %q] expected error type %v, got %v", i, tc.name, tc.errtype, errs[0].Type)
} else if !strings.HasSuffix(errs[0].Field, "."+tc.errfield) {
t.Errorf("[%d: %q] expected error on field %q, got %q", i, tc.name, tc.errfield, errs[0].Field)
}
}
}
}
func TestValidateCSIPersistentVolumeSource(t *testing.T) {
testCases := []struct { testCases := []struct {
name string name string
csi *core.CSIPersistentVolumeSource csi *core.CSIPersistentVolumeSource
@ -2583,7 +2696,7 @@ func TestValidateCSIVolumeSource(t *testing.T) {
errfield: "driver", errfield: "driver",
}, },
{ {
name: "driver name: ok beginnin with number", name: "driver name: ok beginning with number",
csi: &core.CSIPersistentVolumeSource{Driver: "2io.kubernetes.storage-csi.flex", VolumeHandle: "test-123"}, csi: &core.CSIPersistentVolumeSource{Driver: "2io.kubernetes.storage-csi.flex", VolumeHandle: "test-123"},
}, },
{ {
@ -2608,7 +2721,7 @@ func TestValidateCSIVolumeSource(t *testing.T) {
}, },
{ {
name: "driver name: invalid length > 63", name: "driver name: invalid length > 63",
csi: &core.CSIPersistentVolumeSource{Driver: "comgooglestoragecsigcepdcomgooglestoragecsigcepdcomgooglestoragecsigcepdcomgooglestoragecsigcepd", VolumeHandle: "test-123"}, csi: &core.CSIPersistentVolumeSource{Driver: strings.Repeat("g", 65), VolumeHandle: "test-123"},
errtype: field.ErrorTypeTooLong, errtype: field.ErrorTypeTooLong,
errfield: "driver", errfield: "driver",
}, },
@ -2646,6 +2759,38 @@ func TestValidateCSIVolumeSource(t *testing.T) {
name: "valid controllerExpandSecretRef", name: "valid controllerExpandSecretRef",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", ControllerExpandSecretRef: &core.SecretReference{Name: "foobar", Namespace: "default"}}, csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", ControllerExpandSecretRef: &core.SecretReference{Name: "foobar", Namespace: "default"}},
}, },
{
name: "controllerPublishSecretRef: invalid name missing",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", ControllerPublishSecretRef: &core.SecretReference{Namespace: "default"}},
errtype: field.ErrorTypeRequired,
errfield: "controllerPublishSecretRef.name",
},
{
name: "controllerPublishSecretRef: invalid namespace missing",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", ControllerPublishSecretRef: &core.SecretReference{Name: "foobar"}},
errtype: field.ErrorTypeRequired,
errfield: "controllerPublishSecretRef.namespace",
},
{
name: "valid controllerPublishSecretRef",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", ControllerPublishSecretRef: &core.SecretReference{Name: "foobar", Namespace: "default"}},
},
{
name: "valid nodePublishSecretRef",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", NodePublishSecretRef: &core.SecretReference{Name: "foobar", Namespace: "default"}},
},
{
name: "nodePublishSecretRef: invalid name missing",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", NodePublishSecretRef: &core.SecretReference{Namespace: "foobar"}},
errtype: field.ErrorTypeRequired,
errfield: "nodePublishSecretRef.name",
},
{
name: "nodePublishSecretRef: invalid namespace missing",
csi: &core.CSIPersistentVolumeSource{Driver: "com.google.gcepd", VolumeHandle: "foobar", NodePublishSecretRef: &core.SecretReference{Name: "foobar"}},
errtype: field.ErrorTypeRequired,
errfield: "nodePublishSecretRef.namespace",
},
} }
for i, tc := range testCases { for i, tc := range testCases {