.github/workflows/ci_new.yaml

@@ -223,14 +223,29 @@ jobs:
           export TF_ACC_SERVICE_ACCOUNT_FILE
           make test
 
-      - name: Acceptance Testing
+#      - name: Acceptance Testing
-        env:
+#        env:
-          TF_ACC: "1"
+#          TF_ACC: "1"
+#        if: ${{ github.event_name == 'pull_request' }}
+#        run: |
+#          TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json
+#          export TF_ACC_SERVICE_ACCOUNT_FILE
+#          make test-acceptance-tf
+
+      - name: Run Test
         if: ${{ github.event_name == 'pull_request' }}
-        run: |
+        uses: ./.github/actions/acc_test
-          TF_ACC_SERVICE_ACCOUNT_FILE=~/.service_account.json
+        with:
-          export TF_ACC_SERVICE_ACCOUNT_FILE
+          go-version: ${{ env.GO_VERSION }}
-          make test-acceptance-tf
+          project_id: ${{ vars.TF_ACC_PROJECT_ID }}
+          region: 'eu01'
+          service_account_json_content_b64: "${{ secrets.TF_ACC_SERVICE_ACCOUNT_JSON_B64 }}"
+          project_user_email: ${{ vars.TEST_PROJECT_USER_EMAIL }}
+          tf_acc_kek_key_id: ${{ vars.TF_ACC_KEK_KEY_ID }}
+          tf_acc_kek_key_ring_id: ${{ vars.TF_ACC_KEK_KEY_RING_ID }}
+          tf_acc_kek_key_version: ${{ vars.TF_ACC_KEK_KEY_VERSION }}
+          tf_acc_kek_service_account: ${{ vars.TF_ACC_KEK_SERVICE_ACCOUNT }}
+          # service_account_json_file_path: "~/service_account.json"
 
       - name: Check coverage threshold
         shell: bash