From cdd3d1bf2a86a4abc6bc8653e95742ca61a95799 Mon Sep 17 00:00:00 2001 From: Arvind Ranasaria Date: Thu, 25 Jun 2020 19:18:42 -0700 Subject: [PATCH] fix: 'Arc data controller deployment fails' #11086 (#11110) --- extensions/arc/package.json | 11 +++++++---- .../resource-deployment/src/ui/modelViewUtils.ts | 9 ++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/extensions/arc/package.json b/extensions/arc/package.json index eee35a0e8b..18cde7c9c1 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -161,7 +161,7 @@ "providers": [ { "notebookWizard": { - "notebook": "./notesbooks/arcDeployment/deploy.arc.control.plane.ipynb", + "notebook": "./notebooks/arcDeployment/deploy.arc.control.plane.ipynb", "type": "new-arc-control-plane", "runNotebook": false, "codeCellInsertionPosition": 5, @@ -293,7 +293,10 @@ "locations": [ "East US", "East US 2", - "Central US" + "Central US", + "West Europe", + "Southeast Asia", + "West US 2" ] }, { @@ -591,7 +594,7 @@ "providers": [ { "dialog": { - "notebook": "./notesbooks/arcDeployment/deploy.sql.existing.arc.ipynb", + "notebook": "./notebooks/arcDeployment/deploy.sql.existing.arc.ipynb", "runNotebook": true, "taskName": "%arc.sql.new.dialog.title%", "actionText": "%arc.deploy.action%", @@ -699,7 +702,7 @@ "providers": [ { "dialog": { - "notebook": "./notesbooks/arcDeployment/deploy.postgres.existing.arc.ipynb", + "notebook": "./notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb", "runNotebook": true, "taskName": "%arc.postgres.new.dialog.title%", "actionText": "%arc.deploy.action%", diff --git a/extensions/resource-deployment/src/ui/modelViewUtils.ts b/extensions/resource-deployment/src/ui/modelViewUtils.ts index f3aaa76b6d..112869edca 100644 --- a/extensions/resource-deployment/src/ui/modelViewUtils.ts +++ b/extensions/resource-deployment/src/ui/modelViewUtils.ts @@ -920,8 +920,8 @@ async function handleSelectedSubscriptionChanged(context: AzureAccountFieldConte return; } 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 - // to not necessarily have access to all RG's on a subscription so displaying the errors + // 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 Resource Groups on a subscription so displaying the errors // in that case is usually just distracting and causes confusion const errMsg = response.errors.join(EOL); if (response.resourceGroups.length === 0) { @@ -948,7 +948,10 @@ async function handleSelectedSubscriptionChanged(context: AzureAccountFieldConte const knownAzureLocationNameMappings = new Map([ ['East US', azurecore.AzureRegion.eastus], ['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] ]); /**