diff --git a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json index 63a80997afae..b80c39b31548 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json +++ b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json @@ -14,7 +14,7 @@ "@types/uuid": "^9.0.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.235.0", "azure-pipelines-tool-lib": "^2.0.7", @@ -162,9 +162,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json index a238cd26d3d5..616e1b2cff8e 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json +++ b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package.json @@ -21,7 +21,7 @@ "@types/uuid": "^9.0.0", "azure-pipelines-task-lib": "^4.11.0", "agent-base": "^6.0.2", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.235.0", "azure-pipelines-tool-lib": "^2.0.7", diff --git a/Tasks/AzureFunctionOnKubernetesV1/make.json b/Tasks/AzureFunctionOnKubernetesV1/make.json index eb1d638ba9f7..e64adfc0843e 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/make.json +++ b/Tasks/AzureFunctionOnKubernetesV1/make.json @@ -6,7 +6,8 @@ "node_modules/azure-pipelines-tasks-kubernetes-common/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", - "node_modules/https-proxy-agent/node_modules/agent-base" + "node_modules/https-proxy-agent/node_modules/agent-base", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/agent-base" ], "options": "-Rf" } diff --git a/Tasks/AzureFunctionOnKubernetesV1/package-lock.json b/Tasks/AzureFunctionOnKubernetesV1/package-lock.json index e97d514e1fa9..d509cafff0cc 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/package-lock.json +++ b/Tasks/AzureFunctionOnKubernetesV1/package-lock.json @@ -121,9 +121,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -153,67 +153,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, - "jsonwebtoken": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", - "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^7.5.4" - } - }, - "msalv1": { - "version": "npm:@azure/msal-node@1.18.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", - "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", - "requires": { - "@azure/msal-common": "13.3.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - } - }, - "msalv2": { - "version": "npm:@azure/msal-node@2.13.1", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", - "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", - "requires": { - "@azure/msal-common": "14.14.2", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "@azure/msal-common": { - "version": "14.14.2", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", - "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" - } - } - }, - "semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" - }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -221,11 +172,6 @@ "tunnel": "0.0.6", "underscore": "^1.12.1" } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -575,6 +521,30 @@ "esprima": "^4.0.0" } }, + "jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" + } + } + }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -660,6 +630,45 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", + "requires": { + "@azure/msal-common": "14.15.0", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, "node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -786,9 +795,9 @@ } }, "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, "sanitize-filename": { "version": "1.6.3", @@ -857,9 +866,9 @@ } }, "tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/Tasks/AzureFunctionOnKubernetesV1/package.json b/Tasks/AzureFunctionOnKubernetesV1/package.json index f7f27bce498f..89f9e9b42b6d 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/package.json +++ b/Tasks/AzureFunctionOnKubernetesV1/package.json @@ -21,7 +21,7 @@ "@types/uuid": "^9.0.0", "azure-pipelines-task-lib": "^4.11.0", "agent-base": "^6.0.2", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.235.0", "azure-pipelines-tool-lib": "^2.0.7", diff --git a/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts b/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts index f1e14c142993..22aa6da18bf2 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts +++ b/Tasks/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/Tasks/AzureFunctionOnKubernetesV1/task.json b/Tasks/AzureFunctionOnKubernetesV1/task.json index cbd827817c32..a8cac9a66e84 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/task.json +++ b/Tasks/AzureFunctionOnKubernetesV1/task.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "demands": [], "groups": [ diff --git a/Tasks/AzureFunctionOnKubernetesV1/task.loc.json b/Tasks/AzureFunctionOnKubernetesV1/task.loc.json index d88300dd294e..895e15f810a4 100644 --- a/Tasks/AzureFunctionOnKubernetesV1/task.loc.json +++ b/Tasks/AzureFunctionOnKubernetesV1/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "demands": [], "groups": [ diff --git a/Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json b/Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json index 42bd746d75a2..07421c8c2fed 100644 --- a/Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json +++ b/Tasks/HelmDeployV0/_buildConfigs/Node20/package-lock.json @@ -11,7 +11,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", @@ -197,9 +197,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/Tasks/HelmDeployV0/_buildConfigs/Node20/package.json b/Tasks/HelmDeployV0/_buildConfigs/Node20/package.json index 0bf9aeaf00ef..456c7a3b8ac0 100644 --- a/Tasks/HelmDeployV0/_buildConfigs/Node20/package.json +++ b/Tasks/HelmDeployV0/_buildConfigs/Node20/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/Tasks/HelmDeployV0/package-lock.json b/Tasks/HelmDeployV0/package-lock.json index 0a341365a564..879b001821e9 100644 --- a/Tasks/HelmDeployV0/package-lock.json +++ b/Tasks/HelmDeployV0/package-lock.json @@ -155,9 +155,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -187,18 +187,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -234,10 +234,92 @@ "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, + "azure-devops-node-api": { + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", + "requires": { + "tunnel": "0.0.6", + "typed-rest-client": "^2.0.1" + } + }, + "azure-pipelines-tasks-azure-arm-rest": { + "version": "3.246.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.2.tgz", + "integrity": "sha512-RLnVO865AcuDqXbP/IHRa8anKYl6EoTEpMIgmWzayMAsfnBa04iuOcI9vUIhmqK12LJv4ziX+X9fMySSgBpyyw==", + "requires": { + "@types/jsonwebtoken": "^8.5.8", + "@types/mocha": "^5.2.7", + "@types/node": "^10.17.0", + "@types/q": "1.5.4", + "async-mutex": "^0.4.0", + "azure-devops-node-api": "^14.0.1", + "azure-pipelines-task-lib": "^4.11.0", + "https-proxy-agent": "^4.0.0", + "jsonwebtoken": "^9.0.0", + "msalv1": "npm:@azure/msal-node@^1.18.4", + "msalv2": "npm:@azure/msal-node@^2.7.0", + "node-fetch": "^2.6.7", + "q": "1.5.1", + "typed-rest-client": "^2.0.1", + "xml2js": "0.6.2" + }, + "dependencies": { + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" + } + } + }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.13.1", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", + "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", + "requires": { + "@azure/msal-common": "14.14.2", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.14.2", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", + "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" + } + } + }, "q": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", "integrity": "sha512-/CdEdaw49VZVmyIDGUQKDDT53c7qBkO6g5CefWz91Ae+l4+cRtcDYwMTXh6me4O8TMldeGHG3N2Bl84V78Ywbg==" + }, + "typed-rest-client": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", + "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "requires": { + "des.js": "^1.1.0", + "js-md4": "^0.3.2", + "qs": "^6.10.3", + "tunnel": "0.0.6", + "underscore": "^1.12.1" + } + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -886,19 +968,19 @@ } }, "msalv2": { - "version": "npm:@azure/msal-node@2.12.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz", - "integrity": "sha512-jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg==", + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", "requires": { - "@azure/msal-common": "14.14.0", + "@azure/msal-common": "14.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { "@azure/msal-common": { - "version": "14.14.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz", - "integrity": "sha512-OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ==" + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" }, "uuid": { "version": "8.3.2", diff --git a/Tasks/HelmDeployV0/package.json b/Tasks/HelmDeployV0/package.json index dc01e3ddb35e..f32a40308484 100644 --- a/Tasks/HelmDeployV0/package.json +++ b/Tasks/HelmDeployV0/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts b/Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts index 56bb7717ade4..f31abfe267d9 100644 --- a/Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts +++ b/Tasks/HelmDeployV0/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/Tasks/HelmDeployV0/task.json b/Tasks/HelmDeployV0/task.json index 41676442d095..216478e6a186 100644 --- a/Tasks/HelmDeployV0/task.json +++ b/Tasks/HelmDeployV0/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ diff --git a/Tasks/HelmDeployV0/task.loc.json b/Tasks/HelmDeployV0/task.loc.json index 67ca9c09c651..a97830c2e8dd 100644 --- a/Tasks/HelmDeployV0/task.loc.json +++ b/Tasks/HelmDeployV0/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ diff --git a/Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json b/Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json index 82eff86a089e..d7fb07510ba2 100644 --- a/Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json +++ b/Tasks/HelmDeployV1/_buildConfigs/Node20/package-lock.json @@ -11,7 +11,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", @@ -197,9 +197,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/Tasks/HelmDeployV1/_buildConfigs/Node20/package.json b/Tasks/HelmDeployV1/_buildConfigs/Node20/package.json index 0bf9aeaf00ef..456c7a3b8ac0 100644 --- a/Tasks/HelmDeployV1/_buildConfigs/Node20/package.json +++ b/Tasks/HelmDeployV1/_buildConfigs/Node20/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/Tasks/HelmDeployV1/package-lock.json b/Tasks/HelmDeployV1/package-lock.json index 0a341365a564..499147d0ca90 100644 --- a/Tasks/HelmDeployV1/package-lock.json +++ b/Tasks/HelmDeployV1/package-lock.json @@ -155,9 +155,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -187,18 +187,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -767,9 +767,9 @@ }, "dependencies": { "semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" } } }, @@ -886,19 +886,19 @@ } }, "msalv2": { - "version": "npm:@azure/msal-node@2.12.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz", - "integrity": "sha512-jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg==", + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", "requires": { - "@azure/msal-common": "14.14.0", + "@azure/msal-common": "14.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { "@azure/msal-common": { - "version": "14.14.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz", - "integrity": "sha512-OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ==" + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" }, "uuid": { "version": "8.3.2", @@ -1187,9 +1187,9 @@ } }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/Tasks/HelmDeployV1/package.json b/Tasks/HelmDeployV1/package.json index dc01e3ddb35e..f32a40308484 100644 --- a/Tasks/HelmDeployV1/package.json +++ b/Tasks/HelmDeployV1/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/Tasks/HelmDeployV1/src/clusters/armkubernetescluster.ts b/Tasks/HelmDeployV1/src/clusters/armkubernetescluster.ts index 56bb7717ade4..f31abfe267d9 100644 --- a/Tasks/HelmDeployV1/src/clusters/armkubernetescluster.ts +++ b/Tasks/HelmDeployV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/Tasks/HelmDeployV1/task.json b/Tasks/HelmDeployV1/task.json index f2f34b373f9a..b3939a1cc8fa 100644 --- a/Tasks/HelmDeployV1/task.json +++ b/Tasks/HelmDeployV1/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ diff --git a/Tasks/HelmDeployV1/task.loc.json b/Tasks/HelmDeployV1/task.loc.json index 7ab63d1c15eb..41087051879c 100644 --- a/Tasks/HelmDeployV1/task.loc.json +++ b/Tasks/HelmDeployV1/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ diff --git a/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package-lock.json b/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package-lock.json index 36a135500046..b54f3467fc87 100644 --- a/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package-lock.json +++ b/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package-lock.json @@ -13,7 +13,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", @@ -187,9 +187,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package.json b/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package.json index 9123a3201ebe..7af501264c37 100644 --- a/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package.json +++ b/Tasks/KubernetesManifestV1/_buildConfigs/Node20/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/Tasks/KubernetesManifestV1/package-lock.json b/Tasks/KubernetesManifestV1/package-lock.json index 2a1775a5b8b2..af6745aaa257 100644 --- a/Tasks/KubernetesManifestV1/package-lock.json +++ b/Tasks/KubernetesManifestV1/package-lock.json @@ -189,9 +189,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -221,18 +221,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -1065,19 +1065,19 @@ } }, "msalv2": { - "version": "npm:@azure/msal-node@2.11.1", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.11.1.tgz", - "integrity": "sha512-8ECtug4RL+zsgh20VL8KYHjrRO3MJOeAKEPRXT2lwtiu5U3BdyIdBb50+QZthEkIi60K6pc/pdOx/k5Jp4sLng==", + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", "requires": { - "@azure/msal-common": "14.13.1", + "@azure/msal-common": "14.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { "@azure/msal-common": { - "version": "14.13.1", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.13.1.tgz", - "integrity": "sha512-iUp3BYrsRZ4X3EiaZ2fDjNFjmtYMv9rEQd6c1op6ULn0HWk4ACvDmosL6NaBgWOhl1BAblIbd9vmB5/ilF8d4A==" + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" }, "uuid": { "version": "8.3.2", @@ -1424,9 +1424,9 @@ } }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/Tasks/KubernetesManifestV1/package.json b/Tasks/KubernetesManifestV1/package.json index 1da28aff3d63..7759fdbf7644 100644 --- a/Tasks/KubernetesManifestV1/package.json +++ b/Tasks/KubernetesManifestV1/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/Tasks/KubernetesManifestV1/src/clusters/armkubernetescluster.ts b/Tasks/KubernetesManifestV1/src/clusters/armkubernetescluster.ts index f1e14c142993..22aa6da18bf2 100644 --- a/Tasks/KubernetesManifestV1/src/clusters/armkubernetescluster.ts +++ b/Tasks/KubernetesManifestV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/Tasks/KubernetesManifestV1/task.json b/Tasks/KubernetesManifestV1/task.json index dd25167f5d17..9bbf1f8cd9e7 100644 --- a/Tasks/KubernetesManifestV1/task.json +++ b/Tasks/KubernetesManifestV1/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 2 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [], diff --git a/Tasks/KubernetesManifestV1/task.loc.json b/Tasks/KubernetesManifestV1/task.loc.json index 665fde921841..2ea9a3f362ca 100644 --- a/Tasks/KubernetesManifestV1/task.loc.json +++ b/Tasks/KubernetesManifestV1/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 2 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [], diff --git a/Tasks/KubernetesV1/Tests/TestSetup.ts b/Tasks/KubernetesV1/Tests/TestSetup.ts index 176c586a47f9..f868dbc4abf5 100644 --- a/Tasks/KubernetesV1/Tests/TestSetup.ts +++ b/Tasks/KubernetesV1/Tests/TestSetup.ts @@ -108,6 +108,35 @@ nock('https://management.azure.com', { kubeConfig: '{\"apiVersion\":\"v1\", \"clusters\": [{\"cluster\": {\"insecure-skip-tls-verify\":\"true\", \"server\":\"https://5.6.7.8\", \"name\" : \"scratch\"}}], \"contexts\": [{\"context\" : {\"cluster\": \"scratch\", \"namespace\" : \"default\", \"user\": \"experimenter\", \"name\" : \"exp-scratch\"}], \"current-context\" : \"exp-scratch\", \"kind\": \"Config\", \"users\" : [{\"user\": {\"password\": \"regpassword\", \"username\" : \"test\"}]}' } }).persist(); +nock('https://management.azure.com', { + reqheaders: { + "authorization": "Bearer DUMMY_ACCESS_TOKEN", + "content-type": "application/json; charset=utf-8" + } +}).post("/subscriptions/sId/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myCluster1/listClusterUserCredential?api-version=2024-05-01") +.reply(200, { + kubeconfigs: [{ + name: "clusterUser", + value: "base46kubeconfig" + }, + { + name: "customUser", + value: "base46kubeconfig" + }] + }).persist(); + + nock('https://management.azure.com', { + reqheaders: { + "authorization": "Bearer DUMMY_ACCESS_TOKEN", + "content-type": "application/json; charset=utf-8" + } +}).post("/subscriptions/sId/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myCluster1/listClusterAdminCredential?api-version=2024-05-01") +.reply(200, { + kubeconfigs: [{ + name: "clusterAdmin", + value: "base46kubeconfig" + }] + }).persist(); // provide answers for task mock let a = { diff --git a/Tasks/KubernetesV1/_buildConfigs/Node20/npm-shrinkwrap.json b/Tasks/KubernetesV1/_buildConfigs/Node20/npm-shrinkwrap.json index 04f7809b26c9..41d8ab5140a5 100644 --- a/Tasks/KubernetesV1/_buildConfigs/Node20/npm-shrinkwrap.json +++ b/Tasks/KubernetesV1/_buildConfigs/Node20/npm-shrinkwrap.json @@ -13,7 +13,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.16.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", @@ -185,9 +185,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/Tasks/KubernetesV1/_buildConfigs/Node20/package.json b/Tasks/KubernetesV1/_buildConfigs/Node20/package.json index fb8ec5dedbfd..3b6d6dc0d736 100644 --- a/Tasks/KubernetesV1/_buildConfigs/Node20/package.json +++ b/Tasks/KubernetesV1/_buildConfigs/Node20/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.16.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/Tasks/KubernetesV1/npm-shrinkwrap.json b/Tasks/KubernetesV1/npm-shrinkwrap.json index 5afda03b36d4..09befbfada2b 100644 --- a/Tasks/KubernetesV1/npm-shrinkwrap.json +++ b/Tasks/KubernetesV1/npm-shrinkwrap.json @@ -193,9 +193,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -225,72 +225,23 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, - "jsonwebtoken": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", - "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^7.5.4" - } - }, - "msalv1": { - "version": "npm:@azure/msal-node@1.18.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", - "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", - "requires": { - "@azure/msal-common": "13.3.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - } - }, - "msalv2": { - "version": "npm:@azure/msal-node@2.13.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.0.tgz", - "integrity": "sha512-DhP97ycs7qlCVzzzWGzJiwAFyFj5okno74E4FUZ61oCLfKh4IxA1kxirqzrWuYZWpBe9HVPL6GA4NvmlEOBN5Q==", - "requires": { - "@azure/msal-common": "14.14.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "@azure/msal-common": { - "version": "14.14.1", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.1.tgz", - "integrity": "sha512-2Q3tqNz/PZLfSr8BvcHZVpRRfSn4MjGSqjj9J+HlBsmbf1Uu4P0WeXnemjTJwwx9KrmplsrN3UkZ/LPOR720rw==" - } - } - }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" }, - "semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" - }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -298,11 +249,6 @@ "tunnel": "0.0.6", "underscore": "^1.12.1" } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -920,6 +866,30 @@ "esprima": "^4.0.0" } }, + "jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" + } + } + }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -1015,6 +985,45 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", + "requires": { + "@azure/msal-common": "14.15.0", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, "node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -1341,9 +1350,9 @@ } }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/Tasks/KubernetesV1/package.json b/Tasks/KubernetesV1/package.json index 8f5ff62e090c..f276966d72ed 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.16.0", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.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 541a73df0578..19f69a5ecebb 100644 --- a/Tasks/KubernetesV1/src/clusters/armkubernetescluster.ts +++ b/Tasks/KubernetesV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/Tasks/KubernetesV1/task.json b/Tasks/KubernetesV1/task.json index 9c1e127d9e0d..c3270c7809e4 100644 --- a/Tasks/KubernetesV1/task.json +++ b/Tasks/KubernetesV1/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 244, + "Minor": 246, "Patch": 0 }, "demands": [], diff --git a/Tasks/KubernetesV1/task.loc.json b/Tasks/KubernetesV1/task.loc.json index 6cbfed070f7b..1a7e4698382a 100644 --- a/Tasks/KubernetesV1/task.loc.json +++ b/Tasks/KubernetesV1/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 244, + "Minor": 246, "Patch": 0 }, "demands": [], diff --git a/_generated/AzureFunctionOnKubernetesV1.versionmap.txt b/_generated/AzureFunctionOnKubernetesV1.versionmap.txt index 86e3fa3ba9a3..2aa90f57367e 100644 --- a/_generated/AzureFunctionOnKubernetesV1.versionmap.txt +++ b/_generated/AzureFunctionOnKubernetesV1.versionmap.txt @@ -1,2 +1,2 @@ -Default|1.246.0 -Node20_229_2|1.246.1 +Default|1.246.2 +Node20_229_2|1.246.3 diff --git a/_generated/AzureFunctionOnKubernetesV1/make.json b/_generated/AzureFunctionOnKubernetesV1/make.json index eb1d638ba9f7..e64adfc0843e 100644 --- a/_generated/AzureFunctionOnKubernetesV1/make.json +++ b/_generated/AzureFunctionOnKubernetesV1/make.json @@ -6,7 +6,8 @@ "node_modules/azure-pipelines-tasks-kubernetes-common/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", - "node_modules/https-proxy-agent/node_modules/agent-base" + "node_modules/https-proxy-agent/node_modules/agent-base", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/agent-base" ], "options": "-Rf" } diff --git a/_generated/AzureFunctionOnKubernetesV1/package-lock.json b/_generated/AzureFunctionOnKubernetesV1/package-lock.json index e97d514e1fa9..d509cafff0cc 100644 --- a/_generated/AzureFunctionOnKubernetesV1/package-lock.json +++ b/_generated/AzureFunctionOnKubernetesV1/package-lock.json @@ -121,9 +121,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -153,67 +153,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, - "jsonwebtoken": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", - "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^7.5.4" - } - }, - "msalv1": { - "version": "npm:@azure/msal-node@1.18.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", - "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", - "requires": { - "@azure/msal-common": "13.3.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - } - }, - "msalv2": { - "version": "npm:@azure/msal-node@2.13.1", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", - "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", - "requires": { - "@azure/msal-common": "14.14.2", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "@azure/msal-common": { - "version": "14.14.2", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", - "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" - } - } - }, - "semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" - }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -221,11 +172,6 @@ "tunnel": "0.0.6", "underscore": "^1.12.1" } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -575,6 +521,30 @@ "esprima": "^4.0.0" } }, + "jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" + } + } + }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -660,6 +630,45 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", + "requires": { + "@azure/msal-common": "14.15.0", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, "node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -786,9 +795,9 @@ } }, "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" }, "sanitize-filename": { "version": "1.6.3", @@ -857,9 +866,9 @@ } }, "tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/_generated/AzureFunctionOnKubernetesV1/package.json b/_generated/AzureFunctionOnKubernetesV1/package.json index f7f27bce498f..89f9e9b42b6d 100644 --- a/_generated/AzureFunctionOnKubernetesV1/package.json +++ b/_generated/AzureFunctionOnKubernetesV1/package.json @@ -21,7 +21,7 @@ "@types/uuid": "^9.0.0", "azure-pipelines-task-lib": "^4.11.0", "agent-base": "^6.0.2", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.235.0", "azure-pipelines-tool-lib": "^2.0.7", diff --git a/_generated/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts b/_generated/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts index f1e14c142993..22aa6da18bf2 100644 --- a/_generated/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts +++ b/_generated/AzureFunctionOnKubernetesV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/AzureFunctionOnKubernetesV1/task.json b/_generated/AzureFunctionOnKubernetesV1/task.json index f634d0cf11f2..7b0a99757658 100644 --- a/_generated/AzureFunctionOnKubernetesV1/task.json +++ b/_generated/AzureFunctionOnKubernetesV1/task.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "demands": [], "groups": [ @@ -196,7 +196,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_2": "1.246.1" + "Default": "1.246.2", + "Node20_229_2": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AzureFunctionOnKubernetesV1/task.loc.json b/_generated/AzureFunctionOnKubernetesV1/task.loc.json index 9dff422d62c1..f7824ce3ae02 100644 --- a/_generated/AzureFunctionOnKubernetesV1/task.loc.json +++ b/_generated/AzureFunctionOnKubernetesV1/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 0 + "Patch": 2 }, "demands": [], "groups": [ @@ -196,7 +196,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_2": "1.246.1" + "Default": "1.246.2", + "Node20_229_2": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AzureFunctionOnKubernetesV1_Node20/make.json b/_generated/AzureFunctionOnKubernetesV1_Node20/make.json index eb1d638ba9f7..e64adfc0843e 100644 --- a/_generated/AzureFunctionOnKubernetesV1_Node20/make.json +++ b/_generated/AzureFunctionOnKubernetesV1_Node20/make.json @@ -6,7 +6,8 @@ "node_modules/azure-pipelines-tasks-kubernetes-common/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", - "node_modules/https-proxy-agent/node_modules/agent-base" + "node_modules/https-proxy-agent/node_modules/agent-base", + "node_modules/azure-pipelines-tasks-azure-arm-rest/node_modules/agent-base" ], "options": "-Rf" } diff --git a/_generated/AzureFunctionOnKubernetesV1_Node20/package-lock.json b/_generated/AzureFunctionOnKubernetesV1_Node20/package-lock.json index 63a80997afae..b80c39b31548 100644 --- a/_generated/AzureFunctionOnKubernetesV1_Node20/package-lock.json +++ b/_generated/AzureFunctionOnKubernetesV1_Node20/package-lock.json @@ -14,7 +14,7 @@ "@types/uuid": "^9.0.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.235.0", "azure-pipelines-tool-lib": "^2.0.7", @@ -162,9 +162,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/_generated/AzureFunctionOnKubernetesV1_Node20/package.json b/_generated/AzureFunctionOnKubernetesV1_Node20/package.json index a238cd26d3d5..616e1b2cff8e 100644 --- a/_generated/AzureFunctionOnKubernetesV1_Node20/package.json +++ b/_generated/AzureFunctionOnKubernetesV1_Node20/package.json @@ -21,7 +21,7 @@ "@types/uuid": "^9.0.0", "azure-pipelines-task-lib": "^4.11.0", "agent-base": "^6.0.2", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.235.0", "azure-pipelines-tool-lib": "^2.0.7", diff --git a/_generated/AzureFunctionOnKubernetesV1_Node20/src/clusters/armkubernetescluster.ts b/_generated/AzureFunctionOnKubernetesV1_Node20/src/clusters/armkubernetescluster.ts index f1e14c142993..22aa6da18bf2 100644 --- a/_generated/AzureFunctionOnKubernetesV1_Node20/src/clusters/armkubernetescluster.ts +++ b/_generated/AzureFunctionOnKubernetesV1_Node20/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/AzureFunctionOnKubernetesV1_Node20/task.json b/_generated/AzureFunctionOnKubernetesV1_Node20/task.json index ca9016fdc01f..2cb17a3dd792 100644 --- a/_generated/AzureFunctionOnKubernetesV1_Node20/task.json +++ b/_generated/AzureFunctionOnKubernetesV1_Node20/task.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 1 + "Patch": 3 }, "demands": [], "groups": [ @@ -200,7 +200,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_2": "1.246.1" + "Default": "1.246.2", + "Node20_229_2": "1.246.3" } } \ No newline at end of file diff --git a/_generated/AzureFunctionOnKubernetesV1_Node20/task.loc.json b/_generated/AzureFunctionOnKubernetesV1_Node20/task.loc.json index ca9160851c10..1c9e41b957af 100644 --- a/_generated/AzureFunctionOnKubernetesV1_Node20/task.loc.json +++ b/_generated/AzureFunctionOnKubernetesV1_Node20/task.loc.json @@ -15,7 +15,7 @@ "version": { "Major": 1, "Minor": 246, - "Patch": 1 + "Patch": 3 }, "demands": [], "groups": [ @@ -200,7 +200,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.246.0", - "Node20_229_2": "1.246.1" + "Default": "1.246.2", + "Node20_229_2": "1.246.3" } } \ No newline at end of file diff --git a/_generated/HelmDeployV0.versionmap.txt b/_generated/HelmDeployV0.versionmap.txt index 2377aa3f00b5..a4922c143cba 100644 --- a/_generated/HelmDeployV0.versionmap.txt +++ b/_generated/HelmDeployV0.versionmap.txt @@ -1,2 +1,2 @@ -Default|0.243.10 -Node20_229_3|0.243.11 +Default|0.246.0 +Node20_229_3|0.246.1 diff --git a/_generated/HelmDeployV0/package-lock.json b/_generated/HelmDeployV0/package-lock.json index 0a341365a564..879b001821e9 100644 --- a/_generated/HelmDeployV0/package-lock.json +++ b/_generated/HelmDeployV0/package-lock.json @@ -155,9 +155,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -187,18 +187,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -234,10 +234,92 @@ "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz", "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, + "azure-devops-node-api": { + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", + "requires": { + "tunnel": "0.0.6", + "typed-rest-client": "^2.0.1" + } + }, + "azure-pipelines-tasks-azure-arm-rest": { + "version": "3.246.2", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.2.tgz", + "integrity": "sha512-RLnVO865AcuDqXbP/IHRa8anKYl6EoTEpMIgmWzayMAsfnBa04iuOcI9vUIhmqK12LJv4ziX+X9fMySSgBpyyw==", + "requires": { + "@types/jsonwebtoken": "^8.5.8", + "@types/mocha": "^5.2.7", + "@types/node": "^10.17.0", + "@types/q": "1.5.4", + "async-mutex": "^0.4.0", + "azure-devops-node-api": "^14.0.1", + "azure-pipelines-task-lib": "^4.11.0", + "https-proxy-agent": "^4.0.0", + "jsonwebtoken": "^9.0.0", + "msalv1": "npm:@azure/msal-node@^1.18.4", + "msalv2": "npm:@azure/msal-node@^2.7.0", + "node-fetch": "^2.6.7", + "q": "1.5.1", + "typed-rest-client": "^2.0.1", + "xml2js": "0.6.2" + }, + "dependencies": { + "q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" + } + } + }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.13.1", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.1.tgz", + "integrity": "sha512-sijfzPNorKt6+9g1/miHwhj6Iapff4mPQx1azmmZExgzUROqWTM1o3ACyxDja0g47VpowFy/sxTM/WsuCyXTiw==", + "requires": { + "@azure/msal-common": "14.14.2", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.14.2", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.2.tgz", + "integrity": "sha512-XV0P5kSNwDwCA/SjIxTe9mEAsKB0NqGNSuaVrkCCE2lAyBr/D6YtD80Vkdp4tjWnPFwjzkwldjr1xU/facOJog==" + } + } + }, "q": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", "integrity": "sha512-/CdEdaw49VZVmyIDGUQKDDT53c7qBkO6g5CefWz91Ae+l4+cRtcDYwMTXh6me4O8TMldeGHG3N2Bl84V78Ywbg==" + }, + "typed-rest-client": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", + "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "requires": { + "des.js": "^1.1.0", + "js-md4": "^0.3.2", + "qs": "^6.10.3", + "tunnel": "0.0.6", + "underscore": "^1.12.1" + } + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -886,19 +968,19 @@ } }, "msalv2": { - "version": "npm:@azure/msal-node@2.12.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz", - "integrity": "sha512-jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg==", + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", "requires": { - "@azure/msal-common": "14.14.0", + "@azure/msal-common": "14.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { "@azure/msal-common": { - "version": "14.14.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz", - "integrity": "sha512-OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ==" + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" }, "uuid": { "version": "8.3.2", diff --git a/_generated/HelmDeployV0/package.json b/_generated/HelmDeployV0/package.json index dc01e3ddb35e..f32a40308484 100644 --- a/_generated/HelmDeployV0/package.json +++ b/_generated/HelmDeployV0/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/_generated/HelmDeployV0/src/clusters/armkubernetescluster.ts b/_generated/HelmDeployV0/src/clusters/armkubernetescluster.ts index 56bb7717ade4..f31abfe267d9 100644 --- a/_generated/HelmDeployV0/src/clusters/armkubernetescluster.ts +++ b/_generated/HelmDeployV0/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/HelmDeployV0/task.json b/_generated/HelmDeployV0/task.json index 20414daf95e1..460b2e1ccafa 100644 --- a/_generated/HelmDeployV0/task.json +++ b/_generated/HelmDeployV0/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ @@ -561,7 +561,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "0.243.10", - "Node20_229_3": "0.243.11" + "Default": "0.246.0", + "Node20_229_3": "0.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV0/task.loc.json b/_generated/HelmDeployV0/task.loc.json index 0bd6380b8813..13febc924558 100644 --- a/_generated/HelmDeployV0/task.loc.json +++ b/_generated/HelmDeployV0/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ @@ -561,7 +561,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "0.243.10", - "Node20_229_3": "0.243.11" + "Default": "0.246.0", + "Node20_229_3": "0.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV0_Node20/package-lock.json b/_generated/HelmDeployV0_Node20/package-lock.json index 42bd746d75a2..07421c8c2fed 100644 --- a/_generated/HelmDeployV0_Node20/package-lock.json +++ b/_generated/HelmDeployV0_Node20/package-lock.json @@ -11,7 +11,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", @@ -197,9 +197,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/_generated/HelmDeployV0_Node20/package.json b/_generated/HelmDeployV0_Node20/package.json index 0bf9aeaf00ef..456c7a3b8ac0 100644 --- a/_generated/HelmDeployV0_Node20/package.json +++ b/_generated/HelmDeployV0_Node20/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/_generated/HelmDeployV0_Node20/src/clusters/armkubernetescluster.ts b/_generated/HelmDeployV0_Node20/src/clusters/armkubernetescluster.ts index 56bb7717ade4..f31abfe267d9 100644 --- a/_generated/HelmDeployV0_Node20/src/clusters/armkubernetescluster.ts +++ b/_generated/HelmDeployV0_Node20/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/HelmDeployV0_Node20/task.json b/_generated/HelmDeployV0_Node20/task.json index 7f9f39946cc8..b64670df3a93 100644 --- a/_generated/HelmDeployV0_Node20/task.json +++ b/_generated/HelmDeployV0_Node20/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 243, - "Patch": 11 + "Minor": 246, + "Patch": 1 }, "demands": [], "groups": [ @@ -573,7 +573,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "0.243.10", - "Node20_229_3": "0.243.11" + "Default": "0.246.0", + "Node20_229_3": "0.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV0_Node20/task.loc.json b/_generated/HelmDeployV0_Node20/task.loc.json index f2c36982029f..9b607beac422 100644 --- a/_generated/HelmDeployV0_Node20/task.loc.json +++ b/_generated/HelmDeployV0_Node20/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 0, - "Minor": 243, - "Patch": 11 + "Minor": 246, + "Patch": 1 }, "demands": [], "groups": [ @@ -573,7 +573,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "0.243.10", - "Node20_229_3": "0.243.11" + "Default": "0.246.0", + "Node20_229_3": "0.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV1.versionmap.txt b/_generated/HelmDeployV1.versionmap.txt index 38fe5547ebc5..46c428aec355 100644 --- a/_generated/HelmDeployV1.versionmap.txt +++ b/_generated/HelmDeployV1.versionmap.txt @@ -1,2 +1,2 @@ -Default|1.243.10 -Node20_229_3|1.243.11 +Default|1.246.0 +Node20_229_3|1.246.1 diff --git a/_generated/HelmDeployV1/package-lock.json b/_generated/HelmDeployV1/package-lock.json index 0a341365a564..499147d0ca90 100644 --- a/_generated/HelmDeployV1/package-lock.json +++ b/_generated/HelmDeployV1/package-lock.json @@ -155,9 +155,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -187,18 +187,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -767,9 +767,9 @@ }, "dependencies": { "semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" } } }, @@ -886,19 +886,19 @@ } }, "msalv2": { - "version": "npm:@azure/msal-node@2.12.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz", - "integrity": "sha512-jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg==", + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", "requires": { - "@azure/msal-common": "14.14.0", + "@azure/msal-common": "14.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { "@azure/msal-common": { - "version": "14.14.0", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz", - "integrity": "sha512-OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ==" + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" }, "uuid": { "version": "8.3.2", @@ -1187,9 +1187,9 @@ } }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/_generated/HelmDeployV1/package.json b/_generated/HelmDeployV1/package.json index dc01e3ddb35e..f32a40308484 100644 --- a/_generated/HelmDeployV1/package.json +++ b/_generated/HelmDeployV1/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/_generated/HelmDeployV1/src/clusters/armkubernetescluster.ts b/_generated/HelmDeployV1/src/clusters/armkubernetescluster.ts index 56bb7717ade4..f31abfe267d9 100644 --- a/_generated/HelmDeployV1/src/clusters/armkubernetescluster.ts +++ b/_generated/HelmDeployV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/HelmDeployV1/task.json b/_generated/HelmDeployV1/task.json index f89d9357260d..dff47317b86e 100644 --- a/_generated/HelmDeployV1/task.json +++ b/_generated/HelmDeployV1/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ @@ -562,7 +562,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.243.10", - "Node20_229_3": "1.243.11" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV1/task.loc.json b/_generated/HelmDeployV1/task.loc.json index 90e1f731acba..b80bf52b8680 100644 --- a/_generated/HelmDeployV1/task.loc.json +++ b/_generated/HelmDeployV1/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 10 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [ @@ -562,7 +562,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.243.10", - "Node20_229_3": "1.243.11" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV1_Node20/package-lock.json b/_generated/HelmDeployV1_Node20/package-lock.json index 82eff86a089e..d7fb07510ba2 100644 --- a/_generated/HelmDeployV1_Node20/package-lock.json +++ b/_generated/HelmDeployV1_Node20/package-lock.json @@ -11,7 +11,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", @@ -197,9 +197,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/_generated/HelmDeployV1_Node20/package.json b/_generated/HelmDeployV1_Node20/package.json index 0bf9aeaf00ef..456c7a3b8ac0 100644 --- a/_generated/HelmDeployV1_Node20/package.json +++ b/_generated/HelmDeployV1_Node20/package.json @@ -6,7 +6,7 @@ "@types/uuid": "^8.3.0", "agent-base": "6.0.2", "azure-pipelines-task-lib": "^4.13.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "^2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-securefiles-common": "^2.207.0", diff --git a/_generated/HelmDeployV1_Node20/src/clusters/armkubernetescluster.ts b/_generated/HelmDeployV1_Node20/src/clusters/armkubernetescluster.ts index 56bb7717ade4..f31abfe267d9 100644 --- a/_generated/HelmDeployV1_Node20/src/clusters/armkubernetescluster.ts +++ b/_generated/HelmDeployV1_Node20/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/HelmDeployV1_Node20/task.json b/_generated/HelmDeployV1_Node20/task.json index 433884b1022f..a5a07dce54c5 100644 --- a/_generated/HelmDeployV1_Node20/task.json +++ b/_generated/HelmDeployV1_Node20/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 11 + "Minor": 246, + "Patch": 1 }, "demands": [], "groups": [ @@ -574,7 +574,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.243.10", - "Node20_229_3": "1.243.11" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/HelmDeployV1_Node20/task.loc.json b/_generated/HelmDeployV1_Node20/task.loc.json index 25d2304f8a12..4c7865674f5c 100644 --- a/_generated/HelmDeployV1_Node20/task.loc.json +++ b/_generated/HelmDeployV1_Node20/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 11 + "Minor": 246, + "Patch": 1 }, "demands": [], "groups": [ @@ -574,7 +574,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.243.10", - "Node20_229_3": "1.243.11" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesManifestV1.versionmap.txt b/_generated/KubernetesManifestV1.versionmap.txt index d4a06ea95ed3..46c428aec355 100644 --- a/_generated/KubernetesManifestV1.versionmap.txt +++ b/_generated/KubernetesManifestV1.versionmap.txt @@ -1,2 +1,2 @@ -Default|1.243.2 -Node20_229_3|1.243.3 +Default|1.246.0 +Node20_229_3|1.246.1 diff --git a/_generated/KubernetesManifestV1/package-lock.json b/_generated/KubernetesManifestV1/package-lock.json index 2a1775a5b8b2..af6745aaa257 100644 --- a/_generated/KubernetesManifestV1/package-lock.json +++ b/_generated/KubernetesManifestV1/package-lock.json @@ -189,9 +189,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -221,18 +221,18 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -1065,19 +1065,19 @@ } }, "msalv2": { - "version": "npm:@azure/msal-node@2.11.1", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.11.1.tgz", - "integrity": "sha512-8ECtug4RL+zsgh20VL8KYHjrRO3MJOeAKEPRXT2lwtiu5U3BdyIdBb50+QZthEkIi60K6pc/pdOx/k5Jp4sLng==", + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", "requires": { - "@azure/msal-common": "14.13.1", + "@azure/msal-common": "14.15.0", "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { "@azure/msal-common": { - "version": "14.13.1", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.13.1.tgz", - "integrity": "sha512-iUp3BYrsRZ4X3EiaZ2fDjNFjmtYMv9rEQd6c1op6ULn0HWk4ACvDmosL6NaBgWOhl1BAblIbd9vmB5/ilF8d4A==" + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" }, "uuid": { "version": "8.3.2", @@ -1424,9 +1424,9 @@ } }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/_generated/KubernetesManifestV1/package.json b/_generated/KubernetesManifestV1/package.json index 1da28aff3d63..7759fdbf7644 100644 --- a/_generated/KubernetesManifestV1/package.json +++ b/_generated/KubernetesManifestV1/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/_generated/KubernetesManifestV1/src/clusters/armkubernetescluster.ts b/_generated/KubernetesManifestV1/src/clusters/armkubernetescluster.ts index f1e14c142993..22aa6da18bf2 100644 --- a/_generated/KubernetesManifestV1/src/clusters/armkubernetescluster.ts +++ b/_generated/KubernetesManifestV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/KubernetesManifestV1/task.json b/_generated/KubernetesManifestV1/task.json index e2ff9fac453a..24ed23b23cbd 100644 --- a/_generated/KubernetesManifestV1/task.json +++ b/_generated/KubernetesManifestV1/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 2 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [], @@ -466,7 +466,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.243.2", - "Node20_229_3": "1.243.3" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesManifestV1/task.loc.json b/_generated/KubernetesManifestV1/task.loc.json index be3602250d26..9e0a9c239ead 100644 --- a/_generated/KubernetesManifestV1/task.loc.json +++ b/_generated/KubernetesManifestV1/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 2 + "Minor": 246, + "Patch": 0 }, "demands": [], "groups": [], @@ -466,7 +466,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.243.2", - "Node20_229_3": "1.243.3" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesManifestV1_Node20/package-lock.json b/_generated/KubernetesManifestV1_Node20/package-lock.json index 36a135500046..b54f3467fc87 100644 --- a/_generated/KubernetesManifestV1_Node20/package-lock.json +++ b/_generated/KubernetesManifestV1_Node20/package-lock.json @@ -13,7 +13,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", @@ -187,9 +187,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/_generated/KubernetesManifestV1_Node20/package.json b/_generated/KubernetesManifestV1_Node20/package.json index 9123a3201ebe..7af501264c37 100644 --- a/_generated/KubernetesManifestV1_Node20/package.json +++ b/_generated/KubernetesManifestV1_Node20/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.11.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/_generated/KubernetesManifestV1_Node20/src/clusters/armkubernetescluster.ts b/_generated/KubernetesManifestV1_Node20/src/clusters/armkubernetescluster.ts index f1e14c142993..22aa6da18bf2 100644 --- a/_generated/KubernetesManifestV1_Node20/src/clusters/armkubernetescluster.ts +++ b/_generated/KubernetesManifestV1_Node20/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/KubernetesManifestV1_Node20/task.json b/_generated/KubernetesManifestV1_Node20/task.json index d1e8d198bd2f..b56e4b10f0b2 100644 --- a/_generated/KubernetesManifestV1_Node20/task.json +++ b/_generated/KubernetesManifestV1_Node20/task.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 3 + "Minor": 246, + "Patch": 1 }, "demands": [], "groups": [], @@ -470,7 +470,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.243.2", - "Node20_229_3": "1.243.3" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesManifestV1_Node20/task.loc.json b/_generated/KubernetesManifestV1_Node20/task.loc.json index 99f2369f8a81..2447e65818b5 100644 --- a/_generated/KubernetesManifestV1_Node20/task.loc.json +++ b/_generated/KubernetesManifestV1_Node20/task.loc.json @@ -13,8 +13,8 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 243, - "Patch": 3 + "Minor": 246, + "Patch": 1 }, "demands": [], "groups": [], @@ -470,7 +470,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.243.2", - "Node20_229_3": "1.243.3" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesV1.versionmap.txt b/_generated/KubernetesV1.versionmap.txt index 6b0a48375bea..46c428aec355 100644 --- a/_generated/KubernetesV1.versionmap.txt +++ b/_generated/KubernetesV1.versionmap.txt @@ -1,2 +1,2 @@ -Default|1.244.0 -Node20_229_3|1.244.1 +Default|1.246.0 +Node20_229_3|1.246.1 diff --git a/_generated/KubernetesV1/Tests/TestSetup.ts b/_generated/KubernetesV1/Tests/TestSetup.ts index 176c586a47f9..f868dbc4abf5 100644 --- a/_generated/KubernetesV1/Tests/TestSetup.ts +++ b/_generated/KubernetesV1/Tests/TestSetup.ts @@ -108,6 +108,35 @@ nock('https://management.azure.com', { kubeConfig: '{\"apiVersion\":\"v1\", \"clusters\": [{\"cluster\": {\"insecure-skip-tls-verify\":\"true\", \"server\":\"https://5.6.7.8\", \"name\" : \"scratch\"}}], \"contexts\": [{\"context\" : {\"cluster\": \"scratch\", \"namespace\" : \"default\", \"user\": \"experimenter\", \"name\" : \"exp-scratch\"}], \"current-context\" : \"exp-scratch\", \"kind\": \"Config\", \"users\" : [{\"user\": {\"password\": \"regpassword\", \"username\" : \"test\"}]}' } }).persist(); +nock('https://management.azure.com', { + reqheaders: { + "authorization": "Bearer DUMMY_ACCESS_TOKEN", + "content-type": "application/json; charset=utf-8" + } +}).post("/subscriptions/sId/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myCluster1/listClusterUserCredential?api-version=2024-05-01") +.reply(200, { + kubeconfigs: [{ + name: "clusterUser", + value: "base46kubeconfig" + }, + { + name: "customUser", + value: "base46kubeconfig" + }] + }).persist(); + + nock('https://management.azure.com', { + reqheaders: { + "authorization": "Bearer DUMMY_ACCESS_TOKEN", + "content-type": "application/json; charset=utf-8" + } +}).post("/subscriptions/sId/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myCluster1/listClusterAdminCredential?api-version=2024-05-01") +.reply(200, { + kubeconfigs: [{ + name: "clusterAdmin", + value: "base46kubeconfig" + }] + }).persist(); // provide answers for task mock let a = { diff --git a/_generated/KubernetesV1/npm-shrinkwrap.json b/_generated/KubernetesV1/npm-shrinkwrap.json index 5afda03b36d4..09befbfada2b 100644 --- a/_generated/KubernetesV1/npm-shrinkwrap.json +++ b/_generated/KubernetesV1/npm-shrinkwrap.json @@ -193,9 +193,9 @@ } }, "azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", "requires": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", @@ -225,72 +225,23 @@ "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==" }, "azure-devops-node-api": { - "version": "14.0.1", - "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.1.tgz", - "integrity": "sha512-oVnFfTNmergd3JU852EpGY64d1nAxW8lCyzZqFDPhfQVZkdApBeK/ZMN7yoFiq/C50Ru304X1L/+BFblh2SRJw==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-14.0.2.tgz", + "integrity": "sha512-TwjAEnWnOSZ2oypkDyqppgvJw43qArEfPiJtEWLL3NBgdvAuOuB0xgFz/Eiz4H6Dk0Yv52wCodZxtZvAMhJXwQ==", "requires": { "tunnel": "0.0.6", "typed-rest-client": "^2.0.1" } }, - "jsonwebtoken": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", - "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^7.5.4" - } - }, - "msalv1": { - "version": "npm:@azure/msal-node@1.18.4", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", - "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", - "requires": { - "@azure/msal-common": "13.3.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - } - }, - "msalv2": { - "version": "npm:@azure/msal-node@2.13.0", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.13.0.tgz", - "integrity": "sha512-DhP97ycs7qlCVzzzWGzJiwAFyFj5okno74E4FUZ61oCLfKh4IxA1kxirqzrWuYZWpBe9HVPL6GA4NvmlEOBN5Q==", - "requires": { - "@azure/msal-common": "14.14.1", - "jsonwebtoken": "^9.0.0", - "uuid": "^8.3.0" - }, - "dependencies": { - "@azure/msal-common": { - "version": "14.14.1", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.1.tgz", - "integrity": "sha512-2Q3tqNz/PZLfSr8BvcHZVpRRfSn4MjGSqjj9J+HlBsmbf1Uu4P0WeXnemjTJwwx9KrmplsrN3UkZ/LPOR720rw==" - } - } - }, "q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==" }, - "semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==" - }, "typed-rest-client": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.0.2.tgz", - "integrity": "sha512-rmAQM2gZw/PQpK5+5aSs+I6ZBv4PFC2BT1o+0ADS1SgSejA+14EmbI2Lt8uXwkX7oeOMkwFmg0pHKwe8D9IT5A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-2.1.0.tgz", + "integrity": "sha512-Nel9aPbgSzRxfs1+4GoSB4wexCF+4Axlk7OSGVQCMa+4fWcyxIsN/YNmkp0xTT2iQzMD98h8yFLav/cNaULmRA==", "requires": { "des.js": "^1.1.0", "js-md4": "^0.3.2", @@ -298,11 +249,6 @@ "tunnel": "0.0.6", "underscore": "^1.12.1" } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" } } }, @@ -920,6 +866,30 @@ "esprima": "^4.0.0" } }, + "jsonwebtoken": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==" + } + } + }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -1015,6 +985,45 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, + "msalv1": { + "version": "npm:@azure/msal-node@1.18.4", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.4.tgz", + "integrity": "sha512-Kc/dRvhZ9Q4+1FSfsTFDME/v6+R2Y1fuMty/TfwqE5p9GTPw08BPbKgeWinE8JRHRp+LemjQbUZsn4Q4l6Lszg==", + "requires": { + "@azure/msal-common": "13.3.1", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, + "msalv2": { + "version": "npm:@azure/msal-node@2.14.0", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.14.0.tgz", + "integrity": "sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==", + "requires": { + "@azure/msal-common": "14.15.0", + "jsonwebtoken": "^9.0.0", + "uuid": "^8.3.0" + }, + "dependencies": { + "@azure/msal-common": { + "version": "14.15.0", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.15.0.tgz", + "integrity": "sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==" + }, + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } + } + }, "node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -1341,9 +1350,9 @@ } }, "tslib": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", - "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", + "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==" }, "tunnel": { "version": "0.0.6", diff --git a/_generated/KubernetesV1/package.json b/_generated/KubernetesV1/package.json index 8f5ff62e090c..f276966d72ed 100644 --- a/_generated/KubernetesV1/package.json +++ b/_generated/KubernetesV1/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.16.0", - "azure-pipelines-tasks-azure-arm-rest": "^3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/_generated/KubernetesV1/src/clusters/armkubernetescluster.ts b/_generated/KubernetesV1/src/clusters/armkubernetescluster.ts index 541a73df0578..19f69a5ecebb 100644 --- a/_generated/KubernetesV1/src/clusters/armkubernetescluster.ts +++ b/_generated/KubernetesV1/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/KubernetesV1/task.json b/_generated/KubernetesV1/task.json index ac96f758d7dc..d710becfde18 100644 --- a/_generated/KubernetesV1/task.json +++ b/_generated/KubernetesV1/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 244, + "Minor": 246, "Patch": 0 }, "demands": [], @@ -492,7 +492,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.244.0", - "Node20_229_3": "1.244.1" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesV1/task.loc.json b/_generated/KubernetesV1/task.loc.json index 6a9f2b6a1a67..c314f061f36d 100644 --- a/_generated/KubernetesV1/task.loc.json +++ b/_generated/KubernetesV1/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 244, + "Minor": 246, "Patch": 0 }, "demands": [], @@ -492,7 +492,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.244.0", - "Node20_229_3": "1.244.1" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesV1_Node20/Tests/TestSetup.ts b/_generated/KubernetesV1_Node20/Tests/TestSetup.ts index 176c586a47f9..f868dbc4abf5 100644 --- a/_generated/KubernetesV1_Node20/Tests/TestSetup.ts +++ b/_generated/KubernetesV1_Node20/Tests/TestSetup.ts @@ -108,6 +108,35 @@ nock('https://management.azure.com', { kubeConfig: '{\"apiVersion\":\"v1\", \"clusters\": [{\"cluster\": {\"insecure-skip-tls-verify\":\"true\", \"server\":\"https://5.6.7.8\", \"name\" : \"scratch\"}}], \"contexts\": [{\"context\" : {\"cluster\": \"scratch\", \"namespace\" : \"default\", \"user\": \"experimenter\", \"name\" : \"exp-scratch\"}], \"current-context\" : \"exp-scratch\", \"kind\": \"Config\", \"users\" : [{\"user\": {\"password\": \"regpassword\", \"username\" : \"test\"}]}' } }).persist(); +nock('https://management.azure.com', { + reqheaders: { + "authorization": "Bearer DUMMY_ACCESS_TOKEN", + "content-type": "application/json; charset=utf-8" + } +}).post("/subscriptions/sId/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myCluster1/listClusterUserCredential?api-version=2024-05-01") +.reply(200, { + kubeconfigs: [{ + name: "clusterUser", + value: "base46kubeconfig" + }, + { + name: "customUser", + value: "base46kubeconfig" + }] + }).persist(); + + nock('https://management.azure.com', { + reqheaders: { + "authorization": "Bearer DUMMY_ACCESS_TOKEN", + "content-type": "application/json; charset=utf-8" + } +}).post("/subscriptions/sId/resourceGroups/myResourceGroup/providers/Microsoft.ContainerService/managedClusters/myCluster1/listClusterAdminCredential?api-version=2024-05-01") +.reply(200, { + kubeconfigs: [{ + name: "clusterAdmin", + value: "base46kubeconfig" + }] + }).persist(); // provide answers for task mock let a = { diff --git a/_generated/KubernetesV1_Node20/npm-shrinkwrap.json b/_generated/KubernetesV1_Node20/npm-shrinkwrap.json index 04f7809b26c9..41d8ab5140a5 100644 --- a/_generated/KubernetesV1_Node20/npm-shrinkwrap.json +++ b/_generated/KubernetesV1_Node20/npm-shrinkwrap.json @@ -13,7 +13,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.16.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", @@ -185,9 +185,10 @@ } }, "node_modules/azure-pipelines-tasks-azure-arm-rest": { - "version": "3.242.2", - "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.242.2.tgz", - "integrity": "sha512-ljPHxC07BIMH9f3EP0+Rd86CCH+GX3TeDoULa1hCQUoMYrSfvx+Q5ywxoMp9riB78h9aUZf93CPuuVc79naUgg==", + "version": "3.246.5", + "resolved": "https://registry.npmjs.org/azure-pipelines-tasks-azure-arm-rest/-/azure-pipelines-tasks-azure-arm-rest-3.246.5.tgz", + "integrity": "sha512-CwBPrRABGQU693zuhCDsx71LynicfttHY4b/7r6kgPT5aRseJI7KsemuhDSdYmzlM8jfg4nn9DxFS7b+e+vung==", + "license": "MIT", "dependencies": { "@types/jsonwebtoken": "^8.5.8", "@types/mocha": "^5.2.7", diff --git a/_generated/KubernetesV1_Node20/package.json b/_generated/KubernetesV1_Node20/package.json index fb8ec5dedbfd..3b6d6dc0d736 100644 --- a/_generated/KubernetesV1_Node20/package.json +++ b/_generated/KubernetesV1_Node20/package.json @@ -8,7 +8,7 @@ "@types/uuid": "^8.3.0", "agent-base": "^6.0.2", "azure-pipelines-task-lib": "^4.16.0", - "azure-pipelines-tasks-azure-arm-rest": "3.242.2", + "azure-pipelines-tasks-azure-arm-rest": "3.246.5", "azure-pipelines-tasks-docker-common": "2.242.0", "azure-pipelines-tasks-kubernetes-common": "^2.224.1", "azure-pipelines-tasks-utility-common": "^3.210.0", diff --git a/_generated/KubernetesV1_Node20/src/clusters/armkubernetescluster.ts b/_generated/KubernetesV1_Node20/src/clusters/armkubernetescluster.ts index 541a73df0578..19f69a5ecebb 100644 --- a/_generated/KubernetesV1_Node20/src/clusters/armkubernetescluster.ts +++ b/_generated/KubernetesV1_Node20/src/clusters/armkubernetescluster.ts @@ -3,7 +3,7 @@ import tl = require('azure-pipelines-task-lib/task'); 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'; +import { AzureEndpoint, AKSCluster, AKSClusterAccessProfile, AKSCredentialResult} from 'azure-pipelines-tasks-azure-arm-rest/azureModels'; // get kubeconfig file content async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceGroup: string, clusterName: string, useClusterAdmin?: boolean) : Promise { @@ -12,8 +12,8 @@ async function getKubeConfigFromAKS(azureSubscriptionEndpoint: string, resourceG tl.debug(tl.loc("KubernetesClusterResourceGroup", clusterName, resourceGroup)); - var clusterInfo : AKSClusterAccessProfile = await aks.getAccessProfile(resourceGroup, clusterName, useClusterAdmin); - var base64Kubeconfig = Buffer.from(clusterInfo.properties.kubeConfig, 'base64'); + var clusterInfo : AKSCredentialResult = await aks.getClusterCredential(resourceGroup, clusterName, useClusterAdmin); + var base64Kubeconfig = Buffer.from(clusterInfo.value, 'base64'); return base64Kubeconfig.toString(); } diff --git a/_generated/KubernetesV1_Node20/task.json b/_generated/KubernetesV1_Node20/task.json index f218a5631504..959c2e0f5d26 100644 --- a/_generated/KubernetesV1_Node20/task.json +++ b/_generated/KubernetesV1_Node20/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 244, + "Minor": 246, "Patch": 1 }, "demands": [], @@ -496,7 +496,7 @@ "KubeloginFailed": "Kubelogin authentication failed. Exception: %s" }, "_buildConfigMapping": { - "Default": "1.244.0", - "Node20_229_3": "1.244.1" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file diff --git a/_generated/KubernetesV1_Node20/task.loc.json b/_generated/KubernetesV1_Node20/task.loc.json index 2d41822bc45f..e5bafed1793c 100644 --- a/_generated/KubernetesV1_Node20/task.loc.json +++ b/_generated/KubernetesV1_Node20/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 244, + "Minor": 246, "Patch": 1 }, "demands": [], @@ -496,7 +496,7 @@ "KubeloginFailed": "ms-resource:loc.messages.KubeloginFailed" }, "_buildConfigMapping": { - "Default": "1.244.0", - "Node20_229_3": "1.244.1" + "Default": "1.246.0", + "Node20_229_3": "1.246.1" } } \ No newline at end of file