diff --git a/lib/index.js b/lib/index.js index 55954c0a..4b20f78e 100644 --- a/lib/index.js +++ b/lib/index.js @@ -7157,7 +7157,6 @@ module.exports = v4; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.getExecutableExtension = exports.getkubectlDownloadURL = exports.getKubectlArch = void 0; const os = __nccwpck_require__(2037); -const util = __nccwpck_require__(3837); function getKubectlArch() { const arch = os.arch(); if (arch === 'x64') { @@ -7169,12 +7168,12 @@ exports.getKubectlArch = getKubectlArch; function getkubectlDownloadURL(version, arch) { switch (os.type()) { case 'Linux': - return util.format('https://storage.googleapis.com/kubernetes-release/release/%s/bin/linux/%s/kubectl', version, arch); + return `https://dl.k8s.io/release/${version}/bin/linux/${arch}/kubectl`; case 'Darwin': - return util.format('https://storage.googleapis.com/kubernetes-release/release/%s/bin/darwin/%s/kubectl', version, arch); + return `https://dl.k8s.io/release/${version}/bin/darwin/${arch}/kubectl`; case 'Windows_NT': default: - return util.format('https://storage.googleapis.com/kubernetes-release/release/%s/bin/windows/%s/kubectl.exe', version, arch); + return `https://dl.k8s.io/release/${version}/bin/windows/${arch}/kubectl.exe`; } } exports.getkubectlDownloadURL = getkubectlDownloadURL; diff --git a/package-lock.json b/package-lock.json index a24fbbbb..f949fc2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1892,9 +1892,9 @@ "dev": true }, "node_modules/decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true, "engines": { "node": ">=0.10" @@ -7664,9 +7664,9 @@ "dev": true }, "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true }, "deep-is": { diff --git a/src/helpers.ts b/src/helpers.ts index bf16ce36..a0838f61 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -12,26 +12,14 @@ export function getKubectlArch(): string { export function getkubectlDownloadURL(version: string, arch: string): string { switch (os.type()) { case 'Linux': - return util.format( - 'https://storage.googleapis.com/kubernetes-release/release/%s/bin/linux/%s/kubectl', - version, - arch - ) + return `https://dl.k8s.io/release/${version}/bin/linux/${arch}/kubectl` case 'Darwin': - return util.format( - 'https://storage.googleapis.com/kubernetes-release/release/%s/bin/darwin/%s/kubectl', - version, - arch - ) + return `https://dl.k8s.io/release/${version}/bin/darwin/${arch}/kubectl` case 'Windows_NT': default: - return util.format( - 'https://storage.googleapis.com/kubernetes-release/release/%s/bin/windows/%s/kubectl.exe', - version, - arch - ) + return `https://dl.k8s.io/release/${version}/bin/windows/${arch}/kubectl.exe` } } diff --git a/src/run.test.ts b/src/run.test.ts index a9e966da..7fd25e2d 100644 --- a/src/run.test.ts +++ b/src/run.test.ts @@ -45,7 +45,7 @@ describe('Testing all functions in run file.', () => { (arch) => { jest.spyOn(os, 'type').mockReturnValue('Linux') const kubectlLinuxUrl = util.format( - 'https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/%s/kubectl', + 'https://dl.k8s.io/release/v1.15.0/bin/linux/%s/kubectl', arch ) @@ -59,7 +59,7 @@ describe('Testing all functions in run file.', () => { (arch) => { jest.spyOn(os, 'type').mockReturnValue('Darwin') const kubectlDarwinUrl = util.format( - 'https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/darwin/%s/kubectl', + 'https://dl.k8s.io/release/v1.15.0/bin/darwin/%s/kubectl', arch ) @@ -74,7 +74,7 @@ describe('Testing all functions in run file.', () => { jest.spyOn(os, 'type').mockReturnValue('Windows_NT') const kubectlWindowsUrl = util.format( - 'https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/windows/%s/kubectl.exe', + 'https://dl.k8s.io/release/v1.15.0/bin/windows/%s/kubectl.exe', arch ) expect(getkubectlDownloadURL('v1.15.0', arch)).toBe(kubectlWindowsUrl)