Merge branch 'GoogleCloudPlatform:main' into main

Author: kminsu-google

mmv1/products/alloydb/Cluster.yaml

@@ -59,10 +59,7 @@ 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: true
@@ -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/apphub/Service.yaml

@@ -190,6 +190,15 @@ properties:
                   type: String
                   description: "The resource name for the Extended Metadata Schema."
                   output: true
+      - name: 'identity'
+        type: NestedObject
+        description: "The identity associated with the service."
+        output: true
+        properties:
+          - name: 'principal'
+            type: String
+            description: "The principal of the identity."
+            output: true
   - name: 'attributes'
     type: NestedObject
     description: 'Consumer provided attributes.'

mmv1/products/apphub/Workload.yaml

@@ -173,6 +173,15 @@ properties:
                   type: String
                   description: "The resource name for the Extended Metadata Schema."
                   output: true
+      - name: 'identity'
+        type: NestedObject
+        description: "The identity associated with the workload."
+        output: true
+        properties:
+          - name: 'principal'
+            type: String
+            description: "The principal of the identity."
+            output: true
   - name: 'discoveredWorkload'
     type: String
     description: 'Immutable. The resource name of the original discovered workload.'

mmv1/products/netapp/HostGroup.yaml

@@ -18,8 +18,8 @@ description: |
   Hostgroup is a regional resource and independent of the volumes or any other resource
 references:
   guides:
-    'Documentation': ''
-  api: ''
+    'Documentation': 'https://docs.cloud.google.com/netapp/volumes/docs/configure-and-use/host-groups/overview'
+  api: 'https://docs.cloud.google.com/netapp/volumes/docs/reference/rest/v1/projects.locations.hostGroups'
 docs:
 id_format: 'projects/{{project}}/locations/{{location}}/hostGroups/{{name}}'
 base_url: 'projects/{{project}}/locations/{{location}}/hostGroups'

mmv1/products/networkconnectivity/GatewayAdvertisedRoute.yaml

@@ -0,0 +1,116 @@
+# Copyright 2025 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.
+
+---
+# API resource name
+name: 'GatewayAdvertisedRoute'
+# Resource description for the provider documentation.
+description: |
+  A gateway advertised route is a route that a gateway spoke advertises somewhere.
+references:
+  guides:
+    'QUICKSTART_TITLE': 'https://docs.cloud.google.com/network-connectivity/docs/network-connectivity-center/concepts/ncc-gateway-overview'
+  api: 'https://docs.cloud.google.com/network-connectivity/docs/reference/networkconnectivity/rest/v1beta/projects.locations.spokes.gatewayAdvertisedRoutes'
+min_version: beta
+base_url: 'projects/{{project}}/locations/{{location}}/spokes/{{spoke}}/gatewayAdvertisedRoutes'
+self_link: 'projects/{{project}}/locations/{{location}}/spokes/{{spoke}}/gatewayAdvertisedRoutes/{{name}}'
+create_url: 'projects/{{project}}/locations/{{location}}/spokes/{{spoke}}/gatewayAdvertisedRoutes?gatewayAdvertisedRouteId={{name}}'
+immutable: true
+autogen_async: true
+async:
+  operation:
+    base_url: '{{op_id}}'
+examples:
+  - name: 'network_connectivity_gateway_advertised_route_basic'
+    min_version: beta
+    primary_resource_id: 'default'
+    vars:
+      resource_name: 'gateway-advertised-route-name'
+      spoke_name: 'spoke-name'
+      network_name: 'net-spoke'
+      hub_name: 'hub'
+parameters:
+  - name: 'location'
+    type: String
+    required: true
+    immutable: true
+    url_param_only: true
+    description: |
+      The location for the resource
+  - name: 'spoke'
+    type: String
+    required: true
+    immutable: true
+    url_param_only: true
+    description: |
+      The name of the spoke
+properties:
+  - name: 'name'
+    type: String
+    description: The name of the gateway advertised route. Route names must be unique.
+    required: true
+    immutable: true
+    custom_flatten: 'templates/terraform/custom_flatten/id_from_name.tmpl'
+  - name: 'createTime'
+    type: String
+    description: The time the gateway advertised route was created.
+    output: true
+  - name: 'updateTime'
+    type: String
+    description: The time the gateway advertised route was last updated.
+    output: true
+  - name: 'labels'
+    type: KeyValueLabels
+    description: Optional labels in key:value format. For more information about labels, see [Requirements for labels](https://cloud.google.com/resource-manager/docs/creating-managing-labels#requirements).
+  - name: 'description'
+    type: String
+    description: An optional description of the gateway advertised route.
+  - name: 'uniqueId'
+    type: String
+    description: |
+      The Google-generated UUID for the gateway advertised route.
+      This value is unique across all gateway advertised route resources.
+      If a gateway advertised route is deleted and another with the same name is created, the new route is assigned a different uniqueId.
+    output: true
+  - name: 'state'
+    type: Enum
+    description: The current lifecycle state of this gateway advertised route.
+    enum_values:
+      - 'STATE_UNSPECIFIED'
+      - 'CREATING'
+      - 'ACTIVE'
+      - 'DELETING'
+      - 'ACCEPTING'
+      - 'REJECTING'
+      - 'UPDATING'
+      - 'INACTIVE'
+      - 'OBSOLETE'
+      - 'FAILED'
+    output: true
+  - name: 'ipRange'
+    type: String
+    description: |
+      This route's advertised IP address range. Must be a valid CIDR-formatted prefix.
+      If an IP address is provided without a subnet mask, it is interpreted as, for IPv4, a /32 singular IP address range, and, for IPv6, /128
+    immutable: true
+  - name: 'recipient'
+    type: Enum
+    description: 'the recipient of this advertised route'
+    enum_values:
+      - 'RECIPIENT_UNSPECIFIED'
+      - 'ADVERTISE_TO_HUB'
+  - name: 'priority'
+    type: Integer
+    description: |
+      The priority of this advertised route. You can choose a value from 0 to 65335.
+      If you don't provide a value, Google Cloud assigns a priority of 100 to the ranges.

mmv1/products/networkconnectivity/Spoke.yaml

@@ -131,6 +131,7 @@ properties:
     required: true
     immutable: true
     diff_suppress_func: 'tpgresource.CompareSelfLinkOrResourceName'
+    custom_flatten: 'templates/terraform/custom_flatten/id_from_name.tmpl'
   - name: 'createTime'
     type: String
     description: Output only. The time the spoke was created.

mmv1/products/networkservices/ServiceBinding.yaml

@@ -25,6 +25,10 @@ create_url: 'projects/{{project}}/locations/global/serviceBindings?serviceBindin
 immutable: true
 import_format:
   - 'projects/{{project}}/locations/global/serviceBindings/{{name}}'
+deprecation_message: >-
+  Cloud Service Mesh's integration with Service Directory is going to be deprecated.
+  [Learn more](https://docs.cloud.google.com/service-mesh/docs/service-routing/service-directory-integration-setup).
+  Creating new service binding resources will be disabled.
 timeouts:
   insert_minutes: 10
   update_minutes: 10
@@ -46,6 +50,7 @@ schema_version: 1
 state_upgraders: true
 examples:
   - name: 'network_services_service_binding_basic'
+    exclude_test: true
     primary_resource_id: 'default'
     vars:
       resource_name: 'my-service-binding'

mmv1/templates/terraform/constants/alloydb_cluster.go.tmpl

@@ -237,6 +237,7 @@ func resizeWorkbenchInstanceDisk(config *transport_tpg.Config, d *schema.Resourc
 	  UserAgent: userAgent,
 	  Body: diskObj,
 	  Timeout: d.Timeout(schema.TimeoutUpdate),
+	  ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsWorkbenchQueueError},
 	})
 
 	if err != nil {

mmv1/templates/terraform/constants/workbench_instance.go.tmpl

@@ -13,10 +13,6 @@ resource "google_alloydb_cluster" "{{$.PrimaryResourceId}}" {
     network = google_compute_network.default.id
   }
 
-  initial_user {
-    password = "{{index $.Vars "alloydb_cluster_name"}}"
-  }
-
   deletion_protection = false
 }