From 2c5c0123478b6474ec99d918f2f7d5cd2a82cad7 Mon Sep 17 00:00:00 2001
From: Leonardo Villela <leonardo.villela37@gmail.com>
Date: Sun, 7 May 2023 00:14:38 +0200
Subject: [PATCH] Remove unecessary nested vault action test

---
 .../actions/nested-vault-action/action.yml    | 11 ----------
 .github/workflows/build.yml                   | 21 +++++++++----------
 integrationTests/e2e/e2e.test.js              |  2 +-
 integrationTests/e2e/setup.js                 |  4 ++--
 4 files changed, 13 insertions(+), 25 deletions(-)
 delete mode 100644 .github/actions/nested-vault-action/action.yml

diff --git a/.github/actions/nested-vault-action/action.yml b/.github/actions/nested-vault-action/action.yml
deleted file mode 100644
index 32ebb98..0000000
--- a/.github/actions/nested-vault-action/action.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: 'Nested Vault Action'
-description: 'A Nested Vault Action to be used in E2E tests'
-runs:
-  using: "composite"
-  steps:
-    - uses: ./
-      with:
-        url: http://localhost:8200
-        token: testtoken
-        secrets: |
-          secret/data/nested-vault-action secret | NESTED_VAULT_ACTION_SECRET;
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2460e8..542c151 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -162,21 +162,20 @@ jobs:
           /cubbyhole/test foo ;
           /cubbyhole/test zip | NAMED_CUBBYSECRET ;
 
-    - name: Test Vault Action Overwrites Env Vars In Nested Action (part 1/2)
+    - name: Test Vault Action Overwrites Env Vars In Subsequent Action (part 1/2)
       uses: ./
       with:
-        url: http://localhost:8200
+        url: http://localhost:8200/
         token: testtoken
         secrets: |
-          secret/data/test secret | NESTED_VAULT_ACTION_SECRET;
-
-    - name: Test Vault Action Overwrites Env Vars In Nested Action (part 2/2)
-      uses: ./.github/actions/nested-vault-action 
-
-    - name: Verify Vault Action Outputs
-      run: npm run test:integration:e2e
-      env:
-        OTHER_SECRET_OUTPUT: ${{ steps.kv-secrets.outputs.otherSecret }}
+          secret/data/test secret | SUBSEQUENT_TEST_SECRET;
+    - name: Test Vault Action Overwrites Env Vars In Subsequent Action (part 2/2)
+      uses: ./
+      with:
+        url: http://localhost:8200/
+        token: testtoken
+        secrets: |
+          secret/data/subsequent-test secret | SUBSEQUENT_TEST_SECRET;
 
   e2e-tls:
     runs-on: ubuntu-latest
diff --git a/integrationTests/e2e/e2e.test.js b/integrationTests/e2e/e2e.test.js
index 2ba6688..6495d14 100644
--- a/integrationTests/e2e/e2e.test.js
+++ b/integrationTests/e2e/e2e.test.js
@@ -9,6 +9,6 @@ describe('e2e', () => {
         expect(process.env.OTHERALTSECRET).toBe("OTHERCUSTOMSECRET");
         expect(process.env.FOO).toBe("bar");
         expect(process.env.NAMED_CUBBYSECRET).toBe("zap");
-        expect(process.env.NESTED_VAULT_ACTION_SECRET).toBe("NESTED_VAULT_ACTION_SECRET");
+        expect(process.env.SUBSEQUENT_TEST_SECRET).toBe("SUBSEQUENT_TEST_SECRET");
     });
 });
diff --git a/integrationTests/e2e/setup.js b/integrationTests/e2e/setup.js
index 582bde1..96f2295 100644
--- a/integrationTests/e2e/setup.js
+++ b/integrationTests/e2e/setup.js
@@ -77,14 +77,14 @@ const vaultToken = `${process.env.VAULT_TOKEN}` === undefined ? `${process.env.V
             },
         });
 
-        await got(`http://${vaultUrl}/v1/secret/data/nested-vault-action`, {
+        await got(`http://${vaultUrl}/v1/secret/data/subsequent-test`, {
             method: 'POST',
             headers: {
                 'X-Vault-Token': vaultToken,
             },
             json: {
                 data: {
-                    secret: 'NESTED_VAULT_ACTION_SECRET',
+                    secret: 'SUBSEQUENT_TEST_SECRET',
                 },
             },
         });