addressing comment

Zheng Qin · Zheng Qin · commit 2d430a80d979 · 2025-08-04T10:02:00.000-04:00
diff --git a/metadata.yaml b/metadata.yaml
@@ -95,14 +95,14 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/monitoring.viewer
           - roles/compute.admin
           - roles/iam.serviceAccountAdmin
           - roles/iam.serviceAccountUser
           - roles/compute.securityAdmin
           - roles/compute.imageUser
           - roles/compute.networkAdmin
           - roles/logging.logWriter
-          - roles/monitoring.viewer
     services:
       - compute.googleapis.com
       - iam.googleapis.com
diff --git a/modules/compute_instance/metadata.yaml b/modules/compute_instance/metadata.yaml
@@ -172,13 +172,14 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/compute.networkAdmin
+          - roles/iam.serviceAccountUser
           - roles/iam.serviceAccountAdmin
           - roles/compute.instanceAdmin
           - roles/resourcemanager.projectIamAdmin
           - roles/compute.admin
-          - roles/compute.networkAdmin
-          - roles/iam.serviceAccountUser
     services:
+      - cloudresourcemanager.googleapis.com
       - compute.googleapis.com
       - iam.googleapis.com
     providerVersions:
diff --git a/modules/instance_template/metadata.yaml b/modules/instance_template/metadata.yaml
@@ -479,9 +479,10 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/compute.instanceAdmin.v1
           - roles/iam.serviceAccountUser
           - roles/logging.logWriter
+          - roles/compute.admin
+          - roles/iam.serviceAccountAdmin
     services:
       - cloudresourcemanager.googleapis.com
       - compute.googleapis.com
diff --git a/modules/mig/metadata.yaml b/modules/mig/metadata.yaml
@@ -316,9 +316,9 @@ spec:
     roles:
       - level: Project
         roles:
+          - roles/compute.admin
           - roles/iam.serviceAccountUser
           - roles/logging.logWriter
-          - roles/compute.admin
     services:
       - cloudresourcemanager.googleapis.com
       - compute.googleapis.com
diff --git a/modules/preemptible_and_regular_instance_templates/metadata.yaml b/modules/preemptible_and_regular_instance_templates/metadata.yaml
@@ -203,9 +203,9 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/logging.logWriter
           - roles/compute.instanceAdmin.v1
           - roles/iam.serviceAccountUser
+          - roles/logging.logWriter
     services:
       - compute.googleapis.com
       - iam.googleapis.com
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
@@ -31,7 +31,8 @@ locals {
     ]
 
     instance_template = [
-      "roles/compute.instanceAdmin.v1",
+      "roles/compute.admin",
+      "roles/iam.serviceAccountAdmin",
       "roles/iam.serviceAccountUser",
       "roles/logging.logWriter",
     ]
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -21,6 +21,7 @@ locals {
     ]
 
     compute_instance = [
+      "cloudresourcemanager.googleapis.com",
       "compute.googleapis.com",
       "iam.googleapis.com",
     ]

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ locals {`
`31`	`31`	`]`
`32`	`32`
`33`	`33`	`instance_template = [`
`34`		`- "roles/compute.instanceAdmin.v1",`
	`34`	`+ "roles/compute.admin",`
	`35`	`+ "roles/iam.serviceAccountAdmin",`
`35`	`36`	`"roles/iam.serviceAccountUser",`
`36`	`37`	`"roles/logging.logWriter",`
`37`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ locals {`
`21`	`21`	`]`
`22`	`22`
`23`	`23`	`compute_instance = [`
	`24`	`+ "cloudresourcemanager.googleapis.com",`
`24`	`25`	`"compute.googleapis.com",`
`25`	`26`	`"iam.googleapis.com",`
`26`	`27`	`]`