Add SQL instance name validation (#12480)

* Add SQL instance name validation

* Move -

* Update PG validation

* Fix regex

* simplify
This commit is contained in:
Charles Gagnon
2020-09-18 16:43:04 -07:00
committed by GitHub
parent d00f94f51c
commit bf49788296
2 changed files with 7 additions and 3 deletions

View File

@@ -578,7 +578,10 @@
"type": "text",
"defaultValue": "sqlinstance1",
"required": true,
"labelWidth": "100%"
"labelWidth": "100%",
"textValidationRequired": true,
"textValidationRegex": "^[a-z]([-a-z0-9]{0,11}[a-z0-9])?$",
"textValidationDescription": "%arc.sql.invalidinstancename%"
},
{
"label": "%arc.sql.username%",
@@ -722,7 +725,7 @@
"variableName": "AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_NAME",
"type": "text",
"textValidationRequired": true,
"textValidationRegex": "^[a-z]([-a-z0-9]{0,8}[a-z0-9])?$",
"textValidationRegex": "^[a-z]([-a-z0-9]{0,10}[a-z0-9])?$",
"textValidationDescription": "%arc.postgres.server.group.name.validation.description%",
"required": true
},

View File

@@ -77,6 +77,7 @@
"arc.sql.instance.name": "Instance name (lower case letters and digits only)",
"arc.sql.username": "Username",
"arc.sql.invalidusername": "sa username is disabled, please choose another username",
"arc.sql.invalidinstancename": "Instance name must consist of lower case alphanumeric characters or '-', start with a letter, end with an alphanumeric character, and be 13 characters or fewer in length.",
"arc.storage-class.dc.label": "Storage Class",
"arc.sql.storage-class.dc.description": "The storage class to be used for all data and logs persistent volumes for all data controller pods that require them.",
"arc.storage-class.data.label": "Storage Class (Data)",
@@ -106,7 +107,7 @@
"arc.postgres.settings.resource.title": "PostgreSQL server group resource settings",
"arc.postgres.settings.storage.title": "PostgreSQL server group storage settings",
"arc.postgres.server.group.name": "Server group name",
"arc.postgres.server.group.name.validation.description": "Server group name must consist of lower case alphanumeric characters or '-', start with a letter, end with an alphanumeric character, and be 10 characters or fewer in length.",
"arc.postgres.server.group.name.validation.description": "Server group name must consist of lower case alphanumeric characters or '-', start with a letter, end with an alphanumeric character, and be 12 characters or fewer in length.",
"arc.postgres.server.group.workers": "Number of workers",
"arc.postgres.server.group.port": "Port",
"arc.postgres.server.group.engine.version": "Engine Version",