From 89daaa3508460c9e3c7fe11af1c956e2a19b92e9 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 24 Mar 2022 00:11:24 +0100
Subject: [PATCH] kubernetes-backend: fix Jest 27 test incompatibility

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/kubernetes-backend/package.json       |  3 +--
 .../AwsIamKubernetesAuthTranslator.test.ts    | 23 +++++++++++--------
 yarn.lock                                     |  5 ----
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/plugins/kubernetes-backend/package.json b/plugins/kubernetes-backend/package.json
index 22e88b9609..9682d879b4 100644
--- a/plugins/kubernetes-backend/package.json
+++ b/plugins/kubernetes-backend/package.json
@@ -61,8 +61,7 @@
     "@backstage/cli": "^0.16.1-next.0",
     "@types/aws4": "^1.5.1",
     "supertest": "^6.1.3",
-    "aws-sdk-mock": "^5.2.1",
-    "bdd-lazy-var": "^2.6.0"
+    "aws-sdk-mock": "^5.2.1"
   },
   "files": [
     "dist",
diff --git a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts
index 7806160e58..2696587e69 100644
--- a/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts
+++ b/plugins/kubernetes-backend/src/kubernetes-auth-translator/AwsIamKubernetesAuthTranslator.test.ts
@@ -16,7 +16,6 @@
 import AWS from 'aws-sdk';
 import AWSMock from 'aws-sdk-mock';
 import { AwsIamKubernetesAuthTranslator } from './AwsIamKubernetesAuthTranslator';
-import { get, def } from 'bdd-lazy-var';
 
 describe('AwsIamKubernetesAuthTranslator tests', () => {
   let role: any = undefined;
@@ -48,7 +47,7 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
     jest.resetAllMocks();
   });
 
-  def('subject', () => {
+  function executeTranslation() {
     AWSMock.mock('STS', 'assumeRole', (_params: any, callback: Function) => {
       callback(null, assumeResponse);
     });
@@ -71,7 +70,7 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
     mockedCredentials = undefined;
 
     return response;
-  });
+  }
 
   it('returns a signed url for AWS credentials', async () => {
     // These credentials are not real.
@@ -81,8 +80,8 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
       'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
     );
 
-    const subject = await get('subject');
-    expect(subject.serviceAccountToken).toBeDefined();
+    const response = await executeTranslation();
+    expect(response.serviceAccountToken).toBeDefined();
   });
 
   describe('When the role is assumed', () => {
@@ -96,15 +95,17 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
 
     describe('When the role is valid', () => {
       it('returns a signed url for AWS credentials', async () => {
-        const subject = await get('subject');
-        expect(subject.serviceAccountToken).toBeDefined();
+        const response = await executeTranslation();
+        expect(response.serviceAccountToken).toBeDefined();
       });
     });
 
     describe('When the role is invalid', () => {
       it('returns the original AWS credentials', async () => {
         assumeResponse = undefined;
-        await expect(get('subject')).rejects.toThrow(/Unable to assume role:/);
+        await expect(executeTranslation()).rejects.toThrow(
+          /Unable to assume role:/,
+        );
       });
     });
   });
@@ -112,7 +113,9 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
   describe('When no AWS creds are available', () => {
     it('throws unable to get AWS credentials', async () => {
       mockedCredentials = new Error();
-      await expect(get('subject')).rejects.toThrow('No AWS credentials found.');
+      await expect(executeTranslation()).rejects.toThrow(
+        'No AWS credentials found.',
+      );
     });
   });
 
@@ -123,7 +126,7 @@ describe('AwsIamKubernetesAuthTranslator tests', () => {
         'AKIAIOSFODNN7EXAMPLE',
         undefinedSecret,
       );
-      await expect(get('subject')).rejects.toThrow(
+      await expect(executeTranslation()).rejects.toThrow(
         'Invalid AWS credentials found.',
       );
     });
diff --git a/yarn.lock b/yarn.lock
index e6b1a65863..f9656214a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8367,11 +8367,6 @@ bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   dependencies:
     tweetnacl "^0.14.3"
 
-bdd-lazy-var@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.npmjs.org/bdd-lazy-var/-/bdd-lazy-var-2.6.1.tgz#ca03fb36d68c5a507c0ba9a4d53160b899e6b7cb"
-  integrity sha512-X3ADwcFji/IHIrYJhTTpaiWhoOx4pl4whdAx1dmvdeUPsMUb7fVYFvf/Q33VEAEAVkEwi5rgNSZ0Y9oOVeQV+A==
-
 before-after-hook@^2.1.0, before-after-hook@^2.2.0:
   version "2.2.2"
   resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"