Porting changes for kubectl path fix (#38)

Azure · Sep 2, 2021 · 773b614 · 773b614
1 parent fe0e722
commit 773b614
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/__tests__/kubectl-util.test.ts b/__tests__/kubectl-util.test.ts
@@ -166,7 +166,7 @@ describe('Testing all funcitons in kubectl-util file.', () => {
         jest.spyOn(toolCache, 'find').mockReturnValue('pathToKubectl');
         jest.spyOn(os, 'type').mockReturnValue('Windows_NT');
 
-        expect(await kubectlUtil.getKubectlPath()).toBe('pathToKubectl');
+        expect(await kubectlUtil.getKubectlPath()).toBe(path.join('pathToKubectl', 'kubectl.exe'));
         expect(core.getInput).toBeCalledWith('kubectl-version', {required: false});
         expect(toolCache.find).toBeCalledWith('kubectl', 'v2.0.0');
     });

diff --git a/lib/kubectl-util.js b/lib/kubectl-util.js
@@ -75,7 +75,8 @@ function getKubectlPath() {
         if (core.getInput('kubectl-version', { required: false })) {
             var version = core.getInput('kubectl-version', { required: false });
             if (!!version && version != "latest") {
-                kubectlPath = toolCache.find('kubectl', version);
+                const cachedToolPath = toolCache.find('kubectl', version);
+                kubectlPath = path.join(cachedToolPath, kubectlToolName + utilities_1.getExecutableExtension());
             }
             if (!kubectlPath) {
                 kubectlPath = yield installKubectl(version);

diff --git a/src/kubectl-util.ts b/src/kubectl-util.ts
@@ -68,7 +68,8 @@ export async function getKubectlPath() {
     if (core.getInput('kubectl-version', { required: false })) {
         var version = core.getInput('kubectl-version', { required: false });
         if ( !!version && version != "latest" ){
-            kubectlPath = toolCache.find('kubectl', version);
+            const cachedToolPath = toolCache.find('kubectl', version);
+            kubectlPath = path.join(cachedToolPath, kubectlToolName + getExecutableExtension())
         }
 
         if (!kubectlPath) {