Add logging before and after calling toolrunner exec method. Replace …

…chmod by chmodSync. (#9918) * Add logging before and after calling toolrunner exec method. Replace chmod by chmodSync. * Bumping up versions of Tasks which are dependent on kubectlutility.ts - HelmDeployV0, HelmInstallerV0, KubernetesManifestV0, KubernetesV1 * Bumping up other task versions as is imposed by build policy
microsoft · Mar 31, 2019 · 40d1b95 · 40d1b95
1 parent 9a1419b
commit 40d1b95
Show file tree

Hide file tree

Showing 48 changed files with 94 additions and 48 deletions.
diff --git a/Tasks/AzureIoTEdgeV2/task.json b/Tasks/AzureIoTEdgeV2/task.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "preview": true,
   "instanceNameFormat": "Azure IoT Edge - $(action)",

diff --git a/Tasks/AzureIoTEdgeV2/task.loc.json b/Tasks/AzureIoTEdgeV2/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 0,
-    "Patch": 2
+    "Patch": 3
   },
   "preview": true,
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/Tasks/AzureMysqlDeploymentV1/task.json b/Tasks/AzureMysqlDeploymentV1/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 15
+        "Patch": 16
     },
     "demands": [],
     "minimumAgentVersion": "1.100.0",

diff --git a/Tasks/AzureMysqlDeploymentV1/task.loc.json b/Tasks/AzureMysqlDeploymentV1/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 15
+    "Patch": 16
   },
   "demands": [],
   "minimumAgentVersion": "1.100.0",

diff --git a/Tasks/AzureVmssDeploymentV0/task.json b/Tasks/AzureVmssDeploymentV0/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 0,
-        "Patch": 24
+        "Patch": 25
     },
     "demands": [],
     "minimumAgentVersion": "2.0.0",

diff --git a/Tasks/AzureVmssDeploymentV0/task.loc.json b/Tasks/AzureVmssDeploymentV0/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 0,
-    "Patch": 24
+    "Patch": 25
   },
   "demands": [],
   "minimumAgentVersion": "2.0.0",

diff --git a/Tasks/Common/utility-common/kubectlutility.ts b/Tasks/Common/utility-common/kubectlutility.ts
@@ -46,7 +46,7 @@ export async function downloadKubectl(version: string) : Promise<string> {
     }
 
     var kubectlPath = path.join(cachedToolpath, kubectlToolName + getExecutableExtention());
-    fs.chmod(kubectlPath, "777");
+    fs.chmodSync(kubectlPath, "777");
     return kubectlPath;
 }
 

diff --git a/Tasks/DockerV2/task.json b/Tasks/DockerV2/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 150,
-        "Patch": 3
+        "Patch": 4
     },
     "demands": [],
     "releaseNotes": "Simplified the task YAML by:<br/>&nbsp;- Removing the Container registry type input<br/>&nbsp;- Removing complex inputs as they can be passed as arguments to the command.",

diff --git a/Tasks/DockerV2/task.loc.json b/Tasks/DockerV2/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 2,
     "Minor": 150,
-    "Patch": 3
+    "Patch": 4
   },
   "demands": [],
   "releaseNotes": "ms-resource:loc.releaseNotes",

diff --git a/Tasks/DotNetCoreCLIV2/task.json b/Tasks/DotNetCoreCLIV2/task.json
@@ -18,7 +18,7 @@
     "version": {
         "Major": 2,
         "Minor": 150,
-        "Patch": 1
+        "Patch": 2
     },
     "minimumAgentVersion": "2.115.0",
     "instanceNameFormat": "dotnet $(command)",

diff --git a/Tasks/DotNetCoreCLIV2/task.loc.json b/Tasks/DotNetCoreCLIV2/task.loc.json
@@ -18,7 +18,7 @@
   "version": {
     "Major": 2,
     "Minor": 150,
-    "Patch": 1
+    "Patch": 2
   },
   "minimumAgentVersion": "2.115.0",
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",

diff --git a/Tasks/DownloadPackageV0/task.json b/Tasks/DownloadPackageV0/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 0,
         "Minor": 150,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [],
     "minimumAgentVersion": "1.99.0",

diff --git a/Tasks/DownloadPackageV0/task.loc.json b/Tasks/DownloadPackageV0/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 0,
     "Minor": 150,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "1.99.0",

diff --git a/Tasks/DownloadPackageV1/task.json b/Tasks/DownloadPackageV1/task.json
@@ -10,7 +10,7 @@
     "version": {
         "Major": 1,
         "Minor": 150,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [],
     "minimumAgentVersion": "2.115.0",

diff --git a/Tasks/DownloadPackageV1/task.loc.json b/Tasks/DownloadPackageV1/task.loc.json
@@ -10,7 +10,7 @@
   "version": {
     "Major": 1,
     "Minor": 150,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "2.115.0",

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

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

diff --git a/Tasks/GitHubReleaseV0/task.json b/Tasks/GitHubReleaseV0/task.json
@@ -15,7 +15,7 @@
     "version": {
         "Major": 0,
         "Minor": 150,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [],
     "minimumAgentVersion": "2.0.0",

diff --git a/Tasks/GitHubReleaseV0/task.loc.json b/Tasks/GitHubReleaseV0/task.loc.json
@@ -15,7 +15,7 @@
   "version": {
     "Major": 0,
     "Minor": 150,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [],
   "minimumAgentVersion": "2.0.0",

diff --git a/Tasks/GradleV2/task.json b/Tasks/GradleV2/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 149,
-        "Patch": 1
+        "Patch": 2
     },
     "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
     "demands": [

diff --git a/Tasks/GradleV2/task.loc.json b/Tasks/GradleV2/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 149,
-    "Patch": 1
+    "Patch": 2
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [

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

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

diff --git a/Tasks/HelmInstallerV0/task.json b/Tasks/HelmInstallerV0/task.json
@@ -13,8 +13,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 1,
-        "Patch": 15
+        "Minor": 150,
+        "Patch": 0
     },
     "demands": [],
     "satisfies": [

diff --git a/Tasks/HelmInstallerV0/task.loc.json b/Tasks/HelmInstallerV0/task.loc.json
@@ -13,8 +13,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 1,
-    "Patch": 15
+    "Minor": 150,
+    "Patch": 0
   },
   "demands": [],
   "satisfies": [

diff --git a/Tasks/KubernetesManifestV0/task.json b/Tasks/KubernetesManifestV0/task.json
@@ -14,7 +14,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,
-        "Minor": 149,
+        "Minor": 150,
         "Patch": 0
     },
     "demands": [],

diff --git a/Tasks/KubernetesManifestV0/task.loc.json b/Tasks/KubernetesManifestV0/task.loc.json
@@ -14,7 +14,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,
-    "Minor": 149,
+    "Minor": 150,
     "Patch": 0
   },
   "demands": [],

diff --git a/Tasks/KubernetesV0/Strings/resources.resjson/en-US/resources.resjson b/Tasks/KubernetesV0/Strings/resources.resjson/en-US/resources.resjson
@@ -62,6 +62,7 @@
   "loc.input.help.kubectlOutput": "Name of the variable in which output of the command should be saved.",
   "loc.messages.DownloadingClient": "Downloading kubernetes client.",
   "loc.messages.CreatingSecret": "Executing create %s secret.",
+  "loc.messages.CallToolRunnerExec": "Calling Toolrunner exec() method asynchronously to execute the kubectl command and store the returned promise object.",
   "loc.messages.DeleteSecret": "Executing delete %s secret",
   "loc.messages.CreatingConfigMap": "Executing create %s configmap.",
   "loc.messages.DeleteConfigMap": "Executing delete %s configmap",
@@ -73,6 +74,9 @@
   "loc.messages.DownloadPathForStableTxt": "Download path for stable.txt: %s",
   "loc.messages.DownloadKubeCtlFailed": "Can not download the kubectl client of version %s. Check if the version is correct https://github.com/kubernetes/kubernetes/releases",
   "loc.messages.DownloadStableVersionFailed": "Can not download kubernetes stable version file from %s. Falling back to %s",
+  "loc.messages.ReturningToolRunnerExecPromise": "Called Toolrunner exec() method asynchronously. Returning the promise.",
+  "loc.messages.ToolRunnerExecCallFailed": "Toolrunner exec() method returned error for the kubectl command. Error: %s.",
+  "loc.messages.ToolRunnerExecCallSucceeded": "Toolrunner exec() method returned successfully for the kubectl command.",
   "loc.messages.UsingLatestStableVersion": "Invalid version 1.7 specified in Version Spec input. Using latest stable version instead. Check for correct versions https://github.com/kubernetes/kubernetes/releases",
   "loc.messages.ConfigurationFileNotFound": "No configuration file matching %s was found.",
   "loc.messages.OutputVariableDataSizeExceeded": "Output variable not set as kubectl command output exceeded the maximum supported length. Output length: %s, Maximum supported length: %s",

diff --git a/Tasks/KubernetesV0/src/clusterconnection.ts b/Tasks/KubernetesV0/src/clusterconnection.ts
@@ -68,10 +68,21 @@ export default class ClusterConnection {
         command.on("errline", line => {
             errlines.push(line);
         });
-        return command.exec(options).fail(error => {
+
+        tl.debug(tl.loc('CallToolRunnerExec'));
+
+        let promise = command.exec(options)
+        .fail(error => {
+            tl.debug(tl.loc('ToolRunnerExecCallFailed', error));
             errlines.forEach(line => tl.error(line));
             throw error;
+        })
+        .then(() => {
+            tl.debug(tl.loc('ToolRunnerExecCallSucceeded'));
         });
+
+        tl.debug(tl.loc('ReturningToolRunnerExecPromise'));
+        return promise;
     }
 
     private getExecutableExtention(): string {

diff --git a/Tasks/KubernetesV0/src/utilities.ts b/Tasks/KubernetesV0/src/utilities.ts
@@ -82,7 +82,7 @@ export async function downloadKubectl(version: string, kubectlPath: string): Pro
     var kubectlPathTmp = kubectlPath+".tmp";
     return downloadutility.download(kubectlURL, kubectlPathTmp, false, true).then( (res) => {
             tl.cp(kubectlPathTmp, kubectlPath, "-f");
-            fs.chmod(kubectlPath, "777");
+            fs.chmodSync(kubectlPath, "777");
             assertFileExists(kubectlPath);
             return kubectlPath;
     },

diff --git a/Tasks/KubernetesV0/task.json b/Tasks/KubernetesV0/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 0,
         "Minor": 150,
-        "Patch": 3
+        "Patch": 4
     },
     "demands": [],
     "preview": "false",
@@ -350,6 +350,7 @@
     "messages": {
         "DownloadingClient": "Downloading kubernetes client.",
         "CreatingSecret": "Executing create %s secret.",
+        "CallToolRunnerExec": "Calling Toolrunner exec() method asynchronously to execute the kubectl command and store the returned promise object.",
         "DeleteSecret": "Executing delete %s secret",
         "CreatingConfigMap": "Executing create %s configmap.",
         "DeleteConfigMap": "Executing delete %s configmap",
@@ -361,6 +362,9 @@
         "DownloadPathForStableTxt": "Download path for stable.txt: %s",
         "DownloadKubeCtlFailed": "Can not download the kubectl client of version %s. Check if the version is correct https://github.com/kubernetes/kubernetes/releases",
         "DownloadStableVersionFailed": "Can not download kubernetes stable version file from %s. Falling back to %s",
+        "ReturningToolRunnerExecPromise": "Called Toolrunner exec() method asynchronously. Returning the promise.",
+        "ToolRunnerExecCallFailed": "Toolrunner exec() method returned error for the kubectl command. Error: %s.",
+        "ToolRunnerExecCallSucceeded": "Toolrunner exec() method returned successfully for the kubectl command.",
         "UsingLatestStableVersion": "Invalid version 1.7 specified in Version Spec input. Using latest stable version instead. Check for correct versions https://github.com/kubernetes/kubernetes/releases",
         "ConfigurationFileNotFound": "No configuration file matching %s was found.",
         "OutputVariableDataSizeExceeded": "Output variable not set as kubectl command output exceeded the maximum supported length. Output length: %s, Maximum supported length: %s",

diff --git a/Tasks/KubernetesV0/task.loc.json b/Tasks/KubernetesV0/task.loc.json
@@ -14,7 +14,7 @@
   "version": {
     "Major": 0,
     "Minor": 150,
-    "Patch": 3
+    "Patch": 4
   },
   "demands": [],
   "preview": "false",
@@ -350,6 +350,7 @@
   "messages": {
     "DownloadingClient": "ms-resource:loc.messages.DownloadingClient",
     "CreatingSecret": "ms-resource:loc.messages.CreatingSecret",
+    "CallToolRunnerExec": "ms-resource:loc.messages.CallToolRunnerExec",
     "DeleteSecret": "ms-resource:loc.messages.DeleteSecret",
     "CreatingConfigMap": "ms-resource:loc.messages.CreatingConfigMap",
     "DeleteConfigMap": "ms-resource:loc.messages.DeleteConfigMap",
@@ -361,6 +362,9 @@
     "DownloadPathForStableTxt": "ms-resource:loc.messages.DownloadPathForStableTxt",
     "DownloadKubeCtlFailed": "ms-resource:loc.messages.DownloadKubeCtlFailed",
     "DownloadStableVersionFailed": "ms-resource:loc.messages.DownloadStableVersionFailed",
+    "ReturningToolRunnerExecPromise": "ms-resource:loc.messages.ReturningToolRunnerExecPromise",
+    "ToolRunnerExecCallFailed": "ms-resource:loc.messages.ToolRunnerExecCallFailed",
+    "ToolRunnerExecCallSucceeded": "ms-resource:loc.messages.ToolRunnerExecCallSucceeded",
     "UsingLatestStableVersion": "ms-resource:loc.messages.UsingLatestStableVersion",
     "ConfigurationFileNotFound": "ms-resource:loc.messages.ConfigurationFileNotFound",
     "OutputVariableDataSizeExceeded": "ms-resource:loc.messages.OutputVariableDataSizeExceeded",

diff --git a/Tasks/KubernetesV1/Strings/resources.resjson/en-US/resources.resjson b/Tasks/KubernetesV1/Strings/resources.resjson/en-US/resources.resjson
@@ -95,5 +95,9 @@
   "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": "No Kubernetes configuration found, supply either inline configuration or configuration file path",
+  "loc.messages.CallToolRunnerExec": "Calling Toolrunner exec() method asynchronously to execute the kubectl command and store the returned promise object.",
+  "loc.messages.ReturningToolRunnerExecPromise": "Called Toolrunner exec() method asynchronously. Returning the promise.",
+  "loc.messages.ToolRunnerExecCallFailed": "Toolrunner exec() method returned error for the kubectl command. Error: %s.",
+  "loc.messages.ToolRunnerExecCallSucceeded": "Toolrunner exec() method returned successfully for the kubectl command.",
   "loc.messages.WritingDockerConfigToTempFile": "Writing Docker config to temp file. File path: %s, Docker config: %s"
 }
diff --git a/Tasks/KubernetesV1/src/clusterconnection.ts b/Tasks/KubernetesV1/src/clusterconnection.ts
@@ -111,10 +111,21 @@ export default class ClusterConnection {
         command.on("errline", line => {
             errlines.push(line);
         });
-        return command.exec(options).fail(error => {
+
+        tl.debug(tl.loc('CallToolRunnerExec'));
+
+        let promise = command.exec(options)
+        .fail(error => {
+            tl.debug(tl.loc('ToolRunnerExecCallFailed', error));
             errlines.forEach(line => tl.error(line));
             throw error;
+        })
+        .then(() => {
+            tl.debug(tl.loc('ToolRunnerExecCallSucceeded'));
         });
+
+        tl.debug(tl.loc('ReturningToolRunnerExecPromise'));
+        return promise;
     }
 
     private async getKubectl() : Promise<string> {