Merge branch 'sts_path' of github.com:gurusai-voleti/magic-modules into sts_path

Author: gurusai-voleti

.ci/infra/terraform/main.tf

@@ -306,6 +306,7 @@ module "project-services" {
     "migrationcenter.googleapis.com",
     "ml.googleapis.com",
     "mobilecrashreporting.googleapis.com",
+    "modelarmor.googleapis.com",
     "monitoring.googleapis.com",
     "multiclustermetering.googleapis.com",
     "netapp.googleapis.com",

mmv1/api/type.go

@@ -296,6 +296,20 @@ type Type struct {
 
 	// The field is not present in CAI asset
 	IsMissingInCai bool `yaml:"is_missing_in_cai,omitempty"`
+
+	// A custom expander replaces the default expander for an attribute.
+	// It is called as part of tfplan2cai conversion if
+	// object.input is false.  It can return an object of any type,
+	// so the function header *is* part of the custom code template.
+	// As with flatten, `property` and `prefix` are available.
+	CustomTgcExpand string `yaml:"custom_tgc_expand,omitempty"`
+
+	// A custom flattener replaces the default flattener for an attribute.
+	// It is called as part of cai2hcl conversion. It can return an object of any type,
+	// so the function header *is* a part of the custom code template. To help with
+	// creating the function header, `property` and `prefix` are available,
+	// just as they are in the standard flattener template.
+	CustomTgcFlatten string `yaml:"custom_tgc_flatten,omitempty"`
 }
 
 const MAX_NAME = 20

mmv1/products/bigqueryanalyticshub/DataExchange.yaml

@@ -149,5 +149,4 @@ properties:
   - name: 'logLinkedDatasetQueryUserEmail'
     type: Boolean
     description:
-      If true, subscriber email logging is enabled and all queries on the linked dataset will log the email address of the querying user.
-    immutable: true
+      If true, subscriber email logging is enabled and all queries on the linked dataset will log the email address of the querying user. Once enabled, this setting cannot be turned off.

mmv1/products/bigqueryanalyticshub/Listing.yaml

@@ -240,5 +240,4 @@ properties:
   - name: 'logLinkedDatasetQueryUserEmail'
     type: Boolean
     description:
-      If true, subscriber email logging is enabled and all queries on the linked dataset will log the email address of the querying user.
-    immutable: true
+      If true, subscriber email logging is enabled and all queries on the linked dataset will log the email address of the querying user. Once enabled, this setting cannot be turned off.

mmv1/products/cloudidentity/GroupMembership.yaml

@@ -37,6 +37,7 @@ timeouts:
   update_minutes: 20
   delete_minutes: 20
 custom_code:
+  pre_create: templates/terraform/pre_create/cloud_identity_group_membership.go.tmpl
   post_create: 'templates/terraform/post_create/set_computed_name.tmpl'
   custom_update: 'templates/terraform/custom_update/cloud_identity_group_membership.go.tmpl'
   post_import: 'templates/terraform/post_import/cloud_identity_group_membership.go.tmpl'
@@ -62,6 +63,12 @@ examples:
       identity_user: 'IDENTITY_USER'
     # Has a handwritten test due to CloudIdentityGroup-related tests needing to run synchronously
     exclude_test: true
+virtual_fields:
+  - name: 'create_ignore_already_exists'
+    description: |
+      If set to true, skip group member creation if a membership with the same name already exists. Defaults to false.
+    type: Boolean
+    default_value: false
 parameters:
   - name: 'group'
     type: ResourceRef

mmv1/products/cloudrunv2/Job.yaml

@@ -125,6 +125,14 @@ examples:
       cloud_run_job_name: 'cloudrun-job'
     ignore_read_extra:
       - 'deletion_protection'
+  - name: 'cloudrunv2_job_gpu'
+    min_version: 'beta'
+    primary_resource_id: 'default'
+    primary_resource_name: 'fmt.Sprintf("tf-test-cloudrun-job%s", context["random_suffix"])'
+    vars:
+      cloud_run_job_name: 'cloudrun-job'
+    ignore_read_extra:
+      - 'deletion_protection'
 virtual_fields:
   - name: 'deletion_protection'
     description: |
@@ -397,7 +405,7 @@ properties:
                     - name: 'limits'
                       type: KeyValuePairs
                       description: |-
-                        Only memory and CPU are supported. Use key `cpu` for CPU limit and `memory` for memory limit. Note: The only supported values for CPU are '1', '2', '4', and '8'. Setting 4 CPU requires at least 2Gi of memory. The values of the map is string form of the 'quantity' k8s type: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
+                        Only memory, CPU, and nvidia.com/gpu are supported. Use key `cpu` for CPU limit, `memory` for memory limit, `nvidia.com/gpu` for gpu limit. Note: The only supported values for CPU are '1', '2', '4', and '8'. Setting 4 CPU requires at least 2Gi of memory. The values of the map is string form of the 'quantity' k8s type: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go
                       default_from_api: true
                 - name: 'ports'
                   type: Array
@@ -765,6 +773,16 @@ properties:
               Number of retries allowed per Task, before marking this Task failed. Defaults to 3. Minimum value is 0.
             send_empty_value: true
             default_value: 3
+          - name: 'nodeSelector'
+            min_version: beta
+            type: NestedObject
+            description: Node Selector describes the hardware requirements of the resources.
+            properties:
+              - name: 'accelerator'
+                type: String
+                description:
+                  The GPU to attach to an instance. See https://cloud.google.com/run/docs/configuring/jobs/gpu for configuring GPU.
+                required: true
   - name: 'observedGeneration'
     type: String
     description: |

mmv1/products/compute/Autoscaler.yaml

@@ -42,6 +42,7 @@ async:
   result:
     resource_inside_response: false
 collection_url_key: 'items'
+include_in_tgc_next_DO_NOT_USE: true
 custom_code:
 sweeper:
   url_substitutions:
@@ -83,6 +84,8 @@ parameters:
     ignore_read: true
     default_from_api: true
     custom_expand: 'templates/terraform/custom_expand/resourceref_with_validation.go.tmpl'
+    custom_tgc_flatten: 'templates/tgc_next/custom_flatten/compute_auto_scaler.go.tmpl'
+    custom_tgc_expand: 'templates/tgc_next/custom_expand/compute_auto_scaler_zone.go.tmpl'
     resource: 'Zone'
     imports: 'name'
 properties:
@@ -423,5 +426,6 @@ properties:
       URL of the managed instance group that this autoscaler will scale.
     required: true
     custom_expand: 'templates/terraform/custom_expand/compute_full_url.tmpl'
+    custom_tgc_expand: 'templates/tgc_next/custom_expand/compute_full_url.go.tmpl'
     resource: 'InstanceGroupManager'
     imports: 'selfLink'

mmv1/products/compute/Disk.yaml

@@ -73,7 +73,7 @@ examples:
     vars:
       disk_name: 'test-disk'
   - name: 'disk_async'
-    primary_resource_id: 'primary'
+    primary_resource_id: 'secondary'
     primary_resource_name: 'fmt.Sprintf("tf-test-test-disk%s", context["random_suffix"])'
     vars:
       disk_name: 'async-test-disk'

mmv1/products/compute/NetworkFirewallPolicy.yaml

@@ -57,6 +57,17 @@ properties:
   - name: 'description'
     type: String
     description: An optional description of this resource. Provide this property when you create the resource.
+  - name: 'policyType'
+    type: Enum
+    immutable: true
+    description: |
+      Policy type is used to determine which resources (networks) the policy can be associated with.
+      A policy can be associated with a network only if the network has the matching policyType in its network profile.
+      Different policy types may support some of the Firewall Rules features.
+    min_version: 'beta'
+    default_from_api: true
+    enum_values:
+      - 'VPC_POLICY'
   - name: 'fingerprint'
     type: Fingerprint
     description: Fingerprint of the resource. This field is used internally during updates of this resource.

mmv1/products/compute/NetworkFirewallPolicyWithRules.yaml

@@ -76,6 +76,17 @@ properties:
   - name: 'description'
     type: String
     description: An optional description of this resource.
+  - name: 'policyType'
+    type: Enum
+    immutable: true
+    description: |
+      Policy type is used to determine which resources (networks) the policy can be associated with.
+      A policy can be associated with a network only if the network has the matching policyType in its network profile.
+      Different policy types may support some of the Firewall Rules features.
+    default_from_api: true
+    min_version: 'beta'
+    enum_values:
+      - 'VPC_POLICY'
   - name: 'rule'
     type: Array
     description: A list of firewall policy rules.