Merge pull request #753 from laudibert/master

Fix expires-on case on Azure auth
kubernetes-client · Dec 11, 2021 · 6131bae · 6131bae
2 parents eae3e8d + 5ae6ad8
commit 6131bae
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/azure_auth.ts b/src/azure_auth.ts
@@ -57,7 +57,8 @@ export class AzureAuth implements Authenticator {
             return false;
         }
 
-        const expiration = expiry ? Date.parse(expiry) : new Date(parseInt(expiresOn!, 10));
+        const expiresOnDate = expiresOn ? new Date(parseInt(expiresOn, 10) * 1000) : undefined;
+        const expiration = expiry ? Date.parse(expiry) : expiresOnDate!;
         if (expiration < Date.now()) {
             return true;
         }

diff --git a/src/azure_auth_test.ts b/src/azure_auth_test.ts
@@ -168,6 +168,25 @@ describe('AzureAuth', () => {
         return expect(config.applyToRequest(opts)).to.eventually.be.rejectedWith(/Failed to refresh token/);
     });
 
+    it('should exec when no cmd and token is not expired', async () => {
+        const config = new KubeConfig();
+        const expireOn = new Date().getTime() / 1000 + 1000;
+        config.loadFromClusterAndUser(
+            { skipTLSVerify: false } as Cluster,
+            {
+                authProvider: {
+                    name: 'azure',
+                    config: {
+                        'access-token': 'token',
+                        'expires-on': expireOn.toString(),
+                    },
+                },
+            } as User,
+        );
+        const opts = {} as requestlib.Options;
+        await config.applyToRequest(opts);
+    });
+
     it('should exec with expired token', async () => {
         // TODO: fix this test for Windows
         if (process.platform === 'win32') {