[KubernetesV1] Using default configtype instead of failing (#9506)

* [KubernetesV1] Using default configtype instead of failing

* Fixing test

* Making the default false

Author: thesattiraju

Tasks/KubernetesV1/Strings/resources.resjson/en-US/resources.resjson

@@ -92,5 +92,5 @@
   "loc.messages.ConfigurationFileNotFound": "No configuration file matching %s was found.",
   "loc.messages.KubernetesServiceConnectionNotFound": "Kubernetes service connection details not found.",
   "loc.messages.OutputVariableDataSizeExceeded": "Output variable not set as kubectl command output exceeded the maximum supported length. Output length: %s, Maximum supported length: %s",
-  "loc.messages.InvalidConfiguration": "Can not set configuration with both file: %s and inline configuration: %s."
+  "loc.messages.InvalidConfiguration": "No Kubernetes configuration found, supply either inline configuration or configuration file path"
 }

Tasks/KubernetesV1/Tests/L0.ts

@@ -575,19 +575,21 @@ describe('Kubernetes Suite', function() {
         done();
     });
 
-    it('Run fails when both configurations are provided through yaml', (done:MochaDone) => {
+    it('Run defaults to filepath when both configurations are provided through yaml', (done:MochaDone) => {
         let tp = path.join(__dirname, 'TestSetup.js');
         let tr : ttm.MockTestRunner = new ttm.MockTestRunner(tp);
         process.env[shared.TestEnvVars.command] = shared.Commands.apply;
         process.env[shared.TestEnvVars.useConfigurationFile] = "true";
         process.env[shared.TestEnvVars.configurationType] = ''; //does not matter during a yaml definition
-        process.env[shared.TestEnvVars.configuration] = 'someFile.yaml'; //dummy value to trigger not default configuration condition
+        process.env[shared.TestEnvVars.configuration] = shared.formatPath("dir/deployment.yaml"); //dummy value to trigger not default configuration condition
         process.env[shared.TestEnvVars.inline] = 'sometextforinline';
         tr.run();
 
-        assert(tr.failed, 'task should have failed');
-        assert(tr.invokedToolCount == 0, 'should not have invoked the tool. actual: ' + tr.invokedToolCount);
-        assert(tr.stderr.length > 0 || tr.errorIssues.length, 'should have written an error message');
+        assert(tr.succeeded, 'task should have succeeded');
+        assert(tr.invokedToolCount == 1, 'should have invoked tool one times. actual: ' + tr.invokedToolCount);
+        assert(tr.stderr.length == 0 || tr.errorIssues.length, 'should not have written to stderr');
+        assert(tr.succeeded, 'task should have succeeded');
+        assert(tr.stdout.indexOf(`[command]kubectl apply -f ${shared.formatPath("dir/deployment.yaml")} -o json`) != -1, "kubectl apply should run");
         console.log(tr.stderr);
         done();
     });

Tasks/KubernetesV1/src/kubernetescommand.ts

@@ -45,32 +45,40 @@ function getCommandOutputFormat(kubecommand: string) : string[] {
 function getCommandConfigurationFile(): string[] {
     var args: string[] = [];
     var useConfigurationFile: boolean = tl.getBoolInput("useConfigurationFile", false);
-    let configurationPath = tl.getPathInput("configuration", false);
-    var inlineConfiguration = tl.getInput("inline", false);
-
-    if (!tl.filePathSupplied("configuration")) {
-        configurationPath = null;
-    }
-    if (configurationPath != null && inlineConfiguration != null) {
-        throw new Error(tl.loc('InvalidConfiguration', configurationPath, inlineConfiguration));
-    }
-    else if (configurationPath) {
-    //apply incoming configuration irrespective of useConfigurationFile flag. Simplifies yaml definition for pipelines
-        if (tl.exist(configurationPath)) {
-            args[0] = "-f";
-            args[1] = configurationPath;
+    if (useConfigurationFile) {
+        let configurationPath = tl.getPathInput("configuration", false);
+        var inlineConfiguration = tl.getInput("inline", false);
+    
+        if (!tl.filePathSupplied("configuration")) {
+            configurationPath = null;
         }
-        else {
-            throw new Error(tl.loc('ConfigurationFileNotFound', configurationPath));
+    
+        if (configurationPath != null && inlineConfiguration != null) {
+            let type = tl.getInput("configurationType", false);
+            if (type == "inline") configurationPath = null;
+            else inlineConfiguration = null;
         }
-    }
-    else if (inlineConfiguration) {
-        var tempInlineFile = utils.writeInlineConfigInTempPath(inlineConfiguration);
-        if (tl.exist(tempInlineFile)) {
-            args[0] = "-f";
-            args[1] = tempInlineFile;
-        } else {
-            throw new Error(tl.loc('ConfigurationFileNotFound', tempInlineFile));
+        
+        if (configurationPath == null && inlineConfiguration == null) {
+            throw new Error(tl.loc('InvalidConfiguration'));
+        }
+        else if (configurationPath) {
+            if (tl.exist(configurationPath)) {
+                args[0] = "-f";
+                args[1] = configurationPath;
+            }
+            else {
+                throw new Error(tl.loc('ConfigurationFileNotFound', configurationPath));
+            }
+        }
+        else if (inlineConfiguration) {
+            var tempInlineFile = utils.writeInlineConfigInTempPath(inlineConfiguration);
+            if (tl.exist(tempInlineFile)) {
+                args[0] = "-f";
+                args[1] = tempInlineFile;
+            } else {
+                throw new Error(tl.loc('ConfigurationFileNotFound', tempInlineFile));
+            }
         }
     }
 

Tasks/KubernetesV1/task.json

@@ -14,7 +14,7 @@
     "version": {
         "Major": 1,
         "Minor": 1,
-        "Patch": 21
+        "Patch": 22
     },
     "demands": [],
     "releaseNotes": "What's new in Version 1.0:<br/>&nbsp;Added new service connection type input for easy selection of Azure AKS cluster.<br/>&nbsp;Replaced output variable input with output variables section that we had added in all tasks.",
@@ -160,42 +160,42 @@
             "visibleRule": "command != login && command != logout"
         },
         {
-          "name": "configurationType",
-          "type": "radio",
-          "label": "Configuration type",
-          "defaultValue": "configuration",
-          "groupName": "commands",
-          "helpMarkDown": "Type of Kubernetes configuration for kubectl command. It can be a file path or an inline script.",
-          "options": {
-              "configuration": "File path",
-              "inline": "Inline configuration"
-          },
-          "visibleRule": "useConfigurationFile = true"
-        },
-        {
-          "name": "configuration",
-          "type": "filePath",
-          "label": "File path",
-          "defaultValue": "",
-          "required": true,
-          "helpMarkDown": "Filename, directory, or URL to kubernetes configuration files that will be used with the commands.",
-          "visibleRule": "configurationType = configuration",
-          "groupName": "commands"
-        },
-        {
-          "name": "inline",
-          "type": "multiLine",
-          "properties": {
-            "resizable": "true",
-            "rows": "10",
-            "maxLength": "5000"
-          },
-          "required": true,
-          "defaultValue": "",
-          "label": "Inline configuration",
-          "helpMarkDown": "Inline deployment configuration for kubectl command",
-          "groupName": "commands",
-          "visibleRule": "configurationType = inline"
+            "name": "configurationType",
+            "type": "radio",
+            "label": "Configuration type",
+            "defaultValue": "configuration",
+            "groupName": "commands",
+            "helpMarkDown": "Type of Kubernetes configuration for kubectl command. It can be a file path or an inline script.",
+            "options": {
+                "configuration": "File path",
+                "inline": "Inline configuration"
+            },
+            "visibleRule": "useConfigurationFile = true"
+        },
+        {
+            "name": "configuration",
+            "type": "filePath",
+            "label": "File path",
+            "defaultValue": "",
+            "required": true,
+            "helpMarkDown": "Filename, directory, or URL to kubernetes configuration files that will be used with the commands.",
+            "visibleRule": "configurationType = configuration",
+            "groupName": "commands"
+        },
+        {
+            "name": "inline",
+            "type": "multiLine",
+            "properties": {
+                "resizable": "true",
+                "rows": "10",
+                "maxLength": "5000"
+            },
+            "required": true,
+            "defaultValue": "",
+            "label": "Inline configuration",
+            "helpMarkDown": "Inline deployment configuration for kubectl command",
+            "groupName": "commands",
+            "visibleRule": "configurationType = inline"
         },
         {
             "name": "arguments",
@@ -358,7 +358,7 @@
             "name": "versionSpec",
             "type": "string",
             "label": "Version spec",
-            "defaultValue": "1.7.0",
+            "defaultValue": "1.13.2",
             "helpMarkDown": "Version Spec of version to get.  Examples: 1.7.0, 1.x.0, 4.x.0, 6.10.0, >=6.10.0",
             "groupName": "advanced",
             "visibleRule": "versionOrLocation = version"
@@ -466,6 +466,6 @@
         "ConfigurationFileNotFound": "No configuration file matching %s was found.",
         "KubernetesServiceConnectionNotFound": "Kubernetes service connection details not found.",
         "OutputVariableDataSizeExceeded": "Output variable not set as kubectl command output exceeded the maximum supported length. Output length: %s, Maximum supported length: %s",
-        "InvalidConfiguration": "Can not set configuration with both file: %s and inline configuration: %s."
+        "InvalidConfiguration": "No Kubernetes configuration found, supply either inline configuration or configuration file path"
     }
 }

Tasks/KubernetesV1/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 1,
-    "Patch": 21
+    "Patch": 22
   },
   "demands": [],
   "releaseNotes": "ms-resource:loc.releaseNotes",
@@ -357,7 +357,7 @@
       "name": "versionSpec",
       "type": "string",
       "label": "ms-resource:loc.input.label.versionSpec",
-      "defaultValue": "1.7.0",
+      "defaultValue": "1.13.2",
       "helpMarkDown": "ms-resource:loc.input.help.versionSpec",
       "groupName": "advanced",
       "visibleRule": "versionOrLocation = version"