ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: 'Arc data controller deployment fails' #11086 (#11110)

Browse Source
This commit is contained in:
Arvind Ranasaria
2020-06-25 19:18:42 -07:00
committed by GitHub
parent 8e0050f2af
commit cdd3d1bf2a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
extensions/arc/package.json
View File

@@ -161,7 +161,7 @@
"providers": [ "providers": [
{ {
"notebookWizard": { "notebookWizard": {
"notebook": "./notesbooks/arcDeployment/deploy.arc.control.plane.ipynb", "notebook": "./notebooks/arcDeployment/deploy.arc.control.plane.ipynb",
"type": "new-arc-control-plane", "type": "new-arc-control-plane",
"runNotebook": false, "runNotebook": false,
"codeCellInsertionPosition": 5, "codeCellInsertionPosition": 5,
@@ -293,7 +293,10 @@
"locations": [ "locations": [
"East US", "East US",
"East US 2", "East US 2",
"Central US" "Central US",
"West Europe",
"Southeast Asia",
"West US 2"
] ]
}, },
{ {
@@ -591,7 +594,7 @@
"providers": [ "providers": [
{ {
"dialog": { "dialog": {
"notebook": "./notesbooks/arcDeployment/deploy.sql.existing.arc.ipynb", "notebook": "./notebooks/arcDeployment/deploy.sql.existing.arc.ipynb",
"runNotebook": true, "runNotebook": true,
"taskName": "%arc.sql.new.dialog.title%", "taskName": "%arc.sql.new.dialog.title%",
"actionText": "%arc.deploy.action%", "actionText": "%arc.deploy.action%",
@@ -699,7 +702,7 @@
"providers": [ "providers": [
{ {
"dialog": { "dialog": {
"notebook": "./notesbooks/arcDeployment/deploy.postgres.existing.arc.ipynb", "notebook": "./notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb",
"runNotebook": true, "runNotebook": true,
"taskName": "%arc.postgres.new.dialog.title%", "taskName": "%arc.postgres.new.dialog.title%",
"actionText": "%arc.deploy.action%", "actionText": "%arc.deploy.action%",

9
extensions/resource-deployment/src/ui/modelViewUtils.ts
View File

@@ -920,8 +920,8 @@ async function handleSelectedSubscriptionChanged(context: AzureAccountFieldConte
return; return;
} }
if (response.errors.length > 0) { if (response.errors.length > 0) {
// If we got back some RG's then don't display the errors to the user - it's normal for users // If we got back some Resource Groups then don't display the errors to the user - it's normal for users
// to not necessarily have access to all RG's on a subscription so displaying the errors // to not necessarily have access to all Resource Groups on a subscription so displaying the errors
// in that case is usually just distracting and causes confusion // in that case is usually just distracting and causes confusion
const errMsg = response.errors.join(EOL); const errMsg = response.errors.join(EOL);
if (response.resourceGroups.length === 0) { if (response.resourceGroups.length === 0) {
@@ -948,7 +948,10 @@ async function handleSelectedSubscriptionChanged(context: AzureAccountFieldConte
const knownAzureLocationNameMappings = new Map<string, string>([ const knownAzureLocationNameMappings = new Map<string, string>([
['East US', azurecore.AzureRegion.eastus], ['East US', azurecore.AzureRegion.eastus],
['East US 2', azurecore.AzureRegion.eastus2], ['East US 2', azurecore.AzureRegion.eastus2],
['Central US', azurecore.AzureRegion.centralus] ['Central US', azurecore.AzureRegion.centralus],
['West Europe', azurecore.AzureRegion.westeurope],
['Southeast Asia', azurecore.AzureRegion.southeastasia],
['West US 2', azurecore.AzureRegion.westus2]
]); ]);
/** /**