fix(app): fix env var state and validation [EE-6232] (#10941)

Co-authored-by: testa113 <testa113>
pull/10943/head
Ali 2024-01-15 10:56:53 +13:00 committed by GitHub
parent 067a7d148f
commit 55f66f161e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View File

@ -45,15 +45,15 @@ export function EnvironmentVariablesFieldset({
export function envVarValidation(): SchemaOf<Values> { export function envVarValidation(): SchemaOf<Values> {
return array( return array(
object({ object({
name: string().required('Name is required'), name: string().required('Environment variable name is required'),
value: string().default(''), value: string().default(''),
needsDeletion: boolean().default(false), needsDeletion: boolean().default(false),
}) })
).test( ).test(
'unique', 'unique',
'This environment variable is already defined.', 'This environment variable is already defined',
buildUniquenessTest( buildUniquenessTest(
() => 'This environment variable is already defined.', () => 'This environment variable is already defined',
'name' 'name'
) )
); );

View File

@ -35,6 +35,7 @@ export function parseArrayOfStrings(array: Array<string> = []): Array<EnvVar> {
return { return {
name: parsedKeyValArr[1].trim(), name: parsedKeyValArr[1].trim(),
value: parsedKeyValArr[3].trim() || '', value: parsedKeyValArr[3].trim() || '',
needsDeletion: false,
}; };
}) })
); );

View File

@ -7,19 +7,19 @@ export function kubeEnvVarValidationSchema(): SchemaOf<EnvVar[]> {
return array( return array(
object({ object({
name: string() name: string()
.required('Name is required') .required('Environment variable name is required')
.matches( .matches(
/^[a-zA-Z][a-zA-Z0-9_.-]*$/, /^[a-zA-Z][a-zA-Z0-9_.-]*$/,
`This field must consist of alphabetic characters, digits, '_', '-', or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'.` `This field must consist of alphabetic characters, digits, '_', '-', or '.', and must not start with a digit (e.g. 'my.env-name', or 'MY_ENV.NAME', or 'MyEnvName1'`
), ),
value: string().default(''), value: string().default(''),
needsDeletion: bool().default(false), needsDeletion: bool().default(false),
}) })
).test( ).test(
'unique', 'unique',
'This environment variable is already defined.', 'This environment variable is already defined',
buildUniquenessTest( buildUniquenessTest(
() => 'This environment variable is already defined.', () => 'This environment variable is already defined',
'name' 'name'
) )
); );