Convert MIAA and Postgres deploy from Dialog to NotebookWizard (#12609)

* dialog to NotebookWizard

* move fields

* fix 12599

* pr feedback

* add missing page titles
This commit is contained in:
Arvind Ranasaria
2020-09-24 11:47:34 -07:00
committed by GitHub
parent 96ea3d8273
commit 23e1141484
5 changed files with 134 additions and 255 deletions

View File

@@ -146,7 +146,7 @@
"type": "new-arc-control-plane",
"runNotebook": false,
"codeCellInsertionPosition": 5,
"actionText": "%deploy.arc.data.controller.action%",
"actionText": "%deploy.script.to.notebook.action%",
"title": "%arc.data.controller.new.wizard.title%",
"name": "arc.data.controller.new.wizard",
"labelPosition": "left",
@@ -519,23 +519,27 @@
},
"providers": [
{
"dialog": {
"notebookWizard": {
"notebook": "./notebooks/arcDeployment/deploy.sql.existing.arc.ipynb",
"runNotebook": true,
"taskName": "%arc.sql.new.dialog.title%",
"actionText": "%arc.deploy.action%",
"title": "%arc.sql.new.dialog.title%",
"name": "arc.sql.new.dialog",
"tabs": [
"runNotebook": false,
"codeCellInsertionPosition": 5,
"actionText": "%deploy.script.to.notebook.action%",
"title": "%arc.sql.wizard.title%",
"name": "arc.sql.wizard",
"labelPosition": "left",
"generateSummaryPage": false,
"pages": [
{
"title": "",
"title": "%arc.sql.wizard.page1.title%",
"labelWidth": "175px",
"inputWidth": "280px",
"sections": [
{
"title": "%arc.sql.settings.section.title%",
"title": "%arc.sql.connection.settings.section.title%",
"fields": [
{
"label": "%arc.controller%",
"variableName": "AZDATA_NB_VAR_ARC_CONTROLLER",
"variableName": "",
"type": "options",
"editable": false,
"required": true,
@@ -549,28 +553,28 @@
}
},
"optionsType": "dropdown"
},
"labelWidth": "100%"
}
},
{
"label": "%arc.sql.instance.name%",
"variableName": "AZDATA_NB_VAR_SQL_INSTANCE_NAME",
"type": "text",
"defaultValue": "sqlinstance1",
"description": "%arc.sql.invalid.instance.name%",
"required": true,
"labelWidth": "100%",
"textValidationRequired": true,
"textValidationRegex": "^[a-z]([-a-z0-9]{0,11}[a-z0-9])?$",
"textValidationDescription": "%arc.sql.invalidinstancename%"
"textValidationDescription": "%arc.sql.invalid.instance.name%"
},
{
"label": "%arc.sql.username%",
"variableName": "AZDATA_NB_VAR_SQL_USERNAME",
"type": "text",
"description": "%arc.sql.invalid.username%",
"required": true,
"textValidationRequired": true,
"textValidationRegex": "^(?!sa$)",
"textValidationDescription": "%arc.sql.invalidusername%"
"textValidationDescription": "%arc.sql.invalid.username%"
},
{
"label": "%arc.password%",
@@ -581,7 +585,12 @@
"confirmationLabel": "%arc.confirm.password%",
"defaultValue": "",
"required": true
},
}
]
},
{
"title": "%arc.sql.instance.settings.section.title%",
"fields": [
{
"label": "%arc.storage-class.data.label%",
"description": "%arc.sql.storage-class.data.description%",
@@ -596,14 +605,6 @@
"type": "kube_storage_class",
"required": true
},
{
"label": "%arc.cores-limit.label%",
"description": "%arc.sql.cores-limit.description%",
"variableName": "AZDATA_NB_VAR_SQL_CORES_LIMIT",
"type": "number",
"min": 1,
"required": false
},
{
"label": "%arc.cores-request.label%",
"description": "%arc.sql.cores-request.description%",
@@ -613,11 +614,11 @@
"required": false
},
{
"label": "%arc.memory-limit.label%",
"description": "%arc.sql.memory-limit.description%",
"variableName": "AZDATA_NB_VAR_SQL_MEMORY_LIMIT",
"label": "%arc.cores-limit.label%",
"description": "%arc.sql.cores-limit.description%",
"variableName": "AZDATA_NB_VAR_SQL_CORES_LIMIT",
"type": "number",
"min": 2,
"min": 1,
"required": false
},
{
@@ -627,6 +628,14 @@
"type": "number",
"min": 2,
"required": false
},
{
"label": "%arc.memory-limit.label%",
"description": "%arc.sql.memory-limit.description%",
"variableName": "AZDATA_NB_VAR_SQL_MEMORY_LIMIT",
"type": "number",
"min": 2,
"required": false
}
]
}
@@ -671,23 +680,27 @@
},
"providers": [
{
"dialog": {
"notebookWizard": {
"notebook": "./notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb",
"runNotebook": true,
"taskName": "%arc.postgres.new.dialog.title%",
"actionText": "%arc.deploy.action%",
"title": "%arc.postgres.new.dialog.title%",
"name": "arc.postgres.new.dialog",
"tabs": [
"runNotebook": false,
"codeCellInsertionPosition": 5,
"actionText": "%deploy.script.to.notebook.action%",
"title": "%arc.postgres.wizard.title%",
"name": "arc.postgres.wizard",
"labelPosition": "left",
"generateSummaryPage": false,
"pages": [
{
"title": "",
"title": "%arc.postgres.wizard.page1.title%",
"labelWidth": "205px",
"inputWidth": "280px",
"sections": [
{
"title": "%arc.postgres.settings.section.title%",
"fields": [
{
"label": "%arc.controller%",
"variableName": "AZDATA_NB_VAR_ARC_CONTROLLER",
"variableName": "",
"type": "options",
"editable": false,
"required": true,
@@ -701,13 +714,13 @@
}
},
"optionsType": "dropdown"
},
"labelWidth": "100%"
}
},
{
"label": "%arc.postgres.server.group.name%",
"variableName": "AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_NAME",
"type": "text",
"description": "%arc.postgres.server.group.name.validation.description%",
"textValidationRequired": true,
"textValidationRegex": "^[a-z]([-a-z0-9]{0,10}[a-z0-9])?$",
"textValidationDescription": "%arc.postgres.server.group.name.validation.description%",