Merge remote-tracking branch 'origin/demosite-app-recaptcha' into demosite-app-recaptcha

Author: Sita04

.github/workflows/asset.yaml

@@ -0,0 +1,85 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: asset
+on:
+  push:
+    branches:
+    - main
+    paths:
+    - 'asset/**'
+    - '.github/workflows/asset.yaml'
+  pull_request:
+    paths:
+    - 'asset/**'
+    - '.github/workflows/asset.yaml'
+  pull_request_target:
+    types: [labeled]
+    paths:
+    - 'asset/**'
+    - '.github/workflows/asset.yaml'
+  schedule:
+  - cron:  '0 0 * * 0'
+jobs:
+  test:
+    if: ${{ github.event.action != 'labeled' || github.event.label.name == 'actions:force-run' }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    permissions:
+      contents: 'write'
+      pull-requests: 'write'
+      id-token: 'write'
+    steps:
+    - uses: actions/[email protected]
+      with:
+        ref: ${{github.event.pull_request.head.sha}}
+    - uses: 'google-github-actions/[email protected]'
+      with:
+        workload_identity_provider: 'projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider'
+        service_account: '[email protected]'
+        create_credentials_file: 'true'
+        access_token_lifetime: 600s
+    - uses: actions/[email protected]
+      with:
+        node-version: 16
+    - run: npm install
+      working-directory: asset/snippets
+    - run: npm test
+      working-directory: asset/snippets
+      env:
+        MOCHA_REPORTER_SUITENAME: asset
+        MOCHA_REPORTER_OUTPUT: asset_sponge_log.xml
+        MOCHA_REPORTER: xunit
+    - if: ${{ github.event.action == 'labeled' && github.event.label.name == 'actions:force-run' }}
+      uses: actions/github-script@v6
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          try {
+            await github.rest.issues.removeLabel({
+              name: 'actions:force-run',
+              owner: 'GoogleCloudPlatform',
+              repo: 'nodejs-docs-samples',
+              issue_number: context.payload.pull_request.number
+            });
+          } catch (e) {
+            if (!e.message.includes('Label does not exist')) {
+              throw e;
+            }
+          }
+    - if: ${{ github.event_name == 'schedule' && always() }}
+      run: |
+        curl https://github.com/googleapis/repo-automation-bots/releases/download/flakybot-1.1.0/flakybot -o flakybot -s -L
+        chmod +x ./flakybot
+        ./flakybot --repo GoogleCloudPlatform/nodejs-docs-samples --commit_hash ${{github.sha}} --build_url https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}

.github/workflows/media-livestream.yaml

@@ -27,7 +27,7 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.3.0
       with:
         ref: ${{github.event.pull_request.head.sha}}
     - uses: 'google-github-actions/[email protected]'
@@ -36,7 +36,7 @@ jobs:
         service_account: '[email protected]'
         create_credentials_file: 'true'
         access_token_lifetime: 600s
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3.6.0
       with:
         node-version: 16
     - run: npm install

.github/workflows/media-transcoder.yaml

@@ -27,7 +27,7 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.3.0
       with:
         ref: ${{github.event.pull_request.head.sha}}
     - uses: 'google-github-actions/[email protected]'
@@ -36,7 +36,7 @@ jobs:
         service_account: '[email protected]'
         create_credentials_file: 'true'
         access_token_lifetime: 600s
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3.6.0
       with:
         node-version: 16
     - run: npm install

.github/workflows/media-video-stitcher.yaml

@@ -27,7 +27,7 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.3.0
       with:
         ref: ${{github.event.pull_request.head.sha}}
     - uses: 'google-github-actions/[email protected]'
@@ -36,7 +36,7 @@ jobs:
         service_account: '[email protected]'
         create_credentials_file: 'true'
         access_token_lifetime: 600s
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3.6.0
       with:
         node-version: 16
     - run: npm install

.github/workflows/retail.yaml

@@ -27,7 +27,7 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.3.0
       with:
         ref: ${{github.event.pull_request.head.sha}}
     - uses: 'google-github-actions/[email protected]'
@@ -36,7 +36,7 @@ jobs:
         service_account: '[email protected]'
         create_credentials_file: 'true'
         access_token_lifetime: 600s
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3.6.0
       with:
         node-version: 16
     - run: npm install

.github/workflows/storagetransfer.yaml

@@ -27,7 +27,7 @@ jobs:
       pull-requests: 'write'
       id-token: 'write'
     steps:
-    - uses: actions/checkout@v3.1.0
+    - uses: actions/checkout@v3.3.0
       with:
         ref: ${{github.event.pull_request.head.sha}}
     - uses: 'google-github-actions/[email protected]'
@@ -42,7 +42,7 @@ jobs:
         secrets: |-
           sts_aws_secret:nodejs-docs-samples-tests/nodejs-docs-samples-storagetransfer-aws
           sts_azure_secret:nodejs-docs-samples-tests/nodejs-docs-samples-storagetransfer-azure
-    - uses: actions/setup-node@v3.5.1
+    - uses: actions/setup-node@v3.6.0
       with:
         node-version: 16
     - run: npm install

.github/workflows/workflows.json

@@ -14,6 +14,7 @@
   "appengine/static-files",
   "appengine/storage/flexible",
   "appengine/storage/standard",
+  "asset",
   "auth",
   "automl",
   "appengine/typescript",

CODEOWNERS

@@ -59,12 +59,11 @@ monitoring/opencensus @GoogleCloudPlatform/nodejs-samples-reviewers
 # Data & AI
 ai-platform @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 automl @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
-dialogflow @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
-dialogflow-cx @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
-document-ai @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 cloud-language @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 contact-center-insights @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 datalabeling @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
+dialogflow @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
+dialogflow-cx @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 document-ai @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 mediatranslation @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers
 notebooks @GoogleCloudPlatform/dee-data-ai @GoogleCloudPlatform/nodejs-samples-reviewers

appengine/pubsub/app.js

@@ -63,7 +63,7 @@ app.post('/', formBodyParser, async (req, res, next) => {
 
   const data = Buffer.from(req.body.payload);
   try {
-    const messageId = await topic.publish(data);
+    const messageId = await topic.publishMessage({data});
     res.status(200).send(`Message ${messageId} sent.`);
   } catch (error) {
     next(error);

appengine/pubsub/package.json

@@ -15,7 +15,7 @@
   "dependencies": {
     "@google-cloud/pubsub": "^3.0.0",
     "express": "^4.17.1",
-    "google-auth-library": "^7.0.0",
+    "google-auth-library": "^8.0.0",
     "pug": "^3.0.0"
   },
   "devDependencies": {

asset/snippets/package.json

@@ -12,7 +12,7 @@
   "repository": "googleapis/nodejs-asset",
   "private": true,
   "scripts": {
-    "test": "mocha --timeout 600000"
+    "test": "mocha test --timeout 600000"
   },
   "dependencies": {
     "@google-cloud/asset": "^4.5.0",

asset/snippets/test/asset.test.js

@@ -0,0 +1,118 @@
+// Copyright 2023 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+const {assert} = require('chai');
+const {after, before, describe, it} = require('mocha');
+const sinon = require('sinon');
+const uuid = require('uuid');
+
+const {Storage} = require('@google-cloud/storage');
+
+const cp = require('child_process');
+const execSync = cmd => cp.execSync(cmd, {encoding: 'utf-8'});
+
+function sleep(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+describe('asset sample tests', () => {
+  let bucket;
+  let bucketName;
+  let fileSuffix;
+  const suffix = uuid.v4();
+
+  before(async () => {
+    const storage = new Storage();
+    fileSuffix = `${suffix}`;
+
+    bucketName = `asset-nodejs-${suffix}`;
+    bucket = storage.bucket(bucketName);
+    await bucket.create();
+  });
+
+  after(async () => {
+    await bucket.delete();
+  });
+
+  const stubConsole = function () {
+    sinon.stub(console, 'error');
+    sinon.stub(console, 'log');
+  };
+  const restoreConsole = function () {
+    console.log.restore();
+    console.error.restore();
+  };
+
+  beforeEach(stubConsole);
+  afterEach(restoreConsole);
+
+  it('should export assets to specified path', async () => {
+    const dumpFilePath = `gs://${bucketName}/my-assets-${fileSuffix}.txt`;
+    execSync(`node exportAssets ${dumpFilePath}`);
+    let waitMs = 4000;
+    let exists = false;
+    let file;
+    for (let retry = 0; retry < 3 && !exists; ++retry) {
+      await sleep((waitMs *= 2));
+      file = await bucket.file(`my-assets-${fileSuffix}.txt`);
+      exists = await file.exists();
+    }
+    assert.ok(exists);
+    await file.delete();
+  });
+
+  it.skip('should export asset relationships to specified path', async () => {
+    const dumpFilePath = `gs://${bucketName}/my-relationships-${fileSuffix}.txt`;
+    const contentType = 'RELATIONSHIP';
+    execSync(`node exportAssets ${dumpFilePath} ${contentType}`);
+    let waitMs = 4000;
+    let exists = false;
+    let file;
+    for (let retry = 0; retry < 3 && !exists; ++retry) {
+      await sleep((waitMs *= 2));
+      file = await bucket.file(`my-relationships-${fileSuffix}.txt`);
+      exists = await file.exists();
+    }
+    assert.ok(exists);
+    await file.delete();
+  });
+
+  // The assets returned within 'readTimeWindow' frequently do not include
+  // the newly created bucket:
+  it('should get assets history successfully', async () => {
+    const assetName = `//storage.googleapis.com/${bucketName}`;
+    let waitMs = 1000;
+    let included = false;
+    for (let retry = 0; retry < 3 && !included; ++retry) {
+      await sleep((waitMs *= 2));
+      const stdout = execSync(
+        `node getBatchAssetHistory ${assetName} 'RESOURCE'`
+      );
+      included = stdout.includes(assetName);
+    }
+    assert.ok(included);
+  });
+
+  it('should list assets successfully', async () => {
+    const assetType = 'storage.googleapis.com/Bucket';
+    const stdout = execSync(`node listAssets ${assetType} 'RESOURCE'`);
+    assert.include(stdout, assetType);
+  });
+
+  it.skip('should list asset relationship successfully', async () => {
+    const assetType = '';
+    const stdout = execSync(`node listAssets ${assetType} 'RELATIONSHIP'`);
+    assert.include(stdout, 'relatedAsset');
+  });
+});