Merge pull request #7781 from Microsoft/users/ansheno/authTypeFixMaster

Added proper check for authorizationType in Helm and Kubernetes Tasks
microsoft · Aug 21, 2018 · cb4d8cc · cb4d8cc
2 parents a222502 + 9c11567
commit cb4d8cc
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/Tasks/HelmDeployV0/src/clusters/generickubernetescluster.ts b/Tasks/HelmDeployV0/src/clusters/generickubernetescluster.ts
@@ -5,8 +5,8 @@ import kubectlutility = require("utility-common/kubectlutility");
 
 export async function getKubeConfig(): Promise<string> {
     var kubernetesServiceEndpoint = tl.getInput("kubernetesServiceEndpoint", true);
-    var authorizationType = tl.getEndpointDataParameter(kubernetesServiceEndpoint, 'authorizationType', false);
-    if (authorizationType === "Kubeconfig")
+    var authorizationType = tl.getEndpointDataParameter(kubernetesServiceEndpoint, 'authorizationType', true);
+    if (!authorizationType || authorizationType === "Kubeconfig")
     {
         return tl.getEndpointAuthorizationParameter(kubernetesServiceEndpoint, 'kubeconfig', false);
     }

diff --git a/Tasks/HelmDeployV0/task.json b/Tasks/HelmDeployV0/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 138,
-        "Patch": 1
+        "Patch": 2
     },
     "demands": [],
     "groups": [

diff --git a/Tasks/HelmDeployV0/task.loc.json b/Tasks/HelmDeployV0/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 138,
-    "Patch": 1
+    "Patch": 2
   },
   "demands": [],
   "groups": [

diff --git a/Tasks/KubernetesV0/src/clusterconnection.ts b/Tasks/KubernetesV0/src/clusterconnection.ts
@@ -41,7 +41,7 @@ export default class ClusterConnection {
          return this.initialize().then(() => {
             var authorizationType = tl.getEndpointDataParameter(kubernetesEndpoint, 'authorizationType', true);
             var kubeconfig = null;
-            if (authorizationType == null || authorizationType === "Kubeconfig")
+            if (!authorizationType || authorizationType === "Kubeconfig")
             {
                 if (kubernetesEndpoint) {
                      kubeconfig = tl.getEndpointAuthorizationParameter(kubernetesEndpoint, 'kubeconfig', false);

diff --git a/Tasks/KubernetesV0/task.json b/Tasks/KubernetesV0/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 1,
-        "Patch": 27
+        "Patch": 28
     },
     "demands": [],
     "preview": "false",

diff --git a/Tasks/KubernetesV0/task.loc.json b/Tasks/KubernetesV0/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 1,
-    "Patch": 27
+    "Patch": 28
   },
   "demands": [],
   "preview": "false",

diff --git a/Tasks/KubernetesV1/src/clusters/generickubernetescluster.ts b/Tasks/KubernetesV1/src/clusters/generickubernetescluster.ts
@@ -6,7 +6,7 @@ import kubectlutility = require("utility-common/kubectlutility");
 export async function getKubeConfig(): Promise<string> {
     var kubernetesServiceEndpoint = tl.getInput("kubernetesServiceEndpoint", true);
     var authorizationType = tl.getEndpointDataParameter(kubernetesServiceEndpoint, 'authorizationType', true);
-    if (authorizationType == null || authorizationType === "Kubeconfig")
+    if (!authorizationType || authorizationType === "Kubeconfig")
     {
         return tl.getEndpointAuthorizationParameter(kubernetesServiceEndpoint, 'kubeconfig', false);
     }

diff --git a/Tasks/KubernetesV1/task.json b/Tasks/KubernetesV1/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 1,
-        "Patch": 2
+        "Patch": 3
     },
     "demands": [],
     "preview": "true",

diff --git a/Tasks/KubernetesV1/task.loc.json b/Tasks/KubernetesV1/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [],
   "preview": "true",