Allowing override Release.Name for manifest bake (#10311)

thesattiraju · web-flow · commit d3d33f3f1d1f · 2019-05-22T15:52:16.000+05:30
* Allowing override Release.Name for manifest bake

* adding L0s

* Reset task version
diff --git a/Tasks/Common/kubernetes-common/helm-object-model.ts b/Tasks/Common/kubernetes-common/helm-object-model.ts
@@ -20,10 +20,13 @@ export class Helm {
         }
     }
 
-    public template(chartPath: string, overrideFiles: string[], overrideValues: NameValuePair[]): IExecSyncResult {
+    public template(releaseName: string, chartPath: string, overrideFiles: string[], overrideValues: NameValuePair[]): IExecSyncResult {
         var command = tl.tool(this.helmPath);
         command.arg("template");
-        command.arg(chartPath)
+        command.arg(chartPath);
+        if (releaseName) {
+            command.arg(["--name", releaseName]);
+        }
         command.arg(["--namespace", this.namespace]);
         if (overrideFiles.length > 0) {
             overrideFiles.forEach(file => {
diff --git a/Tasks/KubernetesManifestV0/Strings/resources.resjson/en-US/resources.resjson b/Tasks/KubernetesManifestV0/Strings/resources.resjson/en-US/resources.resjson
@@ -22,6 +22,8 @@
   "loc.input.help.renderType": "Tool to generate manifest",
   "loc.input.label.helmChart": "Helm Chart",
   "loc.input.help.helmChart": "Helm chart path to bake",
+  "loc.input.label.releaseName": "Helm Release Name",
+  "loc.input.help.releaseName": "Helm release name to use",
   "loc.input.label.overrideFiles": "Override Files",
   "loc.input.help.overrideFiles": "Override files to set",
   "loc.input.label.overrides": "Overrides",
diff --git a/Tasks/KubernetesManifestV0/Tests/L0.ts b/Tasks/KubernetesManifestV0/Tests/L0.ts
@@ -128,4 +128,28 @@ describe('Kubernetes Manifests Suite', function () {
         assert(tr.failed, 'task should have failed');
         done();
     });
+    it('Run should succeed with helm bake', (done: MochaDone) => {
+        let tp = path.join(__dirname, 'TestSetup.js');
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+        process.env[shared.TestEnvVars.action] = shared.Actions.bake;
+        process.env[shared.TestEnvVars.helmChart] = "helmChart";
+        process.env[shared.TestEnvVars.renderType] = "helm2";
+        tr.run();
+        assert(tr.succeeded, 'task should have succeeded');
+        assert(tr.stdout.indexOf("set manifestsBundle") > -1, 'task should have set manifestsBundle output variable');
+        done();
+    });
+    it('Run should succeed with helm bake overriding release name', (done: MochaDone) => {
+        let tp = path.join(__dirname, 'TestSetup.js');
+        let tr: ttm.MockTestRunner = new ttm.MockTestRunner(tp);
+        process.env[shared.TestEnvVars.action] = shared.Actions.bake;
+        process.env[shared.TestEnvVars.helmChart] = "helmChart";
+        process.env[shared.TestEnvVars.renderType] = "helm2";
+        process.env[shared.TestEnvVars.releaseName] = "newReleaseName";
+        tr.run();
+        assert(tr.succeeded, 'task should have succeeded');
+        assert(tr.stdout.indexOf("set manifestsBundle") > -1, 'task should have set manifestsBundle output variable');
+        assert(tr.stdout.indexOf("--name newReleaseName") > -1, 'bake should have overriden release name');
+        done();
+    });
 });
diff --git a/Tasks/KubernetesManifestV0/Tests/TestSetup.ts b/Tasks/KubernetesManifestV0/Tests/TestSetup.ts
@@ -28,6 +28,7 @@ tr.setInput('containers', process.env[shared.TestEnvVars.containers] || '');
 tr.setInput('imagePullSecrets', process.env[shared.TestEnvVars.imagePullSecrets] || '');
 tr.setInput('renderType', process.env[shared.TestEnvVars.renderType] || '');
 tr.setInput('helmChart', process.env[shared.TestEnvVars.helmChart] || '');
+tr.setInput('releaseName', process.env[shared.TestEnvVars.releaseName] || '');
 tr.setInput('overrideFiles', process.env[shared.TestEnvVars.overrideFiles] || '');
 tr.setInput('overrides', process.env[shared.TestEnvVars.overrides] || '');
 tr.setInput('resourceToPatch', process.env[shared.TestEnvVars.resourceToPatch] || '');
@@ -57,12 +58,31 @@ process.env["ENDPOINT_DATA_kubernetesConnection_AUTHORIZATIONTYPE"] = process.en
 process.env["ENDPOINT_AUTH_PARAMETER_kubernetesConnection_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\"}]}";
 
 let a: ma.TaskLibAnswers = <ma.TaskLibAnswers>{
-    "checkPath": {},
-    "exec": {},
+    "checkPath": {
+        "helm": true
+    },
+    "exec": {
+    },
     "findMatch": {},
-    "which": {}
+    "which": {
+        "helm": "helm"
+    }
 };
 
+if (process.env[shared.TestEnvVars.action] === "bake") {
+    const command = `helm template ${process.env[shared.TestEnvVars.helmChart]} --namespace ${process.env[shared.TestEnvVars.namespace] || 'default'}`;
+    const commandWithReleaseNameOverride = `helm template ${process.env[shared.TestEnvVars.helmChart]} --name ${process.env[shared.TestEnvVars.releaseName]} --namespace ${process.env[shared.TestEnvVars.namespace] || 'default'}`;
+    
+    a.exec[command] = {
+        "code": 0,
+        stdout: "some yaml"
+    };
+    a.exec[commandWithReleaseNameOverride] = {
+        "code": 0,
+        stdout: "some yaml"
+    };
+}
+
 if (process.env[shared.TestEnvVars.isKubectlPresentOnMachine] && JSON.parse(process.env[shared.TestEnvVars.isKubectlPresentOnMachine])) {
     a.which["kubectl"] = KubectlPath;
 }
diff --git a/Tasks/KubernetesManifestV0/Tests/TestShared.ts b/Tasks/KubernetesManifestV0/Tests/TestShared.ts
@@ -13,6 +13,7 @@ export let TestEnvVars = {
     containers: "__containers__",
     imagePullSecrets: "__imagePullSecrets__",
     renderType: "__renderType__",
+    releaseName: "__releaseName__",
     helmChart: "__helmChart__",
     secretName: "__secretName__",
     overrideFiles: "__overrideFiles__",
diff --git a/Tasks/KubernetesManifestV0/src/actions/bake.ts b/Tasks/KubernetesManifestV0/src/actions/bake.ts
@@ -5,7 +5,7 @@ import path = require('path');
 import fs = require('fs');
 import { getTempDirectory } from "../utils/FileHelper";
 import helmutility = require("utility-common/helmutility");
-import { Helm, NameValuePair } from "utility-common/helm-object-model";
+import { Helm, NameValuePair } from "kubernetes-common/helm-object-model";
 
 const uuidV4 = require('uuid/v4');
 
@@ -24,7 +24,8 @@ class HelmRenderEngine {
     public static async bake() {
         let helmPath = await helmutility.getHelm();
         let helmCommand = new Helm(helmPath, tl.getInput("namespace"));
-        var result = helmCommand.template(tl.getPathInput("helmChart", true), tl.getDelimitedInput("overrideFiles", "\n"), this.getOverrideValues());
+        let helmReleaseName = tl.getInput("releaseName", false);
+        var result = helmCommand.template(helmReleaseName, tl.getPathInput("helmChart", true), tl.getDelimitedInput("overrideFiles", "\n"), this.getOverrideValues());
         if (result.stderr) {
             tl.setResult(tl.TaskResult.Failed, result.stderr);
             return;
diff --git a/Tasks/KubernetesManifestV0/task.json b/Tasks/KubernetesManifestV0/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 151,
-        "Patch": 7
+        "Patch": 8
     },
     "demands": [],
     "groups": [],
@@ -129,6 +129,15 @@
             "helpMarkDown": "Helm chart path to bake",
             "visibleRule": "action = bake && renderType = helm2"
         },
+        {
+            "name": "releaseName",
+            "type": "string",
+            "label": "Helm Release Name",
+            "required": false,
+            "defaultValue": "",
+            "helpMarkDown": "Helm release name to use",
+            "visibleRule": "action = bake && renderType = helm2"
+        },
         {
             "name": "overrideFiles",
             "type": "multiLine",
diff --git a/Tasks/KubernetesManifestV0/task.loc.json b/Tasks/KubernetesManifestV0/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 151,
-    "Patch": 7
+    "Patch": 8
   },
   "demands": [],
   "groups": [],
@@ -129,6 +129,15 @@
       "helpMarkDown": "ms-resource:loc.input.help.helmChart",
       "visibleRule": "action = bake && renderType = helm2"
     },
+    {
+      "name": "releaseName",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.releaseName",
+      "required": false,
+      "defaultValue": "",
+      "helpMarkDown": "ms-resource:loc.input.help.releaseName",
+      "visibleRule": "action = bake && renderType = helm2"
+    },
     {
       "name": "overrideFiles",
       "type": "multiLine",
