Merge branch 'GoogleCloudPlatform:main' into main

Author: anthonyrtong

.ci/infra/terraform/main.tf

@@ -334,6 +334,7 @@ module "project-services" {
     "resourceviews.googleapis.com",
     "run.googleapis.com",
     "runtimeconfig.googleapis.com",
+    "saasservicemgmt.googleapis.com",
     "secretmanager.googleapis.com",
     "securesourcemanager.googleapis.com",
     "securetoken.googleapis.com",

mmv1/api/resource.go

@@ -227,7 +227,7 @@ type Resource struct {
 	ExcludeImport bool `yaml:"exclude_import,omitempty"`
 
 	// If true, resource should be autogenerated as a data source
-	GenerateDatasource bool `yaml:"generate_datasource,omitempty"`
+	Datasource *resource.Datasource `yaml:"datasource,omitempty"`
 
 	// If true, skip sweeper generation for this resource
 	ExcludeSweeper bool `yaml:"exclude_sweeper,omitempty"`
@@ -2078,8 +2078,31 @@ func urlContainsOnlyAllowedKeys(templateURL string, allowedKeys []string) bool {
 	return true
 }
 
-func (r Resource) ShouldGenerateSingularDataSource() bool {
-	return r.GenerateDatasource
+func (r *Resource) ShouldGenerateSingularDataSource() bool {
+
+	if r.Datasource == nil {
+		return false
+	}
+
+	return r.Datasource.Generate
+}
+
+func (r Resource) ShouldDatasourceSetLabels() bool {
+	for _, p := range r.Properties {
+		if p.Name == "labels" && p.Type == "KeyValueLabels" {
+			return true
+		}
+	}
+	return false
+}
+
+func (r Resource) ShouldDatasourceSetAnnotations() bool {
+	for _, p := range r.Properties {
+		if p.Name == "annotations" && p.Type == "KeyValueAnnotations" {
+			return true
+		}
+	}
+	return false
 }
 
 // DatasourceOptionalFields returns a list of fields from the resource's URI

mmv1/api/resource/datasource.go

@@ -0,0 +1,19 @@
+// Copyright 2024 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.
+
+package resource
+
+type Datasource struct {
+	// boolean to determine whether the datasource file should be generated
+	Generate bool `yaml:"generate"`
+}

mmv1/api/resource/iam_policy.go

@@ -114,6 +114,9 @@ type IamPolicy struct {
 	// [Optional] Check to see if zone value should be replaced with GOOGLE_ZONE in iam tests
 	// Defaults to true
 	SubstituteZoneValue bool `yaml:"substitute_zone_value"`
+
+	// Add a deprecation message for a resource that's been deprecated in the API.
+	DeprecationMessage string `yaml:"deprecation_message,omitempty"`
 }
 
 func (p *IamPolicy) UnmarshalYAML(unmarshal func(any) error) error {

mmv1/products/alloydb/Instance.yaml

@@ -52,6 +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
 examples:
   - name: 'alloydb_instance_basic'
     primary_resource_id: 'default'
@@ -248,9 +249,11 @@ properties:
       - name: 'recordApplicationTags'
         type: Boolean
         description: 'Record application tags for an instance. This flag is turned "on" by default.'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
       - name: 'recordClientAddress'
         type: Boolean
         description: 'Record client address for an instance. Client address is PII information. This flag is turned "on" by default.'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
       - name: 'queryPlansPerMinute'
         type: Integer
         description: 'Number of query execution plans captured by Insights per minute for all queries combined. The default value is 5. Any integer between 0 and 20 is considered valid.'
@@ -263,9 +266,11 @@ properties:
       - name: 'enabled'
         type: Boolean
         description: 'Observability feature status for an instance.'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
       - name: 'preserveComments'
         type: Boolean
         description: 'Preserve comments in the query string.'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
       - name: 'trackWaitEvents'
         type: Boolean
         description: 'Record wait events during query execution for an instance.'
@@ -278,12 +283,14 @@ properties:
       - name: 'recordApplicationTags'
         type: Boolean
         description: 'Record application tags for an instance. This flag is turned "on" by default.'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
       - name: 'queryPlansPerMinute'
         type: Integer
         description: 'Number of query execution plans captured by Insights per minute for all queries combined. The default value is 5. Any integer between 0 and 200 is considered valid.'
       - name: 'trackActiveQueries'
         type: Boolean
         description: 'Track actively running queries. If not set, default value is "off".'
+        include_empty_value_in_cai: true  # Default value is false in CAI asset
       - name: 'assistiveExperiencesEnabled'
         type: Boolean
         description: 'Whether assistive experiences are enabled for this AlloyDB instance.'

mmv1/products/apphub/Application.yaml

@@ -41,6 +41,7 @@ custom_code:
   constants: 'templates/terraform/constants/apphub_application.go.tmpl'
 custom_diff:
   - 'apphubApplicationCustomizeDiff'
+include_in_tgc_next_DO_NOT_USE: true
 sweeper:
   url_substitutions:
     - region: "us-central1"

mmv1/products/apphub/Service.yaml

@@ -40,6 +40,7 @@ async:
   result:
     resource_inside_response: true
 custom_code:
+include_in_tgc_next_DO_NOT_USE: true
 examples:
   - name: 'apphub_service_basic'
     primary_resource_id: 'example'

mmv1/products/apphub/Workload.yaml

@@ -40,6 +40,7 @@ async:
   result:
     resource_inside_response: true
 custom_code:
+include_in_tgc_next_DO_NOT_USE: true
 examples:
   - name: 'apphub_workload_basic'
     primary_resource_id: 'example'

mmv1/products/beyondcorp/Application.yaml

@@ -31,6 +31,7 @@ iam_policy:
   import_format:
     - 'projects/{{project}}/locations/global/securityGateways/{{security_gateways_id}}/applications/{{application_id}}'
     - '{{application_id}}'
+  deprecation_message: '`google_beyondcorp_application` and associated IAM resources are deprecated. Use `google_beyondcorp_security_gateway_application` instead.'
 examples:
   - name: beyondcorp_application_basic
     primary_resource_id: example

mmv1/products/bigquery/Job.yaml

@@ -406,6 +406,30 @@ properties:
             description: |
               Whether to run the query as continuous or a regular query.
             min_version: beta
+          - name: 'connectionProperties'
+            type: Array
+            description: |
+              Connection properties to customize query behavior. Under JDBC, these correspond
+              directly to connection properties passed to the DriverManager. Under ODBC, these
+              correspond to properties in the connection string.
+            item_type:
+              type: NestedObject
+              properties:
+                - name: 'key'
+                  type: String
+                  description: |
+                    The key of the property to set. Currently supported connection properties:
+                    * `dataset_project_id`: represents the default project for datasets that are used in the query
+                    * `time_zone`: represents the default timezone used to run the query
+                    * `session_id`: associates the query with a given session
+                    * `query_label`: associates the query with a given job label
+                    * `service_account`: indicates the service account to use to run a continuous query
+                  required: true
+                - name: 'value'
+                  type: String
+                  description: |
+                    The value of the property to set.
+                  required: true
       - name: 'load'
         type: NestedObject
         description: 'Configures a load job.'