From 5eba85e46fb98264ce2ef3f8f5107848940b7ed0 Mon Sep 17 00:00:00 2001 From: Ravikumar Palanisamy Date: Tue, 11 May 2021 20:13:03 -0700 Subject: [PATCH 1/2] Deploy container image to Azure Arc --- package-lock.json | 528 ++---------------- package.json | 4 +- .../azure/DockerAssignAcrPullRoleStep.ts | 3 +- .../registries/azure/DockerSiteCreateStep.ts | 59 +- .../registries/azure/deployImageToAzure.ts | 16 +- .../createWizard/AzureRegistryCreateStep.ts | 7 +- 6 files changed, 127 insertions(+), 490 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0f197fbe55..0a56d19bc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,8 +26,8 @@ "tar": "^6.1.0", "tar-stream": "^2.2.0", "uuid": "^8.3.2", - "vscode-azureappservice": "^0.76.1", - "vscode-azureextensionui": "^0.41.3", + "vscode-azureappservice": "^0.80.0", + "vscode-azureextensionui": "^0.43.2", "vscode-languageclient": "^7.0.0", "vscode-nls": "^5.0.0", "vscode-tas-client": "^0.1.22", @@ -121,6 +121,16 @@ "tslib": "^1.10.0" } }, + "node_modules/@azure/arm-resourcegraph": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-resourcegraph/-/arm-resourcegraph-4.0.0.tgz", + "integrity": "sha512-2iCedUV2WACNKeivlt1YLpHDTFaMLvaWMizdkocaHp+e4K8QiV/ToB0FxBWHtT0l9SH9RK4hoHEcgtW5bEEnAg==", + "dependencies": { + "@azure/ms-rest-azure-js": "^2.0.1", + "@azure/ms-rest-js": "^2.0.4", + "tslib": "^1.10.0" + } + }, "node_modules/@azure/arm-resources": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-4.0.0.tgz", @@ -582,9 +592,6 @@ }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { @@ -851,19 +858,6 @@ }, "engines": { "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^4.0.0", - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } } }, "node_modules/@typescript-eslint/experimental-utils": { @@ -881,13 +875,6 @@ }, "engines": { "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" } }, "node_modules/@typescript-eslint/parser": { @@ -903,18 +890,6 @@ }, "engines": { "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } } }, "node_modules/@typescript-eslint/scope-manager": { @@ -928,10 +903,6 @@ }, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" } }, "node_modules/@typescript-eslint/types": { @@ -941,10 +912,6 @@ "dev": true, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" } }, "node_modules/@typescript-eslint/typescript-estree": { @@ -963,15 +930,6 @@ }, "engines": { "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } } }, "node_modules/@typescript-eslint/visitor-keys": { @@ -985,10 +943,6 @@ }, "engines": { "node": "^8.10.0 || ^10.13.0 || >=11.10.1" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" } }, "node_modules/@ungap/promise-all-settled": { @@ -1147,11 +1101,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz", "integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==", - "dev": true, - "peerDependencies": { - "webpack": "4.x.x || 5.x.x", - "webpack-cli": "4.x.x" - } + "dev": true }, "node_modules/@webpack-cli/info": { "version": "1.2.3", @@ -1160,24 +1110,13 @@ "dev": true, "dependencies": { "envinfo": "^7.7.3" - }, - "peerDependencies": { - "webpack-cli": "4.x.x" } }, "node_modules/@webpack-cli/serve": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz", "integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==", - "dev": true, - "peerDependencies": { - "webpack-cli": "4.x.x" - }, - "peerDependenciesMeta": { - "webpack-dev-server": { - "optional": true - } - } + "dev": true }, "node_modules/@xtuc/ieee754": { "version": "1.2.0", @@ -1218,10 +1157,7 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } + "dev": true }, "node_modules/acorn-walk": { "version": "8.0.2", @@ -1253,20 +1189,13 @@ "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" } }, "node_modules/ajv-keywords": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } + "dev": true }, "node_modules/ansi-colors": { "version": "4.1.1", @@ -1308,9 +1237,6 @@ }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/ansi-wrap": { @@ -1486,21 +1412,7 @@ "node_modules/base64-js": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", @@ -1544,9 +1456,6 @@ "dependencies": { "buffers": "~0.1.1", "chainsaw": "~0.1.0" - }, - "engines": { - "node": "*" } }, "node_modules/binary-extensions": { @@ -1623,30 +1532,12 @@ }, "engines": { "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" } }, "node_modules/buffer": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -1706,9 +1597,6 @@ "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/callsites": { @@ -1727,9 +1615,6 @@ "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/caniuse-lite": { @@ -1745,9 +1630,6 @@ "dev": true, "dependencies": { "traverse": ">=0.3.0 <0.4" - }, - "engines": { - "node": "*" } }, "node_modules/chalk": { @@ -1761,9 +1643,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" } }, "node_modules/cheerio": { @@ -1794,9 +1673,6 @@ "domelementtype": "^2.2.0", "domhandler": "^4.1.0", "domutils": "^2.5.2" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" } }, "node_modules/chokidar": { @@ -2031,13 +1907,6 @@ }, "engines": { "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" } }, "node_modules/core-util-is": { @@ -2071,9 +1940,6 @@ "domhandler": "^4.1.0", "domutils": "^2.5.1", "nth-check": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" } }, "node_modules/css-what": { @@ -2083,9 +1949,6 @@ "dev": true, "engines": { "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" } }, "node_modules/d": { @@ -2111,11 +1974,6 @@ }, "engines": { "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } } }, "node_modules/decamelize": { @@ -2125,9 +1983,6 @@ "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/deep-is": { @@ -2356,22 +2211,13 @@ "domelementtype": "^2.0.1", "domhandler": "^4.0.0", "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" } }, "node_modules/domelementtype": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] + "dev": true }, "node_modules/domhandler": { "version": "4.1.0", @@ -2383,9 +2229,6 @@ }, "engines": { "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" } }, "node_modules/domutils": { @@ -2397,9 +2240,6 @@ "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", "domhandler": "^4.1.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" } }, "node_modules/duplexer": { @@ -2522,10 +2362,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } + "dev": true }, "node_modules/envinfo": { "version": "7.8.1", @@ -2602,9 +2439,6 @@ "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint": { @@ -2656,9 +2490,6 @@ }, "engines": { "node": "^10.12.0 || >=12.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-scope": { @@ -2684,9 +2515,6 @@ }, "engines": { "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" } }, "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { @@ -2852,9 +2680,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, "node_modules/ext": { @@ -2986,9 +2811,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/flat": { @@ -3023,19 +2845,8 @@ "version": "1.13.3", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz", "integrity": "sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], "engines": { "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } } }, "node_modules/form-data": { @@ -3097,7 +2908,6 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, - "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -3202,9 +3012,6 @@ "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-stream": { @@ -3214,9 +3021,6 @@ "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/glob": { @@ -3233,9 +3037,6 @@ }, "engines": { "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" } }, "node_modules/glob-gitignore": { @@ -3289,9 +3090,6 @@ }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/globby": { @@ -3308,9 +3106,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/globby/node_modules/ignore": { @@ -3407,9 +3202,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/handlebars": { @@ -3460,9 +3252,6 @@ "dev": true, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/he": { @@ -3563,13 +3352,6 @@ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.0.0", @@ -3627,21 +3409,7 @@ "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "node_modules/ignore": { "version": "4.0.6", @@ -3663,9 +3431,6 @@ }, "engines": { "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/import-local": { @@ -3755,9 +3520,6 @@ }, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-core-module": { @@ -3767,9 +3529,6 @@ "dev": true, "dependencies": { "has": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-docker": { @@ -3829,9 +3588,6 @@ "dev": true, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-plain-obj": { @@ -3870,9 +3626,6 @@ "dev": true, "engines": { "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-typedarray": { @@ -3991,10 +3744,8 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", "dependencies": { + "graceful-fs": "^4.1.6", "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" } }, "node_modules/jwa": { @@ -4095,9 +3846,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lodash": { @@ -4405,10 +4153,6 @@ }, "engines": { "node": ">= 10.12.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/mochajs" } }, "node_modules/mocha/node_modules/argparse": { @@ -4445,9 +4189,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" } }, "node_modules/ms": { @@ -4549,9 +4290,6 @@ "dev": true, "dependencies": { "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" } }, "node_modules/once": { @@ -4572,15 +4310,12 @@ }, "engines": { "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/open": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/open/-/open-8.0.5.tgz", - "integrity": "sha512-hkPXCz7gijWp2GoWqsQ4O/5p7F6d5pIQ/+9NyeWG1nABJ4zvLi9kJRv1a44kVf5p13wK0WMoiRA+Xey68yOytA==", + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/open/-/open-8.0.7.tgz", + "integrity": "sha512-qoyG0kpdaWVoL5MiwTRQWujSdivwBOgfLadVEdpsZNHOK1+kBvmVtLYdgWr8G4cgBpG9zaxezn6jz6PPdQW5xg==", "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -4663,9 +4398,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { @@ -4678,9 +4410,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-retry": { @@ -4818,9 +4547,6 @@ "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==", "engines": { "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" } }, "node_modules/pkg-dir": { @@ -4870,9 +4596,6 @@ }, "engines": { "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/pkg-dir/node_modules/p-locate": { @@ -4934,9 +4657,6 @@ "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", "engines": { "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/private": { @@ -5002,21 +4722,7 @@ "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" }, "node_modules/randombytes": { "version": "2.1.0", @@ -5129,9 +4835,6 @@ "dev": true, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/mysticatea" } }, "node_modules/remove-trailing-separator": { @@ -5181,9 +4884,6 @@ "dependencies": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/resolve-cwd": { @@ -5243,29 +4943,12 @@ }, "bin": { "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" } }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], "dependencies": { "queue-microtask": "^1.2.2" } @@ -5273,21 +4956,7 @@ "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, "node_modules/safer-buffer": { "version": "2.1.2", @@ -5311,10 +4980,6 @@ }, "engines": { "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" } }, "node_modules/semver": { @@ -5450,9 +5115,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, "node_modules/source-list-map": { @@ -5599,9 +5261,6 @@ "dev": true, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/supports-color": { @@ -5646,10 +5305,6 @@ "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2", "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" } }, "node_modules/table/node_modules/json-schema-traverse": { @@ -5754,13 +5409,6 @@ }, "engines": { "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" } }, "node_modules/terser/node_modules/commander": { @@ -5848,10 +5496,7 @@ "version": "0.3.9", "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=", - "dev": true, - "engines": { - "node": "*" - } + "dev": true }, "node_modules/ts-loader": { "version": "8.1.0", @@ -5867,10 +5512,6 @@ }, "engines": { "node": ">=10.0.0" - }, - "peerDependencies": { - "typescript": "*", - "webpack": "*" } }, "node_modules/tslib": { @@ -5888,9 +5529,6 @@ }, "engines": { "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" } }, "node_modules/tunnel": { @@ -5930,9 +5568,6 @@ "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/typed-rest-client": { @@ -6275,13 +5910,15 @@ } }, "node_modules/vscode-azureappservice": { - "version": "0.76.1", - "resolved": "https://registry.npmjs.org/vscode-azureappservice/-/vscode-azureappservice-0.76.1.tgz", - "integrity": "sha512-zQEo49juQet8hJZkV3ZwxzQY/cdsjzde3kTNmIVHt/NLD2rGXTLp4gbGvgqQzAhp054Wc4rQ5+RvlmdIUCyvag==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/vscode-azureappservice/-/vscode-azureappservice-0.80.0.tgz", + "integrity": "sha512-q2e8mAvNtZt/YNOtIYTpsVojh9gJjcP6ejIjynKkVcsvIBpmI2kgJcZc5HoggD1hcWP/cFgVqOJ/W7qpbytpXA==", + "license": "MIT", "dependencies": { "@azure/abort-controller": "^1.0.4", "@azure/arm-appinsights": "^3.0.0", "@azure/arm-appservice": "^6.1.0", + "@azure/arm-resourcegraph": "^4.0.0", "@azure/arm-resources": "^4.0.0", "@azure/arm-subscriptions": "^3.0.0", "@azure/ms-rest-azure-env": "^2.0.0", @@ -6295,7 +5932,7 @@ "portfinder": "^1.0.25", "pretty-bytes": "^5.3.0", "simple-git": "1.132.0", - "vscode-azureextensionui": "^0.41.1", + "vscode-azureextensionui": "^0.43.0", "vscode-azurekudu": "^0.2.0", "vscode-nls": "^4.1.1", "websocket": "^1.0.31", @@ -6337,9 +5974,9 @@ "integrity": "sha512-7bOHxPsfyuCqmP+hZXscLhiHwe7CSuFE4hyhbs22xPIhQ4jv99FcR4eBzfYYVLP356HNFpdvz63FFb/xw6T4Iw==" }, "node_modules/vscode-azureextensionui": { - "version": "0.41.3", - "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.41.3.tgz", - "integrity": "sha512-0E3An1cIT3PBWmoRNMV0KN1Wmvu0jTwAuVDUAKX5mjbx5xZ+FXKEMwHzNA+yoJRp0gk9DmrWd1D55/Au2cIx8A==", + "version": "0.43.2", + "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.43.2.tgz", + "integrity": "sha512-cLeWFQIwWzpE5+wjRW0L8y/qPB15vhOWGxFzehDv+irmfRA/ERXjha8Jh7nxnhFXrtsBJVKAAICMMAq5b4w8/Q==", "dependencies": { "@azure/arm-resources": "^3.0.0", "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", @@ -6658,9 +6295,6 @@ }, "engines": { "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/vscode-nls-dev/node_modules/p-locate": { @@ -6845,15 +6479,6 @@ }, "engines": { "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } } }, "node_modules/webpack-bundle-analyzer": { @@ -6917,23 +6542,6 @@ }, "engines": { "node": ">=10.13.0" - }, - "peerDependencies": { - "webpack": "4.x.x || 5.x.x" - }, - "peerDependenciesMeta": { - "@webpack-cli/generators": { - "optional": true - }, - "@webpack-cli/migrate": { - "optional": true - }, - "webpack-bundle-analyzer": { - "optional": true - }, - "webpack-dev-server": { - "optional": true - } } }, "node_modules/webpack-cli/node_modules/commander": { @@ -7145,9 +6753,6 @@ }, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, "node_modules/wrappy": { @@ -7162,18 +6767,6 @@ "dev": true, "engines": { "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } } }, "node_modules/xml2js": { @@ -7285,9 +6878,6 @@ "dev": true, "engines": { "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" } } }, @@ -7347,6 +6937,16 @@ "tslib": "^1.10.0" } }, + "@azure/arm-resourcegraph": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@azure/arm-resourcegraph/-/arm-resourcegraph-4.0.0.tgz", + "integrity": "sha512-2iCedUV2WACNKeivlt1YLpHDTFaMLvaWMizdkocaHp+e4K8QiV/ToB0FxBWHtT0l9SH9RK4hoHEcgtW5bEEnAg==", + "requires": { + "@azure/ms-rest-azure-js": "^2.0.1", + "@azure/ms-rest-js": "^2.0.4", + "tslib": "^1.10.0" + } + }, "@azure/arm-resources": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@azure/arm-resources/-/arm-resources-4.0.0.tgz", @@ -8215,8 +7815,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.2.tgz", "integrity": "sha512-3OBzV2fBGZ5TBfdW50cha1lHDVf9vlvRXnjpVbJBa20pSZQaSkMJZiwA8V2vD9ogyeXn8nU5s5A6mHyf5jhMzA==", - "dev": true, - "requires": {} + "dev": true }, "@webpack-cli/info": { "version": "1.2.3", @@ -8231,8 +7830,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.3.1.tgz", "integrity": "sha512-0qXvpeYO6vaNoRBI52/UsbcaBydJCggoBBnIo/ovQQdn6fug0BgwsjorV1hVS7fMqGVTZGcVxv8334gjmbj5hw==", - "dev": true, - "requires": {} + "dev": true }, "@xtuc/ieee754": { "version": "1.2.0", @@ -8264,8 +7862,7 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", - "dev": true, - "requires": {} + "dev": true }, "acorn-walk": { "version": "8.0.2", @@ -8297,8 +7894,7 @@ "version": "3.5.2", "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "requires": {} + "dev": true }, "ansi-colors": { "version": "4.1.1", @@ -10839,9 +10435,9 @@ } }, "open": { - "version": "8.0.5", - "resolved": "https://registry.npmjs.org/open/-/open-8.0.5.tgz", - "integrity": "sha512-hkPXCz7gijWp2GoWqsQ4O/5p7F6d5pIQ/+9NyeWG1nABJ4zvLi9kJRv1a44kVf5p13wK0WMoiRA+Xey68yOytA==", + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/open/-/open-8.0.7.tgz", + "integrity": "sha512-qoyG0kpdaWVoL5MiwTRQWujSdivwBOgfLadVEdpsZNHOK1+kBvmVtLYdgWr8G4cgBpG9zaxezn6jz6PPdQW5xg==", "requires": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -12134,13 +11730,14 @@ } }, "vscode-azureappservice": { - "version": "0.76.1", - "resolved": "https://registry.npmjs.org/vscode-azureappservice/-/vscode-azureappservice-0.76.1.tgz", - "integrity": "sha512-zQEo49juQet8hJZkV3ZwxzQY/cdsjzde3kTNmIVHt/NLD2rGXTLp4gbGvgqQzAhp054Wc4rQ5+RvlmdIUCyvag==", + "version": "0.80.0", + "resolved": "https://registry.npmjs.org/vscode-azureappservice/-/vscode-azureappservice-0.80.0.tgz", + "integrity": "sha512-q2e8mAvNtZt/YNOtIYTpsVojh9gJjcP6ejIjynKkVcsvIBpmI2kgJcZc5HoggD1hcWP/cFgVqOJ/W7qpbytpXA==", "requires": { "@azure/abort-controller": "^1.0.4", "@azure/arm-appinsights": "^3.0.0", "@azure/arm-appservice": "^6.1.0", + "@azure/arm-resourcegraph": "^4.0.0", "@azure/arm-resources": "^4.0.0", "@azure/arm-subscriptions": "^3.0.0", "@azure/ms-rest-azure-env": "^2.0.0", @@ -12154,7 +11751,7 @@ "portfinder": "^1.0.25", "pretty-bytes": "^5.3.0", "simple-git": "1.132.0", - "vscode-azureextensionui": "^0.41.1", + "vscode-azureextensionui": "^0.43.0", "vscode-azurekudu": "^0.2.0", "vscode-nls": "^4.1.1", "websocket": "^1.0.31", @@ -12192,9 +11789,9 @@ } }, "vscode-azureextensionui": { - "version": "0.41.3", - "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.41.3.tgz", - "integrity": "sha512-0E3An1cIT3PBWmoRNMV0KN1Wmvu0jTwAuVDUAKX5mjbx5xZ+FXKEMwHzNA+yoJRp0gk9DmrWd1D55/Au2cIx8A==", + "version": "0.43.2", + "resolved": "https://registry.npmjs.org/vscode-azureextensionui/-/vscode-azureextensionui-0.43.2.tgz", + "integrity": "sha512-cLeWFQIwWzpE5+wjRW0L8y/qPB15vhOWGxFzehDv+irmfRA/ERXjha8Jh7nxnhFXrtsBJVKAAICMMAq5b4w8/Q==", "requires": { "@azure/arm-resources": "^3.0.0", "@azure/arm-resources-profile-2020-09-01-hybrid": "^1.0.0", @@ -12841,8 +12438,7 @@ "version": "7.4.4", "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz", "integrity": "sha512-Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw==", - "dev": true, - "requires": {} + "dev": true }, "xml2js": { "version": "0.4.23", diff --git a/package.json b/package.json index 3d8890a397..34c206952d 100644 --- a/package.json +++ b/package.json @@ -2760,8 +2760,8 @@ "tar": "^6.1.0", "tar-stream": "^2.2.0", "uuid": "^8.3.2", - "vscode-azureappservice": "^0.76.1", - "vscode-azureextensionui": "^0.41.3", + "vscode-azureappservice": "^0.80.0", + "vscode-azureextensionui": "^0.43.2", "vscode-languageclient": "^7.0.0", "vscode-nls": "^5.0.0", "vscode-tas-client": "^0.1.22", diff --git a/src/commands/registries/azure/DockerAssignAcrPullRoleStep.ts b/src/commands/registries/azure/DockerAssignAcrPullRoleStep.ts index 6f4d08f14c..77482576aa 100644 --- a/src/commands/registries/azure/DockerAssignAcrPullRoleStep.ts +++ b/src/commands/registries/azure/DockerAssignAcrPullRoleStep.ts @@ -81,6 +81,7 @@ export class DockerAssignAcrPullRoleStep extends AzureWizardExecuteStep { public priority: number = 140; - public constructor(private readonly siteConfig: WebSiteManagementModels.SiteConfig) { + public constructor(private readonly siteConfig: WebSiteManagementModels.SiteConfig, private readonly node: RemoteTagTreeItem) { super(); } @@ -22,19 +26,56 @@ export class DockerSiteCreateStep extends AzureWizardExecuteStep { + // Temporary workaround until Arc adds support for managed identity, so use usename and password instead. + // When customLocation is set, then user is deploying to Arc. + const registryTreeItem: RegistryTreeItemBase = this.node.parent.parent; + if (registryTreeItem instanceof AzureRegistryTreeItem && context.customLocation) { + const appSettings: WebSiteManagementModels.NameValuePair[] = []; + const cred = await registryTreeItem.tryGetAdminCredentials(); + if (!cred) { + throw new Error(localize('vscode-docker.commands.registries.azure.dockersitecreatestep.notAdminEnabled', 'Azure App service deployment on Azure Arc only supports running images from Azure Container Registries with admin enabled')); + } else { + appSettings.push({ name: "DOCKER_REGISTRY_SERVER_URL", value: registryTreeItem.baseUrl }); + appSettings.push({ name: "DOCKER_REGISTRY_SERVER_USERNAME", value: cred.username }); + appSettings.push({ name: "DOCKER_REGISTRY_SERVER_PASSWORD", value: nonNullProp(cred, 'passwords')[0].value }); + appSettings.push({ name: "DOCKER_ENABLE_CI", value: 'true' }); + const linuxFxVersion = `DOCKER|${registryTreeItem.baseImagePath}/${this.node.repoNameAndTag}`; + return { + linuxFxVersion, + appSettings + }; + } + } + else { + return this.siteConfig; + } } public shouldExecute(context: IAppServiceWizardContext): boolean { diff --git a/src/commands/registries/azure/deployImageToAzure.ts b/src/commands/registries/azure/deployImageToAzure.ts index 7fee4733cf..df49d114b6 100644 --- a/src/commands/registries/azure/deployImageToAzure.ts +++ b/src/commands/registries/azure/deployImageToAzure.ts @@ -5,8 +5,8 @@ import { WebSiteManagementModels } from '@azure/arm-appservice'; // These are only dev-time imports so don't need to be lazy import { env, Uri, window } from "vscode"; -import { IAppServiceWizardContext } from "vscode-azureappservice"; // These are only dev-time imports so don't need to be lazy -import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, LocationListStep, ResourceGroupListStep } from "vscode-azureextensionui"; +import { CustomLocationListStep, IAppServiceWizardContext } from "vscode-azureappservice"; // These are only dev-time imports so don't need to be lazy +import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, ResourceGroupListStep } from "vscode-azureextensionui"; import { ext } from "../../../extensionVariables"; import { localize } from "../../../localize"; import { RegistryApi } from '../../../tree/registries/all/RegistryApi'; @@ -46,17 +46,15 @@ export async function deployImageToAzure(context: IActionContext, node?: RemoteT promptSteps.push(subscriptionStep); } - promptSteps.push(...[ - new vscAzureAppService.SiteNameStep(), - new ResourceGroupListStep(), - new vscAzureAppService.AppServicePlanListStep() - ]); - LocationListStep.addStep(wizardContext, promptSteps); + promptSteps.push(new vscAzureAppService.SiteNameStep()); + promptSteps.push(new ResourceGroupListStep()); + CustomLocationListStep.addStep(wizardContext, promptSteps); + promptSteps.push(new vscAzureAppService.AppServicePlanListStep()); // Get site config before running the wizard so that any problems with the tag tree item are shown at the beginning of the process const siteConfig: WebSiteManagementModels.SiteConfig = await getNewSiteConfig(node); const executeSteps: AzureWizardExecuteStep[] = [ - new DockerSiteCreateStep(siteConfig), + new DockerSiteCreateStep(siteConfig, node), new DockerAssignAcrPullRoleStep(node), new DockerWebhookCreateStep(node), ]; diff --git a/src/tree/registries/azure/createWizard/AzureRegistryCreateStep.ts b/src/tree/registries/azure/createWizard/AzureRegistryCreateStep.ts index 611b0c6474..c6f44f084c 100644 --- a/src/tree/registries/azure/createWizard/AzureRegistryCreateStep.ts +++ b/src/tree/registries/azure/createWizard/AzureRegistryCreateStep.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { Progress } from 'vscode'; -import { AzureWizardExecuteStep, createAzureClient } from 'vscode-azureextensionui'; +import { AzExtLocation, AzureWizardExecuteStep, createAzureClient, LocationListStep } from 'vscode-azureextensionui'; import { ext } from '../../../../extensionVariables'; import { localize } from '../../../../localize'; import { nonNullProp } from '../../../../utils/nonNull'; @@ -22,7 +22,8 @@ export class AzureRegistryCreateStep extends AzureWizardExecuteStep Date: Wed, 12 May 2021 10:38:55 -0700 Subject: [PATCH 2/2] Lazy load CustomLocationListStep --- src/commands/registries/azure/DockerSiteCreateStep.ts | 2 +- src/commands/registries/azure/deployImageToAzure.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/registries/azure/DockerSiteCreateStep.ts b/src/commands/registries/azure/DockerSiteCreateStep.ts index caec461af3..7432ef0a3f 100644 --- a/src/commands/registries/azure/DockerSiteCreateStep.ts +++ b/src/commands/registries/azure/DockerSiteCreateStep.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { WebSiteManagementClient, WebSiteManagementModels } from '@azure/arm-appservice'; // These are only dev-time imports so don't need to be lazy -import { Site } from '@azure/arm-appservice/esm/models'; +import { Site } from '@azure/arm-appservice/esm/models'; // These are only dev-time imports so don't need to be lazy import { Progress } from "vscode"; import { IAppServiceWizardContext } from "vscode-azureappservice"; // These are only dev-time imports so don't need to be lazy import { AzExtLocation, AzureWizardExecuteStep, createAzureClient, LocationListStep } from "vscode-azureextensionui"; diff --git a/src/commands/registries/azure/deployImageToAzure.ts b/src/commands/registries/azure/deployImageToAzure.ts index df49d114b6..7057522a20 100644 --- a/src/commands/registries/azure/deployImageToAzure.ts +++ b/src/commands/registries/azure/deployImageToAzure.ts @@ -5,7 +5,7 @@ import { WebSiteManagementModels } from '@azure/arm-appservice'; // These are only dev-time imports so don't need to be lazy import { env, Uri, window } from "vscode"; -import { CustomLocationListStep, IAppServiceWizardContext } from "vscode-azureappservice"; // These are only dev-time imports so don't need to be lazy +import { IAppServiceWizardContext } from "vscode-azureappservice"; // These are only dev-time imports so don't need to be lazy import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, IActionContext, ResourceGroupListStep } from "vscode-azureextensionui"; import { ext } from "../../../extensionVariables"; import { localize } from "../../../localize"; @@ -48,7 +48,7 @@ export async function deployImageToAzure(context: IActionContext, node?: RemoteT promptSteps.push(new vscAzureAppService.SiteNameStep()); promptSteps.push(new ResourceGroupListStep()); - CustomLocationListStep.addStep(wizardContext, promptSteps); + vscAzureAppService.CustomLocationListStep.addStep(wizardContext, promptSteps); promptSteps.push(new vscAzureAppService.AppServicePlanListStep()); // Get site config before running the wizard so that any problems with the tag tree item are shown at the beginning of the process