From 6e284e2a3aa3d11f451c7805fb3adef40b471c0c Mon Sep 17 00:00:00 2001
From: goenning <me@goenning.net>
Date: Mon, 16 May 2022 15:51:54 +0100
Subject: [PATCH] code review

Signed-off-by: goenning <me@goenning.net>
---
 .../AzureIdentityKubernetesAuthTranslator.test.ts |  6 +++---
 .../AzureIdentityKubernetesAuthTranslator.ts      | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.test.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.test.ts
index 8a2387723c..c5183f8a22 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.test.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.test.ts
@@ -50,7 +50,7 @@ describe('AzureIdentityKubernetesAuthTranslator tests', () => {
 
   it('should re-use token before expiry', async () => {
     const authTranslator = new AzureIdentityKubernetesAuthTranslator(
-      new StaticTokenCredential(5 * 60 * 1000),
+      new StaticTokenCredential(20 * 60 * 1000),
     );
 
     const response = await authTranslator.decorateClusterDetailsWithAuth(cd);
@@ -60,9 +60,9 @@ describe('AzureIdentityKubernetesAuthTranslator tests', () => {
     expect(response2.serviceAccountToken).toEqual('MY_TOKEN_1');
   });
 
-  it('should issue new token 2 minutes befory expiry', async () => {
+  it('should issue new token 15 minutes befory expiry', async () => {
     const authTranslator = new AzureIdentityKubernetesAuthTranslator(
-      new StaticTokenCredential(3 * 60 * 1000), // token expires in 3m
+      new StaticTokenCredential(16 * 60 * 1000), // token expires in 11m
     );
 
     const response = await authTranslator.decorateClusterDetailsWithAuth(cd);
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts
index d33ce5fe5a..027bf03bb6 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AzureIdentityKubernetesAuthTranslator.ts
@@ -27,12 +27,11 @@ const aksScope = '6dae42f8-4368-4678-94ff-3960e28e3630/.default'; // This scope
 export class AzureIdentityKubernetesAuthTranslator
   implements KubernetesAuthTranslator
 {
-  private tokenCredential: TokenCredential;
   private accessToken: AccessToken | null = null;
 
-  constructor(tokenCredential?: TokenCredential) {
-    this.tokenCredential = tokenCredential || new DefaultAzureCredential();
-  }
+  constructor(
+    private readonly tokenCredential: TokenCredential = new DefaultAzureCredential(),
+  ) {}
 
   async decorateClusterDetailsWithAuth(
     clusterDetails: AzureClusterDetails,
@@ -42,7 +41,7 @@ export class AzureIdentityKubernetesAuthTranslator
       clusterDetails,
     );
 
-    if (!this.accessToken || this.tokenExpired()) {
+    if (this.tokenExpired()) {
       this.accessToken = await this.tokenCredential.getToken(aksScope);
 
       if (!this.accessToken) {
@@ -50,15 +49,15 @@ export class AzureIdentityKubernetesAuthTranslator
       }
     }
 
-    clusterDetailsWithAuthToken.serviceAccountToken = this.accessToken.token;
+    clusterDetailsWithAuthToken.serviceAccountToken = this.accessToken!.token;
     return clusterDetailsWithAuthToken;
   }
 
   private tokenExpired(): boolean {
     if (!this.accessToken) return true;
 
-    // Set tokens to expire 2 minutes before its actual expiry time
-    const expiresOn = this.accessToken.expiresOnTimestamp - 2 * 60 * 1000;
+    // Set tokens to expire 15 minutes before its actual expiry time
+    const expiresOn = this.accessToken.expiresOnTimestamp - 15 * 60 * 1000;
     return Date.now() >= expiresOn;
   }
 }