fix: read projectId from retailClient.getProjectId (#159)

t-karasova · web-flow · commit f4fa61c2a385 · 2022-04-13T14:57:47.000-04:00
diff --git a/samples/interactive-tutorials/README.md b/samples/interactive-tutorials/README.md
@@ -51,7 +51,7 @@ Because you are going to run the code samples in your own Google Cloud project,
 To install all the dependencies, run
 
 ```
-cd cloudshell_open/retail-search-nodejs-samples
+cd cloudshell_open/nodejs-retail
 npm install
 ```
 
@@ -61,4 +61,4 @@ To execute an individual code sample, invoke `node` with a file as a parameter a
 
 ```
 node search/search-simple-query.js
-```
+```
diff --git a/samples/interactive-tutorials/product/delete-product.js b/samples/interactive-tutorials/product/delete-product.js
@@ -46,7 +46,7 @@ async function main(generatedProductId) {
   // Delete product
   console.log('Start deleting the product');
   await callDeleteProduct();
-  console.log(`Product ${product.id} deleted`);
+  console.log(`Product ${product.name} deleted`);
   // [END retail_delete_product]
 }
 
diff --git a/samples/interactive-tutorials/setup/create-gcs-bucket.js b/samples/interactive-tutorials/setup/create-gcs-bucket.js
@@ -17,8 +17,11 @@
 async function main(generatedBucketName) {
   const utils = require('./setup-cleanup');
 
-  //Get your project ID
-  const projectId = process.env['PROJECT_ID'];
+  // Instantiates a client.
+  const {ProductServiceClient} = require('@google-cloud/retail').v2;
+  const retailClient = new ProductServiceClient();
+
+  const projectId = await retailClient.getProjectId();
 
   // The ID of your GCS bucket
   const bucketName = generatedBucketName
diff --git a/samples/interactive-tutorials/test/delete-product.test.js b/samples/interactive-tutorials/test/delete-product.test.js
@@ -51,7 +51,7 @@ describe('Delete product', () => {
   });
 
   it('should check that product deleted', async () => {
-    const regex = new RegExp(`Product ${productId} deleted`, 'g');
+    const regex = new RegExp(`Product .*${productId} deleted`, 'g');
     assert.match(stdout, regex);
   });
 
diff --git a/samples/interactive-tutorials/user_environment_setup.sh b/samples/interactive-tutorials/user_environment_setup.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Copyright 2022 Google Inc. All Rights Reserved.
+#
+# 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.
+
+# set the Google Cloud Project ID
+project_id=$1
+echo "Project ID: $project_id"
+gcloud config set project "$project_id"
+
+timestamp=$(date +%s)
+
+service_account_id="service-acc-$timestamp"
+echo "Service Account: $service_account_id"
+
+# create service account (your service-acc-$timestamp)
+gcloud iam service-accounts create "$service_account_id"
+
+# assign necessary roles to your new service account
+for role in {retail.admin,editor,bigquery.admin}
+  do
+    gcloud projects add-iam-policy-binding "$project_id" --member="serviceAccount:$service_account_id@$project_id.iam.gserviceaccount.com" --role=roles/"${role}"
+done
+
+echo "Wait ~60 seconds to be sure the appropriate roles have been assigned to your service account"
+sleep 60
+
+# upload your service account key file
+service_acc_email="$service_account_id@$project_id.iam.gserviceaccount.com"
+gcloud iam service-accounts keys create ~/key.json --iam-account "$service_acc_email"
+
+# activate the service account using the key
+gcloud auth activate-service-account --key-file ~/key.json
+
+# install needed Google client libraries
+cd ~/cloudshell_open/nodejs-retail/samples || exit
+npm install
+
+echo "======================================="
+echo "The Google Cloud setup is completed."
+echo "Please proceed with the Tutorial steps"
+echo "======================================="
diff --git a/samples/interactive-tutorials/user_import_data_to_catalog.sh b/samples/interactive-tutorials/user_import_data_to_catalog.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# Copyright 2022 Google Inc. All Rights Reserved.
+#
+# 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.
+
+# set the key as GOOGLE_APPLICATION_CREDENTIALS
+export GOOGLE_APPLICATION_CREDENTIALS=~/key.json
+
+# Create a GCS bucket and upload the product data to the bucket
+output=$(node ~/cloudshell_open/nodejs-retail/samples/interactive-tutorials/setup/create-gcs-bucket.js)
+
+# Get the bucket name and store it in the env variable BUCKET_NAME
+temp="${output#*Bucket }"
+bucket_name="${temp% created*}"
+export BUCKET_NAME=$bucket_name
+
+# Import products to the Retail catalog
+node ~/cloudshell_open/nodejs-retail/samples/interactive-tutorials/product/import-products-gcs.js
+
+echo "====================================="
+echo "Your Retail catalog is ready to use!"
+echo "====================================="

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ async function main(generatedProductId) {`
`46`	`46`	`// Delete product`
`47`	`47`	`console.log('Start deleting the product');`
`48`	`48`	`await callDeleteProduct();`
`49`		- console.log(`Product ${product.id} deleted`);
	`49`	+ console.log(`Product ${product.name} deleted`);
`50`	`50`	`// [END retail_delete_product]`
`51`	`51`	`}`
`52`	`52`