Merge branch 'main' into transferManager-storage-migration

Author: angelcaamal

appengine/storage/flexible/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@google-cloud/storage": "^7.0.0",
     "express": "^4.18.2",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.1.1",
     "pug": "^3.0.2"
   },
   "devDependencies": {

appengine/storage/flexible/system-test/app.test.js

@@ -32,12 +32,7 @@ const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 before(async () => {
   try {
-    await bucket.create(bucket).then(() => {
-      return bucket.acl.add({
-        entity: 'allUsers',
-        role: Storage.acl.READER_ROLE,
-      });
-    });
+    await bucket.create();
   } catch (err) {
     if (
       !err.message.match(

appengine/storage/flexible_nodejs16_and_earlier/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@google-cloud/storage": "^7.0.0",
     "express": "^4.18.2",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.1.1",
     "pug": "^3.0.2"
   },
   "devDependencies": {

appengine/storage/flexible_nodejs16_and_earlier/system-test/app.test.js

@@ -32,12 +32,7 @@ const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 before(async () => {
   try {
-    await bucket.create(bucket).then(() => {
-      return bucket.acl.add({
-        entity: 'allUsers',
-        role: Storage.acl.READER_ROLE,
-      });
-    });
+    await bucket.create();
   } catch (err) {
     if (
       !err.message.match(

appengine/storage/standard/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@google-cloud/storage": "^7.0.0",
     "express": "^4.18.2",
-    "multer": "^1.4.5-lts.1",
+    "multer": "^2.1.1",
     "pug": "^3.0.2"
   },
   "devDependencies": {

appengine/storage/standard/system-test/app.test.js

@@ -32,12 +32,7 @@ const requestObj = supertest(proxyquire(path.join(cwd, 'app'), {process}));
 
 before(async () => {
   try {
-    await bucket.create(bucket).then(() => {
-      return bucket.acl.add({
-        entity: 'allUsers',
-        role: Storage.acl.READER_ROLE,
-      });
-    });
+    await bucket.create();
   } catch (err) {
     if (
       !err.message.match(

asset/snippets/test/asset.test.js

@@ -104,9 +104,35 @@ describe('asset sample tests', () => {
     assert.ok(included);
   });
 
-  it('should list assets successfully', async () => {
+  it('should list assets successfully', async function () {
     const assetType = 'storage.googleapis.com/Bucket';
-    const stdout = execSync(`node listAssets ${assetType} 'RESOURCE'`);
+    let waitMs = 60000;
+    let stdout = '';
+    const maxRetries = 3;
+
+    for (let retry = 0; retry < maxRetries; retry++) {
+      try {
+        await sleep(waitMs);
+        stdout = execSync(`node listAssets ${assetType} 'RESOURCE'`);
+        break;
+      } catch (err) {
+        const errorMessage = err.stderr || err.message || '';
+        if (
+          errorMessage.includes('RESOURCE_EXHAUSTED') ||
+          errorMessage.includes('Quota exceeded')
+        ) {
+          if (retry === maxRetries - 1) {
+            console.warn(
+              '[Quota Error] Max retries exhausted. Test did not recover in time. Skipping test...'
+            );
+            this.skip();
+          }
+        } else {
+          throw err;
+        }
+      }
+      waitMs *= 2;
+    }
     assert.include(stdout, assetType);
   });
 

asset/snippets/test/orgPolicyAnalyzer.test.js

@@ -15,28 +15,15 @@
 'use strict';
 
 const {assert} = require('chai');
-const {after, before, describe, it} = require('mocha');
+const {describe, it} = require('mocha');
 const sinon = require('sinon');
-const uuid = require('uuid');
 
 const cp = require('child_process');
 const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
 
-const {Storage} = require('@google-cloud/storage');
-
-const {BigQuery} = require('@google-cloud/bigquery');
-const bigquery = new BigQuery();
-const options = {
-  location: 'US',
-};
-const datasetId = `asset_nodejs_${uuid.v4()}`.replace(/-/gi, '_');
-
 const orgId = 'organizations/474566717491'; // This is the id of ipa1.joonix.net, a test organization owned by mdb.cloud-asset-analysis-team@google.com
 
 describe('org policy analyzer sample tests', () => {
-  let bucket;
-  let bucketName;
-
   const stubConsole = function () {
     sinon.stub(console, 'error');
     sinon.stub(console, 'log');
@@ -49,19 +36,6 @@ describe('org policy analyzer sample tests', () => {
   beforeEach(stubConsole);
   afterEach(restoreConsole);
 
-  before(async () => {
-    bucketName = `asset-nodejs-${uuid.v4()}`;
-    bucket = new Storage().bucket(bucketName);
-    await bucket.create();
-    await bigquery.createDataset(datasetId, options);
-    await bigquery.dataset(datasetId).exists();
-  });
-
-  after(async () => {
-    await bucket.delete();
-    await bigquery.dataset(datasetId).delete({force: true}).catch(console.warn);
-  });
-
   it('should analyze org policies successfully', async () => {
     const constraint =
       'constraints/iam.allowServiceAccountCredentialLifetimeExtension';

cloud-tasks/tutorial-gcf/function/test/index.test.js

@@ -17,22 +17,22 @@
 const proxyquire = require('proxyquire').noCallThru();
 const sinon = require('sinon');
 const assert = require('assert');
-const {SecretManagerServiceClient} = require('@google-cloud/secret-manager');
 
 describe('tasks/function', () => {
   let key;
 
   const getSample = function () {
-    const requestPromise = sinon
-      .stub()
-      .returns(new Promise(resolve => resolve('test')));
+    const sendGridStub = {
+      setApiKey: sinon.stub(),
+      send: sinon.stub().resolves([{statusCode: 200}]),
+    };
 
     return {
       program: proxyquire('../', {
-        'request-promise': requestPromise,
+        '@sendgrid/mail': sendGridStub,
       }),
       mocks: {
-        requestPromise: requestPromise,
+        sendGridStub: sendGridStub,
       },
     };
   };
@@ -54,14 +54,7 @@ describe('tasks/function', () => {
   };
 
   before(async () => {
-    const secrets = new SecretManagerServiceClient();
-    const projectId = await secrets.getProjectId();
-    const secretName = 'sendgrid-api-key';
-    const secretVersion = 1;
-    const [version] = await secrets.accessSecretVersion({
-      name: secrets.secretVersionPath(projectId, secretName, secretVersion),
-    });
-    key = version.payload.data.toString();
+    key = 'SG.dummy_key_for_testing';
     process.env.SENDGRID_API_KEY = key;
   });
 
@@ -167,5 +160,11 @@ describe('tasks/function', () => {
     assert.strictEqual(mocks.res.status.callCount, 1);
     assert.deepStrictEqual(mocks.res.status.firstCall.args, [200]);
     assert.strictEqual(mocks.res.send.callCount, 1);
+    sinon.assert.calledOnceWithExactly(sample.mocks.sendGridStub.send, {
+      to: 'to@gmail.com',
+      from: 'postcard@example.com',
+      subject: 'A Postcard Just for You!',
+      html: sinon.match.string,
+    });
   });
 });

contact-center-insights/createAnalysis.js

@@ -31,13 +31,18 @@ function main(conversationName) {
   const client = new ContactCenterInsightsClient();
 
   async function createAnalysis() {
-    const [operation] = await client.createAnalysis({
-      parent: conversationName,
-    });
+    try {
+      const [operation] = await client.createAnalysis({
+        parent: conversationName,
+      });
 
-    // Wait for the operation to complete.
-    const [analysis] = await operation.promise();
-    console.info(`Created ${analysis.name}`);
+      // Wait for the operation to complete.
+      const [analysis] = await operation.promise();
+      console.info(`Created ${analysis.name}`);
+    } catch (err) {
+      console.error(`createAnalysis failed: ${JSON.stringify(err, null, 2)}`);
+      process.exitCode = 1;
+    }
   }
   createAnalysis();
   // [END contactcenterinsights_create_analysis]