Cherry-picked "the bash scripts are added"

samples/interactive-tutorials/user_environment_setup.sh

@@ -14,40 +14,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# set the Google Cloud Project ID
+# set the Google Cloud project Id
 project_id=$1
-echo "Project ID: $project_id"
-gcloud config set project "$project_id"
+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"
+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"
+# create service account (your project_id+timestamp)
+gcloud iam service-accounts create $service_account_id
 
-# assign necessary roles to your new service account
+# assign needed 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}"
+    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
+echo Wait 70 seconds to be sure the appropriate roles have been assigned to your service account
+sleep 70
 
 # 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"
+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/java-retail/samples/interactive-tutorials || exit
+cd ~/cloudshell_open/java-retail/samples/interactive-tutorials
 mvn clean install -DskipTests
 
-echo "========================================"
+echo ========================================
 echo "The Google Cloud setup is completed."
 echo "Please proceed with the Tutorial steps"
-echo "========================================"
+echo ========================================

samples/interactive-tutorials/user_import_data_to_catalog.sh

@@ -18,9 +18,9 @@
 export GOOGLE_APPLICATION_CREDENTIALS=~/key.json
 
 # Change the working directory
-cd ~/cloudshell_open/java-retail/samples/interactive-tutorials/ || exit
+cd ~/cloudshell_open/java-retail/samples/interactive-tutorials/
 
-# Run the sample for creating the GCS bucket and extract the output of that execution
+# Create a GCS bucket and upload the product data to the bucket
 output=$(mvn compile exec:java -Dexec.mainClass="product.setup.ProductsCreateGcsBucket")
 
 # Get the bucket name and store it in the env variable BUCKET_NAME
@@ -31,6 +31,6 @@ export BUCKET_NAME=$bucket_name
 # Import products to the Retail catalog
 mvn compile exec:java -Dexec.mainClass="product.ImportProductsGcs"
 
-echo "====================================="
+echo =====================================
 echo "Your Retail catalog is ready to use!"
-echo "====================================="
+echo =====================================