gaarf-wf: introduced --disable-grants args for set_iam_permissions target

create-gaarf-wf@1.12.2: introduced disable_grants parameters in answers file to disable IAM grants (via putting --disable-grants into deploy-wf.sh)

Change-Id: I37e848c40bd77a31dd3d3ab3ebac97662098ca79

Author: evil-shrike

gcp/create-gaarf-wf/build/index.js

@@ -1,6 +1,6 @@
 {
   "name": "create-gaarf-wf",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "description": "Interactive generator for Gaarf (Google Ads API Report Fetcher) Workflow",
   "type": "module",
   "bin": {

gcp/create-gaarf-wf/build/index.js.map

@@ -1114,14 +1114,19 @@ fi
     // not using google-ads.yaml means using Secret Manager
     settings['functions']['use-secret-manager'] = true;
   }
+  let aux_args = '';
+  if (answers.disable_grants) {
+    aux_args = '--disable-grants'
+  }
+
   deployShellScript(
     'deploy-wf.sh',
     `# Deploy Cloud Functions and Cloud Workflows
 set -e
 cd ./${gaarf_folder}
 git pull --ff
 cd ..
-./${gaarf_folder}/gcp/setup.sh deploy_all --settings $(readlink -f "./${settings_file}")
+./${gaarf_folder}/gcp/setup.sh deploy_all --settings $(readlink -f "./${settings_file}") ${aux_args}
 `
   );
 

gcp/create-gaarf-wf/package-lock.json

@@ -28,6 +28,7 @@ pushd $SCRIPT_PATH > /dev/null
 
 args=()
 started=0
+# pack all arguments into args array (except --settings)
 for ((i=1; i<=$#; i++)); do
   if [[ ${!i} == --* ]]; then started=1; fi
   if [ ${!i} = "--settings" ]; then
@@ -106,6 +107,13 @@ check_service_account() {
 }
 
 set_iam_permissions() {
+  local disable_grants
+  disable_grants=$(_get_arg_value "--disable-grants" "$@")
+  if [[ "$disable_grants" == "true" ]]; then
+    echo -e "${CYAN}Skipping setting up IAM permissions...${NC}"
+    return
+  fi
+
   echo -e "${CYAN}Setting up IAM permissions...${NC}"
   declare -ar ROLES=(
     # Permissions for Workflow:
@@ -217,9 +225,17 @@ _get_arg_value() {
   shift
   for ((i=1; i<=$#; i++)); do
     if [ ${!i} = "$arg_name" ]; then
-      ((i++))
-      echo ${!i}
-      return 0
+      # Check if this is the last argument or if next argument starts with - or --
+      ((next=i+1))
+      if [ $next -gt $# ] || [[ "${!next}" == -* ]]; then
+        # This is a flag without value
+        echo "true"
+        return 0
+      else
+        # This is a value argument
+        echo ${!next}
+        return 0
+      fi
     fi
   done
   return 1
@@ -292,7 +308,7 @@ delete_all() {
 
 deploy_all() {
   enable_apis || return $?
-  set_iam_permissions || return $?
+  set_iam_permissions $@ || return $?
   deploy_functions || return $?
   create_wf_completion_topic || return $?
   deploy_wf || return $?