Downgrade the blueprint roles

terraform-google-modules · Dec 30, 2024 · daa6980 · daa6980
1 parent ff07b65
commit daa6980
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 52 deletions.
diff --git a/metadata.yaml b/metadata.yaml
@@ -195,16 +195,11 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/owner
-    module_roles:
-      root:
+          - roles/memorystore.admin
           - roles/redis.admin
-      memcache:
           - roles/memcache.admin
-      redis-cluster:
-          - roles/redis.admin
-      valkey:
-          - roles/memorystore.admin
+          - roles/compute.networkAdmin
+          - roles/resourcemanager.projectIamAdmin
     services:
       - cloudresourcemanager.googleapis.com
       - serviceusage.googleapis.com
@@ -213,15 +208,6 @@ spec:
       - serviceconsumermanagement.googleapis.com
       - networkconnectivity.googleapis.com
       - compute.googleapis.com
-    module_services:
-      root:
-          - redis.googleapis.com
-      memcache:
-          - memcache.googleapis.com
-      redis-cluster:
-          - redis.googleapis.com
-      valkey:
-          - memorystore.googleapis.com
     providerVersions:
       - source: hashicorp/google
         version: ">= 4.74.0, < 7"
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
@@ -16,23 +16,11 @@
 
 locals {
   int_required_roles = [
-    "roles/owner"
-  ]
-
-  root_module_roles = [
-    "roles/redis.admin"
-  ]
-
-  memcache_module_roles = [
-    "roles/memcache.admin"
-  ]
-
-  redis-cluster_module_roles = [
-    "roles/redis.admin"
-  ]
-
-  valkey_module_roles = [
-    "roles/memorystore.admin"
+    "roles/memorystore.admin",
+    "roles/redis.admin",
+    "roles/memcache.admin",
+    "roles/compute.networkAdmin",
+    "roles/resourcemanager.projectIamAdmin"
   ]
 
 }

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -14,24 +14,6 @@
  * limitations under the License.
  */
 
-locals {
-  root_module_services = [
-    "redis.googleapis.com"
-  ]
-
-  memcache_module_services = [
-    "memcache.googleapis.com"
-  ]
-
-  redis-cluster_module_services = [
-    "redis.googleapis.com"
-  ]
-
-  valkey_module_services = [
-    "memorystore.googleapis.com"
-  ]
-}
-
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
   version = "~> 17.0"