From 3efdf55f238fb806f112dadbb6f25ed1faeb020c Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Wed, 8 Mar 2023 16:33:45 +0000
Subject: [PATCH 1/3] remove unhandled promise on bad creds

The unhandled promise had been bringing down the whole application when
the creds were bad.

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .../AwsIamKubernetesAuthTranslator.ts         | 66 +++++++++----------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts
index b89945902d..84e60c9c69 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.ts
@@ -55,46 +55,44 @@ export class AwsIamKubernetesAuthTranslator
     assumeRole?: string,
     externalId?: string,
   ): Promise<SigningCreds> {
-    return new Promise<SigningCreds>(async (resolve, reject) => {
-      const awsCreds = await this.awsGetCredentials();
+    const awsCreds = await this.awsGetCredentials();
 
-      if (!(awsCreds instanceof Credentials))
-        return reject(Error('No AWS credentials found.'));
+    if (!(awsCreds instanceof Credentials))
+      throw new Error('No AWS credentials found.');
 
-      let creds: SigningCreds = {
-        accessKeyId: awsCreds.accessKeyId,
-        secretAccessKey: awsCreds.secretAccessKey,
-        sessionToken: awsCreds.sessionToken,
+    let creds: SigningCreds = {
+      accessKeyId: awsCreds.accessKeyId,
+      secretAccessKey: awsCreds.secretAccessKey,
+      sessionToken: awsCreds.sessionToken,
+    };
+
+    if (!this.validCredentials(creds))
+      throw new Error('Invalid AWS credentials found.');
+    if (!assumeRole) return creds;
+
+    try {
+      const params: AWS.STS.Types.AssumeRoleRequest = {
+        RoleArn: assumeRole,
+        RoleSessionName: 'backstage-login',
       };
+      if (externalId) params.ExternalId = externalId;
 
-      if (!this.validCredentials(creds))
-        return reject(Error('Invalid AWS credentials found.'));
-      if (!assumeRole) return resolve(creds);
+      const assumedRole = await new AWS.STS().assumeRole(params).promise();
 
-      try {
-        const params: AWS.STS.Types.AssumeRoleRequest = {
-          RoleArn: assumeRole,
-          RoleSessionName: 'backstage-login',
-        };
-        if (externalId) params.ExternalId = externalId;
-
-        const assumedRole = await new AWS.STS().assumeRole(params).promise();
-
-        if (!assumedRole.Credentials) {
-          throw new Error(`No credentials returned for role ${assumeRole}`);
-        }
-
-        creds = {
-          accessKeyId: assumedRole.Credentials.AccessKeyId,
-          secretAccessKey: assumedRole.Credentials.SecretAccessKey,
-          sessionToken: assumedRole.Credentials.SessionToken,
-        };
-      } catch (e) {
-        console.warn(`There was an error assuming the role: ${e}`);
-        return reject(Error(`Unable to assume role: ${e}`));
+      if (!assumedRole.Credentials) {
+        throw new Error(`No credentials returned for role ${assumeRole}`);
       }
-      return resolve(creds);
-    });
+
+      creds = {
+        accessKeyId: assumedRole.Credentials.AccessKeyId,
+        secretAccessKey: assumedRole.Credentials.SecretAccessKey,
+        sessionToken: assumedRole.Credentials.SessionToken,
+      };
+    } catch (e) {
+      console.warn(`There was an error assuming the role: ${e}`);
+      throw new Error(`Unable to assume role: ${e}`);
+    }
+    return creds;
   }
   async getBearerToken(
     clusterName: string,

From 75d4985f5e80c8a86bbe2dbf216da330a651994c Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Wed, 8 Mar 2023 16:38:42 +0000
Subject: [PATCH 2/3] add changeset for k8s plugin

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/fuzzy-actors-turn.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/fuzzy-actors-turn.md

diff --git a/.changeset/fuzzy-actors-turn.md b/.changeset/fuzzy-actors-turn.md
new file mode 100644
index 0000000000..3cb8f84cae
--- /dev/null
+++ b/.changeset/fuzzy-actors-turn.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Fixes bug whereby backstage crashes when bad aws credentials are provided to the kubernetes plugin.

From bd1ee2b7403b5049e67c72458526e521328770eb Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Wed, 8 Mar 2023 16:42:59 +0000
Subject: [PATCH 3/3] remove typo

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/fuzzy-actors-turn.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/fuzzy-actors-turn.md b/.changeset/fuzzy-actors-turn.md
index 3cb8f84cae..bd92ad34ef 100644
--- a/.changeset/fuzzy-actors-turn.md
+++ b/.changeset/fuzzy-actors-turn.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-kubernetes-backend': patch
 ---
 
-Fixes bug whereby backstage crashes when bad aws credentials are provided to the kubernetes plugin.
+Fixes bug whereby backstage crashes when bad credentials are provided to the kubernetes plugin.