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

Validate ConfigMapRef and SecretRef name

Browse Source
This commit is contained in:
Michael Fraenkel 2017-02-24 10:07:20 -08:00
parent ee88325f81
commit 62bd5d3de6
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/validation/validation.go
View File

@ -1399,6 +1399,10 @@ func validateConfigMapEnvSource(configMapSource *api.ConfigMapEnvSource, fldPath
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if len(configMapSource.Name) == 0 { if len(configMapSource.Name) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("name"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("name"), ""))
} else {
for _, msg := range ValidateConfigMapName(configMapSource.Name, true) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), configMapSource.Name, msg))
}
} }
return allErrs return allErrs
} }
@ -1407,6 +1411,10 @@ func validateSecretEnvSource(secretSource *api.SecretEnvSource, fldPath *field.P
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
if len(secretSource.Name) == 0 { if len(secretSource.Name) == 0 {
allErrs = append(allErrs, field.Required(fldPath.Child("name"), "")) allErrs = append(allErrs, field.Required(fldPath.Child("name"), ""))
} else {
for _, msg := range ValidateSecretName(secretSource.Name, true) {
allErrs = append(allErrs, field.Invalid(fldPath.Child("name"), secretSource.Name, msg))
}
} }
return allErrs return allErrs
} }

20
pkg/api/validation/validation_test.go
View File

@ -2316,6 +2316,16 @@ func TestValidateEnvFrom(t *testing.T) {
}, },
expectedError: "field[0].configMapRef.name: Required value", expectedError: "field[0].configMapRef.name: Required value",
}, },
{
name: "invalid name",
envs: []api.EnvFromSource{
{
ConfigMapRef: &api.ConfigMapEnvSource{
LocalObjectReference: api.LocalObjectReference{Name: "$"}},
},
},
expectedError: "field[0].configMapRef.name: Invalid value",
},
{ {
name: "invalid prefix", name: "invalid prefix",
envs: []api.EnvFromSource{ envs: []api.EnvFromSource{
@ -2337,6 +2347,16 @@ func TestValidateEnvFrom(t *testing.T) {
}, },
expectedError: "field[0].secretRef.name: Required value", expectedError: "field[0].secretRef.name: Required value",
}, },
{
name: "invalid name",
envs: []api.EnvFromSource{
{
SecretRef: &api.SecretEnvSource{
LocalObjectReference: api.LocalObjectReference{Name: "&"}},
},
},
expectedError: "field[0].secretRef.name: Invalid value",
},
{ {
name: "invalid prefix", name: "invalid prefix",
envs: []api.EnvFromSource{ envs: []api.EnvFromSource{