Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

actions-user · actions-user · commit d9bddeaf4164 · 2026-04-16T22:33:27.000Z
diff --git a/mmv1/products/vectorsearch/Collection.yaml b/mmv1/products/vectorsearch/Collection.yaml
@@ -26,6 +26,10 @@ examples:
     primary_resource_id: "example-collection"
     vars:
       collection_id: "example-collection"
+  - name: vectorsearch_collection_cmek
+    primary_resource_id: "example-cmek-collection"
+    vars:
+      collection_id: "example-cmek-collection"
 autogen_async: true
 async:
   operation:
@@ -81,6 +85,23 @@ properties:
   - name: displayName
     type: String
     description: User-specified display name of the collection
+  - name: encryptionSpec
+    type: NestedObject
+    description: |-
+      Represents a customer-managed encryption key specification that can be
+      applied to a Vector Search collection.
+    immutable: true
+    properties:
+      - name: cryptoKeyName
+        type: String
+        required: true
+        immutable: true
+        description: |-
+          Resource name of the Cloud KMS key used to protect the resource.
+
+          The Cloud KMS key must be in the same region as the resource. It must have
+          the format
+          `projects/{project}/locations/{location}/keyRings/{key_ring}/cryptoKeys/{crypto_key}`.
   - name: labels
     type: KeyValueLabels
     description: Labels as key value pairs.
diff --git a/mmv1/products/workstations/WorkstationConfig.yaml b/mmv1/products/workstations/WorkstationConfig.yaml
@@ -421,6 +421,7 @@ properties:
               enum_values:
                 - 'DELETE'
                 - 'RETAIN'
+              default_from_api: true
             - name: 'sourceSnapshot'
               type: String
               description: |
diff --git a/mmv1/templates/terraform/examples/ces_agent_basic.tf.tmpl b/mmv1/templates/terraform/examples/ces_agent_basic.tf.tmpl
@@ -71,7 +71,7 @@ resource "google_ces_agent" "ces_child_agent" {
   instruction = "You are a helpful assistant for this example."
 
   model_settings {
-    model       = "gemini-2.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
@@ -116,7 +116,7 @@ resource "google_ces_agent" "ces_agent_basic" {
   instruction = "You are a helpful assistant for this example."
 
   model_settings {
-    model       = "gemini-2.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
diff --git a/mmv1/templates/terraform/examples/ces_agent_remote_dialogflow_agent.tf.tmpl b/mmv1/templates/terraform/examples/ces_agent_remote_dialogflow_agent.tf.tmpl
@@ -23,7 +23,7 @@ resource "google_ces_agent" "ces_agent_remote_dialogflow_agent" {
   display_name = "{{index $.Vars "agent_display_name"}}"
 
   model_settings {
-    model       = "gemini-1.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
diff --git a/mmv1/templates/terraform/examples/ces_agent_remote_dialogflow_agent_interruption.tf.tmpl b/mmv1/templates/terraform/examples/ces_agent_remote_dialogflow_agent_interruption.tf.tmpl
@@ -23,7 +23,7 @@ resource "google_ces_agent" "{{$.PrimaryResourceId}}" {
   display_name = "{{index $.Vars "agent_display_name"}}"
 
   model_settings {
-    model       = "gemini-1.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
diff --git a/mmv1/templates/terraform/examples/ces_app_ambient_sound_gcs_uri.tf.tmpl b/mmv1/templates/terraform/examples/ces_app_ambient_sound_gcs_uri.tf.tmpl
@@ -63,7 +63,7 @@ resource "google_ces_app" "ces_app_ambient_sound_gcs_uri" {
   }
 
   model_settings {
-    model       = "gemini-1.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
diff --git a/mmv1/templates/terraform/examples/ces_app_basic.tf.tmpl b/mmv1/templates/terraform/examples/ces_app_basic.tf.tmpl
@@ -85,7 +85,7 @@ resource "google_ces_app" "ces_app_basic" {
   }
 
   model_settings {
-    model       = "gemini-1.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
diff --git a/mmv1/templates/terraform/examples/ces_example_basic.tf.tmpl b/mmv1/templates/terraform/examples/ces_example_basic.tf.tmpl
@@ -62,7 +62,7 @@ resource "google_ces_agent" "ces_base_agent" {
     instruction = "You are a helpful assistant for this example."
 
     model_settings {
-        model       = "gemini-2.5-flash"
+        model       = "gemini-2.5-flash-001"
         temperature = 0.5
     }
 
@@ -79,7 +79,7 @@ resource "google_ces_agent" "ces_child_agent" {
     instruction = "You are a helpful assistant for this example."
 
     model_settings {
-        model       = "gemini-2.5-flash"
+        model       = "gemini-2.5-flash-001"
         temperature = 0.5
     }
 
diff --git a/mmv1/templates/terraform/examples/ces_guardrail_generative_answer_llm_prompt_security.tf.tmpl b/mmv1/templates/terraform/examples/ces_guardrail_generative_answer_llm_prompt_security.tf.tmpl
@@ -31,7 +31,7 @@ resource "google_ces_guardrail" "ces_guardrail_generative_answer_llm_prompt_secu
     custom_policy {
       max_conversation_messages = 10
       model_settings {
-        model = "gemini-2.5-flash"
+        model = "gemini-2.5-flash-001"
         temperature = 50
       }
       prompt = "example_prompt"
diff --git a/mmv1/templates/terraform/examples/ces_guardrail_llm_policy.tf.tmpl b/mmv1/templates/terraform/examples/ces_guardrail_llm_policy.tf.tmpl
@@ -30,7 +30,7 @@ resource "google_ces_guardrail" "ces_guardrail_llm_policy" {
   llm_policy {
     max_conversation_messages = 10
     model_settings {
-        model = "gemini-2.5-flash"
+        model = "gemini-2.5-flash-001"
         temperature = 50
     }
     prompt = "example_prompt"
diff --git a/mmv1/templates/terraform/examples/ces_tool_data_store_tool_engine_source_basic.tf.tmpl b/mmv1/templates/terraform/examples/ces_tool_data_store_tool_engine_source_basic.tf.tmpl
@@ -56,15 +56,15 @@ resource "google_ces_tool" "{{$.PrimaryResourceId}}" {
             modality_type = "TEXT"
             rewriter_config {
                 model_settings {
-                    model = "gemini-2.5-flash"
+                    model = "gemini-2.5-flash-001"
                     temperature = 1
                 }
                 prompt = "example-prompt"
                 disabled = false
             }
             summarization_config {
                 model_settings {
-                    model = "gemini-2.5-flash"
+                    model = "gemini-2.5-flash-001"
                     temperature = 1
                 }
                 prompt = "example-prompt"
diff --git a/mmv1/templates/terraform/examples/vectorsearch_collection_cmek.tf.tmpl b/mmv1/templates/terraform/examples/vectorsearch_collection_cmek.tf.tmpl
@@ -0,0 +1,64 @@
+resource "google_vector_search_collection" "{{$.PrimaryResourceId}}" {
+  location      = "us-central1"
+  collection_id = "{{index $.Vars "collection_id"}}"
+
+  display_name = "My Awesome Encrypted Collection"
+  description  = "This collection stores important data."
+
+  encryption_spec {
+    crypto_key_name = google_kms_crypto_key.crypto_key.id
+  }
+
+  labels = {
+    env  = "dev"
+    team = "my-team"
+  }
+
+  data_schema = <<EOF
+{
+  "type": "object",
+  "properties": {
+    "title": {
+      "type": "string"
+    },
+    "plot": {
+      "type": "string"
+    }
+  }
+}
+EOF
+
+  vector_schema {
+    field_name = "text_embedding"
+    dense_vector {
+      dimensions = 768
+      vertex_embedding_config {
+        model_id   = "textembedding-gecko@003"
+        task_type  = "RETRIEVAL_DOCUMENT"
+        text_template = "Title: {title} ---- Plot: {plot}"
+      }
+    }
+  }
+
+  depends_on = [google_kms_crypto_key_iam_member.crypto_key_member_vs_sa]
+}
+
+resource "google_kms_crypto_key" "crypto_key" {
+  name     = "{{index $.Vars "collection_id"}}"
+  key_ring = google_kms_key_ring.key_ring.id
+}
+
+resource "google_kms_key_ring" "key_ring" {
+  name     = "{{index $.Vars "collection_id"}}"
+  location = "us-central1"
+}
+
+resource "google_kms_crypto_key_iam_member" "crypto_key_member_vs_sa" {
+  crypto_key_id = google_kms_crypto_key.crypto_key.id
+  role          = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
+
+  member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-vectorsearch.iam.gserviceaccount.com"
+}
+
+data "google_project" "project" {}
+
diff --git a/mmv1/third_party/terraform/services/ces/ces_app_test.go b/mmv1/third_party/terraform/services/ces/ces_app_test.go
@@ -136,7 +136,7 @@ resource "google_ces_app" "ces_app_basic" {
   }
 
   model_settings {
-    model       = "gemini-1.5-flash"
+    model       = "gemini-2.5-flash-001"
     temperature = 0.5
   }
 
diff --git a/mmv1/third_party/terraform/services/ces/ces_example_test.go b/mmv1/third_party/terraform/services/ces/ces_example_test.go
@@ -113,7 +113,7 @@ resource "google_ces_agent" "ces_base_agent" {
     instruction = "You are a helpful assistant for this example."
 
     model_settings {
-        model       = "gemini-2.5-flash"
+        model       = "gemini-2.5-flash-001"
         temperature = 0.5
     }
 
@@ -130,7 +130,7 @@ resource "google_ces_agent" "ces_child_agent" {
     instruction = "You are a helpful assistant for this example."
 
     model_settings {
-        model       = "gemini-2.5-flash"
+        model       = "gemini-2.5-flash-001"
         temperature = 0.5
     }
 
@@ -282,7 +282,7 @@ resource "google_ces_agent" "ces_base_agent" {
     instruction = "You are a helpful assistant for this example."
 
     model_settings {
-        model       = "gemini-2.5-flash"
+        model       = "gemini-2.5-flash-001"
         temperature = 0.5
     }
 
@@ -299,7 +299,7 @@ resource "google_ces_agent" "ces_child_agent" {
     instruction = "You are a helpful assistant for this example."
 
     model_settings {
-        model       = "gemini-2.5-flash"
+        model       = "gemini-2.5-flash-001"
         temperature = 0.5
     }
 
diff --git a/mmv1/third_party/terraform/services/ces/ces_guardrail_test.go b/mmv1/third_party/terraform/services/ces/ces_guardrail_test.go
@@ -332,7 +332,7 @@ resource "google_ces_guardrail" "ces_guardrail_generative_answer_llm_prompt_secu
     custom_policy {
       max_conversation_messages = 10
       model_settings {
-        model = "gemini-2.5-flash"
+        model = "gemini-2.5-flash-001"
         temperature = 50
       }
       prompt = "example_prompt"
@@ -619,7 +619,7 @@ resource "google_ces_guardrail" "ces_guardrail_llm_policy" {
   llm_policy {
     max_conversation_messages = 10
     model_settings {
-        model = "gemini-2.5-flash"
+        model = "gemini-2.5-flash-001"
         temperature = 50
     }
     prompt = "example_prompt"
diff --git a/mmv1/third_party/terraform/services/ces/ces_tool_test.go b/mmv1/third_party/terraform/services/ces/ces_tool_test.go
@@ -368,15 +368,15 @@ resource "google_ces_tool" "ces_tool_data_store_tool_engine_source_basic" {
             modality_type = "TEXT"
             rewriter_config {
                 model_settings {
-                    model = "gemini-2.5-flash"
+                    model = "gemini-2.5-flash-001"
                     temperature = 1
                 }
                 prompt = "example-prompt"
                 disabled = false
             }
             summarization_config {
                 model_settings {
-                    model = "gemini-2.5-flash"
+                    model = "gemini-2.5-flash-001"
                     temperature = 1
                 }
                 prompt = "example-prompt"
@@ -464,15 +464,15 @@ resource "google_ces_tool" "ces_tool_data_store_tool_engine_source_basic" {
             modality_type = "TEXT"
             rewriter_config {
                 model_settings {
-                    model = "gemini-2.5-flash"
+                    model = "gemini-2.5-flash-001"
                     temperature = 1
                 }
                 prompt = "example-prompt"
                 disabled = false
             }
             summarization_config {
                 model_settings {
-                    model = "gemini-2.5-flash"
+                    model = "gemini-2.5-flash-001"
                     temperature = 1
                 }
                 prompt = "example-prompt"
diff --git a/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go b/mmv1/third_party/terraform/services/cloudbuild/resource_cloudbuild_trigger_test.go
@@ -549,7 +549,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
 func testAccCloudBuildTrigger_webhook_config(name string) string {
 	return fmt.Sprintf(`
 resource "google_secret_manager_secret" "webhook_trigger_secret_key" {
-  secret_id = "webhook_trigger-secret-key"
+  secret_id = "%s"
 
   replication {
     user_managed {
@@ -608,13 +608,13 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     google_secret_manager_secret_iam_policy.policy
   ]
 }
-`, name)
+`, name, name)
 }
 
 func testAccCloudBuildTrigger_webhook_config_update(name string) string {
 	return fmt.Sprintf(`
 resource "google_secret_manager_secret" "webhook_trigger_secret_key" {
-  secret_id = "webhook_trigger-secret-key"
+  secret_id = "%s"
 
   replication {
     user_managed {
@@ -673,7 +673,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     google_secret_manager_secret_iam_policy.policy
   ]
 }
-`, name)
+`, name, name)
 }
 
 func testAccCloudBuildTrigger_customizeDiffTimeoutSum(name string) string {
diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster.go.tmpl b/mmv1/third_party/terraform/services/container/resource_container_cluster.go.tmpl
@@ -6789,17 +6789,17 @@ func expandControlPlaneEndpointsConfig(d *schema.ResourceData) *container.Contro
 	dns := &container.DNSEndpointConfig{}
 	if v := d.Get("control_plane_endpoints_config.0.dns_endpoint_config.0.allow_external_traffic"); v != nil {
 		dns.AllowExternalTraffic = v.(bool)
-		dns.ForceSendFields = []string{"AllowExternalTraffic"}
+		dns.ForceSendFields = append(dns.ForceSendFields, "AllowExternalTraffic")
 	}
 
 	if v := d.Get("control_plane_endpoints_config.0.dns_endpoint_config.0.enable_k8s_tokens_via_dns"); v != nil {
 		dns.EnableK8sTokensViaDns = v.(bool)
-		dns.ForceSendFields = []string{"EnableK8sTokensViaDns"}
+		dns.ForceSendFields = append(dns.ForceSendFields, "EnableK8sTokensViaDns")
 	}
 
 	if v := d.Get("control_plane_endpoints_config.0.dns_endpoint_config.0.enable_k8s_certs_via_dns"); v != nil {
 		dns.EnableK8sCertsViaDns = v.(bool)
-		dns.ForceSendFields = []string{"EnableK8sCertsViaDns"}
+		dns.ForceSendFields = append(dns.ForceSendFields, "EnableK8sCertsViaDns")
 	}
 
 	ip := &container.IPEndpointsConfig{
diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl
diff --git a/mmv1/third_party/terraform/website/docs/d/service_account.html.markdown b/mmv1/third_party/terraform/website/docs/d/service_account.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ resource "google_ces_agent" "ces_child_agent" {`
`71`	`71`	`instruction = "You are a helpful assistant for this example."`
`72`	`72`
`73`	`73`	`model_settings {`
`74`		`- model = "gemini-2.5-flash"`
	`74`	`+ model = "gemini-2.5-flash-001"`
`75`	`75`	`temperature = 0.5`
`76`	`76`	`}`
`77`	`77`
`@@ -116,7 +116,7 @@ resource "google_ces_agent" "ces_agent_basic" {`
`116`	`116`	`instruction = "You are a helpful assistant for this example."`
`117`	`117`
`118`	`118`	`model_settings {`
`119`		`- model = "gemini-2.5-flash"`
	`119`	`+ model = "gemini-2.5-flash-001"`
`120`	`120`	`temperature = 0.5`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ resource "google_ces_agent" "ces_agent_remote_dialogflow_agent" {`
`23`	`23`	`display_name = "{{index $.Vars "agent_display_name"}}"`
`24`	`24`
`25`	`25`	`model_settings {`
`26`		`- model = "gemini-1.5-flash"`
	`26`	`+ model = "gemini-2.5-flash-001"`
`27`	`27`	`temperature = 0.5`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ resource "google_ces_app" "ces_app_ambient_sound_gcs_uri" {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`model_settings {`
`66`		`- model = "gemini-1.5-flash"`
	`66`	`+ model = "gemini-2.5-flash-001"`
`67`	`67`	`temperature = 0.5`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ resource "google_ces_app" "ces_app_basic" {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`model_settings {`
`88`		`- model = "gemini-1.5-flash"`
	`88`	`+ model = "gemini-2.5-flash-001"`
`89`	`89`	`temperature = 0.5`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ resource "google_ces_agent" "ces_base_agent" {`
`62`	`62`	`instruction = "You are a helpful assistant for this example."`
`63`	`63`
`64`	`64`	`model_settings {`
`65`		`- model = "gemini-2.5-flash"`
	`65`	`+ model = "gemini-2.5-flash-001"`
`66`	`66`	`temperature = 0.5`
`67`	`67`	`}`
`68`	`68`
`@@ -79,7 +79,7 @@ resource "google_ces_agent" "ces_child_agent" {`
`79`	`79`	`instruction = "You are a helpful assistant for this example."`
`80`	`80`
`81`	`81`	`model_settings {`
`82`		`- model = "gemini-2.5-flash"`
	`82`	`+ model = "gemini-2.5-flash-001"`
`83`	`83`	`temperature = 0.5`
`84`	`84`	`}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ resource "google_ces_guardrail" "ces_guardrail_generative_answer_llm_prompt_secu`
`31`	`31`	`custom_policy {`
`32`	`32`	`max_conversation_messages = 10`
`33`	`33`	`model_settings {`
`34`		`- model = "gemini-2.5-flash"`
	`34`	`+ model = "gemini-2.5-flash-001"`
`35`	`35`	`temperature = 50`
`36`	`36`	`}`
`37`	`37`	`prompt = "example_prompt"`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ resource "google_ces_guardrail" "ces_guardrail_llm_policy" {`
`30`	`30`	`llm_policy {`
`31`	`31`	`max_conversation_messages = 10`
`32`	`32`	`model_settings {`
`33`		`- model = "gemini-2.5-flash"`
	`33`	`+ model = "gemini-2.5-flash-001"`
`34`	`34`	`temperature = 50`
`35`	`35`	`}`
`36`	`36`	`prompt = "example_prompt"`