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

Author: actions-user

mmv1/products/alloydb/Instance.yaml

@@ -311,6 +311,12 @@ properties:
         include_empty_value_in_cai: true  # Default value is false in CAI asset
         send_empty_value: true
         default_from_api: true
+      - name: 'trackClientAddress'
+        type: Boolean
+        description: 'Track client address for an instance. If not set, default value is "off".'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
+        send_empty_value: true
+        default_from_api: true
       - name: 'assistiveExperiencesEnabled'
         type: Boolean
         description: 'Whether assistive experiences are enabled for this AlloyDB instance.'

mmv1/products/chronicle/DataTableRow.yaml

@@ -24,16 +24,14 @@ import_format:
 update_verb: PATCH
 update_mask: true
 
-min_version: 'beta'
 references:
   guides:
     'Google SecOps Guides': 'https://cloud.google.com/chronicle/docs/secops/secops-overview'
-  api: 'https://cloud.google.com/chronicle/docs/reference/rest/v1beta/projects.locations.instances.dataTables.dataTableRows'
+  api: 'https://cloud.google.com/chronicle/docs/reference/rest/v1/projects.locations.instances.dataTables.dataTableRows'
 examples:
   - name: 'chronicle_data_table_row_basic'
     config_path: 'templates/terraform/examples/chronicle_data_table_row_basic.tf.tmpl'
     primary_resource_id: 'example_row'
-    min_version: 'beta'
     test_env_vars:
       instance_id: 'CHRONICLE_ID'
     vars:

mmv1/products/firebasestorage/DefaultBucket.yaml

@@ -0,0 +1,72 @@
+# Copyright 2026 Google Inc.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+name: "DefaultBucket"
+description: |
+  A resource that manages the creation of the default Google Cloud Storage bucket
+  for a Firebase project.
+min_version: "beta"
+references:
+  guides:
+    "Official Documentation": "https://firebase.google.com/docs/storage/"
+  api: "https://firebase.google.com/docs/reference/rest/storage/rest/v1alpha/projects.defaultBucket"
+docs:
+base_url: "projects/{{project}}/defaultBucket"
+self_link: "projects/{{project}}/defaultBucket"
+create_url: "projects/{{project}}/defaultBucket"
+delete_url: "projects/{{project}}/defaultBucket"
+# Does not support update operation. There is nothing to update.
+immutable: true
+import_format:
+  - "projects/{{project}}/defaultBucket"
+  - "{{project}}"
+timeouts:
+  insert_minutes: 20
+  delete_minutes: 20
+examples:
+  - name: "firebasestorage_default_bucket_basic"
+    primary_resource_id: "default"
+    min_version: "beta"
+    test_env_vars:
+      project_id: "PROJECT_NAME"
+properties:
+  - name: "name"
+    type: String
+    description: |
+      The resource name of the default bucket, in the format:
+      projects/PROJECT_IDENTIFIER/defaultBucket
+    min_version: "beta"
+    output: true
+  - name: "bucket"
+    type: NestedObject
+    description: |
+      The resource name of the underlying Google Cloud Storage bucket.
+    min_version: "beta"
+    output: true
+    properties:
+      - name: "name"
+        type: String
+        description: |
+          The resource name of the bucket in the format
+          projects/PROJECT_IDENTIFIER/buckets/BUCKET_ID
+        min_version: "beta"
+        output: true
+  - name: "location"
+    type: String
+    description: |
+      The ID of the location where the default Google Cloud Storage bucket will be created.
+    min_version: "beta"
+    immutable: true
+    required: true
+    diff_suppress_func: 'tpgresource.CaseDiffSuppress'

mmv1/templates/terraform/custom_expand/alloydb_instance_observability_config.go.tmpl

@@ -59,6 +59,13 @@ func expandAlloydbInstanceObservabilityConfig(v interface{}, d tpgresource.Terra
 		transformed["trackActiveQueries"] = transformedTrackActiveQueries
 	}
 
+	transformedTrackClientAddress, err := expandAlloydbInstanceObservabilityConfigTrackClientAddress(original["track_client_address"], d, config)
+	if err != nil {
+		return nil, err
+	} else if transformedTrackClientAddress != nil {
+		transformed["trackClientAddress"] = transformedTrackClientAddress
+	}
+
 	transformedAssistiveExperiencesEnabled, err := expandAlloydbInstanceObservabilityConfigAssistiveExperiencesEnabled(original["assistive_experiences_enabled"], d, config)
 	if err != nil {
 		return nil, err
@@ -102,6 +109,10 @@ func expandAlloydbInstanceObservabilityConfigTrackActiveQueries(v interface{}, d
 	return v, nil
 }
 
+func expandAlloydbInstanceObservabilityConfigTrackClientAddress(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandAlloydbInstanceObservabilityConfigAssistiveExperiencesEnabled(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	return v, nil
 }

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

@@ -1,5 +1,4 @@
 resource "google_chronicle_data_table" "example_dt" {
-  provider       = google-beta
   location       = "us"
   instance = "{{index $.TestEnvVars "instance_id"}}"
   data_table_id  = "{{index $.Vars "data_table_id"}}"
@@ -17,7 +16,6 @@ resource "google_chronicle_data_table" "example_dt" {
 }
 
 resource "google_chronicle_data_table_row" "example_row" {
-  provider       = google-beta
   location       = "us"
   instance       = "{{index $.TestEnvVars "instance_id"}}"
   data_table_id  = google_chronicle_data_table.example_dt.data_table_id

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

@@ -0,0 +1,5 @@
+resource "google_firebase_storage_default_bucket" "default" {
+  provider = google-beta
+  project  = "{{index $.TestEnvVars "project_id"}}"
+  location = "us-central1"
+}

mmv1/third_party/terraform/acctest/test_utils.go.tmpl

@@ -16,7 +16,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov5"
+	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-mux/tf5muxserver"
+	"github.com/hashicorp/terraform-plugin-testing/echoprovider"
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
 	"github.com/hashicorp/terraform-provider-google/google/envvar"
@@ -200,6 +202,28 @@ func ProtoV5ProviderBetaFactories(t *testing.T) map[string]func() (tfprotov5.Pro
 	}
 }
 
+// ProtoV6ProviderFactories returns a provider server for that currently
+// only contains an echo provider for testing usage of ephemeral values
+func ProtoV6ProviderFactories(t *testing.T) map[string]func() (tfprotov6.ProviderServer, error) {
+	return map[string]func() (tfprotov6.ProviderServer, error){
+		"echo": echoprovider.NewProviderServer(),
+	}
+}
+
+var EchoResourceName string = "echo.test"
+
+// EchoResourceConfig returns some HCL that configures the echo provider with a reference to an ephemeral value (e.g. an ephemeral resource)
+// and provisions an echo resource that surfaces that ephemeral data in a non-ephemeral way, for testing purposes.
+// See: https://github.com/hashicorp/terraform-plugin-testing/pull/389
+func EchoResourceConfig(ephemeralReference string) string {
+	return fmt.Sprintf(`
+provider "echo" {
+  data = %s
+}
+resource "echo" "test" {}
+`, ephemeralReference)
+}
+
 // This is a Printf sibling (Nprintf; Named Printf), which handles strings like
 // Nprintf("Hello %{target}!", map[string]interface{}{"target":"world"}) == "Hello world!".
 // This is particularly useful for generated tests, where we don't want to use Printf,

mmv1/third_party/terraform/services/alloydb/resource_alloydb_instance_test.go.tmpl

@@ -1595,6 +1595,7 @@ func TestAccAlloydbInstance_ObservabilityConfig_Update(t *testing.T) {
 		"record_application_tags":       true,
 		"query_plans_per_minute":        10,
 		"track_active_queries":          true,
+		"track_client_address":          true,
 		"assistive_experiences_enabled": false,
 	}
 
@@ -1614,6 +1615,7 @@ func TestAccAlloydbInstance_ObservabilityConfig_Update(t *testing.T) {
 		"record_application_tags":       false,
 		"query_plans_per_minute":        5,
 		"track_active_queries":          false,
+		"track_client_address":          false,
 		"assistive_experiences_enabled": false,
 	}
 
@@ -1698,6 +1700,7 @@ resource "google_alloydb_instance" "default" {
     record_application_tags        = %{record_application_tags}
     query_plans_per_minute         = %{query_plans_per_minute}
     track_active_queries           = %{track_active_queries}
+    track_client_address           = %{track_client_address}
     assistive_experiences_enabled  = %{assistive_experiences_enabled}
   }
 }

…_data_table_deletion_policy_test.go.tmpl …nicle_data_table_deletion_policy_test.gommv1/third_party/terraform/services/chronicle/resource_chronicle_data_table_deletion_policy_test.go.tmpl renamed to mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_table_deletion_policy_test.go mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_table_deletion_policy_test.go.tmpl renamed to mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_table_deletion_policy_test.go

@@ -1,7 +1,5 @@
 package chronicle_test
 
-{{- if ne $.TargetVersionName "ga" }}
-
 import (
 	"fmt"
 	"regexp"
@@ -23,7 +21,7 @@ func TestAccChronicleDataTable_DeletionPolicy_DefaultFail(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccChronicleDataTable_DefaultDeletion(context),
@@ -33,16 +31,16 @@ func TestAccChronicleDataTable_DeletionPolicy_DefaultFail(t *testing.T) {
 				),
 			},
 			{
-				Config: testAccChronicleDataTable_DefaultDeletion_TableOnly(context),
-                ExpectError: regexp.MustCompile("Unable to delete table as table is non empty"),
+				Config:      testAccChronicleDataTable_DefaultDeletion_TableOnly(context),
+				ExpectError: regexp.MustCompile("Unable to delete table as table is non empty"),
 			},
 			{
-                Config: testAccChronicleDataTable_DefaultDeletion_RowOnly(context),
-                Check: resource.ComposeTestCheckFunc(
-                    checkResourceDestroyed("google_chronicle_data_table_row.default_fail_row"),
-                    resource.TestCheckResourceAttrSet("google_chronicle_data_table.test_delete_default_fail", "id"),
-                ),
-            },
+				Config: testAccChronicleDataTable_DefaultDeletion_RowOnly(context),
+				Check: resource.ComposeTestCheckFunc(
+					checkResourceDestroyed("google_chronicle_data_table_row.default_fail_row"),
+					resource.TestCheckResourceAttrSet("google_chronicle_data_table.test_delete_default_fail", "id"),
+				),
+			},
 		},
 	})
 }
@@ -57,7 +55,7 @@ func TestAccChronicleDataTable_DeletionPolicy_Force(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		Steps: []resource.TestStep{
 			// Step 1: Create table and a row, with Deletion policy FORCE.
 			{
@@ -83,7 +81,6 @@ func TestAccChronicleDataTable_DeletionPolicy_Force(t *testing.T) {
 func testAccChronicleDataTable_DefaultDeletion(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_chronicle_data_table" "test_delete_default_fail" {
-  provider       = google-beta
   location       = "us"
   instance       = "%{instance_id}"
   data_table_id  = "tf_test_def_fail_%{random_suffix}"
@@ -98,7 +95,6 @@ resource "google_chronicle_data_table" "test_delete_default_fail" {
 }
 
 resource "google_chronicle_data_table_row" "default_fail_row" {
-  provider       = google-beta
   location       = google_chronicle_data_table.test_delete_default_fail.location
   instance       = google_chronicle_data_table.test_delete_default_fail.instance
   data_table_id  = google_chronicle_data_table.test_delete_default_fail.data_table_id
@@ -111,7 +107,6 @@ resource "google_chronicle_data_table_row" "default_fail_row" {
 func testAccChronicleDataTable_ForceDeletion(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_chronicle_data_table" "test_delete_force" {
-  provider         = google-beta
   location         = "us"
   instance         = "%{instance_id}"
   data_table_id    = "tf_test_force_%{random_suffix}"
@@ -126,7 +121,6 @@ resource "google_chronicle_data_table" "test_delete_force" {
 }
 
 resource "google_chronicle_data_table_row" "force_row" {
-  provider      = google-beta
   location      = google_chronicle_data_table.test_delete_force.location
   instance      = google_chronicle_data_table.test_delete_force.instance
   data_table_id = google_chronicle_data_table.test_delete_force.data_table_id
@@ -139,7 +133,6 @@ resource "google_chronicle_data_table_row" "force_row" {
 func testAccChronicleDataTable_DefaultDeletion_TableOnly(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_chronicle_data_table_row" "default_fail_row" {
-  provider       = google-beta
   location       = "us" # Assuming 'us'
   instance       = "%{instance_id}"
   data_table_id  = "tf_test_def_fail_%{random_suffix}" # Needs to match the created table ID
@@ -149,9 +142,8 @@ resource "google_chronicle_data_table_row" "default_fail_row" {
 }
 
 func testAccChronicleDataTable_DefaultDeletion_RowOnly(context map[string]interface{}) string {
-        return acctest.Nprintf(`
+	return acctest.Nprintf(`
 resource "google_chronicle_data_table" "test_delete_default_fail" {
-  provider       = google-beta
   location       = "us"
   instance       = "%{instance_id}"
   data_table_id  = "tf_test_def_fail_%{random_suffix}"
@@ -171,7 +163,6 @@ resource "google_chronicle_data_table" "test_delete_default_fail" {
 func testAccChronicleDataTable_ForceDeletion_TableOnly(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_chronicle_data_table_row" "force_row" {
-  provider      = google-beta
   location      = "us" # Assuming 'us'
   instance      = "%{instance_id}"
   data_table_id = "tf_test_force_%{random_suffix}" # Needs to match the created table ID
@@ -190,5 +181,3 @@ func checkResourceDestroyed(name string) resource.TestCheckFunc {
 		return nil
 	}
 }
-
-{{- end }}