kubectl download fix (#4620) (#4621)

* kubectl download fix * loc fix
microsoft · Jun 23, 2017 · f2728ba · f2728ba
1 parent 42b2393
commit f2728ba
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/Tasks/Kubernetes/Strings/resources.resjson/en-US/resources.resjson b/Tasks/Kubernetes/Strings/resources.resjson/en-US/resources.resjson
@@ -1,6 +1,6 @@
 {
   "loc.friendlyName": "Deploy to Kubernetes",
-  "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=846415)",
+  "loc.helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=851275)",
   "loc.description": "Deploy, configure, update your Kubernetes cluster in Azure Container Service by running kubectl commands.",
   "loc.instanceNameFormat": "kubectl $(command)",
   "loc.group.displayName.registry": "Container Registry Details",
@@ -37,5 +37,8 @@
   "loc.messages.DownloadingClient": "Downloading kubernetes client.",
   "loc.messages.CreatingSecret": "Executing create docker-registry %s secret.",
   "loc.messages.DeleteSecret": "Executing delete docker-registry %s secret",
-  "loc.messages.DockerRegistryConnectionNotSpecified": "Docker Registry connection details not specified"
+  "loc.messages.DockerRegistryConnectionNotSpecified": "Docker Registry connection details not specified",
+  "loc.messages.FileNotFoundException": "Can not find file at location: %s",
+  "loc.messages.DownloadingKubeCtlFromUrl": "Downloading Kubectl from Url: %s",
+  "loc.messages.DownloadPathForStableTxt": "Download path for stable.txt: %s"
 }
diff --git a/Tasks/Kubernetes/src/utilities.ts b/Tasks/Kubernetes/src/utilities.ts
@@ -35,23 +35,30 @@ function ensureDirExists(dirPath : string) : void
 }
 
 export async function getStableKubectlVersion() : Promise<string> {
-    var version = "v1.6.2";
+    var stableVersion = "v1.6.6";
+    var version;
     var stableVersionUrl = "https://storage.googleapis.com/kubernetes-release/release/stable.txt";
-    var downloadPath = path.join(getTempDirectory(), getCurrentTime().toString());
+    var downloadPath = path.join(getTempDirectory(), getCurrentTime().toString()+".txt");
     await downloadutility.download(stableVersionUrl, downloadPath);
-    version = fs.readFileSync(downloadPath).toString();
-    return version.trim();
+    tl.debug(tl.loc('DownloadPathForStableTxt', downloadPath));
+    version = fs.readFileSync(downloadPath, "utf8").toString().trim();
+    if(!version){
+        version = stableVersion;
+    }
+    return version;
 }
 
 export async function downloadKubectl(version: string, kubectlPath: string): Promise<void> {
     var kubectlURL = getkubectlDownloadURL(version);
+    tl.debug(tl.loc('DownloadingKubeCtlFromUrl', kubectlURL));
     var kubectlPathTmp = kubectlPath+".tmp";
     await downloadutility.download(kubectlURL, kubectlPathTmp);
     tl.cp(kubectlPathTmp, kubectlPath, "-f");
+    fs.chmod(kubectlPath, "777");
+    assertFileExists(kubectlPath);
 }
 
-function getkubectlDownloadURL(version: string) : string
-{
+function getkubectlDownloadURL(version: string) : string {
     switch(os.type())
     {
         case 'Linux':
@@ -65,4 +72,11 @@ function getkubectlDownloadURL(version: string) : string
             return util.format("https://storage.googleapis.com/kubernetes-release/release/%s/bin/windows/amd64/kubectl.exe", version);   
 
     }
+}
+
+function assertFileExists(path: string) {
+    if(!fs.existsSync(path)) {
+        tl.error(tl.loc('FileNotFoundException', path));
+        throw new Error(tl.loc('FileNotFoundException', path));
+    }
 }
diff --git a/Tasks/Kubernetes/task.json b/Tasks/Kubernetes/task.json
@@ -3,7 +3,7 @@
     "name": "Kubernetes",
     "friendlyName": "Deploy to Kubernetes",
     "description": "Deploy, configure, update your Kubernetes cluster in Azure Container Service by running kubectl commands.",
-    "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=846415)",
+    "helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?linkid=851275)",
     "category": "Deploy",
     "visibility": [
         "Build",
@@ -13,7 +13,7 @@
     "version": {
         "Major": 0,
         "Minor": 1,
-        "Patch": 2
+        "Patch": 3
     },
     "demands": [],
     "preview": "true",
@@ -199,6 +199,9 @@
         "DownloadingClient":"Downloading kubernetes client.",
         "CreatingSecret":"Executing create docker-registry %s secret.",
         "DeleteSecret": "Executing delete docker-registry %s secret",
-        "DockerRegistryConnectionNotSpecified": "Docker Registry connection details not specified"
+        "DockerRegistryConnectionNotSpecified": "Docker Registry connection details not specified",
+        "FileNotFoundException": "Can not find file at location: %s",
+        "DownloadingKubeCtlFromUrl": "Downloading Kubectl from Url: %s",
+        "DownloadPathForStableTxt": "Download path for stable.txt: %s"
     }
 }
diff --git a/Tasks/Kubernetes/task.loc.json b/Tasks/Kubernetes/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 0,
     "Minor": 1,
-    "Patch": 2
+    "Patch": 3
   },
   "demands": [],
   "preview": "true",
@@ -199,6 +199,9 @@
     "DownloadingClient": "ms-resource:loc.messages.DownloadingClient",
     "CreatingSecret": "ms-resource:loc.messages.CreatingSecret",
     "DeleteSecret": "ms-resource:loc.messages.DeleteSecret",
-    "DockerRegistryConnectionNotSpecified": "ms-resource:loc.messages.DockerRegistryConnectionNotSpecified"
+    "DockerRegistryConnectionNotSpecified": "ms-resource:loc.messages.DockerRegistryConnectionNotSpecified",
+    "FileNotFoundException": "ms-resource:loc.messages.FileNotFoundException",
+    "DownloadingKubeCtlFromUrl": "ms-resource:loc.messages.DownloadingKubeCtlFromUrl",
+    "DownloadPathForStableTxt": "ms-resource:loc.messages.DownloadPathForStableTxt"
   }
 }