chore: update display metadata

terraform-google-modules · Jan 15, 2025 · 18ef492 · 18ef492
1 parent fe8f0e7
commit 18ef492
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 5 deletions.
diff --git a/metadata.yaml b/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -636,7 +636,7 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/cloudkms.admin
+          - roles/cloudkms.cryptoKeyEncrypterDecrypter
           - roles/iam.serviceAccountUser
           - roles/storage.admin
     services:

diff --git a/modules/simple_bucket/metadata.display.yaml b/modules/simple_bucket/metadata.display.yaml
@@ -31,9 +31,11 @@ spec:
         autoclass:
           name: autoclass
           title: Autoclass
+          level: 1
         bucket_policy_only:
           name: bucket_policy_only
           title: Bucket Policy Only
+          level: 1
         cors:
           name: cors
           title: Cors
@@ -43,6 +45,7 @@ spec:
         encryption:
           name: encryption
           title: Encryption
+          level: 1
         force_destroy:
           name: force_destroy
           title: Force Destroy
@@ -56,6 +59,7 @@ spec:
         lifecycle_rules:
           name: lifecycle_rules
           title: Lifecycle Rules
+          level: 1
         location:
           name: location
           title: Location
@@ -79,15 +83,34 @@ spec:
         retention_policy:
           name: retention_policy
           title: Retention Policy
+          level: 1
         soft_delete_policy:
           name: soft_delete_policy
           title: Soft Delete Policy
         storage_class:
           name: storage_class
           title: Storage Class
+          level: 1
+          enumValueLabels:
+            - label: STANDARD
+              value: STANDARD
+            - label: MULTI_REGIONAL
+              value: MULTI_REGIONAL
+            - label: REGIONAL
+              value: REGIONAL
+            - label: NEARLINE
+              value: NEARLINE
+            - label: COLDLINE
+              value: COLDLINE
+            - label: ARCHIVE
+              value: ARCHIVE
+          altDefaults:
+            - type: ALTERNATE_TYPE_DC
+              value: STANDARD
         versioning:
           name: versioning
           title: Versioning
+          level: 1
         website:
           name: website
           title: Website
diff --git a/modules/simple_bucket/metadata.yaml b/modules/simple_bucket/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -299,7 +299,7 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/cloudkms.admin
+          - roles/cloudkms.cryptoKeyEncrypterDecrypter
           - roles/iam.serviceAccountUser
           - roles/storage.admin
     services:

diff --git a/test/setup/iam.tf b/test/setup/iam.tf
@@ -16,7 +16,7 @@
 
 locals {
   int_required_roles = [
-    "roles/cloudkms.admin",
+    "roles/cloudkms.cryptoKeyEncrypterDecrypter",
     "roles/iam.serviceAccountUser",
     "roles/storage.admin",
   ]