build(deps):upgrade deps in action for appengine storage flex and standard (GoogleCloudPlatform#2582)

sofisl · web-flow · commit 07f6bf1704a1 · 2022-03-31T17:26:37.000-07:00
* build(deps):upgrade deps in action for appengine storage flex and standard
diff --git a/.github/workflows/appengine-storage-flexible.yaml b/.github/workflows/appengine-storage-flexible.yaml
@@ -21,18 +21,17 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: 'google-github-actions/auth@v0.3.1'
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+    - uses: 'google-github-actions/auth@v0.6.0'
       with:
         workload_identity_provider: 'projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider'
         service_account: 'kokoro-system-test@long-door-651.iam.gserviceaccount.com'
-        create_credentials_file: 'true'
-        credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
+        token_format: 'access_token'
         access_token_lifetime: 600s
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{github.event.pull_request.head.ref}}
-        repository: ${{github.event.pull_request.head.repo.full_name}}
-    - uses: actions/setup-node@v2
+    - uses: actions/setup-node@v3
       with:
         node-version: 14
     - run: npm install
@@ -44,7 +43,7 @@ jobs:
         MOCHA_REPORTER_OUTPUT: appengine_storage_flexible_sponge_log.xml
         MOCHA_REPORTER: xunit
     - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'actions:force-run' }}
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         script: |
diff --git a/.github/workflows/appengine-storage-standard.yaml b/.github/workflows/appengine-storage-standard.yaml
@@ -21,17 +21,15 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: 'google-github-actions/auth@v0.3.1'
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
+    - uses: 'google-github-actions/auth@v0.6.0'
       with:
         workload_identity_provider: 'projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider'
         service_account: 'kokoro-system-test@long-door-651.iam.gserviceaccount.com'
-        create_credentials_file: 'true'
-        credentials_json: '${{ secrets.GOOGLE_CREDENTIALS }}'
         access_token_lifetime: 600s
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{github.event.pull_request.head.ref}}
-        repository: ${{github.event.pull_request.head.repo.full_name}}
     - uses: actions/setup-node@v2
       with:
         node-version: 14
@@ -44,7 +42,7 @@ jobs:
         MOCHA_REPORTER_OUTPUT: appengine_storage_standard_sponge_log.xml
         MOCHA_REPORTER: xunit
     - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'actions:force-run' }}
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         script: |
diff --git a/appengine/storage/flexible/system-test/app.test.js b/appengine/storage/flexible/system-test/app.test.js
@@ -15,9 +15,9 @@
 
 const path = require('path');
 const {Storage} = require('@google-cloud/storage');
+const supertest = require('supertest');
 const storage = new Storage();
 const assert = require('assert');
-const supertest = require('supertest');
 const proxyquire = require('proxyquire').noPreserveCache();
 
 process.env.GCLOUD_STORAGE_BUCKET =
@@ -29,12 +29,22 @@ const cwd = path.join(__dirname, '../');
 const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 before(async () => {
-  await bucket.create(bucket).then(() => {
-    return bucket.acl.add({
-      entity: 'allUsers',
-      role: Storage.acl.READER_ROLE,
+  try {
+    await bucket.create(bucket).then(() => {
+      return bucket.acl.add({
+        entity: 'allUsers',
+        role: Storage.acl.READER_ROLE,
+      });
     });
-  });
+  } catch (err) {
+    if (
+      !err.message.match(
+        /Your previous request to create the named bucket succeeded and you already own it./
+      )
+    ) {
+      throw err;
+    }
+  }
 });
 after(async () => {
   try {
diff --git a/appengine/storage/standard/system-test/app.test.js b/appengine/storage/standard/system-test/app.test.js
@@ -16,8 +16,8 @@
 const path = require('path');
 const {Storage} = require('@google-cloud/storage');
 const storage = new Storage();
-const assert = require('assert');
 const supertest = require('supertest');
+const assert = require('assert');
 const proxyquire = require('proxyquire').noPreserveCache();
 
 process.env.GCLOUD_STORAGE_BUCKET =
@@ -29,12 +29,22 @@ const cwd = path.join(__dirname, '../');
 const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 before(async () => {
-  await bucket.create(bucket).then(() => {
-    return bucket.acl.add({
-      entity: 'allUsers',
-      role: Storage.acl.READER_ROLE,
+  try {
+    await bucket.create(bucket).then(() => {
+      return bucket.acl.add({
+        entity: 'allUsers',
+        role: Storage.acl.READER_ROLE,
+      });
     });
-  });
+  } catch (err) {
+    if (
+      !err.message.match(
+        /Your previous request to create the named bucket succeeded and you already own it./
+      )
+    ) {
+      throw err;
+    }
+  }
 });
 after(async () => {
   try {
