Update workflow to use inputs to local action

onflow · Jun 24, 2024 · a6344e0 · a6344e0
1 parent 94b9bbe
commit a6344e0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/actions/test-monitor-process-results/action.yml b/.github/workflows/actions/test-monitor-process-results/action.yml
@@ -2,6 +2,14 @@ name: Test Monitor - Process Results
 
 description: Custom action that's used in multiple Flaky Test Monitor jobs to process test results and upload them to BigQuery
 
+inputs:
+  service_account:
+    description: 'The GCP Service Account'
+    required: true
+  workload_identity_provider:
+    description: 'The GCP Workload Identity Provider'
+    required: true
+
 runs:
   using : "composite"
   steps:
@@ -23,9 +31,9 @@ runs:
       id: auth
       uses: google-github-actions/auth@v2
       with:
+        service_account: ${{ inputs.service_account }}
         token_format: 'access_token'
-        workload_identity_provider: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}
-        service_account: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }}
+        workload_identity_provider: ${{ inputs.workload_identity_provider }}
     - name: Upload results to BigQuery (skipped tests)
       uses: nick-fields/retry@v2
       with:

diff --git a/.github/workflows/flaky-test-monitor.yml b/.github/workflows/flaky-test-monitor.yml
@@ -74,9 +74,9 @@ jobs:
         env:
           TEST_CATEGORY: unit
         uses: ./.github/workflows/actions/test-monitor-process-results
-        secrets:
-          FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}
-          FLAKY_TEST_SERVICE_ACCOUNT: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }}
+        with:
+          service_account: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }} 
+          workload_identity_provider: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}
 
   unit-test-modules:
     name: Unit Tests (Modules)
@@ -117,9 +117,9 @@ jobs:
         env:
           TEST_CATEGORY: ${{ matrix.test_category }}
         uses: ./.github/workflows/actions/test-monitor-process-results
-        secrets:
-          FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}
-          FLAKY_TEST_SERVICE_ACCOUNT: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }}
+        with:
+          service_account: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }} 
+          workload_identity_provider: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}
 
   integration-test:
     name: Integration Tests
@@ -178,7 +178,7 @@ jobs:
         env:
           TEST_CATEGORY: ${{ matrix.test_category }}
         uses: ./.github/workflows/actions/test-monitor-process-results
-        secrets:
-          FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}
-          FLAKY_TEST_SERVICE_ACCOUNT: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }}
+        with:
+          service_account: ${{ secrets.FLAKY_TEST_SERVICE_ACCOUNT }} 
+          workload_identity_provider: ${{ secrets.FLAKY_TEST_WORKLOAD_IDENTITY_PROVIDER }}