Sync main dec 5 feature branch resource identity (#15892)

Author: BBBmau

.ci/containers/build-environment/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24-bullseye AS builder
+FROM golang:1.25-trixie AS builder
 
 # Set working directory
 WORKDIR /app

.ci/containers/go-plus/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Download go module cache for builds
-FROM golang:1.24-bullseye AS builder
+FROM golang:1.25-trixie AS builder
 ENV GOCACHE=/go/cache
 
 RUN apt-get update && apt-get install -y unzip
@@ -12,7 +12,7 @@ WORKDIR /app1/magic-modules-main/.ci/magician
 RUN go build -o /dev/null .
 
 # Stage 2: Creating the final image
-FROM golang:1.24-bullseye
+FROM golang:1.25-trixie
 SHELL ["/bin/bash", "-c"]
 ENV GOCACHE=/go/cache
 
@@ -32,4 +32,4 @@ RUN apt-get update && \
 RUN wget https://releases.hashicorp.com/terraform/1.11.0/terraform_1.11.0_linux_amd64.zip \
     && unzip terraform_1.11.0_linux_amd64.zip \
     && rm terraform_1.11.0_linux_amd64.zip \
-    && mv ./terraform /bin/terraform
+    && mv ./terraform /bin/terraform

docs/content/convert/add-new-resource-tgc.md

@@ -42,7 +42,7 @@ Each of these is discussed in more detail below.
 Magic Modules uses a shared code base to generate terraform-google-conversion and the [google](https://github.com/hashicorp/terraform-provider-google) and [google-beta](https://github.com/hashicorp/terraform-provider-google-beta) Terraform providers.
 Most Terraform resources are represented as [yaml files which are grouped by product](https://github.com/GoogleCloudPlatform/magic-modules/tree/master/mmv1/products).
 Each product has a `product.yaml` file (which defines the basic product information) and  Resource.yaml files (which defines any resource-specific information).
-A Resource.yaml file can specify `include_in_tgc_next_DO_NOT_USE: true` to enable converters autogeneration, or `exclude_resource: true` to skip autogeneration for both converters and the providers.
+A Resource.yaml file can specify `include_in_tgc_next: true` to enable converters autogeneration, or `exclude_resource: true` to skip autogeneration for both converters and the providers.
 
 Auto-generating converters code based on yaml files is strongly preferred.
 
@@ -246,7 +246,7 @@ make test-integration-local TESTPATH=./test/services/alloydb  TESTARGS='-run=Tes
 
 To run one integration test for the added resource locally, run the following from the root of the `terraform-google-conversion` repository:
 ```
-make test-integration-local TESTPATH=./test/services/alloydb  TESTARGS='-run=TestAccAlloydbBackup_alloydbBackupBasicTestExample' > alloydbBackup.log
+make test-integration-local TESTPATH=./test/services/alloydb  TESTARGS='-run=TestAccAlloydbBackup/TestAccAlloydbBackup_alloydbBackupBasicTestExample' > alloydbBackup.log
 ```
 
 The core integration tests in `terraform-google-conversion` mirror the naming of the corresponding acceptance tests in the Terraform provider. This testing process uses a crucial round-trip validation method:
@@ -267,7 +267,7 @@ The core integration tests in `terraform-google-conversion` mirror the naming of
 
  | File                    | Content                                                       | Conversion Step      |
  | :---------------------- | :------------------------------------------------------------ | :------------------- |
- | File 1 (.tf)            | Original Terraform configuration (raw_config)                 | Start                |
+ | File 1 (.tf)            | Original Terraform configuration (raw_config)                 |                      |
  | File 2 (.json)          | CAI Assets exported from the resource (export_assets)         | Input for CAI to HCL |
  | File 3 (export.tf)      | Converted Terraform configuration (export_config) from File 2 | cai2hcl              |
  | File 4 (roundtrip.json) | CAI Assets (roundtrip_assets) converted from File 3           | tfplan2cai           |

docs/content/reference/field.md

@@ -435,6 +435,36 @@ item_type:
         MULTI_LINE_FIELD_DESCRIPTION
 ```
 
+### `min_size`
+Array only. Validates that the array has at least this many items in it.
+
+In many cases, it is better to avoid client-side validation. See [Best practices: Validation]({{< ref "/best-practices/validation" >}}) for more information.
+
+Example:
+
+```yaml
+- name: 'fieldOne'
+  type: Array
+  item_type:
+    type: String
+  min_size: 1
+```
+
+### `max_size`
+Array only. Validates that the array has at most this many items in it.
+
+In many cases, it is better to avoid client-side validation. See [Best practices: Validation]({{< ref "/best-practices/validation" >}}) for more information.
+
+Example:
+
+```yaml
+- name: 'fieldOne'
+  type: Array
+  item_type:
+    type: String
+  max_size: 10
+```
+
 ### `item_validation`
 Array only. Controls the [`ValidateFunc`](https://developer.hashicorp.com/terraform/plugin/sdkv2/schemas/schema-behaviors#validatefunc)
 used to validate individual items in the array. Behaves like [`validation`]({{<ref "#validation" >}}).
@@ -482,7 +512,6 @@ Example: Enum
     function: 'customFunction'
 ```
 
-
 ## `NestedObject` properties
 
 ### `properties`

mmv1/api/resource.go

@@ -392,7 +392,7 @@ type TGCResource struct {
 	ExcludeTgc bool `yaml:"exclude_tgc,omitempty"`
 
 	// If true, include resource in the new package of TGC (terraform-provider-conversion)
-	IncludeInTGCNext bool `yaml:"include_in_tgc_next_DO_NOT_USE,omitempty"`
+	IncludeInTGCNext bool `yaml:"include_in_tgc_next,omitempty"`
 
 	// The resource kind in CAI.
 	// If this is not set, then :name is used instead.

mmv1/products/alloydb/Backup.yaml

@@ -40,7 +40,7 @@ async:
     resource_inside_response: false
 custom_code:
   encoder: 'templates/terraform/encoders/alloydb_backup.tmpl'
-include_in_tgc_next_DO_NOT_USE: true
+include_in_tgc_next: true
 tgc_include_handwritten_tests: true
 examples:
   - name: 'alloydb_backup_basic'

mmv1/products/alloydb/Cluster.yaml

@@ -59,13 +59,10 @@ custom_code:
   pre_create: 'templates/terraform/pre_create/alloydb_cluster.go.tmpl'
   pre_update: 'templates/terraform/pre_update/alloydb_cluster.go.tmpl'
   pre_delete: 'templates/terraform/pre_delete/alloydb_cluster.go.tmpl'
-  constants: 'templates/terraform/constants/alloydb_cluster.go.tmpl'
   tgc_decoder: 'templates/tgc_next/decoders/alloydb_cluster.go.tmpl'
-custom_diff:
-  - 'alloydbClusterCustomizeDiff'
 # Skipping the sweeper because we need to force-delete clusters.
 exclude_sweeper: true
-include_in_tgc_next_DO_NOT_USE: true
+include_in_tgc_next: true
 tgc_include_handwritten_tests: true
 examples:
   - name: 'alloydb_cluster_basic'
@@ -326,7 +323,7 @@ properties:
   - name: 'initialUser'
     type: NestedObject
     description: |
-      Initial user to setup during cluster creation. This must be set for all new Clusters.
+      Initial user to setup during cluster creation. If unset for new Clusters, a postgres role with null password is created. You will need to create additional users or set the password in order to log in.
     ignore_read: true
     custom_flatten: 'templates/terraform/custom_flatten/alloydb_cluster_input_user_flatten.go.tmpl'
     properties:
@@ -335,13 +332,18 @@ properties:
         description: |
           The database username.
         is_missing_in_cai: true
+        at_least_one_of:
+          - 'initial_user.0.user'
+          - 'initial_user.0.password'
       - name: 'password'
         type: String
         description: |
           The initial password for the user.
-        required: true
         sensitive: true
         is_missing_in_cai: true
+        at_least_one_of:
+          - 'initial_user.0.user'
+          - 'initial_user.0.password'
   - name: 'restoreBackupSource'
     type: NestedObject
     description: |

mmv1/products/alloydb/Instance.yaml

@@ -52,7 +52,7 @@ custom_code:
   custom_import: 'templates/terraform/custom_import/alloydb_instance.go.tmpl'
 # Skipping the sweeper because instances will be deleted during cluster sweeps
 exclude_sweeper: true
-include_in_tgc_next_DO_NOT_USE: true
+include_in_tgc_next: true
 tgc_include_handwritten_tests: true
 examples:
   - name: 'alloydb_instance_basic'

mmv1/products/apigee/Instance.yaml

@@ -47,7 +47,7 @@ custom_code:
 error_retry_predicates:
   - 'transport_tpg.IsApigeeRetryableError'
 exclude_sweeper: true
-include_in_tgc_next_DO_NOT_USE: true
+include_in_tgc_next: true
 tgc_include_handwritten_tests: true
 examples:
   - name: 'apigee_instance_basic'

mmv1/products/apphub/Application.yaml

@@ -41,7 +41,7 @@ custom_code:
   constants: 'templates/terraform/constants/apphub_application.go.tmpl'
 custom_diff:
   - 'apphubApplicationCustomizeDiff'
-include_in_tgc_next_DO_NOT_USE: true
+include_in_tgc_next: true
 tgc_include_handwritten_tests: true
 sweeper:
   url_substitutions: