diff --git a/Tasks/AzureFunctionOnKubernetesV1/make.json b/Tasks/AzureFunctionOnKubernetesV1/make.json index 2a4aa885dd10..5757b3d9c283 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/make.json +++ b/Tasks/AzureFunctionOnKubernetesV1/make.json @@ -4,7 +4,7 @@ "items": [ "node_modules/azure-pipelines-tasks-docker-common/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-kubernetes-common/node_modules/azure-pipelines-task-lib", - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tool-lib/node_modules/azure-pipelines-task-lib" ], "options": "-Rf" diff --git a/Tasks/AzureFunctionOnKubernetesV1/package-lock.json b/Tasks/AzureFunctionOnKubernetesV1/package-lock.json index ec6562c3d0dd..5656930a517e 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/package-lock.json +++ b/Tasks/AzureFunctionOnKubernetesV1/package-lock.json @@ -160,10 +160,10 @@ "uuid": "^3.0.1" } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.223.4", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.223.4.tgz", - "integrity": "sha512-t7sfkbwSvL6oWTFxCWeC6OBY29tv+eJrT060I1+O4Xpwm0T5sTTAihMjZAi2AdB0ygFfXuOMYZEAornIqWBDKA==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.223.4.tgz", + "integrity": "sha512-3RPwQfTk38HYGOCTmG2+UVM2JClaUV76YVqYrR/AhShMMFkg1wQIbpQZ7PLUh0YPbyWqFhmdaZla0JTRL9MWkg==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/AzureFunctionOnKubernetesV1/package.json b/Tasks/AzureFunctionOnKubernetesV1/package.json index 81f62f3ac9ce..c72a2d557b0a 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/package.json +++ b/Tasks/AzureFunctionOnKubernetesV1/package.json @@ -20,7 +20,7 @@ "@types/q": "^1.5.0", "@types/uuid": "^9.0.0", "azure-pipelines-task-lib": "^3.1.0", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.223.4", + "azure-pipelines-tasks-azure-arm-rest": "3.223.4", "azure-pipelines-tasks-docker-common": "^2.211.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tool-lib": "^2.0.0-preview", diff --git a/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts b/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts index 0b11ed82f325..f1e14c142993 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts +++ b/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts @@ -1,9 +1,9 @@ "use strict"; import tl = require('azure-pipelines-task-lib/task'); -import { AzureAksService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-aks-service'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; -import { AzureEndpoint, AKSClusterAccessProfile} from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; +import { AzureAksService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-aks-service'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; +import { AzureEndpoint, AKSClusterAccessProfile} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { diff --git a/Tasks/AzureFunctionOnKubernetesV1/task.json b/Tasks/AzureFunctionOnKubernetesV1/task.json index d8da016887e6..6068c028ea47 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/task.json +++ b/Tasks/AzureFunctionOnKubernetesV1/task.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "demands": [], "groups": [ diff --git a/Tasks/AzureFunctionOnKubernetesV1/task.loc.json b/Tasks/AzureFunctionOnKubernetesV1/task.loc.json index 09cf073cb93c..72c355a37b9c 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/task.loc.json +++ b/Tasks/AzureFunctionOnKubernetesV1/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "demands": [], "groups": [ diff --git a/Tasks/AzureMysqlDeploymentV1/Tests/mock_utils.ts b/Tasks/AzureMysqlDeploymentV1/Tests/mock_utils.ts index 09439d854ce7..1c9a1506a66a 100644 --- a/Tasks/AzureMysqlDeploymentV1/Tests/mock_utils.ts +++ b/Tasks/AzureMysqlDeploymentV1/Tests/mock_utils.ts @@ -1,6 +1,6 @@ -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; import * as querystring from "querystring"; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; export var nock = require('nock'); import { FirewallRule, FirewallAddressRange } from '../models/Firewall'; diff --git a/Tasks/AzureMysqlDeploymentV1/azuremysqldeploy.ts b/Tasks/AzureMysqlDeploymentV1/azuremysqldeploy.ts index f54dfe695d54..059258393cdc 100644 --- a/Tasks/AzureMysqlDeploymentV1/azuremysqldeploy.ts +++ b/Tasks/AzureMysqlDeploymentV1/azuremysqldeploy.ts @@ -9,9 +9,9 @@ import { MysqlServerOperations } from './operations/MysqlServerOperations'; import { ToolPathOperations } from './operations/ToolPathOperations'; import { ISqlClient } from './sql/ISqlClient'; import { MysqlClient } from './sql/MysqlClient'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; async function run() { let azureMysqlTaskParameter: AzureMysqlTaskParameter; diff --git a/Tasks/AzureMysqlDeploymentV1/make.json b/Tasks/AzureMysqlDeploymentV1/make.json index 44507c4763a1..bd92fcd91053 100644 --- a/Tasks/AzureMysqlDeploymentV1/make.json +++ b/Tasks/AzureMysqlDeploymentV1/make.json @@ -2,7 +2,7 @@ "rm": [ { "items": [ - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-webdeployment-common/node_modules/azure-pipelines-task-lib" ], "options": "-Rf" diff --git a/Tasks/AzureMysqlDeploymentV1/operations/FirewallOperations.ts b/Tasks/AzureMysqlDeploymentV1/operations/FirewallOperations.ts index 6e25941f7af0..3e9bf3e7a81b 100644 --- a/Tasks/AzureMysqlDeploymentV1/operations/FirewallOperations.ts +++ b/Tasks/AzureMysqlDeploymentV1/operations/FirewallOperations.ts @@ -1,6 +1,6 @@ import task = require('azure-pipelines-task-lib/task'); -import { ApplicationTokenCredentials} from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureMysqlManagementClient } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-mysql'; +import { ApplicationTokenCredentials} from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureMysqlManagementClient } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-mysql'; import { FirewallRule, FirewallAddressRange } from '../models/Firewall'; import { MysqlServer } from '../models/MysqlServer'; import { AzureMysqlTaskParameter } from '../models/AzureMysqlTaskParameter'; diff --git a/Tasks/AzureMysqlDeploymentV1/operations/MysqlServerOperations.ts b/Tasks/AzureMysqlDeploymentV1/operations/MysqlServerOperations.ts index 17b0c3bb8ce0..8e517942eae2 100644 --- a/Tasks/AzureMysqlDeploymentV1/operations/MysqlServerOperations.ts +++ b/Tasks/AzureMysqlDeploymentV1/operations/MysqlServerOperations.ts @@ -1,7 +1,7 @@ import task = require('azure-pipelines-task-lib/task'); -import { AzureMysqlManagementClient } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-mysql'; +import { AzureMysqlManagementClient } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-mysql'; import { AzureMysqlTaskParameter } from '../models/AzureMysqlTaskParameter'; -import { ApplicationTokenCredentials} from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; +import { ApplicationTokenCredentials} from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; import { MysqlServer } from '../models/MysqlServer'; import Q = require('q'); diff --git a/Tasks/AzureMysqlDeploymentV1/package-lock.json b/Tasks/AzureMysqlDeploymentV1/package-lock.json index 6980c0f07702..2170a15c096c 100644 --- a/Tasks/AzureMysqlDeploymentV1/package-lock.json +++ b/Tasks/AzureMysqlDeploymentV1/package-lock.json @@ -176,10 +176,10 @@ } } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.223.4", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.223.4.tgz", - "integrity": "sha512-t7sfkbwSvL6oWTFxCWeC6OBY29tv+eJrT060I1+O4Xpwm0T5sTTAihMjZAi2AdB0ygFfXuOMYZEAornIqWBDKA==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.223.4.tgz", + "integrity": "sha512-3RPwQfTk38HYGOCTmG2+UVM2JClaUV76YVqYrR/AhShMMFkg1wQIbpQZ7PLUh0YPbyWqFhmdaZla0JTRL9MWkg==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/AzureMysqlDeploymentV1/package.json b/Tasks/AzureMysqlDeploymentV1/package.json index f3e3756bc961..6daed961f9da 100644 --- a/Tasks/AzureMysqlDeploymentV1/package.json +++ b/Tasks/AzureMysqlDeploymentV1/package.json @@ -21,7 +21,7 @@ "@types/node": "^10.17.0", "@types/q": "1.0.7", "azure-pipelines-task-lib": "^3.4.0", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.223.4", + "azure-pipelines-tasks-azure-arm-rest": "3.223.4", "azure-pipelines-tasks-webdeployment-common": "^4.222.0", "compress-commons": "1.1.0", "crc32-stream": "1.0.0", diff --git a/Tasks/AzureMysqlDeploymentV1/task.json b/Tasks/AzureMysqlDeploymentV1/task.json index c5b024666639..71d9231c855a 100644 --- a/Tasks/AzureMysqlDeploymentV1/task.json +++ b/Tasks/AzureMysqlDeploymentV1/task.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzureMysqlDeploymentV1/task.loc.json b/Tasks/AzureMysqlDeploymentV1/task.loc.json index 711098cbe54e..2936fa9448eb 100644 --- a/Tasks/AzureMysqlDeploymentV1/task.loc.json +++ b/Tasks/AzureMysqlDeploymentV1/task.loc.json @@ -17,7 +17,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "demands": [], "minimumAgentVersion": "1.100.0", diff --git a/Tasks/AzurePowerShellV5/azurepowershell.ts b/Tasks/AzurePowerShellV5/azurepowershell.ts index 8013117ba0fd..c5378d87d040 100644 --- a/Tasks/AzurePowerShellV5/azurepowershell.ts +++ b/Tasks/AzurePowerShellV5/azurepowershell.ts @@ -4,7 +4,7 @@ import os = require('os'); import tl = require('azure-pipelines-task-lib/task'); import tr = require('azure-pipelines-task-lib/toolrunner'); -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; var uuidV4 = require('uuid/v4'); function convertToNullIfUndefined(arg: T): T|null { diff --git a/Tasks/AzurePowerShellV5/make.json b/Tasks/AzurePowerShellV5/make.json index 736328eb12c7..7a8f24c43cc2 100644 --- a/Tasks/AzurePowerShellV5/make.json +++ b/Tasks/AzurePowerShellV5/make.json @@ -2,7 +2,7 @@ "rm": [ { "items": [ - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib" + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib" ], "options": "-Rf" } diff --git a/Tasks/AzurePowerShellV5/package-lock.json b/Tasks/AzurePowerShellV5/package-lock.json index f80fb3987169..2a1b1a50fd52 100644 --- a/Tasks/AzurePowerShellV5/package-lock.json +++ b/Tasks/AzurePowerShellV5/package-lock.json @@ -133,10 +133,10 @@ "uuid": "^3.0.1" } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.224.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.224.0.tgz", - "integrity": "sha512-G76zBn1hthbrAdB6AnQbbe9Yh6zLZzv5NBNaBVqMqkb8VvaciqKCLEYAIc2FAdhqy/w7lwqWEPr82dJX59J7aQ==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.224.0.tgz", + "integrity": "sha512-1S77+wBJIBA97ioWpMlVf/9WHCMcTN7zNzI70LM2Gub24c/CNi6C+9wXTHPMCrt8o2IlylBI/UeVB+oWG8U/hQ==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/AzurePowerShellV5/package.json b/Tasks/AzurePowerShellV5/package.json index ed374b89d1be..101024ad3dfd 100644 --- a/Tasks/AzurePowerShellV5/package.json +++ b/Tasks/AzurePowerShellV5/package.json @@ -8,7 +8,7 @@ "@types/node": "^10.17.0", "@types/q": "1.0.7", "azure-pipelines-task-lib": "3.1.10", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.224.0", + "azure-pipelines-tasks-azure-arm-rest": "3.224.0", "azure-pipelines-tasks-utility-common": "^3.0.3" }, "devDependencies": { diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json index 6091fc4aa846..3d8f920a3bbc 100644 --- a/Tasks/AzurePowerShellV5/task.json +++ b/Tasks/AzurePowerShellV5/task.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 225, - "Patch": 1 + "Patch": 2 }, "releaseNotes": "Added support for Az Module and cross platform agents.", "groups": [ diff --git a/Tasks/AzurePowerShellV5/task.loc.json b/Tasks/AzurePowerShellV5/task.loc.json index a1e40c27fdc2..2921e6018d5b 100644 --- a/Tasks/AzurePowerShellV5/task.loc.json +++ b/Tasks/AzurePowerShellV5/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 5, "Minor": 225, - "Patch": 1 + "Patch": 2 }, "releaseNotes": "ms-resource:loc.releaseNotes", "groups": [ diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderL0Tests.ts index 8bcfdaa8a32b..0b894422bc37 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderTests.ts index b0be6e12d872..1462680c0926 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/AzureRmWebAppDeploymentProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class AzureRmWebAppDeploymentProviderTests { @@ -31,7 +31,7 @@ export class AzureRmWebAppDeploymentProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderL0Tests.ts index 6d88b6b6354f..86302bb5b86c 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockLinuxAppSettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderTests.ts index b8f74c90091d..9b0de4e9aa3c 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/BuiltInLinuxWebAppDeploymentProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class BuiltInLinuxWebAppDeploymentProviderTests { @@ -47,7 +47,7 @@ export class BuiltInLinuxWebAppDeploymentProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderL0Tests.ts index c6e81863f6c9..431651fefb08 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockContainerDeploySettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderTests.ts index 14a777447a6f..480db861e371 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/ContainerWebAppDeploymentProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class ContainerWebAppDeploymentProviderTests { @@ -34,7 +34,7 @@ export class ContainerWebAppDeploymentProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/L0.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/L0.ts index 928ab3502b91..0c10978aa705 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/L0.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/L0.ts @@ -5,10 +5,10 @@ import tl = require('azure-pipelines-task-lib'); var ltx = require('ltx'); import fs = require('fs'); -var AppServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-app-service.js"); -var KuduServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-app-service-kudu-tests.js"); -var ApplicationInsightsTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-appinsights-tests.js"); -var ResourcesTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/L0-azure-arm-resource-tests.js"); +var AppServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-app-service.js"); +var KuduServiceTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-app-service-kudu-tests.js"); +var ApplicationInsightsTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-appinsights-tests.js"); +var ResourcesTests = require("../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/L0-azure-arm-resource-tests.js"); var fileEncoding = require("../node_modules/azure-pipelines-tasks-webdeployment-common/fileencoding.js"); describe('AzureRmWebAppDeployment Suite', function() { @@ -16,8 +16,8 @@ describe('AzureRmWebAppDeployment Suite', function() { this.timeout(60000); before((done) => { - if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/node_modules'))) { - tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests'), '-rf', true); + if(!tl.exist(path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/node_modules'))) { + tl.cp(path.join( __dirname, 'node_modules'), path.join(__dirname, '..', 'node_modules/azure-pipelines-tasks-azure-arm-rest/Tests'), '-rf', true); } tl.cp(path.join(__dirname, "..", "node_modules", "azure-pipelines-tasks-webdeployment-common", "Tests", 'L1XmlVarSub', 'Web.config'), path.join(__dirname, "..", "node_modules", "azure-pipelines-tasks-webdeployment-common", "Tests", 'L1XmlVarSub', 'Web_test.config'), '-f', false); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderL0Tests.ts index 08385e113188..7cd741153946 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockRunFromZipSettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderTests.ts index b6b4e4870df7..f867c0a8de09 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/PublishProfileWebAppDeploymentProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument } from './utils'; import { PublishProfileUtility } from "../operations/PublishProfileUtility" import { AzureAppServiceUtility } from '../operations/AzureAppServiceUtility'; @@ -24,7 +24,7 @@ export class PublishProfileWebAppDeploymentProviderTests { setEndpointData(); setAgentsData(); - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu', { Kudu: function(A, B, C) { return { updateDeployment : function(D) { diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/TaskParametersLinuxAppL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/TaskParametersLinuxAppL0Tests.ts index 6483d933cb7d..6730a98949a9 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/TaskParametersLinuxAppL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/TaskParametersLinuxAppL0Tests.ts @@ -1,6 +1,6 @@ import tl = require('azure-pipelines-task-lib'); import { TaskParametersUtility, TaskParameters } from '../operations/TaskParameters'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; getMockEndpoint(); function ValidatePostDeploymentInput() { diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderL0Tests.ts index 84bd7c23a381..750e0e588527 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockRunFromZipSettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderTests.ts index e7c16056decf..47df57f207ef 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppRunFromZipProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class WindowsWebAppRunFromZipProviderTests { @@ -48,7 +48,7 @@ export class WindowsWebAppRunFromZipProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderL0Tests.ts index eda1ad51f48f..d7be8c634a51 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockRunFromZipSettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderTests.ts index 0b5bcdcb2f70..e819158b8277 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWarDeployProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class WindowsWebAppWarDeployProviderTests { @@ -47,7 +47,7 @@ export class WindowsWebAppWarDeployProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderL0Tests.ts index 2bc890fcb984..07d7a4b7967c 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockZipDeploySettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderTests.ts index e1074b3dc92e..464aec388581 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppWebDeployProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class WindowsWebAppWebDeployProviderTests { @@ -52,7 +52,7 @@ export class WindowsWebAppWebDeployProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderL0Tests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderL0Tests.ts index 821ae88b33e6..54c59998e620 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderL0Tests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderL0Tests.ts @@ -5,7 +5,7 @@ import { IWebAppDeploymentProvider } from '../deploymentProvider/IWebAppDeployme import { TaskParametersUtility, TaskParameters, DeploymentType } from '../operations/TaskParameters'; import { stringify } from 'querystring'; import { PackageType } from 'azure-pipelines-tasks-webdeployment-common/packageUtility'; -import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/Tests/mock_utils'; +import { getMockEndpoint } from '../node_modules/azure-pipelines-tasks-azure-arm-rest/Tests/mock_utils'; import { mockAzureARMPreDeploymentSteps, mockZipDeploySettings } from "./mock_utils"; getMockEndpoint(); diff --git a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderTests.ts b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderTests.ts index bfb57cf0e4b1..7e88f8616d9e 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderTests.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/Tests/WindowsWebAppZipDeployProviderTests.ts @@ -4,9 +4,9 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import * as path from 'path'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { ApplicationTokenCredentials } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-common'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; import { setEndpointData, setAgentsData, mockTaskArgument, mockTaskInputParameters } from './utils'; export class WindowsWebAppZipDeployProviderTests { @@ -46,7 +46,7 @@ export class WindowsWebAppZipDeployProviderTests { } }; - tr.registerMock('azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility', { + tr.registerMock('azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility', { AzureAppServiceUtility: function(_) { return utility; } diff --git a/Tasks/AzureRmWebAppDeploymentV4/azurermwebappdeployment.ts b/Tasks/AzureRmWebAppDeploymentV4/azurermwebappdeployment.ts index 82440649f150..a77a66ee795b 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/azurermwebappdeployment.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/azurermwebappdeployment.ts @@ -2,7 +2,7 @@ import tl = require('azure-pipelines-task-lib/task'); import path = require('path'); import { TaskParameters, TaskParametersUtility } from './operations/TaskParameters'; import { DeploymentFactory } from './deploymentProvider/DeploymentFactory'; -import * as Endpoint from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import * as Endpoint from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; async function main() { let isDeploymentSuccess: boolean = true; diff --git a/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/AzureRmWebAppDeploymentProvider.ts b/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/AzureRmWebAppDeploymentProvider.ts index 0cea96b0e99d..728449091d96 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/AzureRmWebAppDeploymentProvider.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/deploymentProvider/AzureRmWebAppDeploymentProvider.ts @@ -1,11 +1,11 @@ import { IWebAppDeploymentProvider } from './IWebAppDeploymentProvider'; import { TaskParameters } from '../operations/TaskParameters'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; import { AzureResourceFilterUtility } from '../operations/AzureResourceFilterUtility'; import { KuduServiceUtility } from '../operations/KuduServiceUtility'; -import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service'; -import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu'; +import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service'; +import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu'; import { AzureAppServiceUtility } from '../operations/AzureAppServiceUtility'; import tl = require('azure-pipelines-task-lib/task'); import * as ParameterParser from 'azure-pipelines-tasks-webdeployment-common/ParameterParserUtility'; diff --git a/Tasks/AzureRmWebAppDeploymentV4/make.json b/Tasks/AzureRmWebAppDeploymentV4/make.json index ecb1fe400bff..93fa15d13746 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/make.json +++ b/Tasks/AzureRmWebAppDeploymentV4/make.json @@ -17,7 +17,7 @@ "rm": [ { "items": [ - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-webdeployment-common/node_modules/azure-pipelines-task-lib" ], "options": "-Rf" diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts index 616c7af25c94..687cbd2cc001 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/operations/AzureAppServiceUtility.ts @@ -1,13 +1,13 @@ import tl = require('azure-pipelines-task-lib/task'); -import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service'; -import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient'); +import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service'; +import webClient = require('azure-pipelines-tasks-azure-arm-rest/webClient'); var parseString = require('xml2js').parseString; import Q = require('q'); -import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu'; +import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu'; import { AzureDeployPackageArtifactAlias } from './Constants'; -import { AzureAppServiceUtility as AzureAppServiceUtilityCommon } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureAppServiceUtility'; +import { AzureAppServiceUtility as AzureAppServiceUtilityCommon } from 'azure-pipelines-tasks-azure-arm-rest/azureAppServiceUtility'; -//todo replace this class with azure-arm-rest-v2/azureAppServiceUtility +//todo replace this class with azure-arm-rest/azureAppServiceUtility export class AzureAppServiceUtility { private _appService: AzureAppService; constructor(appService: AzureAppService) { diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/AzureResourceFilterUtility.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/AzureResourceFilterUtility.ts index 277ae77cd00d..98379bd01306 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/operations/AzureResourceFilterUtility.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/operations/AzureResourceFilterUtility.ts @@ -1,6 +1,6 @@ import tl = require('azure-pipelines-task-lib/task'); -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { Resources } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-resource'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { Resources } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-resource'; export class AzureResourceFilterUtility { public static async getResourceGroupName(endpoint: AzureEndpoint, resourceName: string): Promise { diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/ContainerBasedDeploymentUtility.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/ContainerBasedDeploymentUtility.ts index 6b7d5e1d955f..8390173487b8 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/operations/ContainerBasedDeploymentUtility.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/operations/ContainerBasedDeploymentUtility.ts @@ -1,7 +1,7 @@ import tl = require('azure-pipelines-task-lib/task'); import url = require('url'); import util = require('util'); -import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service'; +import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service'; import { TaskParameters } from './TaskParameters'; import { parse } from 'azure-pipelines-tasks-webdeployment-common/ParameterParserUtility'; import { AzureAppServiceUtility } from './AzureAppServiceUtility'; diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/KuduServiceUtility.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/KuduServiceUtility.ts index aebfa08c40a4..7cc3560e54a5 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/operations/KuduServiceUtility.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/operations/KuduServiceUtility.ts @@ -5,10 +5,10 @@ import path = require('path'); import { DeploymentType, TaskParameters } from './TaskParameters'; import { AzureDeployPackageArtifactAlias } from './Constants'; -import { KUDU_DEPLOYMENT_CONSTANTS } from 'azure-pipelines-tasks-azure-arm-rest-v2/constants'; -import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu'; +import { KUDU_DEPLOYMENT_CONSTANTS } from 'azure-pipelines-tasks-azure-arm-rest/constants'; +import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu'; -import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient'); +import webClient = require('azure-pipelines-tasks-azure-arm-rest/webClient'); var deployUtility = require('azure-pipelines-tasks-webdeployment-common/utility.js'); var zipUtility = require('azure-pipelines-tasks-webdeployment-common/ziputility.js'); diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/ReleaseAnnotationUtility.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/ReleaseAnnotationUtility.ts index 8e1ba4d86185..1ed0aef6bcaf 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/operations/ReleaseAnnotationUtility.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/operations/ReleaseAnnotationUtility.ts @@ -1,7 +1,7 @@ import tl = require('azure-pipelines-task-lib/task'); -import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service'; -import { AzureApplicationInsights, ApplicationInsightsResources} from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-appinsights'; -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; +import { AzureAppService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service'; +import { AzureApplicationInsights, ApplicationInsightsResources} from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-appinsights'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; var uuidV4 = require("uuid/v4"); diff --git a/Tasks/AzureRmWebAppDeploymentV4/operations/WarDeploymentUtilities.ts b/Tasks/AzureRmWebAppDeploymentV4/operations/WarDeploymentUtilities.ts index 3c51f9fd0ba6..4347a92826bb 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/operations/WarDeploymentUtilities.ts +++ b/Tasks/AzureRmWebAppDeploymentV4/operations/WarDeploymentUtilities.ts @@ -1,10 +1,10 @@ import tl = require('azure-pipelines-task-lib/task'); import fs = require('fs'); import path = require('path'); -import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-app-service-kudu'; +import { Kudu } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-app-service-kudu'; import { AzureAppServiceUtility } from './AzureAppServiceUtility'; import { TaskParameters } from './TaskParameters'; -import { sleepFor } from 'azure-pipelines-tasks-azure-arm-rest-v2/webClient'; +import { sleepFor } from 'azure-pipelines-tasks-azure-arm-rest/webClient'; var msDeploy = require('azure-pipelines-tasks-webdeployment-common/deployusingmsdeploy.js'); diff --git a/Tasks/AzureRmWebAppDeploymentV4/package-lock.json b/Tasks/AzureRmWebAppDeploymentV4/package-lock.json index 66fd79dcf86b..a0bdcb3bc234 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/package-lock.json +++ b/Tasks/AzureRmWebAppDeploymentV4/package-lock.json @@ -176,10 +176,10 @@ } } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.223.5", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.223.5.tgz", - "integrity": "sha512-ptve71fjnpxU0msJfkprQE1IVBtxp289CUAAzVD2di0swQgc+p3ygaWrTAUbwh23gg5r6aWvwuz9nNEfnyxBbw==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.223.5.tgz", + "integrity": "sha512-qPc011yaOHq+g+/Flr78weU7Q58TwVQDIBjZNq1xC/zqyauc/tA3V0tJSlK2LeHZ9vZRWxDh1DWRPckr+fdcBQ==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/AzureRmWebAppDeploymentV4/package.json b/Tasks/AzureRmWebAppDeploymentV4/package.json index 5de3d6614e76..12abba4bc6a7 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/package.json +++ b/Tasks/AzureRmWebAppDeploymentV4/package.json @@ -21,7 +21,7 @@ "@types/node": "^10.17.0", "@types/q": "1.0.7", "azure-pipelines-task-lib": "^3.4.0", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.223.5", + "azure-pipelines-tasks-azure-arm-rest": "3.223.5", "azure-pipelines-tasks-webdeployment-common": "^4.222.2", "moment": "^2.29.4", "q": "1.4.1", diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.json b/Tasks/AzureRmWebAppDeploymentV4/task.json index d1cbcf9e967a..dbfc68911bd3 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/task.json +++ b/Tasks/AzureRmWebAppDeploymentV4/task.json @@ -18,7 +18,7 @@ "version": { "Major": 4, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "releaseNotes": "What's new in version 4.*
Supports Zip Deploy, Run From Package, War Deploy [Details here](https://aka.ms/appServiceDeploymentMethods)
Supports App Service Environments
Improved UI for discovering different App service types supported by the task
Run From Package is the preferred deployment method, which makes files in wwwroot folder read-only
Click [here](https://aka.ms/azurermwebdeployreadme) for more information.", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json index 6b96ac007087..55a82929ce93 100644 --- a/Tasks/AzureRmWebAppDeploymentV4/task.loc.json +++ b/Tasks/AzureRmWebAppDeploymentV4/task.loc.json @@ -18,7 +18,7 @@ "version": { "Major": 4, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "releaseNotes": "ms-resource:loc.releaseNotes", "minimumAgentVersion": "2.104.1", diff --git a/Tasks/JavaToolInstallerV0/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts b/Tasks/JavaToolInstallerV0/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts index 85ec02163bc0..f90cf5d84970 100644 --- a/Tasks/JavaToolInstallerV0/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts +++ b/Tasks/JavaToolInstallerV0/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts @@ -1,10 +1,10 @@ import * as tl from 'azure-pipelines-task-lib/task'; -import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'); -import Model = require('azure-pipelines-tasks-azure-arm-rest-v2/azureModels'); -import armStorage = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage'); +import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest/azure-arm-common'); +import Model = require('azure-pipelines-tasks-azure-arm-rest/azureModels'); +import armStorage = require('azure-pipelines-tasks-azure-arm-rest/azure-arm-storage'); import BlobService = require('azp-tasks-az-blobstorage-provider/blobservice'); -import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; +import { AzureEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; export class AzureStorageArtifactDownloader { public connectedService: string; diff --git a/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorage.ts b/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorage.ts index c2e7c681bda9..ae924b721fe4 100644 --- a/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorage.ts +++ b/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorage.ts @@ -1,6 +1,6 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import tmrm = require('azure-pipelines-task-lib/mock-run'); -import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'); +import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest/azure-arm-common'); import path = require('path'); import mockTask = require('azure-pipelines-task-lib/mock-task'); @@ -45,7 +45,7 @@ const a: ma.TaskLibAnswers = { tr.setAnswers(a); -tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage", { +tr.registerMock("azure-pipelines-tasks-azure-arm-rest/azure-arm-storage", { StorageManagementClient: function (A, B) { return { storageAccounts: { @@ -72,7 +72,7 @@ tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage", { } }); -tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common", { +tr.registerMock("azure-pipelines-tasks-azure-arm-rest/azure-arm-common", { ApplicationTokenCredentials: function(A,B,C,D,E,F,G) { return {}; } diff --git a/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorageSubFolder.ts b/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorageSubFolder.ts index 028d013e8d46..5176ce747802 100644 --- a/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorageSubFolder.ts +++ b/Tasks/JavaToolInstallerV0/Tests/L0DownloadsJdkFromAzureStorageSubFolder.ts @@ -1,6 +1,6 @@ import ma = require('azure-pipelines-task-lib/mock-answer'); import tmrm = require('azure-pipelines-task-lib/mock-run'); -import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'); +import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest/azure-arm-common'); import path = require('path'); import mockTask = require('azure-pipelines-task-lib/mock-task'); @@ -46,7 +46,7 @@ const a: ma.TaskLibAnswers = { tr.setAnswers(a); -tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage", { +tr.registerMock("azure-pipelines-tasks-azure-arm-rest/azure-arm-storage", { StorageManagementClient: function (A, B) { return { storageAccounts: { @@ -73,7 +73,7 @@ tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage", { } }); -tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common", { +tr.registerMock("azure-pipelines-tasks-azure-arm-rest/azure-arm-common", { ApplicationTokenCredentials: function(A,B,C,D,E,F,G) { return {}; } diff --git a/Tasks/JavaToolInstallerV0/make.json b/Tasks/JavaToolInstallerV0/make.json index 669f0929aeb6..e6b5e151d995 100644 --- a/Tasks/JavaToolInstallerV0/make.json +++ b/Tasks/JavaToolInstallerV0/make.json @@ -12,7 +12,7 @@ "items": [ "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/vsts-task-lib", "node_modules/azp-tasks-az-blobstorage-provider/node_modules/vsts-task-lib", - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib", "node_modules/azp-tasks-az-blobstorage-provider/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-utility-common/node_modules/azure-pipelines-task-lib", "node_modules/artifact-engine/node_modules/azure-pipelines-task-lib", diff --git a/Tasks/JavaToolInstallerV0/package-lock.json b/Tasks/JavaToolInstallerV0/package-lock.json index b4893dc3b5dc..3395e5a2974d 100644 --- a/Tasks/JavaToolInstallerV0/package-lock.json +++ b/Tasks/JavaToolInstallerV0/package-lock.json @@ -2694,10 +2694,10 @@ } } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.223.6", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.223.6.tgz", - "integrity": "sha512-FXxurfZ1xH/6ti1Ijkat6267JT5UCjp8IvjFxEXzG+70k0BR9CbXBroLhwOAcxJIG2tuZTHXsRWZs3sCYVf0gQ==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.223.6.tgz", + "integrity": "sha512-jQeanC/MlqySO3WgUBIxDMDnDG9FnzF1a1qJVSPbPmdKmdIdtFLhuNaB1vxkN1eqgZB6QvpOdY4g3bxQH57Epw==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/JavaToolInstallerV0/package.json b/Tasks/JavaToolInstallerV0/package.json index 319b8e28541b..5c61d5770e16 100644 --- a/Tasks/JavaToolInstallerV0/package.json +++ b/Tasks/JavaToolInstallerV0/package.json @@ -30,7 +30,7 @@ "agent-base": "^6.0.2", "azp-tasks-az-blobstorage-provider": "^2.219.1", "azure-pipelines-task-lib": "^4.0.0-preview", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.223.6", + "azure-pipelines-tasks-azure-arm-rest": "3.223.6", "azure-pipelines-tasks-utility-common": "^3.0.3", "azure-pipelines-tool-lib": "^2.0.0-preview" }, diff --git a/Tasks/JavaToolInstallerV0/task.json b/Tasks/JavaToolInstallerV0/task.json index 3154f4ce4631..205b5b33eecb 100644 --- a/Tasks/JavaToolInstallerV0/task.json +++ b/Tasks/JavaToolInstallerV0/task.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 225, - "Patch": 1 + "Patch": 2 }, "satisfies": [ "Java", diff --git a/Tasks/JavaToolInstallerV0/task.loc.json b/Tasks/JavaToolInstallerV0/task.loc.json index b1547bf0778c..be540445566f 100644 --- a/Tasks/JavaToolInstallerV0/task.loc.json +++ b/Tasks/JavaToolInstallerV0/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 0, "Minor": 225, - "Patch": 1 + "Patch": 2 }, "satisfies": [ "Java", diff --git a/Tasks/JenkinsDownloadArtifactsV1/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts b/Tasks/JenkinsDownloadArtifactsV1/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts index 6f494f00a63c..5ced4fea1029 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts +++ b/Tasks/JenkinsDownloadArtifactsV1/AzureStorageArtifacts/AzureStorageArtifactDownloader.ts @@ -1,8 +1,8 @@ import * as tl from 'azure-pipelines-task-lib/task'; -import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common'); -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; -import armStorage = require('azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage'); -import { AzureEndpoint, StorageAccount } from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; +import msRestAzure = require('azure-pipelines-tasks-azure-arm-rest/azure-arm-common'); +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; +import armStorage = require('azure-pipelines-tasks-azure-arm-rest/azure-arm-storage'); +import { AzureEndpoint, StorageAccount } from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; import BlobService = require('./blobservice'); export class AzureStorageArtifactDownloader { diff --git a/Tasks/JenkinsDownloadArtifactsV1/Tests/L0DownloadArtifactsFromAzureStorage.ts b/Tasks/JenkinsDownloadArtifactsV1/Tests/L0DownloadArtifactsFromAzureStorage.ts index cd87812cb0af..f34932cec87c 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/Tests/L0DownloadArtifactsFromAzureStorage.ts +++ b/Tasks/JenkinsDownloadArtifactsV1/Tests/L0DownloadArtifactsFromAzureStorage.ts @@ -34,7 +34,7 @@ process.env['ENDPOINT_DATA_ARM1_ENVIRONMENTAUTHORITYURL'] = 'dummyurl'; process.env['ENDPOINT_DATA_ARM1_ACTIVEDIRECTORYSERVICEENDPOINTRESOURCEID'] = 'dummyResourceId'; process.env['ENDPOINT_DATA_ARM1_SUBSCRIPTIONID'] = 'dummySubscriptionId'; -tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage", { +tr.registerMock("azure-pipelines-tasks-azure-arm-rest/azure-arm-storage", { StorageManagementClient: function (A, B) { return { storageAccounts: { @@ -68,7 +68,7 @@ tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-storage", { } }); -tr.registerMock("azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-common", { +tr.registerMock("azure-pipelines-tasks-azure-arm-rest/azure-arm-common", { ApplicationTokenCredentials: function(A,B,C,D,E,F,G) { return {}; } diff --git a/Tasks/JenkinsDownloadArtifactsV1/make.json b/Tasks/JenkinsDownloadArtifactsV1/make.json index e0d58ef96826..3b1d15da6dc9 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/make.json +++ b/Tasks/JenkinsDownloadArtifactsV1/make.json @@ -2,7 +2,7 @@ "rm": [ { "items": [ - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib", "node_modules/artifact-engine/node_modules/azure-pipelines-task-lib" ], "options": "-Rf" diff --git a/Tasks/JenkinsDownloadArtifactsV1/package-lock.json b/Tasks/JenkinsDownloadArtifactsV1/package-lock.json index 481982469540..fd5204597060 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/package-lock.json +++ b/Tasks/JenkinsDownloadArtifactsV1/package-lock.json @@ -2657,10 +2657,10 @@ } } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.225.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.225.0.tgz", - "integrity": "sha512-IdnN3ZgRhDkB8uXwkW0CC+F6yy6RcKR+eqp1B6rYT741j8gmKTyA62Us6oCtxn8EU3I5eu7NayXDVPpBFwWrCg==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.225.0.tgz", + "integrity": "sha512-NpKEf40j8WXKpiRfmkpgYJLeKrN6wZOKnBA0jipyJAaEu0YvSbX9aHt2k+OR/p+dnBlg5pyWE0MqKup/IE34IA==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/JenkinsDownloadArtifactsV1/package.json b/Tasks/JenkinsDownloadArtifactsV1/package.json index 9fd5be470975..1af75618f715 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/package.json +++ b/Tasks/JenkinsDownloadArtifactsV1/package.json @@ -13,7 +13,7 @@ "@types/uuid": "^8.3.0", "artifact-engine": "^1.2.0", "azure-pipelines-task-lib": "^4.0.0-preview", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.225.0", + "azure-pipelines-tasks-azure-arm-rest": "3.225.0", "azure-storage": "2.10.4", "decompress-zip": "0.3.3", "fs-extra": "5.0.0", diff --git a/Tasks/JenkinsDownloadArtifactsV1/task.json b/Tasks/JenkinsDownloadArtifactsV1/task.json index 60f95ae7701f..09994f0ea3fd 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/task.json +++ b/Tasks/JenkinsDownloadArtifactsV1/task.json @@ -19,7 +19,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "groups": [ { diff --git a/Tasks/JenkinsDownloadArtifactsV1/task.loc.json b/Tasks/JenkinsDownloadArtifactsV1/task.loc.json index ec438750a210..3a6f67afd55a 100644 --- a/Tasks/JenkinsDownloadArtifactsV1/task.loc.json +++ b/Tasks/JenkinsDownloadArtifactsV1/task.loc.json @@ -19,7 +19,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 0 + "Patch": 1 }, "groups": [ { diff --git a/Tasks/KubeloginInstallerV0/make.json b/Tasks/KubeloginInstallerV0/make.json index 6972ada17401..b9baf1d9ea37 100644 --- a/Tasks/KubeloginInstallerV0/make.json +++ b/Tasks/KubeloginInstallerV0/make.json @@ -2,7 +2,7 @@ "rm": [ { "items": [ - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib" + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib" ], "options": "-Rf" } diff --git a/Tasks/KubeloginInstallerV0/package-lock.json b/Tasks/KubeloginInstallerV0/package-lock.json index 7a7e90986685..5497faf6a18c 100644 --- a/Tasks/KubeloginInstallerV0/package-lock.json +++ b/Tasks/KubeloginInstallerV0/package-lock.json @@ -135,10 +135,10 @@ "uuid": "^3.0.1" } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.223.4", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.223.4.tgz", - "integrity": "sha512-t7sfkbwSvL6oWTFxCWeC6OBY29tv+eJrT060I1+O4Xpwm0T5sTTAihMjZAi2AdB0ygFfXuOMYZEAornIqWBDKA==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.223.4.tgz", + "integrity": "sha512-3RPwQfTk38HYGOCTmG2+UVM2JClaUV76YVqYrR/AhShMMFkg1wQIbpQZ7PLUh0YPbyWqFhmdaZla0JTRL9MWkg==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/KubeloginInstallerV0/package.json b/Tasks/KubeloginInstallerV0/package.json index 03101a9a25fa..3e8ae28c7070 100644 --- a/Tasks/KubeloginInstallerV0/package.json +++ b/Tasks/KubeloginInstallerV0/package.json @@ -24,7 +24,7 @@ "@types/node": "^16.11.59", "@types/q": "^1.0.7", "azure-pipelines-task-lib": "^4.3.1", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.223.4", + "azure-pipelines-tasks-azure-arm-rest": "3.223.4", "azure-pipelines-tool-lib": "^2.0.4" }, "devDependencies": { diff --git a/Tasks/KubeloginInstallerV0/task.json b/Tasks/KubeloginInstallerV0/task.json index 55cf0046f90c..edec4c8c726f 100644 --- a/Tasks/KubeloginInstallerV0/task.json +++ b/Tasks/KubeloginInstallerV0/task.json @@ -15,7 +15,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 224, + "Minor": 225, "Patch": 0 }, "demands": [], diff --git a/Tasks/KubeloginInstallerV0/task.loc.json b/Tasks/KubeloginInstallerV0/task.loc.json index b0b9d616df58..b23d18d4580f 100644 --- a/Tasks/KubeloginInstallerV0/task.loc.json +++ b/Tasks/KubeloginInstallerV0/task.loc.json @@ -15,7 +15,7 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 224, + "Minor": 225, "Patch": 0 }, "demands": [], diff --git a/Tasks/KubeloginInstallerV0/utils.ts b/Tasks/KubeloginInstallerV0/utils.ts index f3ae87d11703..f64238f1ddcb 100644 --- a/Tasks/KubeloginInstallerV0/utils.ts +++ b/Tasks/KubeloginInstallerV0/utils.ts @@ -4,7 +4,7 @@ import * as path from 'path'; import * as taskLib from 'azure-pipelines-task-lib/task'; import * as toolLib from 'azure-pipelines-tool-lib/tool'; -import webClient = require('azure-pipelines-tasks-azure-arm-rest-v2/webClient'); +import webClient = require('azure-pipelines-tasks-azure-arm-rest/webClient'); var process = require('process'); var packagejson = require('./package.json'); diff --git a/Tasks/KubernetesV1/make.json b/Tasks/KubernetesV1/make.json index bd8c6b7ec36d..9a407bef2ed3 100644 --- a/Tasks/KubernetesV1/make.json +++ b/Tasks/KubernetesV1/make.json @@ -2,7 +2,7 @@ "rm": [ { "items": [ - "node_modules/azure-pipelines-tasks-azure-arm-rest-v2/node_modules/azure-pipelines-task-lib", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-docker-common/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-kubernetes-common/node_modules/azure-pipelines-task-lib", "node_modules/azure-pipelines-tasks-utility-common/node_modules/azure-pipelines-task-lib", diff --git a/Tasks/KubernetesV1/npm-shrinkwrap.json b/Tasks/KubernetesV1/npm-shrinkwrap.json index 86c6f045906b..d3b5b8907365 100644 --- a/Tasks/KubernetesV1/npm-shrinkwrap.json +++ b/Tasks/KubernetesV1/npm-shrinkwrap.json @@ -209,10 +209,10 @@ } } }, - "azure-pipelines-tasks-azure-arm-rest-v2": { + "azure-pipelines-tasks-azure-arm-rest": { "version": "3.223.4", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest-v2/-/azure-pipelines-tasks-azure-arm-rest-v2-3.223.4.tgz", - "integrity": "sha512-t7sfkbwSvL6oWTFxCWeC6OBY29tv+eJrT060I1+O4Xpwm0T5sTTAihMjZAi2AdB0ygFfXuOMYZEAornIqWBDKA==", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.223.4.tgz", + "integrity": "sha512-3RPwQfTk38HYGOCTmG2+UVM2JClaUV76YVqYrR/AhShMMFkg1wQIbpQZ7PLUh0YPbyWqFhmdaZla0JTRL9MWkg==", "requires": { "@azure/msal-node": "1.14.5", "@types/jsonwebtoken": "^8.5.8", diff --git a/Tasks/KubernetesV1/package.json b/Tasks/KubernetesV1/package.json index a22193e9c32f..d2b33a06db28 100644 --- a/Tasks/KubernetesV1/package.json +++ b/Tasks/KubernetesV1/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.0.1-preview", - "azure-pipelines-tasks-azure-arm-rest-v2": "^3.223.4", + "azure-pipelines-tasks-azure-arm-rest": "3.223.4", "azure-pipelines-tasks-docker-common": "2.0.1-preview.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/Tasks/KubernetesV1/src/clusters/armkubernetescluster.ts b/Tasks/KubernetesV1/src/clusters/armkubernetescluster.ts index a163cd4955f7..541a73df0578 100644 --- a/Tasks/KubernetesV1/src/clusters/armkubernetescluster.ts +++ b/Tasks/KubernetesV1/src/clusters/armkubernetescluster.ts @@ -1,9 +1,9 @@ "use strict"; import tl = require('azure-pipelines-task-lib/task'); -import { AzureAksService } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-aks-service'; -import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest-v2/azure-arm-endpoint'; -import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile} from 'azure-pipelines-tasks-azure-arm-rest-v2/azureModels'; +import { AzureAksService } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-aks-service'; +import { AzureRMEndpoint } from 'azure-pipelines-tasks-azure-arm-rest/azure-arm-endpoint'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { diff --git a/Tasks/KubernetesV1/src/kubernetes.ts b/Tasks/KubernetesV1/src/kubernetes.ts index bd4318852137..9beb4ab14a97 100644 --- a/Tasks/KubernetesV1/src/kubernetes.ts +++ b/Tasks/KubernetesV1/src/kubernetes.ts @@ -18,7 +18,7 @@ import trm = require('azure-pipelines-task-lib/toolrunner'); tl.setResourcePath(path.join(__dirname, '..', 'task.json')); -tl.setResourcePath(path.join( __dirname, '../node_modules/azure-pipelines-tasks-azure-arm-rest-v2/module.json')); +tl.setResourcePath(path.join( __dirname, '../node_modules/azure-pipelines-tasks-azure-arm-rest/module.json')); // Change to any specified working directory tl.cd(tl.getInput("cwd")); diff --git a/Tasks/KubernetesV1/task.json b/Tasks/KubernetesV1/task.json index f4615e6a9806..90aec50d7752 100644 --- a/Tasks/KubernetesV1/task.json +++ b/Tasks/KubernetesV1/task.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 1 + "Patch": 2 }, "demands": [], "releaseNotes": "What's new in Version 1.0:
 Added new service connection type input for easy selection of Azure AKS cluster.
 Replaced output variable input with output variables section that we had added in all tasks.", diff --git a/Tasks/KubernetesV1/task.loc.json b/Tasks/KubernetesV1/task.loc.json index 8cc21329fd0a..37ae18c31c39 100644 --- a/Tasks/KubernetesV1/task.loc.json +++ b/Tasks/KubernetesV1/task.loc.json @@ -14,7 +14,7 @@ "version": { "Major": 1, "Minor": 225, - "Patch": 1 + "Patch": 2 }, "demands": [], "releaseNotes": "ms-resource:loc.releaseNotes",