minimal the root module requirements config

Author: Zheng Qin

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25.4
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.25
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 ENABLE_BPMETADATA := 1

metadata.yaml

@@ -386,28 +386,13 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/serviceusage.serviceUsageAdmin
-          - roles/storage.admin
           - roles/bigquery.admin
-          - roles/aiplatform.admin
-          - roles/dataform.admin
           - roles/iam.serviceAccountAdmin
-          - roles/logging.configWriter
           - roles/resourcemanager.projectIamAdmin
-          - roles/run.invoker
-          - roles/workflows.admin
-          - roles/cloudfunctions.admin
-          - roles/datalineage.viewer
-          - roles/iam.serviceAccountTokenCreator
-          - roles/iam.serviceAccountUser
     services:
       - bigquery.googleapis.com
-      - bigqueryconnection.googleapis.com
-      - bigquerystorage.googleapis.com
-      - cloudkms.googleapis.com
       - cloudresourcemanager.googleapis.com
       - iam.googleapis.com
-      - serviceusage.googleapis.com
     providerVersions:
       - source: hashicorp/google
         version: ">= 5.39, < 7"

modules/authorization/metadata.yaml

@@ -93,20 +93,20 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/aiplatform.admin
-          - roles/cloudfunctions.admin
-          - roles/iam.serviceAccountAdmin
-          - roles/serviceusage.serviceUsageAdmin
-          - roles/storage.admin
           - roles/workflows.admin
-          - roles/bigquery.admin
+          - roles/cloudfunctions.admin
           - roles/dataform.admin
           - roles/datalineage.viewer
+          - roles/iam.serviceAccountAdmin
           - roles/iam.serviceAccountTokenCreator
           - roles/iam.serviceAccountUser
           - roles/logging.configWriter
           - roles/resourcemanager.projectIamAdmin
+          - roles/bigquery.admin
+          - roles/aiplatform.admin
           - roles/run.invoker
+          - roles/serviceusage.serviceUsageAdmin
+          - roles/storage.admin
     services:
       - bigquery.googleapis.com
       - bigqueryconnection.googleapis.com

modules/data_warehouse/metadata.yaml

@@ -32,29 +32,22 @@ spec:
     description: {}
     icon: assets/data_warehouse_icon_v1.png
     deploymentDuration:
-      configurationSecs: 120
-      deploymentSecs: 420
+      configurationSecs: "120"
+      deploymentSecs: "420"
     costEstimate:
       description: cost of this solution is $0.65
       url: https://cloud.google.com/products/calculator/#id=857776c6-49e8-4c6a-adc5-42a15b8fb67d
     cloudProducts:
-    - productId: search_BIGQUERY_SECTION
-      pageUrl: ""
-    - productId: WORKFLOWS_SECTION
-      pageUrl: ""
-    - productId: STORAGE_SECTION
-      pageUrl: ""
-    - productId: ai-platform
-      pageUrl: ""
-    - productId: LOOKER_STUDIO_SECTION
-      pageUrl: lookerstudio.google.com
-      isExternal: true
-    - productId: CLOUD_DMS_SECTION
-      pageUrl: ""
-    - productId: FUNCTIONS_SECTION
-      pageUrl: ""
-    - productId: DATAFORM_SECTION
-      pageUrl: ""
+      - productId: search_BIGQUERY_SECTION
+      - productId: WORKFLOWS_SECTION
+      - productId: STORAGE_SECTION
+      - productId: ai-platform
+      - productId: LOOKER_STUDIO_SECTION
+        pageUrl: lookerstudio.google.com
+        isExternal: true
+      - productId: CLOUD_DMS_SECTION
+      - productId: FUNCTIONS_SECTION
+      - productId: DATAFORM_SECTION
   content:
     architecture:
       diagramUrl: www.gstatic.com/pantheon/images/solutions/data-warehouse-architecture_v6.svg
@@ -135,20 +128,20 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/resourcemanager.projectIamAdmin
-          - roles/run.invoker
+          - roles/dataform.admin
           - roles/datalineage.viewer
           - roles/iam.serviceAccountTokenCreator
           - roles/logging.configWriter
-          - roles/serviceusage.serviceUsageAdmin
-          - roles/storage.admin
+          - roles/run.invoker
           - roles/workflows.admin
-          - roles/bigquery.admin
           - roles/aiplatform.admin
-          - roles/cloudfunctions.admin
-          - roles/dataform.admin
           - roles/iam.serviceAccountAdmin
           - roles/iam.serviceAccountUser
+          - roles/resourcemanager.projectIamAdmin
+          - roles/serviceusage.serviceUsageAdmin
+          - roles/storage.admin
+          - roles/bigquery.admin
+          - roles/cloudfunctions.admin
     services:
       - bigquery.googleapis.com
       - bigqueryconnection.googleapis.com

modules/scheduled_queries/metadata.yaml

@@ -59,20 +59,20 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/cloudfunctions.admin
+          - roles/iam.serviceAccountAdmin
+          - roles/serviceusage.serviceUsageAdmin
           - roles/storage.admin
           - roles/workflows.admin
-          - roles/bigquery.admin
           - roles/aiplatform.admin
-          - roles/cloudfunctions.admin
+          - roles/dataform.admin
           - roles/datalineage.viewer
-          - roles/iam.serviceAccountAdmin
           - roles/iam.serviceAccountTokenCreator
           - roles/iam.serviceAccountUser
-          - roles/run.invoker
-          - roles/dataform.admin
           - roles/logging.configWriter
           - roles/resourcemanager.projectIamAdmin
-          - roles/serviceusage.serviceUsageAdmin
+          - roles/run.invoker
+          - roles/bigquery.admin
     services:
       - bigquery.googleapis.com
       - bigqueryconnection.googleapis.com

modules/udf/metadata.yaml

@@ -63,20 +63,20 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/workflows.admin
-          - roles/aiplatform.admin
-          - roles/cloudfunctions.admin
-          - roles/datalineage.viewer
+          - roles/dataform.admin
           - roles/iam.serviceAccountAdmin
-          - roles/iam.serviceAccountTokenCreator
           - roles/iam.serviceAccountUser
+          - roles/resourcemanager.projectIamAdmin
           - roles/run.invoker
-          - roles/storage.admin
+          - roles/workflows.admin
           - roles/bigquery.admin
-          - roles/dataform.admin
+          - roles/aiplatform.admin
+          - roles/datalineage.viewer
+          - roles/iam.serviceAccountTokenCreator
           - roles/logging.configWriter
-          - roles/resourcemanager.projectIamAdmin
           - roles/serviceusage.serviceUsageAdmin
+          - roles/storage.admin
+          - roles/cloudfunctions.admin
     services:
       - bigquery.googleapis.com
       - bigqueryconnection.googleapis.com

test/setup/iam.tf

@@ -18,19 +18,8 @@ locals {
   per_module_roles = {
     root = [
       "roles/bigquery.admin",
-      "roles/aiplatform.admin",
-      "roles/cloudfunctions.admin",
-      "roles/dataform.admin",
-      "roles/datalineage.viewer",
       "roles/iam.serviceAccountAdmin",
-      "roles/iam.serviceAccountTokenCreator",
-      "roles/iam.serviceAccountUser",
-      "roles/logging.configWriter",
       "roles/resourcemanager.projectIamAdmin",
-      "roles/run.invoker",
-      "roles/serviceusage.serviceUsageAdmin",
-      "roles/storage.admin",
-      "roles/workflows.admin"
     ]
     authorization = [
       "roles/bigquery.admin",

test/setup/main.tf

@@ -16,12 +16,8 @@
 locals {
   per_module_services = {
     root = [
-      "cloudkms.googleapis.com",
       "cloudresourcemanager.googleapis.com",
       "bigquery.googleapis.com",
-      "bigquerystorage.googleapis.com",
-      "bigqueryconnection.googleapis.com",
-      "serviceusage.googleapis.com",
       "iam.googleapis.com",
     ]
     authorization = [