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

Author: actions-user

mmv1/products/ces/App.yaml

@@ -558,8 +558,14 @@ properties:
               description: |-
                 Optional. Default value of the data. Represents a dynamically typed value
                 which can be either null, a number, a string, a boolean, a struct,
-                or a list of values. The provided default value must be compatible
-                with the defined 'type' and other schema constraints.
+                or a list of values. The provided default value must be encoded as a JSON string.
+                Use `jsonencode` in Terraform HCL to encode the default value.
+              state_func: func(v interface{}) string { s, _ := structure.NormalizeJsonString(v); return s }
+              send_empty_value: true
+              validation:
+                function: validation.StringIsJSON
+              custom_expand: templates/terraform/custom_expand/json_value.tmpl
+              custom_flatten: templates/terraform/custom_flatten/json_schema.tmpl
             - name: additionalProperties
               type: String
               description: |-

mmv1/products/ces/Tool.yaml

@@ -592,6 +592,7 @@ properties:
         description: |-
           Number of search results to return per query.
           The default value is 10. The maximum allowed value is 10.
+        deprecation_message: '`max_results` is deprecated and will be removed in a future release.'
       - name: modalityConfigs
         type: Array
         description: The modality configs for the data store.

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-001"
+    model       = "gemini-3.0-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-001"
+    model       = "gemini-3.0-flash-001"
     temperature = 0.5
   }
 

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-2.5-flash-001"
+    model       = "gemini-3.0-flash-001"
     temperature = 0.5
   }
 

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-2.5-flash-001"
+    model       = "gemini-3.0-flash-001"
     temperature = 0.5
   }
 

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-2.5-flash-001"
+    model       = "gemini-3.0-flash-001"
     temperature = 0.5
   }
 

mmv1/templates/terraform/examples/ces_app_basic.tf.tmpl

@@ -85,7 +85,7 @@ resource "google_ces_app" "ces_app_basic" {
   }
 
   model_settings {
-    model       = "gemini-2.5-flash-001"
+    model       = "gemini-3.0-flash-001"
     temperature = 0.5
   }
 
@@ -177,7 +177,6 @@ variable_declarations {
   client_certificate_settings {
     tls_certificate = file("test-fixtures/cert.pem")
     private_key = google_secret_manager_secret_version.fake_secret_version.name
-    passphrase = google_secret_manager_secret_version.fake_secret_version.name
   }
 
   # Root agent should not be specified when creating an app

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-001"
+        model       = "gemini-3.0-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-001"
+        model       = "gemini-3.0-flash-001"
         temperature = 0.5
     }
 

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-001"
+        model = "gemini-3.0-flash-001"
         temperature = 50
       }
       prompt = "example_prompt"

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-001"
+        model = "gemini-3.0-flash-001"
         temperature = 50
     }
     prompt = "example_prompt"