2208911 Create PR for the Azure-arm-rest Common lib and update relate… (

#20466) * 2208911 Create PR for the Azure-arm-rest Common lib and update related task * Test cases fixed for kubnetes task
microsoft · Sep 25, 2024 · 8629d02 · 8629d02
1 parent 8882cc4
commit 8629d02
Show file tree

Hide file tree

Showing 96 changed files with 890 additions and 590 deletions.
diff --git a/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json b/Tasks/AzureFunctionOnKubernetesV1/_buildConfigs/Node20/package-lock.json
diff --git 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
@@ -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
diff --git 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
@@ -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<string> {
@@ -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
@@ -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
@@ -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
diff --git 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",