mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Port updates for removing EULA acceptance checkbox from Arc deployments (#12409)
* controller dropdown field to SQL MIAA and Postgres deployment. (#12217) * saving first draft * throw if no controllers * cleanup * bug fixes * bug fixes and caching controller access * pr comments and bug fixes. * fixes * fixes * comment fix * remove debug prints * comment fixes * remove debug logs * inputValueTransformer returns string|Promise * PR feedback * pr fixes * remove _ from protected fields * anonymous to full methods * small fixes (cherry picked from commit9cf80113fc) * fix option sources (#12387) (cherry picked from commitfca8b85a72) * Remove azdata eula acceptance from arc deployments (#12292) * saving to switch tasks * activate to exports in extApi * working version - cleanup pending * improve messages * apply pr feedback from a different review * remove unneeded strings * redo apiService * remove async from getVersionFromOutput * remove _ prefix from protected fields * error message fix * throw specif errors from azdata extension * arrow methods to regular methods * pr feedback * expand azdata extension api * pr feedback * remove unused var * pr feedback (cherry picked from commitba44a2f02e) Co-authored-by: Arvind Ranasaria <ranasaria@outlook.com>
This commit is contained in:
Charles Gagnon
@@ -547,20 +547,7 @@
|
||||
],
|
||||
"when": true
|
||||
}
|
||||
],
|
||||
"agreement": {
|
||||
"template": "%arc.control.plane.arc.data.controller.agreement%",
|
||||
"links": [
|
||||
{
|
||||
"text": "%microsoft.agreement.privacy.statement%",
|
||||
"url": "https://go.microsoft.com/fwlink/?LinkId=853010"
|
||||
},
|
||||
{
|
||||
"text": "%arc.agreement.azdata.eula%",
|
||||
"url": "https://aka.ms/eula-azdata-en"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "arc.sql",
|
||||
@@ -571,18 +558,6 @@
|
||||
"light": "./images/miaa.svg",
|
||||
"dark": "./images/miaa.svg"
|
||||
},
|
||||
"options": [
|
||||
{
|
||||
"name": "resourceType",
|
||||
"displayName": "%resource.type.picker.display.name%",
|
||||
"values": [
|
||||
{
|
||||
"name": "sql.managed.instance",
|
||||
"displayName": "%sql.managed.instance.display.name%"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"providers": [
|
||||
{
|
||||
"dialog": {
|
||||
@@ -599,6 +574,25 @@
|
||||
{
|
||||
"title": "%arc.sql.settings.section.title%",
|
||||
"fields": [
|
||||
{
|
||||
"label": "%arc.controller%",
|
||||
"variableName": "AZDATA_NB_VAR_ARC_CONTROLLER",
|
||||
"type": "options",
|
||||
"editable": false,
|
||||
"required": true,
|
||||
"options": {
|
||||
"source": {
|
||||
"type": "ArcControllersOptionsSource",
|
||||
"variableNames": {
|
||||
"endpoint": "AZDATA_NB_VAR_CONTROLLER_ENDPOINT",
|
||||
"username": "AZDATA_NB_VAR_CONTROLLER_USERNAME",
|
||||
"password": "AZDATA_NB_VAR_CONTROLLER_PASSWORD"
|
||||
}
|
||||
},
|
||||
"optionsType": "dropdown"
|
||||
},
|
||||
"labelWidth": "100%"
|
||||
},
|
||||
{
|
||||
"label": "%arc.sql.instance.name%",
|
||||
"variableName": "AZDATA_NB_VAR_SQL_INSTANCE_NAME",
|
||||
@@ -653,7 +647,7 @@
|
||||
"version": "20.1.0"
|
||||
}
|
||||
],
|
||||
"when": "resourceType=sql.managed.instance"
|
||||
"when": "true"
|
||||
}
|
||||
],
|
||||
"agreement": {
|
||||
@@ -666,10 +660,6 @@
|
||||
{
|
||||
"text": "%arc.agreement.sql.terms.conditions%",
|
||||
"url": "https://go.microsoft.com/fwlink/?linkid=2045708"
|
||||
},
|
||||
{
|
||||
"text": "%arc.agreement.azdata.eula%",
|
||||
"url": "https://aka.ms/eula-azdata-en"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -683,18 +673,6 @@
|
||||
"light": "./images/postgres.svg",
|
||||
"dark": "./images/postgres.svg"
|
||||
},
|
||||
"options": [
|
||||
{
|
||||
"name": "resourceType",
|
||||
"displayName": "%resource.type.picker.display.name%",
|
||||
"values": [
|
||||
{
|
||||
"name": "postgres",
|
||||
"displayName": "%postgres.server.group.display.name%"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"providers": [
|
||||
{
|
||||
"dialog": {
|
||||
@@ -711,6 +689,25 @@
|
||||
{
|
||||
"title": "%arc.postgres.settings.section.title%",
|
||||
"fields": [
|
||||
{
|
||||
"label": "%arc.controller%",
|
||||
"variableName": "AZDATA_NB_VAR_ARC_CONTROLLER",
|
||||
"type": "options",
|
||||
"editable": false,
|
||||
"required": true,
|
||||
"options": {
|
||||
"source": {
|
||||
"type": "ArcControllersOptionsSource",
|
||||
"variableNames": {
|
||||
"endpoint": "AZDATA_NB_VAR_CONTROLLER_ENDPOINT",
|
||||
"username": "AZDATA_NB_VAR_CONTROLLER_USERNAME",
|
||||
"password": "AZDATA_NB_VAR_CONTROLLER_PASSWORD"
|
||||
}
|
||||
},
|
||||
"optionsType": "dropdown"
|
||||
},
|
||||
"labelWidth": "100%"
|
||||
},
|
||||
{
|
||||
"label": "%arc.postgres.server.group.name%",
|
||||
"variableName": "AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_NAME",
|
||||
@@ -810,7 +807,7 @@
|
||||
"version": "20.1.0"
|
||||
}
|
||||
],
|
||||
"when": "resourceType=postgres"
|
||||
"when": "true"
|
||||
}
|
||||
],
|
||||
"agreement": {
|
||||
@@ -823,10 +820,6 @@
|
||||
{
|
||||
"text": "%arc.agreement.postgres.terms.conditions%",
|
||||
"url": "https://go.microsoft.com/fwlink/?linkid=2045708"
|
||||
},
|
||||
{
|
||||
"text": "%arc.agreement.azdata.eula%",
|
||||
"url": "https://aka.ms/eula-azdata-en"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user