Merge branch 'master' into apeabody-patch-1

GoogleCloudPlatform · Sep 16, 2024 · bdfc18e · bdfc18e
2 parents 3ff2677 + 6f3afa6
commit bdfc18e
Show file tree

Hide file tree

Showing 3 changed files with 102 additions and 75 deletions.
diff --git a/cli/bpmetadata/bpmetadata_ui.pb.go b/cli/bpmetadata/bpmetadata_ui.pb.go
diff --git a/cli/bpmetadata/proto/bpmetadata_ui.proto b/cli/bpmetadata/proto/bpmetadata_ui.proto
@@ -139,6 +139,8 @@ message DisplayVariable {
       ALTERNATE_TYPE_UNSPECIFIED = 0;
       // A more secure default.
       ALTERNATE_TYPE_SECURITY = 1;
+      // A default specifically needed for Design center.
+      ALTERNATE_TYPE_DC = 2;
     }
     AlternateType type = 1;  // @gotags: json:"type,omitempty" yaml:"type,omitempty"
     // Value of the alternate default.

diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
@@ -91,6 +91,9 @@ locals {
       description = "Deploys apps to Cloud Run, along with option to map custom domain"
       owners      = ["prabhu34", "anamer", "gtsorbo"]
       topics      = "cloudrun,google-cloud-platform,terraform-modules,${local.common_topics.serverless}"
+      lint_env = {
+        ENABLE_BPMETADATA = "1"
+      }
     },
     {
       name        = "terraform-google-secured-data-warehouse"
@@ -294,6 +297,9 @@ locals {
       org         = "terraform-google-modules"
       description = "Creates one or more Cloud Storage buckets and assigns basic permissions on them to arbitrary users"
       topics      = local.common_topics.storage
+      lint_env = {
+        ENABLE_BPMETADATA = "1"
+      }
     },
     {
       name        = "terraform-google-composer"
@@ -375,6 +381,7 @@ locals {
       org         = "terraform-google-modules"
       description = "Manages multiple IAM roles for resources on Google Cloud"
       topics      = local.common_topics.security
+      owners      = ["imrannayer"]
     },
     {
       name        = "terraform-google-jenkins"
@@ -422,6 +429,9 @@ locals {
       description = "Creates a fully functional Google Memorystore (redis) instance"
       topics      = local.common_topics.db
       owners      = ["imrannayer"]
+      lint_env = {
+        ENABLE_BPMETADATA = "1"
+      }
     },
     {
       name              = "terraform-google-module-template"
@@ -486,6 +496,9 @@ locals {
       description = "Creates a Cloud SQL database instance"
       topics      = local.common_topics.db
       owners      = ["isaurabhuttam", "imrannayer"]
+      lint_env = {
+        ENABLE_BPMETADATA = "1"
+      }
     },
     {
       name        = "terraform-google-startup-scripts"
@@ -589,6 +602,13 @@ locals {
       owners      = ["imrannayer"]
       topics      = join(",", [local.common_topics.compute, local.common_topics.net])
     },
+    {
+      name        = "terraform-google-pam"
+      org         = "GoogleCloudPlatform"
+      description = "Deploy Privileged Access Manager"
+      owners      = ["imrannayer", "mgaur10"]
+      topics      = local.common_topics.security
+    },
     {
       name        = "terraform-google-netapp-volumes"
       org         = "GoogleCloudPlatform"