From 22fc579fe5cfd34c0d87c5b1bcb2eb88fae0f89d Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 19 Aug 2021 17:14:21 +0100
Subject: [PATCH] Retrieve the externalId from the config

My previous change to enable the external id, had missed the part
that actually reads the externalId from the config. This change
is the final piece, all going well.

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/rich-mayflies-do.md                               | 5 +++++
 .../src/cluster-locator/ConfigClusterLocator.ts              | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/rich-mayflies-do.md

diff --git a/.changeset/rich-mayflies-do.md b/.changeset/rich-mayflies-do.md
new file mode 100644
index 0000000000..d68e00c0aa
--- /dev/null
+++ b/.changeset/rich-mayflies-do.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-kubernetes-backend': patch
+---
+
+Fixes bug reading ExternalId from k8s backend config
diff --git a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts
index 2899445b2a..8352db6754 100644
--- a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts
+++ b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.ts
@@ -44,7 +44,9 @@ export class ConfigClusterLocator implements KubernetesClustersSupplier {
           }
           case 'aws': {
             const assumeRole = c.getOptionalString('assumeRole');
-            return { assumeRole, ...clusterDetails };
+            const externalId = c.getOptionalString('externalId');
+
+            return { assumeRole, externalId, ...clusterDetails };
           }
           case 'serviceAccount': {
             return clusterDetails;