From a5eced5987896a11ea5b30db2c43462fcee021f0 Mon Sep 17 00:00:00 2001
From: Mike Verbanic <verbanicm@google.com>
Date: Tue, 8 Nov 2022 16:08:40 -0500
Subject: [PATCH] fix: cleanup integration tests

---
 .github/workflows/setup-gcloud-it.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/setup-gcloud-it.yml b/.github/workflows/setup-gcloud-it.yml
index b513fe5b1..6ae770bdf 100644
--- a/.github/workflows/setup-gcloud-it.yml
+++ b/.github/workflows/setup-gcloud-it.yml
@@ -17,7 +17,7 @@ jobs:
   versioned:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud versioned
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -59,7 +59,7 @@ jobs:
   latest:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud latest
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -106,7 +106,7 @@ jobs:
   project_id:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud with configured project
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -143,7 +143,7 @@ jobs:
   components:
     if: ${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name && github.actor != 'dependabot[bot]' }}
     name: setup-gcloud with components
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
@@ -341,8 +341,6 @@ jobs:
 
       - name: 'setup-gcloud'
         uses: './'
-        with:
-          export_default_credentials: true
 
       - id: 'gcloud'
         shell: 'bash'
@@ -396,8 +394,6 @@ jobs:
         uses: ./
         with:
           version: 'latest'
-          service_account_email: ${{ secrets.SETUP_GCLOUD_IT_EMAIL }}
-          service_account_key: ${{ secrets.SETUP_GCLOUD_IT_KEY }}
 
       # current SA should be SETUP_GCLOUD_IT_EMAIL
       - name: 'check current SA'