Merge branch 'main' into parameter-manager-regional-parameter-version-render-datasource-support

Author: abheda-crest

.github/workflows/downstreams.yml

@@ -8,7 +8,7 @@ on:
       - 'FEATURE-BRANCH-*'
   merge_group:
     types: [checks_requested]
-
+  pull_request:
 
 concurrency:
   group: ${{ github.event_name == 'merge_group' && format('merge-group-{0}', github.event.merge_group.head_sha) || github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('commit-{0}', github.sha) }}

mmv1/api/resource.go

@@ -337,7 +337,8 @@ type Resource struct {
 	// fine-grained resources and legacy resources.
 	ApiResourceTypeKind string `yaml:"api_resource_type_kind,omitempty"`
 
-	ImportPath string `yaml:"-"`
+	ImportPath     string `yaml:"-"`
+	SourceYamlFile string `yaml:"-"`
 }
 
 func (r *Resource) UnmarshalYAML(unmarshal func(any) error) error {
@@ -1787,3 +1788,45 @@ func (r Resource) CaiIamAssetNameTemplate(productBackendName string) string {
 	}
 	return fmt.Sprintf("//%s.googleapis.com/%s/{{%s}}", productBackendName, caiBaseUrl, r.IamParentResourceName())
 }
+
+func urlContainsOnlyAllowedKeys(templateURL string, allowedKeys []string) bool {
+	// Create regex to match anything between {{ and }}
+	re := regexp.MustCompile(`{{\s*([^}]+)\s*}}`)
+
+	// Find all matches in the template URL
+	matches := re.FindAllStringSubmatch(templateURL, -1)
+
+	// Create a map of allowed keys for O(1) lookup
+	allowedKeysMap := make(map[string]bool)
+	for _, key := range allowedKeys {
+		allowedKeysMap[key] = true
+	}
+
+	// Check each found key against the allowed keys
+	for _, match := range matches {
+		if len(match) < 2 {
+			continue
+		}
+
+		// Trim spaces from the key
+		key := strings.TrimSpace(match[1])
+
+		// If the key isn't in our allowed list, return false
+		if !allowedKeysMap[key] {
+			return false
+		}
+	}
+
+	return true
+}
+
+func (r Resource) ShouldGenerateSweepers() bool {
+	allowedKeys := []string{"project", "region", "location", "zone", "billing_account"}
+	if !urlContainsOnlyAllowedKeys(r.ListUrlTemplate(), allowedKeys) {
+		return false
+	}
+	if r.ExcludeSweeper || r.CustomCode.CustomDelete != "" || r.CustomCode.PreDelete != "" || r.CustomCode.PostDelete != "" || r.ExcludeDelete {
+		return false
+	}
+	return true
+}

mmv1/main.go

@@ -256,6 +256,7 @@ func GenerateProduct(productChannel chan string, providerToGenerate provider.Pro
 
 		resource := &api.Resource{}
 		api.Compile(resourceYamlPath, resource, overrideDirectory)
+		resource.SourceYamlFile = resourceYamlPath
 
 		resource.TargetVersionName = *version
 		resource.Properties = resource.AddLabelsRelatedFields(resource.PropertiesWithExcluded(), nil)

mmv1/products/apphub/Application.yaml

@@ -40,6 +40,11 @@ custom_code:
   constants: 'templates/terraform/constants/apphub_application.go.tmpl'
 custom_diff:
   - 'apphubApplicationCustomizeDiff'
+sweeper:
+  regions:
+    - "us-central1"
+    - "us-east1"
+    - "global"
 examples:
   - name: 'apphub_application_basic'
     primary_resource_id: 'example'

mmv1/products/artifactregistry/Repository.yaml

@@ -54,6 +54,10 @@ custom_code:
   constants: 'templates/terraform/constants/artifact_registry_repository.go.tmpl'
   encoder: 'templates/terraform/encoders/location_from_region.go.tmpl'
   pre_create: 'templates/terraform/pre_create/artifact_registry_remote_repository.go.tmpl'
+sweeper:
+  regions:
+    - "us-central1"
+    - "us"
 examples:
   - name: 'artifact_registry_repository_basic'
     primary_resource_id: 'my-repo'

mmv1/products/biglake/Catalog.yaml

@@ -29,6 +29,9 @@ timeouts:
   update_minutes: 20
   delete_minutes: 20
 custom_code:
+sweeper:
+  regions:
+    - "US"
 examples:
   - name: 'bigquery_biglake_catalog'
     primary_resource_id: 'default'

mmv1/products/bigqueryanalyticshub/DataExchange.yaml

@@ -41,6 +41,9 @@ iam_policy:
     - 'projects/{{project}}/locations/{{location}}/dataExchanges/{{data_exchange_id}}'
     - '{{data_exchange_id}}'
 custom_code:
+sweeper:
+  regions:
+    - "US"
 examples:
   - name: 'bigquery_analyticshub_data_exchange_basic'
     primary_resource_id: 'data_exchange'

mmv1/products/bigqueryconnection/Connection.yaml

@@ -45,6 +45,12 @@ iam_policy:
 custom_code:
   encoder: 'templates/terraform/encoders/bigquery_connection.go.tmpl'
   post_create: 'templates/terraform/post_create/bigquery_connection_id.go.tmpl'
+sweeper:
+  regions:
+    - "US"
+    - "EU"
+    - "aws-us-east-1"
+    - "azure-eastus2"
 examples:
   - name: 'bigquery_connection_cloud_resource'
     primary_resource_id: 'connection'

mmv1/products/bigqueryreservation/CapacityCommitment.yaml

@@ -37,6 +37,9 @@ timeouts:
 custom_code:
   constants: 'templates/terraform/constants/bigquery_reservation_capacity_commitment.go.tmpl'
   custom_import: 'templates/terraform/custom_import/bigquery_reservation_capacity_commitment_set_id.go.tmpl'
+sweeper:
+  regions:
+    - "us-west2"
 examples:
   - name: 'bigquery_reservation_capacity_commitment_basic'
     primary_resource_id: 'commitment'

mmv1/products/certificatemanager/Certificate.yaml

@@ -40,6 +40,13 @@ custom_code:
   constants: 'templates/terraform/constants/cert_manager.tmpl'
 schema_version: 1
 state_upgraders: true
+sweeper:
+  regions:
+    - "us-central1"
+    - "us-east1"
+    - "us-south1"
+    - "us-west1"
+    - "us-west2"
 examples:
   - name: 'certificate_manager_google_managed_certificate_dns'
     primary_resource_id: 'default'

mmv1/products/certificatemanager/DnsAuthorization.yaml

@@ -38,6 +38,10 @@ async:
 custom_code:
 schema_version: 1
 state_upgraders: true
+sweeper:
+  regions:
+    - "global"
+    - "us-central1"
 examples:
   - name: 'certificate_manager_dns_authorization_basic'
     primary_resource_id: 'default'

mmv1/products/certificatemanager/TrustConfig.yaml

@@ -40,6 +40,10 @@ async:
   result:
     resource_inside_response: false
 custom_code:
+sweeper:
+  regions:
+    - "global"
+    - "us-central1"
 examples:
   - name: 'certificate_manager_trust_config'
     primary_resource_id: 'default'

mmv1/products/cloudbuild/Trigger.yaml

@@ -46,6 +46,10 @@ custom_diff:
   - 'stepTimeoutCustomizeDiff'
 schema_version: 2
 state_upgraders: true
+sweeper:
+  regions:
+    - "us-central1"
+    - "global"
 examples:
   - name: 'cloudbuild_trigger_filename'
     primary_resource_id: 'filename-trigger'

mmv1/products/cloudbuildv2/Connection.yaml

@@ -49,6 +49,10 @@ iam_policy:
 custom_code:
 exclude_tgc: true
 legacy_long_form_project: true
+sweeper:
+  regions:
+    - "us-west1"
+    - "us-central1"
 examples:
   - name: 'cloudbuildv2_connection'
     primary_resource_id: 'my-connection'

mmv1/products/cloudfunctions2/Function.yaml

@@ -56,6 +56,11 @@ custom_code:
   constants: 'templates/terraform/constants/cloudfunctions2_function.go.tmpl'
   encoder: 'templates/terraform/encoders/cloudfunctions2_runtime_update_policy.go.tmpl'
 taint_resource_on_failed_create: true
+sweeper:
+  regions:
+    - "us-central1"
+    - "us-west1"
+    - "europe-west6"
 examples:
   - name: 'cloudfunctions2_basic'
     primary_resource_id: 'function'

mmv1/products/cloudrun/Service.yaml

@@ -60,6 +60,11 @@ error_retry_predicates:
 schema_version: 2
 state_upgrade_base_schema_version: 1
 state_upgraders: true
+sweeper:
+  regions:
+    - "us-central1"
+    - "europe-west1"
+    - "europe-north1"
 examples:
   - name: 'cloud_run_service_basic'
     primary_resource_id: 'default'

mmv1/products/colab/Runtime.yaml

@@ -31,13 +31,24 @@ async:
     full_url: 'https://{{location}}-aiplatform.googleapis.com/v1/{{op_id}}'
 custom_code:
   encoder: 'templates/terraform/encoders/colab_runtime.go.tmpl'
+  post_create: 'templates/terraform/post_create/colab_runtime.go.tmpl'
+  custom_update: 'templates/terraform/custom_update/colab_runtime.go.tmpl'
+  constants: 'templates/terraform/constants/colab_runtime.go.tmpl'
 examples:
   - name: 'colab_runtime_basic'
     primary_resource_id: 'runtime'
     primary_resource_name: 'fmt.Sprintf("tf-test-colab-runtime%s", context["random_suffix"])'
     region_override: 'us-central1'
     vars:
       runtime_name: 'colab-runtime'
+  - name: 'colab_runtime_stopped'
+    primary_resource_id: 'runtime'
+    primary_resource_name: 'fmt.Sprintf("tf-test-colab-runtime%s", context["random_suffix"])'
+    region_override: 'us-central1'
+    vars:
+      runtime_name: 'colab-runtime'
+    ignore_read_extra:
+      - 'desired_state'
   - name: 'colab_runtime_full'
     primary_resource_id: 'runtime'
     primary_resource_name: 'fmt.Sprintf("tf-test-colab-runtime%s", context["random_suffix"])'
@@ -47,16 +58,31 @@ examples:
       key_name: 'my-crypto-key'
     test_vars_overrides:
       key_name: 'acctest.BootstrapKMSKeyInLocation(t, "us-central1").CryptoKey.Name'
+    ignore_read_extra:
+      - 'desired_state'
+      - 'auto_upgrade'
+virtual_fields:
+  - name: 'desired_state'
+    description: |
+      Desired state of the Colab Runtime. Set this field to `RUNNING` to start the runtime, and `STOPPED` to stop it.
+    type: String
+    default_value: "RUNNING"
+  - name: 'auto_upgrade'
+    description: |
+      Triggers an upgrade anytime the runtime is started if it is upgradable.
+    type: Boolean
 parameters:
   - name: 'location'
     type: String
     required: true
     url_param_only: true
     description: 'The location for the resource: https://cloud.google.com/colab/docs/locations'
+    immutable: true
   - name: 'name'
     type: String
     url_param_only: true
     description: 'The resource name of the Runtime'
+    immutable: true
 properties:
   - name: notebookRuntimeTemplateRef
     type: NestedObject
@@ -65,18 +91,42 @@ properties:
     properties:
       - name: 'notebookRuntimeTemplate'
         type: String
+        immutable: true
         required: true
         description: 'The resource name of the NotebookRuntimeTemplate based on which a NotebookRuntime will be created.'
         diff_suppress_func: 'tpgresource.ProjectNumberDiffSuppress'
   - name: 'runtimeUser'
     type: String
     required: true
+    immutable: true
     description: 'The user email of the NotebookRuntime.'
   - name: 'displayName'
     type: String
+    immutable: true
     description:
       Required. The display name of the Runtime.
     required: true
   - name: description
     type: String
+    immutable: true
     description: 'The description of the Runtime.'
+  - name: state
+    type: String
+    description: |
+      Output only. The state of the runtime.
+    output: true
+  - name: isUpgradable
+    type: Boolean
+    description: |
+      Output only. Checks if the NotebookRuntime is upgradable.
+    output: true
+  - name: expirationTime
+    type: String
+    description: |
+      Output only. Timestamp when this NotebookRuntime will be expired.
+    output: true
+  - name: notebookRuntimeType
+    type: String
+    description: |
+      Output only. The type of the notebook runtime.
+    output: true

mmv1/products/colab/RuntimeTemplate.yaml

@@ -41,7 +41,7 @@ iam_policy:
     - 'projects/{{project}}/locations/{{location}}/notebookRuntimeTemplates/{{runtime_template}}'
     - '{{runtime_template}}'
 custom_code:
-  post_create: 'templates/terraform/post_create/colab_runtime_template.tmpl'
+  post_create: 'templates/terraform/post_create/colab_runtime_template.go.tmpl'
 examples:
   - name: 'colab_runtime_template_basic'
     primary_resource_id: 'runtime-template'

mmv1/products/compute/Address.yaml

@@ -51,6 +51,13 @@ async:
 collection_url_key: 'items'
 custom_code:
   post_create: 'templates/terraform/post_create/labels.tmpl'
+sweeper:
+  regions:
+    - "us-west1"
+    - "us-west2"
+    - "us-central1"
+    - "us-east1"
+    - "europe-west1"
 examples:
   - name: 'address_basic'
     primary_resource_id: 'ip_address'

mmv1/products/compute/ForwardingRule.yaml

@@ -47,6 +47,13 @@ custom_code:
 custom_diff:
   - 'forwardingRuleCustomizeDiff'
 legacy_long_form_project: true
+sweeper:
+  regions:
+    - "us-west2"
+    - "us-central1"
+    - "europe-west1"
+    - "europe-west4"
+    - "us-west1"
 examples:
   - name: 'internal_http_lb_with_mig_backend'
     primary_resource_id: 'google_compute_forwarding_rule'

mmv1/products/compute/InterconnectAttachment.yaml

@@ -17,6 +17,10 @@ kind: 'compute#interconnectAttachment'
 description: |
   Represents an InterconnectAttachment (VLAN attachment) resource. For more
   information, see Creating VLAN Attachments.
+references:
+  guides:
+    'Create a Interconnect attachment': 'https://cloud.google.com/network-connectivity/docs/interconnect/how-to/dedicated/creating-vlan-attachments'
+  api: 'https://cloud.google.com/compute/docs/reference/rest/v1/interconnectAttachments'
 docs:
 base_url: 'projects/{{project}}/regions/{{region}}/interconnectAttachments'
 has_self_link: true

mmv1/products/compute/PublicAdvertisedPrefix.yaml

@@ -76,14 +76,18 @@ properties:
   - name: 'ipCidrRange'
     type: String
     description:
-      The IPv4 address range, in CIDR format, represented by this public
-      advertised prefix.
+      The address range, in CIDR format, represented by this public advertised
+      prefix.
     required: true
   - name: 'pdpScope'
     type: Enum
     description: |
       Specifies how child public delegated prefix will be scoped. pdpScope
       must be one of: GLOBAL, REGIONAL
+      * REGIONAL: The public delegated prefix is regional only. The
+      provisioning will take a few minutes.
+      * GLOBAL: The public delegated prefix is global only. The provisioning
+      will take ~4 weeks.
     enum_values:
       - 'GLOBAL'
       - 'REGIONAL'