From 7a3d425b0e228d4fde221bd74bc674bf78a49356 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 23 Apr 2024 22:20:43 +0200
Subject: [PATCH 1/3] Fix: Undefined env variables

---
 .github/workflows/run-cli-tests.yml | 19 +++++++++++++++----
 .github/workflows/test-workflow.yml | 25 +++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/test-workflow.yml

diff --git a/.github/workflows/run-cli-tests.yml b/.github/workflows/run-cli-tests.yml
index 846998528..840a0c69f 100644
--- a/.github/workflows/run-cli-tests.yml
+++ b/.github/workflows/run-cli-tests.yml
@@ -1,12 +1,23 @@
 name: Go CLI Tests
 
 on:
-    pull_request:
-        types: [opened, synchronize]
-        paths:
-            - "cli/**"
+    #pull_request:
+    #    types: [opened, synchronize]
+    #    paths:
+    #        - "cli/**"
 
     workflow_call:
+        secrets:
+            CLI_TESTS_UA_CLIENT_ID:
+                required: true
+            CLI_TESTS_UA_CLIENT_SECRET:
+                required: true
+            CLI_TESTS_SERVICE_TOKEN:
+                required: true
+            CLI_TESTS_PROJECT_ID:
+                required: true
+            CLI_TESTS_ENV_SLUG:
+                required: true
 
 jobs:
     test:
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
new file mode 100644
index 000000000..e745684fe
--- /dev/null
+++ b/.github/workflows/test-workflow.yml
@@ -0,0 +1,25 @@
+name: Go CLI Tests
+
+on:
+    pull_request:
+        types: [opened, synchronize]
+        paths:
+            - "cli/**"
+
+jobs:
+    call-workflow:
+        uses: ./.github/workflows/run-cli-tests.yml
+        secrets:
+            CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
+            CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
+            CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
+            CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
+            CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
+
+    test:
+        name: Go CLI Tests
+        runs-on: ubuntu-latest
+        needs: [call-workflow]
+        steps:
+            - name: Hello world
+              run: echo "Hello world"

From b7893a6a72bb830cfb25489badcb790c9e569d9e Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 23 Apr 2024 22:21:32 +0200
Subject: [PATCH 2/3] Update test-workflow.yml

---
 .github/workflows/test-workflow.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
index e745684fe..39f1fdce1 100644
--- a/.github/workflows/test-workflow.yml
+++ b/.github/workflows/test-workflow.yml
@@ -3,8 +3,8 @@ name: Go CLI Tests
 on:
     pull_request:
         types: [opened, synchronize]
-        paths:
-            - "cli/**"
+        # paths:
+        # - "cli/**"
 
 jobs:
     call-workflow:

From c44c7810cefd269cafbdb65fb963db41c6b468b0 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Tue, 23 Apr 2024 22:24:17 +0200
Subject: [PATCH 3/3] Fix: CLI Tests failing when called as a dependency
 workflow

---
 .../workflows/release_build_infisical_cli.yml |  6 +++++
 .github/workflows/run-cli-tests.yml           |  8 +++---
 .github/workflows/test-workflow.yml           | 25 -------------------
 3 files changed, 10 insertions(+), 29 deletions(-)
 delete mode 100644 .github/workflows/test-workflow.yml

diff --git a/.github/workflows/release_build_infisical_cli.yml b/.github/workflows/release_build_infisical_cli.yml
index 40137a455..4a0da7f69 100644
--- a/.github/workflows/release_build_infisical_cli.yml
+++ b/.github/workflows/release_build_infisical_cli.yml
@@ -14,6 +14,12 @@ jobs:
     cli-integration-tests:
         name: Run tests before deployment
         uses: ./.github/workflows/run-cli-tests.yml
+        secrets:
+            CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
+            CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
+            CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
+            CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
+            CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
 
     goreleaser:
         runs-on: ubuntu-20.04
diff --git a/.github/workflows/run-cli-tests.yml b/.github/workflows/run-cli-tests.yml
index 840a0c69f..bca989e37 100644
--- a/.github/workflows/run-cli-tests.yml
+++ b/.github/workflows/run-cli-tests.yml
@@ -1,10 +1,10 @@
 name: Go CLI Tests
 
 on:
-    #pull_request:
-    #    types: [opened, synchronize]
-    #    paths:
-    #        - "cli/**"
+    pull_request:
+        types: [opened, synchronize]
+        paths:
+            - "cli/**"
 
     workflow_call:
         secrets:
diff --git a/.github/workflows/test-workflow.yml b/.github/workflows/test-workflow.yml
deleted file mode 100644
index 39f1fdce1..000000000
--- a/.github/workflows/test-workflow.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Go CLI Tests
-
-on:
-    pull_request:
-        types: [opened, synchronize]
-        # paths:
-        # - "cli/**"
-
-jobs:
-    call-workflow:
-        uses: ./.github/workflows/run-cli-tests.yml
-        secrets:
-            CLI_TESTS_UA_CLIENT_ID: ${{ secrets.CLI_TESTS_UA_CLIENT_ID }}
-            CLI_TESTS_UA_CLIENT_SECRET: ${{ secrets.CLI_TESTS_UA_CLIENT_SECRET }}
-            CLI_TESTS_SERVICE_TOKEN: ${{ secrets.CLI_TESTS_SERVICE_TOKEN }}
-            CLI_TESTS_PROJECT_ID: ${{ secrets.CLI_TESTS_PROJECT_ID }}
-            CLI_TESTS_ENV_SLUG: ${{ secrets.CLI_TESTS_ENV_SLUG }}
-
-    test:
-        name: Go CLI Tests
-        runs-on: ubuntu-latest
-        needs: [call-workflow]
-        steps:
-            - name: Hello world
-              run: echo "Hello world"