diff --git a/.github/workflows/request-reviewer.yml b/.github/workflows/request-reviewer.yml index b8e8d80043ff..92cb937e709d 100644 --- a/.github/workflows/request-reviewer.yml +++ b/.github/workflows/request-reviewer.yml @@ -38,4 +38,3 @@ jobs: go build . - name: Request reviewer run: .ci/magician/magician request-reviewer ${{ github.event.pull_request.number || github.event.issue.number }} - diff --git a/docs/content/develop/generate-providers.md b/docs/content/develop/generate-providers.md index 129ce81d1361..1af1f99d7db9 100644 --- a/docs/content/develop/generate-providers.md +++ b/docs/content/develop/generate-providers.md @@ -38,7 +38,7 @@ provider changes to the `google` and `google-beta` Terraform providers. ``` Where `[PRODUCT_NAME]` is one of the folder names in https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products. - + For example, if your product is `bigqueryanalyticshub`, the command would be the following: @@ -52,13 +52,13 @@ provider changes to the `google` and `google-beta` Terraform providers. ``` Where `[PRODUCT_NAME]` is one of the folder names in https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/products. - + For example, if your product name is `bigqueryanalyticshub`, the command would be the following: ```bash make provider VERSION=beta OUTPUT_PATH="$GOPATH/src/github.com/hashicorp/terraform-provider-google-beta" PRODUCT=bigqueryanalyticshub ``` - + 1. Confirm that the expected changes were generated: ```bash cd $GOPATH/src/github.com/hashicorp/terraform-provider-google diff --git a/mmv1/products/compute/CrossSiteNetwork.yaml b/mmv1/products/compute/CrossSiteNetwork.yaml new file mode 100644 index 000000000000..3251f609287b --- /dev/null +++ b/mmv1/products/compute/CrossSiteNetwork.yaml @@ -0,0 +1,64 @@ +# 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. + +--- +name: 'CrossSiteNetwork' +description: | + Represents a cross-site-network resource. A CrossSiteNetwork is used to establish L2 connectivity between groups of Interconnects. +min_version: beta +references: + guides: + 'Create a Cross-Site Interconnect': 'https://cloud.google.com/network-connectivity/docs/interconnect/how-to/cross-site/create-network' + api: 'https://cloud.google.com/compute/docs/reference/rest/beta/crossSiteNetworks' +docs: +base_url: 'projects/{{project}}/global/crossSiteNetworks' +self_link: 'projects/{{project}}/global/crossSiteNetworks/{{name}}' +update_verb: 'PATCH' +timeouts: + insert_minutes: 20 + update_minutes: 20 + delete_minutes: 20 +async: + actions: ['create', 'delete', 'update'] + type: 'OpAsync' + operation: + base_url: '{{op_id}}' + result: + resource_inside_response: false +examples: + - name: 'compute_cross_site_network_basic' + primary_resource_id: 'example-cross-site-network' + vars: + name: 'test-cross-site-network' + description: 'Example cross site network' + min_version: 'beta' + test_env_vars: + project: 'PROJECT_NAME' +parameters: +properties: + - name: 'name' + type: String + description: | + Name of the resource. Provided by the client when the resource is created. The name must be + 1-63 characters long, and comply with RFC1035. Specifically, the name must be 1-63 characters + long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?` which means the first + character must be a lowercase letter, and all following characters must be a dash, + lowercase letter, or digit, except the last character, which cannot be a dash. + required: true + immutable: true + validation: + regex: '^[a-z]([-a-z0-9]*[a-z0-9])?$' + - name: 'description' + type: String + description: | + An optional description of this resource. diff --git a/mmv1/templates/terraform/custom_expand/secret_version_enable.go.tmpl b/mmv1/templates/terraform/custom_expand/secret_version_enable.go.tmpl index f1bd48c68a16..b8d494a88f89 100644 --- a/mmv1/templates/terraform/custom_expand/secret_version_enable.go.tmpl +++ b/mmv1/templates/terraform/custom_expand/secret_version_enable.go.tmpl @@ -15,7 +15,7 @@ func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.T if name == "" { return "", nil } - + url, err := tpgresource.ReplaceVars(d, config, "{{"{{"}}SecretManagerBasePath{{"}}"}}{{"{{"}}name{{"}}"}}") if err != nil { return nil, err diff --git a/mmv1/templates/terraform/custom_expand/service_attachment_target_service.go.tmpl b/mmv1/templates/terraform/custom_expand/service_attachment_target_service.go.tmpl index 512d7fcf22bf..9d8928ae5e0e 100644 --- a/mmv1/templates/terraform/custom_expand/service_attachment_target_service.go.tmpl +++ b/mmv1/templates/terraform/custom_expand/service_attachment_target_service.go.tmpl @@ -5,11 +5,11 @@ func expand{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d tpgresource.T if len(resource) < 4 { return nil, fmt.Errorf("invalid value for target_service") } - + _, err := tpgresource.ParseRegionalFieldValue(resourceKind, v.(string), "project", resourceBound, "zone", d, config, true) if err != nil { return nil, fmt.Errorf("invalid value for target_service: %w", err) } - + return v, nil } diff --git a/mmv1/templates/terraform/examples/cloudrunv2_service_sql.tf.tmpl b/mmv1/templates/terraform/examples/cloudrunv2_service_sql.tf.tmpl index b22f049b9298..0b6f1bccc044 100644 --- a/mmv1/templates/terraform/examples/cloudrunv2_service_sql.tf.tmpl +++ b/mmv1/templates/terraform/examples/cloudrunv2_service_sql.tf.tmpl @@ -8,7 +8,7 @@ resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" { scaling { max_instance_count = 2 } - + volumes { name = "cloudsql" cloud_sql_instance { diff --git a/mmv1/templates/terraform/examples/compute_cross_site_network_basic.tf.tmpl b/mmv1/templates/terraform/examples/compute_cross_site_network_basic.tf.tmpl new file mode 100644 index 000000000000..6860582a71c4 --- /dev/null +++ b/mmv1/templates/terraform/examples/compute_cross_site_network_basic.tf.tmpl @@ -0,0 +1,9 @@ +data "google_project" "project" { + provider = google-beta +} + +resource "google_compute_cross_site_network" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "name"}}" + description = "{{index $.Vars "description"}}" + provider = google-beta +} \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl b/mmv1/templates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl index d3a7c3d67fd7..9355f96f6a81 100644 --- a/mmv1/templates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/compute_region_network_firewall_policy_with_rules_full.tf.tmpl @@ -100,7 +100,7 @@ resource "google_compute_region_network_firewall_policy_with_rules" "{{$.Primary } resource "google_network_security_address_group" "address_group_1" { - provider = google-beta + provider = google-beta name = "{{index $.Vars "address_group"}}" parent = data.google_project.project.id description = "Regional address group" diff --git a/mmv1/templates/terraform/examples/dialogflowcx_flow_full.tf.tmpl b/mmv1/templates/terraform/examples/dialogflowcx_flow_full.tf.tmpl index 774be2521980..9b2e154454ef 100644 --- a/mmv1/templates/terraform/examples/dialogflowcx_flow_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/dialogflowcx_flow_full.tf.tmpl @@ -294,4 +294,4 @@ resource "google_dialogflow_cx_flow" "{{$.PrimaryResourceId}}" { enable_consent_based_redaction = true } } -} +} diff --git a/mmv1/templates/terraform/examples/network_connectivity_hub_basic.tf.tmpl b/mmv1/templates/terraform/examples/network_connectivity_hub_basic.tf.tmpl index 1bfba77d608a..604899da16e5 100644 --- a/mmv1/templates/terraform/examples/network_connectivity_hub_basic.tf.tmpl +++ b/mmv1/templates/terraform/examples/network_connectivity_hub_basic.tf.tmpl @@ -1,7 +1,7 @@ -resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "resource_name"}}" - description = "A sample hub" - labels = { - label-one = "value-one" - } -} +resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "resource_name"}}" + description = "A sample hub" + labels = { + label-one = "value-one" + } +} diff --git a/mmv1/templates/terraform/examples/network_connectivity_hub_with_export_psc.tf.tmpl b/mmv1/templates/terraform/examples/network_connectivity_hub_with_export_psc.tf.tmpl index a07d2d0078bf..a3b587a9361c 100644 --- a/mmv1/templates/terraform/examples/network_connectivity_hub_with_export_psc.tf.tmpl +++ b/mmv1/templates/terraform/examples/network_connectivity_hub_with_export_psc.tf.tmpl @@ -1,5 +1,5 @@ -resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "resource_name"}}" - description = "A sample hub with Private Service Connect transitivity is enabled" - export_psc = true -} +resource "google_network_connectivity_hub" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "resource_name"}}" + description = "A sample hub with Private Service Connect transitivity is enabled" + export_psc = true +} diff --git a/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_interconnect_full.tf.tmpl b/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_interconnect_full.tf.tmpl index fbc87c248f6e..bbe7a268db3c 100644 --- a/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_interconnect_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_interconnect_full.tf.tmpl @@ -31,5 +31,3 @@ resource "google_compute_interconnect_attachment" "attachment" { router = google_compute_router.router.id mtu = 1500 } - - diff --git a/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_vpn_full.tf.tmpl b/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_vpn_full.tf.tmpl index 90de9e6bddf8..d3a8d777d2af 100644 --- a/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_vpn_full.tf.tmpl +++ b/mmv1/templates/terraform/examples/network_management_vpc_flow_logs_config_vpn_full.tf.tmpl @@ -68,4 +68,3 @@ resource "google_compute_route" "route" { priority = 1000 next_hop_vpn_tunnel = google_compute_vpn_tunnel.tunnel.id } - diff --git a/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine.tf.tmpl b/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine.tf.tmpl index 6d8f1ee21a56..322de50ac4a0 100644 --- a/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine.tf.tmpl +++ b/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine.tf.tmpl @@ -1,75 +1,75 @@ -// App Engine Example -resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - network_endpoint_type = "SERVERLESS" - region = "us-central1" - app_engine { - service = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.service - version = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.version_id - } -} - -resource "google_app_engine_flexible_app_version" "{{$.PrimaryResourceId}}" { - version_id = "v1" - service = "{{index $.Vars "neg_name"}}" - runtime = "nodejs" - flexible_runtime_settings { - operating_system = "ubuntu22" - runtime_version = "20" - } - - entrypoint { - shell = "node ./app.js" - } - - deployment { - zip { - source_url = "https://storage.googleapis.com/${google_storage_bucket.{{$.PrimaryResourceId}}.name}/${google_storage_bucket_object.{{$.PrimaryResourceId}}.name}" - } - } - - liveness_check { - path = "/" - } - - readiness_check { - path = "/" - } - - env_variables = { - port = "8080" - } - - handlers { - url_regex = ".*\\/my-path\\/*" - security_level = "SECURE_ALWAYS" - login = "LOGIN_REQUIRED" - auth_fail_action = "AUTH_FAIL_ACTION_REDIRECT" - - static_files { - path = "my-other-path" - upload_path_regex = ".*\\/my-path\\/*" - } - } - - automatic_scaling { - cool_down_period = "120s" - cpu_utilization { - target_utilization = 0.5 - } - } - - delete_service_on_destroy = true -} - -resource "google_storage_bucket" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - location = "US" - uniform_bucket_level_access = true -} - -resource "google_storage_bucket_object" "{{$.PrimaryResourceId}}" { - name = "hello-world.zip" - bucket = google_storage_bucket.{{$.PrimaryResourceId}}.name - source = "./test-fixtures/hello-world.zip" +// App Engine Example +resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + network_endpoint_type = "SERVERLESS" + region = "us-central1" + app_engine { + service = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.service + version = google_app_engine_flexible_app_version.{{$.PrimaryResourceId}}.version_id + } +} + +resource "google_app_engine_flexible_app_version" "{{$.PrimaryResourceId}}" { + version_id = "v1" + service = "{{index $.Vars "neg_name"}}" + runtime = "nodejs" + flexible_runtime_settings { + operating_system = "ubuntu22" + runtime_version = "20" + } + + entrypoint { + shell = "node ./app.js" + } + + deployment { + zip { + source_url = "https://storage.googleapis.com/${google_storage_bucket.{{$.PrimaryResourceId}}.name}/${google_storage_bucket_object.{{$.PrimaryResourceId}}.name}" + } + } + + liveness_check { + path = "/" + } + + readiness_check { + path = "/" + } + + env_variables = { + port = "8080" + } + + handlers { + url_regex = ".*\\/my-path\\/*" + security_level = "SECURE_ALWAYS" + login = "LOGIN_REQUIRED" + auth_fail_action = "AUTH_FAIL_ACTION_REDIRECT" + + static_files { + path = "my-other-path" + upload_path_regex = ".*\\/my-path\\/*" + } + } + + automatic_scaling { + cool_down_period = "120s" + cpu_utilization { + target_utilization = 0.5 + } + } + + delete_service_on_destroy = true +} + +resource "google_storage_bucket" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + location = "US" + uniform_bucket_level_access = true +} + +resource "google_storage_bucket_object" "{{$.PrimaryResourceId}}" { + name = "hello-world.zip" + bucket = google_storage_bucket.{{$.PrimaryResourceId}}.name + source = "./test-fixtures/hello-world.zip" } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine_empty.tf.tmpl b/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine_empty.tf.tmpl index 0a221538ac12..ef273a0fa91f 100644 --- a/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine_empty.tf.tmpl +++ b/mmv1/templates/terraform/examples/region_network_endpoint_group_appengine_empty.tf.tmpl @@ -1,8 +1,8 @@ -// App Engine Example -resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - network_endpoint_type = "SERVERLESS" - region = "us-central1" - app_engine { - } +// App Engine Example +resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + network_endpoint_type = "SERVERLESS" + region = "us-central1" + app_engine { + } } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/region_network_endpoint_group_cloudrun.tf.tmpl b/mmv1/templates/terraform/examples/region_network_endpoint_group_cloudrun.tf.tmpl index e6c5c2b58715..a35755c73fb8 100644 --- a/mmv1/templates/terraform/examples/region_network_endpoint_group_cloudrun.tf.tmpl +++ b/mmv1/templates/terraform/examples/region_network_endpoint_group_cloudrun.tf.tmpl @@ -1,27 +1,27 @@ -// Cloud Run Example -resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - network_endpoint_type = "SERVERLESS" - region = "us-central1" - cloud_run { - service = google_cloud_run_service.{{$.PrimaryResourceId}}.name - } -} - -resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - location = "us-central1" - - template { - spec { - containers { - image = "us-docker.pkg.dev/cloudrun/container/hello" - } - } - } - - traffic { - percent = 100 - latest_revision = true - } +// Cloud Run Example +resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + network_endpoint_type = "SERVERLESS" + region = "us-central1" + cloud_run { + service = google_cloud_run_service.{{$.PrimaryResourceId}}.name + } +} + +resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + location = "us-central1" + + template { + spec { + containers { + image = "us-docker.pkg.dev/cloudrun/container/hello" + } + } + } + + traffic { + percent = 100 + latest_revision = true + } } \ No newline at end of file diff --git a/mmv1/templates/terraform/examples/region_network_endpoint_group_functions.tf.tmpl b/mmv1/templates/terraform/examples/region_network_endpoint_group_functions.tf.tmpl index f4e2932c4fb9..6aae04cc235c 100644 --- a/mmv1/templates/terraform/examples/region_network_endpoint_group_functions.tf.tmpl +++ b/mmv1/templates/terraform/examples/region_network_endpoint_group_functions.tf.tmpl @@ -1,33 +1,33 @@ -// Cloud Functions Example -resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - network_endpoint_type = "SERVERLESS" - region = "us-central1" - cloud_function { - function = google_cloudfunctions_function.{{$.PrimaryResourceId}}.name - } -} - -resource "google_cloudfunctions_function" "{{$.PrimaryResourceId}}" { - name = "{{index $.Vars "neg_name"}}" - description = "My function" - runtime = "nodejs20" - - available_memory_mb = 128 - source_archive_bucket = google_storage_bucket.bucket.name - source_archive_object = google_storage_bucket_object.archive.name - trigger_http = true - timeout = 60 - entry_point = "helloGET" -} - -resource "google_storage_bucket" "bucket" { - name = "{{index $.Vars "bucket_name"}}" - location = "US" -} - -resource "google_storage_bucket_object" "archive" { - name = "index.zip" - bucket = google_storage_bucket.bucket.name - source = "{{index $.Vars "zip_path"}}" +// Cloud Functions Example +resource "google_compute_region_network_endpoint_group" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + network_endpoint_type = "SERVERLESS" + region = "us-central1" + cloud_function { + function = google_cloudfunctions_function.{{$.PrimaryResourceId}}.name + } +} + +resource "google_cloudfunctions_function" "{{$.PrimaryResourceId}}" { + name = "{{index $.Vars "neg_name"}}" + description = "My function" + runtime = "nodejs20" + + available_memory_mb = 128 + source_archive_bucket = google_storage_bucket.bucket.name + source_archive_object = google_storage_bucket_object.archive.name + trigger_http = true + timeout = 60 + entry_point = "helloGET" +} + +resource "google_storage_bucket" "bucket" { + name = "{{index $.Vars "bucket_name"}}" + location = "US" +} + +resource "google_storage_bucket_object" "archive" { + name = "index.zip" + bucket = google_storage_bucket.bucket.name + source = "{{index $.Vars "zip_path"}}" } \ No newline at end of file diff --git a/mmv1/third_party/terraform/provider/provider.go.tmpl b/mmv1/third_party/terraform/provider/provider.go.tmpl index 1ab0852b03e0..67f405ee835d 100644 --- a/mmv1/third_party/terraform/provider/provider.go.tmpl +++ b/mmv1/third_party/terraform/provider/provider.go.tmpl @@ -322,7 +322,7 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr // Configure DCL basePath transport_tpg.ProviderDCLConfigure(d, &config) - + // Replace hostname by the universe_domain field. if config.UniverseDomain != "" && config.UniverseDomain != "googleapis.com" { for key, basePath := range transport_tpg.DefaultBasePaths { diff --git a/mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl b/mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl index c920e4acdd24..c6407beb19cb 100644 --- a/mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl +++ b/mmv1/third_party/terraform/provider/provider_mmv1_resources.go.tmpl @@ -89,6 +89,8 @@ var handwrittenDatasources = map[string]*schema.Resource{ "google_compute_instance_serial_port": compute.DataSourceGoogleComputeInstanceSerialPort(), "google_compute_instance_template": compute.DataSourceGoogleComputeInstanceTemplate(), "google_compute_instance_guest_attributes": compute.DataSourceGoogleComputeInstanceGuestAttributes(), + "google_compute_interconnect_location": compute.DataSourceGoogleComputeInterconnectLocation(), + "google_compute_interconnect_locations": compute.DataSourceGoogleComputeInterconnectLocations(), "google_compute_lb_ip_ranges": compute.DataSourceGoogleComputeLbIpRanges(), "google_compute_machine_types": compute.DataSourceGoogleComputeMachineTypes(), "google_compute_network": compute.DataSourceGoogleComputeNetwork(), diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go index 3648712e92f9..ac5216766ffa 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_gcp_user_access_binding_test.go @@ -111,7 +111,7 @@ resource "google_access_context_manager_gcp_user_access_binding" "gcp_user_acces google_access_context_manager_access_level.tf_test_access_level_id_for_user_access_binding%{random_suffix}.name, ] session_settings { - max_inactivity = "300s" + max_inactivity = "300s" session_length = "1800s" session_length_enabled = true session_reauth_method = "LOGIN" diff --git a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go index 90e47fc8fc83..3a1bb9693ff5 100644 --- a/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go +++ b/mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_services_perimeters_test.go @@ -260,7 +260,7 @@ resource "google_access_context_manager_service_perimeters" "test-access" { ingress_policies { title = "ingress policy title 2" ingress_from { - identities = ["user:test@google.com"] + identities = ["user:test@google.com"] } ingress_to { resources = ["*"] @@ -286,7 +286,7 @@ resource "google_access_context_manager_service_perimeters" "test-access" { egress_policies { title = "egress policy title 2" egress_from { - identities = ["user:test@google.com"] + identities = ["user:test@google.com"] } egress_to { resources = ["*"] diff --git a/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go b/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go index 48747a85d5b9..f66975481024 100644 --- a/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go +++ b/mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go @@ -104,7 +104,7 @@ func ResourceApigeeKeystoresAliasesKeyCertFile() *schema.Resource { Type: schema.TypeString, Optional: true, Computed: true, - Description: `Flag that specifies whether the certificate is valid. + Description: `Flag that specifies whether the certificate is valid. Flag is set to Yes if the certificate is valid, No if expired, or Not yet if not yet valid.`, }, "issuer": { diff --git a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go.tmpl b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go.tmpl index 79a2b86d5a0f..77716c60dd29 100644 --- a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go.tmpl @@ -266,4 +266,3 @@ func flattenDatasourceGoogleCloudAssetSearchAllResources(v interface{}) []map[st return results } - diff --git a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.tmpl b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.tmpl index ba59b309effe..411cd6a0e93b 100644 --- a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.tmpl +++ b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.tmpl @@ -46,4 +46,3 @@ data google_cloud_asset_search_all_resources resources { } `, project) } - diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.tmpl b/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.tmpl index 4afe6a9b76b0..6126b86df3fd 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.tmpl +++ b/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.tmpl @@ -906,7 +906,7 @@ func TestAccComposerEnvironmentAirflow2_withSoftwareConfig(t *testing.T) { { ResourceName: "google_composer_environment.test", ImportState: true, - ImportStateVerify: true, + ImportStateVerify: true, }, // This is a terrible clean-up step in order to get destroy to succeed, // due to dangling firewall rules left by the Composer Environment blocking network deletion. @@ -1617,7 +1617,7 @@ resource "google_composer_environment" "test" { private_environment_config { enable_private_endpoint = true enable_privately_used_public_ips = true - } + } } } @@ -1660,7 +1660,7 @@ resource "google_composer_environment" "test" { connection_type = "VPC_PEERING" enable_private_endpoint = true enable_privately_used_public_ips = true - } + } } } diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go.tmpl index 6c7cd5b37862..cd846fe99d08 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go.tmpl @@ -208,7 +208,7 @@ func dataSourceGoogleComputeInstanceRead(d *schema.ResourceData, meta interface{ if err := d.Set("creation_timestamp", instance.CreationTimestamp); err != nil { return fmt.Errorf("Error setting creation_timestamp: %s", err) } - + d.SetId(fmt.Sprintf("projects/%s/zones/%s/instances/%s", project, tpgresource.GetResourceNameFromSelfLink(instance.Zone), instance.Name)) return nil } diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_location.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_location.go new file mode 100644 index 000000000000..161365db1943 --- /dev/null +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_location.go @@ -0,0 +1,122 @@ +package compute + +import ( + "fmt" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" +) + +func DataSourceGoogleComputeInterconnectLocation() *schema.Resource { + return &schema.Resource{ + Read: dataSourceGoogleComputeInterconnectLocationRead, + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "project": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "self_link": { + Type: schema.TypeString, + Computed: true, + }, + "peeringdb_facility_id": { + Type: schema.TypeString, + Computed: true, + }, + "address": { + Type: schema.TypeString, + Computed: true, + }, + "facility_provider": { + Type: schema.TypeString, + Computed: true, + }, + "facility_provider_facility_id": { + Type: schema.TypeString, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Computed: true, + }, + "continent": { + Type: schema.TypeString, + Computed: true, + }, + "city": { + Type: schema.TypeString, + Computed: true, + }, + "availability_zone": { + Type: schema.TypeString, + Computed: true, + }, + "supports_pzs": { + Type: schema.TypeBool, + Computed: true, + }, + "available_features": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "available_link_types": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + } +} + +func dataSourceGoogleComputeInterconnectLocationRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*transport_tpg.Config) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + if err != nil { + return err + } + + project, err := tpgresource.GetProject(d, config) + if err != nil { + return err + } + + name := d.Get("name").(string) + + location, err := config.NewComputeClient(userAgent).InterconnectLocations.Get(project, name).Do() + if err != nil { + return transport_tpg.HandleDataSourceNotFoundError(err, d, fmt.Sprintf("Interconnect Location %q not found", name), "") + } + + d.SetId(location.Name) + d.Set("project", project) + d.Set("description", location.Description) + d.Set("self_link", location.SelfLink) + d.Set("peeringdb_facility_id", location.PeeringdbFacilityId) + d.Set("address", location.Address) + d.Set("facility_provider", location.FacilityProvider) + d.Set("facility_provider_facility_id", location.FacilityProviderFacilityId) + d.Set("status", location.Status) + d.Set("continent", location.Continent) + d.Set("city", location.City) + d.Set("availability_zone", location.AvailabilityZone) + d.Set("supports_pzs", location.SupportsPzs) + d.Set("available_features", location.AvailableFeatures) + d.Set("available_link_types", location.AvailableLinkTypes) + + return nil +} diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_location_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_location_test.go new file mode 100644 index 000000000000..9e1e1f1a758d --- /dev/null +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_location_test.go @@ -0,0 +1,32 @@ +package compute + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" +) + +func TestAccDataSourceGoogleComputeInterconnectLocation_basic(t *testing.T) { + t.Parallel() + + vcrTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceGoogleComputeInterconnectLocation_basic(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("data.google_compute_interconnect_location.iad_zone1", "self_link"), + ), + }, + }, + }) +} + +func testAccDataSourceGoogleComputeInterconnectLocation_basic() string { + return ` +data "google_compute_interconnect_location" "iad_zone1" { + name = "iad-zone1-1" +} +` +} diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_locations.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_locations.go new file mode 100644 index 000000000000..a7c2ca017023 --- /dev/null +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_locations.go @@ -0,0 +1,137 @@ +package compute + +import ( + "fmt" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" + transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" +) + +func DataSourceGoogleComputeInterconnectLocations() *schema.Resource { + return &schema.Resource{ + Read: dataSourceGoogleComputeInterconnectLocationsRead, + Schema: map[string]*schema.Schema{ + "project": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "locations": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Computed: true, + }, + "description": { + Type: schema.TypeString, + Computed: true, + }, + "self_link": { + Type: schema.TypeString, + Computed: true, + }, + "peeringdb_facility_id": { + Type: schema.TypeString, + Computed: true, + }, + "address": { + Type: schema.TypeString, + Computed: true, + }, + "facility_provider": { + Type: schema.TypeString, + Computed: true, + }, + "facility_provider_facility_id": { + Type: schema.TypeString, + Computed: true, + }, + "status": { + Type: schema.TypeString, + Computed: true, + }, + "continent": { + Type: schema.TypeString, + Computed: true, + }, + "city": { + Type: schema.TypeString, + Computed: true, + }, + "availability_zone": { + Type: schema.TypeString, + Computed: true, + }, + "supports_pzs": { + Type: schema.TypeBool, + Computed: true, + }, + "available_features": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + "available_link_types": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{ + Type: schema.TypeString, + }, + }, + }, + }, + }, + }, + } +} + +func dataSourceGoogleComputeInterconnectLocationsRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*transport_tpg.Config) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + if err != nil { + return err + } + + project, err := tpgresource.GetProject(d, config) + if err != nil { + return err + } + + d.SetId(fmt.Sprintf("projects/%s", project)) + + list, err := config.NewComputeClient(userAgent).InterconnectLocations.List(project).Do() + if err != nil { + return fmt.Errorf("Error retrieving list of interconnect locations: %s", err) + } + + var locations []map[string]interface{} + for _, location := range list.Items { + locations = append(locations, map[string]interface{}{ + "name": location.Name, + "description": location.Description, + "self_link": location.SelfLink, + "peeringdb_facility_id": location.PeeringdbFacilityId, + "address": location.Address, + "facility_provider": location.FacilityProvider, + "facility_provider_facility_id": location.FacilityProviderFacilityId, + "status": location.Status, + "continent": location.Continent, + "city": location.City, + "availability_zone": location.AvailabilityZone, + "supports_pzs": location.SupportsPzs, + "available_features": location.AvailableFeatures, + "available_link_types": location.AvailableLinkTypes, + }) + } + if err := d.Set("locations", locations); err != nil { + return fmt.Errorf("Error setting locations: %s", err) + } + + return nil +} diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_locations_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_locations_test.go new file mode 100644 index 000000000000..ff1280eed849 --- /dev/null +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_interconnect_locations_test.go @@ -0,0 +1,30 @@ +package compute + +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" +) + +func TestAccDataSourceGoogleComputeInterconnectLocations_basic(t *testing.T) { + t.Parallel() + + vcrTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + Steps: []resource.TestStep{ + { + Config: testAccDataSourceGoogleComputeInterconnectLocations_basic(), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("data.google_compute_interconnect_locations.all", "locations.0.self_link"), + ), + }, + }, + }) +} + +func testAccDataSourceGoogleComputeInterconnectLocations_basic() string { + return ` +data "google_compute_interconnect_locations" "all" {} +` +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_cross_site_network_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_cross_site_network_test.go.tmpl new file mode 100644 index 000000000000..f2f79da4fcb0 --- /dev/null +++ b/mmv1/third_party/terraform/services/compute/resource_compute_cross_site_network_test.go.tmpl @@ -0,0 +1,75 @@ +package compute_test +{{ if ne $.TargetVersionName `ga` -}} +import ( + "testing" + + "github.com/hashicorp/terraform-plugin-testing/helper/resource" + + "github.com/hashicorp/terraform-provider-google/google/acctest" + "github.com/hashicorp/terraform-provider-google/google/envvar" +) + +func TestAccComputeCrossSiteNetwork_update(t *testing.T) { + t.Parallel() + + context := map[string]interface{}{ + "project": envvar.GetTestProjectFromEnv(), + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), + CheckDestroy: testAccCheckComputeCrossSiteNetworkDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeCrossSiteNetwork_basic(context), + }, + { + ResourceName: "google_compute_cross_site_network.example-cross-site-network", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccComputeCrossSiteNetwork_update(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("google_compute_cross_site_network.example-cross-site-network", "description", "Example cross site network updated"+context["random_suffix"].(string)), + ), + }, + { + ResourceName: "google_compute_cross_site_network.example-cross-site-network", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeCrossSiteNetwork_basic(context map[string]interface{}) string { + return acctest.Nprintf(` +data "google_project" "project" { + provider = google-beta +} + +resource "google_compute_cross_site_network" "example-cross-site-network" { + name = "tf-test-test-cross-site-network%{random_suffix}" + description = "Example cross site network%{random_suffix}" + provider = google-beta +} +`, context) +} + +func testAccComputeCrossSiteNetwork_update(context map[string]interface{}) string { + return acctest.Nprintf(` +data "google_project" "project" { + provider = google-beta +} + +resource "google_compute_cross_site_network" "example-cross-site-network" { +name = "tf-test-test-cross-site-network%{random_suffix}" +description = "Example cross site network updated%{random_suffix}" + provider = google-beta +} +`, context) +} +{{- end }} \ No newline at end of file diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_with_rules_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_with_rules_test.go.tmpl index b1bbb6466780..b7d42e56ca08 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_with_rules_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_with_rules_test.go.tmpl @@ -218,4 +218,3 @@ resource "google_network_security_security_profile" "security_profile_1" { `, context) } {{- end }} - diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl index 4d1eba38721b..27044f37e455 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_test.go.tmpl @@ -1568,7 +1568,7 @@ func TestAccComputeInstance_serviceAccount(t *testing.T) { "https://www.googleapis.com/auth/devstorage.read_only"), testAccCheckComputeInstanceServiceAccount(&instance, "https://www.googleapis.com/auth/userinfo.email"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_serviceAccount(instanceName)), ), }, @@ -1594,7 +1594,7 @@ func TestAccComputeInstance_noServiceAccount(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceNoServiceAccount(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_noServiceAccount(instanceName)), ), }, @@ -1620,7 +1620,7 @@ func TestAccComputeInstance_serviceAccountEmail_0scopes(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceMatchServiceAccount(&instance, "\\d+-compute@developer.gserviceaccount.com"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_serviceAccountEmail_0scopes(instanceName)), ), }, @@ -1677,7 +1677,7 @@ func TestAccComputeInstance_serviceAccount_updated(t *testing.T) { t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceMatchServiceAccount(&instance, "\\d+-compute@developer.gserviceaccount.com"), testAccCheckComputeInstanceScopes(&instance, 3), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_serviceAccount_update3(instanceName)), ), }, @@ -1724,7 +1724,7 @@ func TestAccComputeInstance_serviceAccount_updated0to1to0scopes(t *testing.T) { t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceNoServiceAccount(&instance), testAccCheckComputeInstanceScopes(&instance, 0), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_serviceAccount_update01(instanceName)), ), }, @@ -1757,7 +1757,7 @@ func TestAccComputeInstance_scheduling(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_schedulingUpdated(instanceName)), ), }, @@ -1845,7 +1845,7 @@ func TestAccComputeInstance_advancedMachineFeatures(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_advancedMachineFeaturesUpdated(instanceName)), ), }, @@ -1900,7 +1900,7 @@ func TestAccComputeInstance_performanceMonitoringUnit(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), resource.TestCheckResourceAttr("google_compute_instance.foobar", "advanced_machine_features.0.performance_monitoring_unit", "ARCHITECTURAL"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_performanceMonitoringUnit(context_3)), ), }, @@ -1928,7 +1928,7 @@ func TestAccComputeInstance_enableUefiNetworking(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), resource.TestCheckResourceAttr("google_compute_instance.foobar", "advanced_machine_features.0.enable_uefi_networking", "true"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_enableUefiNetworking(context_1)), ), }, @@ -1964,7 +1964,7 @@ func TestAccComputeInstance_soleTenantNodeAffinities(t *testing.T) { { Config: testAccComputeInstance_soleTenantNodeAffinitiesReduced(instanceName, templateName, groupName), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_soleTenantNodeAffinitiesReduced(instanceName, templateName, groupName)), ), }, @@ -2006,7 +2006,7 @@ func TestAccComputeInstance_reservationAffinities(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasReservationAffinity(&instance, "SPECIFIC_RESERVATION", instanceName), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_reservationAffinity_specificReservationConfig(instanceName)), ), }, @@ -2078,7 +2078,7 @@ func TestAccComputeInstance_hostErrorTimeoutSecconds(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), resource.TestCheckResourceAttr("google_compute_instance.foobar", "scheduling.0.host_error_timeout_seconds", "0"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_hostErrorTimeoutSeconds(context_4)), ), }, @@ -2105,7 +2105,7 @@ func TestAccComputeInstance_subnet_auto(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasSubnet(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_subnet_auto(acctest.RandString(t, 10), instanceName)), ), }, @@ -2131,7 +2131,7 @@ func TestAccComputeInstance_subnet_custom(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasSubnet(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_subnet_custom(acctest.RandString(t, 10), instanceName)), ), }, @@ -2163,7 +2163,7 @@ func TestAccComputeInstance_subnet_xpn(t *testing.T) { t, "google_compute_instance.foobar", fmt.Sprintf("%s-service", projectName), &instance), testAccCheckComputeInstanceHasSubnet(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_subnet_xpn(org, billingId, projectName, instanceName, acctest.RandString(t, 10))), ), }, @@ -2188,7 +2188,7 @@ func TestAccComputeInstance_networkIPAuto(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasAnyNetworkIP(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_networkIPAuto(acctest.RandString(t, 10), instanceName)), ), }, @@ -2213,7 +2213,7 @@ func TestAccComputeInstance_network_ip_custom(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasNetworkIP(&instance, ipAddress), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_network_ip_custom(acctest.RandString(t, 10), instanceName, ipAddress)), ), }, @@ -2239,7 +2239,7 @@ func TestAccComputeInstance_private_image_family(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_private_image_family(diskName, familyName, instanceName)), ), }, @@ -2266,7 +2266,7 @@ func TestAccComputeInstance_networkPerformanceConfig(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasNetworkPerformanceConfig(&instance, "DEFAULT"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_networkPerformanceConfig(imageName, diskName, instanceName)), ), }, @@ -2316,7 +2316,7 @@ func TestAccComputeInstance_multiNic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasMultiNic(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_multiNic(instanceName, networkName, subnetworkName)), ), }, @@ -2348,7 +2348,7 @@ func TestAccComputeInstance_nictype_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_nictype(instanceName, "VIRTIO_NET")), ), }, @@ -2372,7 +2372,7 @@ func TestAccComputeInstance_guestAccelerator(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasGuestAccelerator(&instance, "nvidia-tesla-t4", 1), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_guestAccelerator(instanceName, 1)), ), }, @@ -2429,7 +2429,7 @@ func TestAccComputeInstance_minCpuPlatform(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasMinCpuPlatform(&instance, ""), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_minCpuPlatform_remove(instanceName)), ), }, @@ -2455,7 +2455,7 @@ func TestAccComputeInstance_deletionProtectionExplicitFalse(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasConfiguredDeletionProtection(&instance, false), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_basic_deletionProtectionFalse(instanceName)), ), }, @@ -2512,7 +2512,7 @@ func TestAccComputeInstance_primaryAliasIpRange(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasAliasIpRange(&instance, "", "/24"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_primaryAliasIpRange(instanceName)), ), }, @@ -2547,7 +2547,7 @@ func TestAccComputeInstance_secondaryAliasIpRange(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasAliasIpRange(&instance, "", "10.0.1.0/24"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_secondaryAliasIpRangeUpdate(networkName, subnetName, instanceName)), ), }, @@ -2593,7 +2593,7 @@ func TestAccComputeInstance_aliasIpRangeCommonAddresses(t *testing.T) { testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasAliasIpRange(&instance, "inst-test-secondary", "172.16.1.0/24"), testAccCheckComputeInstanceHasAliasIpRange(&instance, "inst-test-tertiary", "10.1.3.0/24"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_secondaryAliasIpRangeUpdateWithCommonAddressDifferentRanges(networkName, subnetName, instanceName)), ), }, @@ -2618,7 +2618,7 @@ func TestAccComputeInstance_hostname(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("google_compute_instance.foobar", "hostname"), testAccCheckComputeInstanceLacksShieldedVmConfig(&instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_hostname(instanceName)), ), }, @@ -2651,7 +2651,7 @@ func TestAccComputeInstance_shieldedVmConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasShieldedVmConfig(&instance, true, true, false), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_shieldedVmConfig(instanceName, true, true, false)), ), }, @@ -2751,7 +2751,7 @@ func TestAccComputeInstance_confidentialHyperDiskBootDisk(t *testing.T) { { Config: testAccComputeInstanceConfidentialHyperDiskBootDisk(context_2), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstanceConfidentialHyperDiskBootDisk(context_2)), ), }, @@ -2778,7 +2778,7 @@ func TestAccComputeInstance_hyperdiskBootDisk_provisioned_iops_throughput(t *tes { Config: testAccComputeInstanceHyperDiskBootDiskProvisionedIopsThroughput(context), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstanceHyperDiskBootDiskProvisionedIopsThroughput(context)), ), }, @@ -2804,7 +2804,7 @@ func TestAccComputeInstance_enableDisplay(t *testing.T) { { Config: testAccComputeInstance_enableDisplayUpdated(instanceName), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_enableDisplayUpdated(instanceName)), ), }, @@ -2847,7 +2847,7 @@ func TestAccComputeInstance_desiredStatusTerminatedOnCreation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasStatus(&instance, context_2["desired_status"].(string)), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_desiredStatusOnCreation(context_2)), ), }, @@ -2943,7 +2943,7 @@ func TestAccComputeInstance_desiredStatusUpdateBasic(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasStatus(&instance, "RUNNING"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_machineType_desiredStatus_allowStoppingForUpdate(instanceName, "e2-medium", "RUNNING", false)), ), }, @@ -2987,7 +2987,7 @@ func TestAccComputeInstance_desiredStatusTerminatedUpdateFields(t *testing.T) { testAccCheckComputeInstanceLabel(&instance, "only_me", "nothing_else"), testAccCheckComputeInstanceTag(&instance, "baz"), testAccCheckComputeInstanceHasStatus(&instance, "TERMINATED"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_desiredStatusTerminatedUpdate(instanceName)), ), }, @@ -3109,7 +3109,7 @@ func TestAccComputeInstance_updateRunning_desiredStatusTerminated_allowStoppingF t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasMachineType(&instance, "e2-standard-2"), testAccCheckComputeInstanceHasStatus(&instance, "TERMINATED"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_machineType_desiredStatus_allowStoppingForUpdate(instanceName, "e2-standard-2", "TERMINATED", true)), ), }, @@ -3183,7 +3183,7 @@ func TestAccComputeInstance_updateTerminated_desiredStatusNotSet_allowStoppingFo t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasMachineType(&instance, "e2-standard-2"), testAccCheckComputeInstanceHasStatus(&instance, "TERMINATED"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_machineType_desiredStatus_allowStoppingForUpdate(instanceName, "e2-standard-2", "", true)), ), }, @@ -3265,7 +3265,7 @@ func TestAccComputeInstance_updateTerminated_desiredStatusNotSet_notAllowStoppin t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasMachineType(&instance, "e2-standard-2"), testAccCheckComputeInstanceHasStatus(&instance, "TERMINATED"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_machineType_desiredStatus_allowStoppingForUpdate(instanceName, "e2-standard-2", "", false)), ), }, @@ -3433,7 +3433,7 @@ func TestAccComputeInstance_desiredStatus_suspended(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasStatus(&instance, "RUNNING"), // this mimics resume method behavior - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_desiredStatus_suspended(context_1)), ), }, @@ -3454,7 +3454,7 @@ func TestAccComputeInstance_resourcePolicyCollocate(t *testing.T) { { Config: testAccComputeInstance_resourcePolicyCollocate(instanceName, acctest.RandString(t, 10)), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_resourcePolicyCollocate(instanceName, acctest.RandString(t, 10))), ), }, @@ -3481,7 +3481,7 @@ func TestAccComputeInstance_resourcePolicySpread(t *testing.T) { t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasStatus(&instance, "RUNNING"), testAccCheckComputeInstanceHasAvailabilityDomain(&instance, 3), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_resourcePolicySpread(instanceName, acctest.RandString(t, 10))), ), }, @@ -3511,7 +3511,7 @@ func TestAccComputeInstance_subnetworkUpdate(t *testing.T) { { Config: testAccComputeInstance_subnetworkUpdate(suffix, instanceName), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_subnetworkUpdate(suffix, instanceName)), ), }, @@ -3570,7 +3570,7 @@ func TestAccComputeInstance_networkIpUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceHasNetworkIP(&instance, "10.3.0.5"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_networkIpUpdateWithComputeAddress(suffix, instanceName)), ), }, @@ -3591,7 +3591,7 @@ func TestAccComputeInstance_queueCount(t *testing.T) { { Config: testAccComputeInstance_queueCountSet(instanceName), Check: resource.ComposeTestCheckFunc( - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_queueCountSet(instanceName)), ), }, @@ -3616,7 +3616,7 @@ func TestAccComputeInstance_spotVM(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_spotVM(instanceName)), ), }, @@ -3682,7 +3682,7 @@ func TestAccComputeInstance_maxRunDuration_update(t *testing.T) { t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceTerminationAction(&instance, "STOP"), testAccCheckComputeInstanceMaxRunDuration(&instance, expectedMaxRunDuration), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_standardVM_maxRunDurationUpdated(instanceName, "STOP")), ), }, @@ -3714,7 +3714,7 @@ func TestAccComputeInstance_standardVM_maxRunDuration_stopTerminationAction(t *t t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceTerminationAction(&instance, instanceTerminationAction), testAccCheckComputeInstanceMaxRunDuration(&instance, expectedMaxRunDuration), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_standardVM_maxRunDuration(instanceName, instanceTerminationAction)), ), }, @@ -3746,7 +3746,7 @@ func TestAccComputeInstance_localSsdVM_maxRunDuration_stopTerminationAction(t *t t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceTerminationAction(&instance, instanceTerminationAction), testAccCheckComputeInstanceMaxRunDuration(&instance, expectedMaxRunDuration), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_localSsdVM_maxRunDuration(instanceName, instanceTerminationAction)), ), }, @@ -3778,7 +3778,7 @@ func TestAccComputeInstance_spotVM_maxRunDuration_deleteTerminationAction(t *tes t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceTerminationAction(&instance, instanceTerminationAction), testAccCheckComputeInstanceMaxRunDuration(&instance, expectedMaxRunDuration), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_spotVM_maxRunDuration(instanceName, instanceTerminationAction)), ), }, @@ -3873,7 +3873,7 @@ func TestAccComputeInstance_localSsdRecoveryTimeout(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceLocalSsdRecoveryTimeout(&instance, expectedLocalSsdRecoveryTimeout), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_localSsdRecoveryTimeout(instanceName)), ), }, @@ -3939,7 +3939,7 @@ func TestAccComputeInstance_partnerMetadata(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstancePartnerMetadata(&instance, expectedPartnerMetadata), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_partnerMetadata(instanceName)), ), }, @@ -4013,7 +4013,7 @@ func TestAccComputeInstance_partnerMetadata_deletePartnerMetadata(t *testing.T) Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_partnerMetadata_empty(instanceName)), ), }, @@ -4046,7 +4046,7 @@ func TestAccComputeInstance_metadataStartupScript_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_metadataStartupScript(instanceName, "e2-standard-4", "xyz")), ), }, @@ -4085,7 +4085,7 @@ func TestAccComputeInstance_metadataStartupScript_gracefulSwitch(t *testing.T) { &instance, "foo", "abc"), testAccCheckComputeInstanceMetadata( &instance, "startup-script", "echo hi > /test.txt"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_metadataStartupScript_gracefulSwitch(instanceName, "e2-medium", "abc")), ), }, @@ -4148,7 +4148,7 @@ func TestAccComputeInstance_creationOnlyAttributionLabel(t *testing.T) { t, "google_compute_instance.foobar", &instance), testAccCheckComputeInstanceLabel(&instance, "user_label", "bar"), testAccCheckComputeInstanceAttributionLabel(&instance, true), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_attributionLabelUpdate(instanceName, "true", "CREATION_ONLY")), ), }, @@ -4263,7 +4263,7 @@ func TestAccComputeInstance_autoDeleteUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), resource.TestCheckResourceAttr("google_compute_instance.foobar", "boot_disk.0.auto_delete", "true"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_autoDeleteUpdate(context_1)), ), }, @@ -4315,7 +4315,7 @@ func TestAccComputeInstance_keyRevocationActionType(t *testing.T) { testAccCheckComputeInstanceExists( t, "google_compute_instance.foobar", &instance), resource.TestCheckResourceAttr("google_compute_instance.foobar", "key_revocation_action_type", ""), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_keyRevocationActionType(context_3)), ), }, @@ -4422,7 +4422,7 @@ func TestAccComputeInstance_GracefulShutdownWithResetUpdate(t *testing.T) { testAccCheckComputeInstanceExists(t, "google_compute_instance.foobar", &instance), resource.TestCheckResourceAttr("google_compute_instance.foobar", "allow_stopping_for_update", "true"), resource.TestCheckResourceAttr("google_compute_instance.foobar", "scheduling.0.graceful_shutdown.0.max_duration.0.seconds", "100"), - acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", + acctest.GetTestMetadataForTgc("compute", "google_compute_instance.foobar", testAccComputeInstance_GracefulShutdownUpdate(acceptableByApi_3)), ), }, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_with_rules_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_with_rules_test.go.tmpl index 0fddf58aad55..db0429635ab0 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_with_rules_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_with_rules_test.go.tmpl @@ -164,7 +164,7 @@ resource "google_network_security_security_profile" "security_profile_1" { func testAccComputeNetworkFirewallPolicyWithRules_update(context map[string]interface{}) string { return acctest.Nprintf(` data "google_project" "project" { - provider = google-beta + provider = google-beta } resource "google_compute_network_firewall_policy_with_rules" "network-firewall-policy-with-rules" { @@ -259,5 +259,3 @@ resource "google_network_security_security_profile" "security_profile_1" { `, context) } {{- end }} - - diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.tmpl index ee55e2bba82a..0618571eff17 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_backend_service_test.go.tmpl @@ -1310,7 +1310,7 @@ resource "google_compute_region_backend_service" "foobar" { name = "%s" health_checks = [google_compute_health_check.health_check.self_link] protocol = "TCP" - load_balancing_scheme = "INTERNAL" + load_balancing_scheme = "INTERNAL" subsetting { policy = "CONSISTENT_HASH_SUBSETTING" } @@ -1331,7 +1331,7 @@ resource "google_compute_region_backend_service" "foobar" { name = "%s" health_checks = [google_compute_health_check.health_check.self_link] protocol = "TCP" - load_balancing_scheme = "INTERNAL" + load_balancing_scheme = "INTERNAL" } resource "google_compute_health_check" "health_check" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_with_rules_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_with_rules_test.go.tmpl index 9adc5d300f29..153fd91ee8d5 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_with_rules_test.go.tmpl +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_with_rules_test.go.tmpl @@ -210,4 +210,3 @@ resource "google_tags_tag_value" "secure_tag_value_1" { `, context) } {{- end }} - diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl index 201c67b7947e..24f698677a6d 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl +++ b/mmv1/third_party/terraform/services/container/resource_container_node_pool_test.go.tmpl @@ -4581,7 +4581,7 @@ func testAccContainerNodePool_withFlexStart(clusterName, np, networkName, subnet return fmt.Sprintf(` resource "google_container_cluster" "cluster" { min_master_version = "1.32.3-gke.1717000" - + name = "%s" location = "us-central1-a" initial_node_count = 1 diff --git a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go.tmpl b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go.tmpl index fb6d4a649283..38eccfd59538 100644 --- a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go.tmpl +++ b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go.tmpl @@ -72,7 +72,7 @@ func ResourceDataflowJobTemplateGcsPathDiffSuppress(k, old, new string, d *schem func isRegionSuffixedPathMatch(old, new string) bool { re := regexp.MustCompile(`gs://([a-z0-9\-]+)-[a-z0-9]+-[a-z0-9]+(/.*)?`) matches := re.FindStringSubmatch(old) - + if len(matches) == 3 && matches[2] != "" { modifiedOld := "gs://" + matches[1] + matches[2] return modifiedOld == new diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go index 834f88fadc60..d2097a0b3278 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster.go @@ -262,7 +262,7 @@ func ResourceDataprocCluster() *schema.Resource { Optional: true, Elem: &schema.Schema{Type: schema.TypeString}, Description: `The list of the labels (key/value pairs) configured on the resource and to be applied to instances in the cluster. - + **Note**: This field is non-authoritative, and will only manage the labels present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the resource.`, }, diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.tmpl index ce91b2dc7217..6f2fdee1edf6 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.tmpl @@ -2774,4 +2774,3 @@ resource "google_dataproc_metastore_service" "ms" { } `, clusterName, serviceId) } - diff --git a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go.tmpl b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go.tmpl index ea74a7e7dc09..4fd87a5ed964 100644 --- a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go.tmpl +++ b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go.tmpl @@ -142,15 +142,15 @@ func testAccDeveloperConnectAccountConnector_GitlabUpdate(context map[string]int resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" - + annotations = { "foo": "bar" } - + labels = { "bar": "foo" } - + provider_oauth_config { system_provider_id = "GITLAB" scopes = ["api", "read_api"] @@ -219,11 +219,11 @@ func testAccDeveloperConnectAccountConnector_GoogleUpdate(context map[string]int resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" - + annotations = { "foo": "bar" } - + labels = { "bar": "foo" } @@ -296,11 +296,11 @@ func testAccDeveloperConnectAccountConnector_SentryUpdate(context map[string]int resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" - + annotations = { "foo": "bar" } - + labels = { "bar": "foo" } @@ -373,11 +373,11 @@ func testAccDeveloperConnectAccountConnector_RovoUpdate(context map[string]inter resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" - + annotations = { "foo": "bar" } - + labels = { "bar": "foo" } @@ -450,11 +450,11 @@ func testAccDeveloperConnectAccountConnector_NewRelicUpdate(context map[string]i resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" - + annotations = { "foo": "bar" } - + labels = { "bar": "foo" } @@ -527,11 +527,11 @@ func testAccDeveloperConnectAccountConnector_DatastaxUpdate(context map[string]i resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" - + annotations = { "foo": "bar" } - + labels = { "bar": "foo" } @@ -543,5 +543,3 @@ resource "google_developer_connect_account_connector" "my-account-connector" { } `, context) } - - diff --git a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go.tmpl b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go.tmpl index d9be48f20c8b..29269b5c44a2 100644 --- a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go.tmpl +++ b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go.tmpl @@ -560,8 +560,8 @@ func TestAccDeveloperConnectConnection_developerConnectConnectionBitbucketDataCe { Config: testAccDeveloperConnectConnection_BitbucketDataCenterUpdate(context), ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_connection.my-connection", plancheck.ResourceActionUpdate), + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_connection.my-connection", plancheck.ResourceActionUpdate), }, }, }, @@ -634,9 +634,9 @@ func TestAccDeveloperConnectConnection_BbdcPrivConnection(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), - } + } - acctest.VcrTest(t, resource.TestCase{ + acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ @@ -651,11 +651,11 @@ func TestAccDeveloperConnectConnection_BbdcPrivConnection(t *testing.T) { }, }, }) -} +} func testAccDeveloperConnectConnection_BbdcPrivConnection(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_connection" "my-connection" { location = "us-central1" connection_id = "tf-test-tf-test-connection%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go b/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go index 0442f018d845..5173f787a8e4 100644 --- a/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go +++ b/mmv1/third_party/terraform/services/iap/data_source_iap_client_test.go @@ -50,13 +50,13 @@ resource "google_project_service" "project_service" { project = google_project.project.project_id service = "iap.googleapis.com" } - + resource "google_iap_brand" "project_brand" { support_email = "support@%{org_domain}" application_title = "Cloud IAP protected Application" project = google_project_service.project_service.project } - + resource "google_iap_client" "project_client" { display_name = "Test Client" brand = google_iap_brand.project_brand.name diff --git a/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_handle.go.tmpl b/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_handle.go.tmpl index 043d6d5c5039..e21865a23de5 100644 --- a/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_handle.go.tmpl +++ b/mmv1/third_party/terraform/services/kms/data_source_google_kms_key_handle.go.tmpl @@ -30,8 +30,8 @@ func dataSourceGoogleKmsKeyHandleRead(d *schema.ResourceData, meta interface{}) return err } keyHandleId := KmsKeyHandleId{ - Name: d.Get("name").(string), - Location: d.Get("location").(string), + Name: d.Get("name").(string), + Location: d.Get("location").(string), Project: project, } id := keyHandleId.KeyHandleId() diff --git a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_spoke_test.go b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_spoke_test.go index 9c28e20a50f9..ca155dd7024d 100644 --- a/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_spoke_test.go +++ b/mmv1/third_party/terraform/services/networkconnectivity/resource_network_connectivity_spoke_test.go @@ -604,7 +604,7 @@ resource "google_network_connectivity_spoke" "primary" { "10.10.0.0/16" ] include_export_ranges = [ - "198.51.100.0/23", + "198.51.100.0/23", "10.0.0.0/8" ] uri = google_compute_network.network.self_link diff --git a/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl b/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl index 04c17b73a924..bb1b5d1a1396 100644 --- a/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl @@ -242,4 +242,3 @@ resource "google_compute_route" "route" { } `, context) } - diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_backend_authentication_config_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_backend_authentication_config_test.go.tmpl index 1c0a4594fb53..015446354702 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_backend_authentication_config_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_backend_authentication_config_test.go.tmpl @@ -5,7 +5,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" - + "github.com/hashicorp/terraform-provider-google/google/acctest" ) diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.tmpl index 45106b1dbdec..47ff9ffad9d2 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.tmpl +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_client_tls_policy_test.go.tmpl @@ -85,8 +85,8 @@ func testAccNetworkSecurityClientTlsPolicy_update(clientTlsPolicyName string) st } } server_validation_ca { - grpc_endpoint { - target_uri = "unix:mypath2" + grpc_endpoint { + target_uri = "unix:mypath2" } } } diff --git a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.tmpl b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.tmpl index fc13e6adcc10..432d77563837 100644 --- a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.tmpl +++ b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.tmpl @@ -74,4 +74,3 @@ resource "google_org_policy_custom_constraint" "constraint" { } `, context) } - diff --git a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_test.go.tmpl b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_test.go.tmpl index e67a0565fbb9..142d7b1ab359 100644 --- a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_test.go.tmpl +++ b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_test.go.tmpl @@ -110,10 +110,10 @@ resource "google_os_config_v2_policy_orchestrator_for_folder" "policy_orchestrat policy_orchestrator_id = "tf-test-po-folder%{random_suffix}" folder_id = google_folder.my_folder.folder_id - + state = "ACTIVE" action = "UPSERT" - + orchestrated_resource { id = "tf-test-test-orchestrated-resource-folder%{random_suffix}" os_policy_assignment_v1_payload { diff --git a/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.tmpl index f67faddd73f3..cec59af347fe 100644 --- a/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.tmpl +++ b/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.tmpl @@ -446,7 +446,7 @@ func testAccCheckRedisClusterOnDemandBackup(t *testing.T, resourceName string, b if err != nil { return fmt.Errorf("Error creating on-demand backup for Redis cluster %s: %s", name, err) } - + // Wait for the operation to complete err = redis.RedisOperationWaitTime( config, res, project, "Creating Redis Cluster Backup", config.UserAgent, diff --git a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job.go.tmpl b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job.go.tmpl index f283d995173d..5ba48321dbdf 100644 --- a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job.go.tmpl +++ b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job.go.tmpl @@ -1343,11 +1343,11 @@ func flattenAwsS3Data(awsS3Data *storagetransfer.AwsS3Data, d *schema.ResourceDa if _, exist := d.GetOk("transfer_spec.0.aws_s3_data_source.0.aws_access_key"); exist{ data["aws_access_key"] = flattenAwsAccessKeys(d) } - + if awsS3Data.ManagedPrivateNetwork { data["managed_private_network"] = awsS3Data.ManagedPrivateNetwork } - + return []map[string]interface{}{data} } diff --git a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go index 1d50924e8060..458bd223d620 100644 --- a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go +++ b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_test.go @@ -911,7 +911,7 @@ resource "google_storage_transfer_job" "transfer_job" { } repeat_interval = "604800s" } - + logging_config { log_actions = [ "COPY", @@ -1086,7 +1086,7 @@ resource "google_storage_transfer_job" "transfer_job" { } repeat_interval = "604800s" } - + logging_config { log_actions = [ "COPY", @@ -1112,7 +1112,7 @@ func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketN data "google_storage_transfer_project_service_account" "default" { project = "%s" } - + resource "google_storage_bucket" "data_source" { name = "%s" project = "%s" @@ -1120,13 +1120,13 @@ func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketN force_destroy = true uniform_bucket_level_access = true } - + resource "google_storage_bucket_iam_member" "data_source" { bucket = google_storage_bucket.data_source.name role = "roles/storage.admin" member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}" } - + resource "google_storage_bucket" "data_sink" { name = "%s" project = "%s" @@ -1134,18 +1134,18 @@ func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketN force_destroy = true uniform_bucket_level_access = true } - + resource "google_storage_bucket_iam_member" "data_sink" { bucket = google_storage_bucket.data_sink.name role = "roles/storage.admin" member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}" } - + resource "google_storage_transfer_job" "transfer_job" { name = "transferJobs/%s" description = "%s" project = "%s" - + transfer_spec { gcs_data_source { bucket_name = google_storage_bucket.data_source.name @@ -1156,7 +1156,7 @@ func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketN path = "foo/bar/" } } - + schedule { schedule_start_date { year = 2018 @@ -1176,7 +1176,7 @@ func testAccStorageTransferJob_transferJobName(project string, dataSourceBucketN } repeat_interval = "604800s" } - + depends_on = [ google_storage_bucket_iam_member.data_source, google_storage_bucket_iam_member.data_sink, @@ -1361,7 +1361,7 @@ resource "google_storage_transfer_job" "transfer_job" { path = "foo/bar/" } } - + logging_config { enable_on_prem_gcs_transfer_logs = true } @@ -1496,7 +1496,7 @@ resource "google_storage_transfer_job" "transfer_job" { bucket_name = google_storage_bucket.data_source.name } } - + logging_config { enable_on_prem_gcs_transfer_logs = false } @@ -2129,7 +2129,7 @@ resource "google_storage_transfer_job" "transfer_job" { last_modified_since = "2020-01-01T00:00:00Z" last_modified_before = "2020-01-01T00:00:00Z" exclude_prefixes = [ - "a/b/c", + "a/b/c", ] include_prefixes = [ "a/b" @@ -2215,7 +2215,7 @@ resource "google_storage_transfer_job" "transfer_job" { last_modified_since = "2020-01-01T00:00:00Z" last_modified_before = "2020-01-01T00:00:00Z" exclude_prefixes = [ - "a/b/c", + "a/b/c", ] include_prefixes = [ "a/b" diff --git a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.tmpl b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.tmpl index bb5f8eff4455..e63d65e7acad 100644 --- a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.tmpl +++ b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.tmpl @@ -23,7 +23,7 @@ func TestAccWorkbenchInstance_update(t *testing.T) { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -32,11 +32,11 @@ func TestAccWorkbenchInstance_update(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_update(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -114,8 +114,8 @@ func TestAccWorkbenchInstance_updateGpu(t *testing.T) { { Config: testAccWorkbenchInstance_basicGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -124,11 +124,11 @@ func TestAccWorkbenchInstance_updateGpu(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_updateGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -202,8 +202,8 @@ func TestAccWorkbenchInstance_removeGpu(t *testing.T) { { Config: testAccWorkbenchInstance_Gpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -212,11 +212,11 @@ func TestAccWorkbenchInstance_removeGpu(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_removeGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -275,8 +275,8 @@ func TestAccWorkbenchInstance_updateMetadata(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -285,11 +285,11 @@ func TestAccWorkbenchInstance_updateMetadata(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "update_time"}, }, - { + { Config: testAccWorkbenchInstance_updateMetadata(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -301,8 +301,8 @@ func TestAccWorkbenchInstance_updateMetadata(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -329,8 +329,8 @@ func TestAccWorkbenchInstance_updateMetadataKey(t *testing.T) { { Config: testAccWorkbenchInstance_updateMetadata(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -339,11 +339,11 @@ func TestAccWorkbenchInstance_updateMetadataKey(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateMetadataKey(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -356,7 +356,7 @@ func TestAccWorkbenchInstance_updateMetadataKey(t *testing.T) { Config: testAccWorkbenchInstance_updateMetadata(context), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -426,8 +426,8 @@ func TestAccWorkbenchInstance_updateState(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -436,11 +436,11 @@ func TestAccWorkbenchInstance_updateState(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time"}, }, - { + { Config: testAccWorkbenchInstance_updateState(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "STOPPED"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "STOPPED"), ), }, { @@ -449,11 +449,11 @@ func TestAccWorkbenchInstance_updateState(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time"}, }, - { + { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -492,8 +492,8 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -502,11 +502,11 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels"}, }, - { + { Config: testAccWorkbenchInstance_empty_accelerator(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -518,8 +518,8 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { { Config: testAccWorkbenchInstance_empty_accelerator(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -560,8 +560,8 @@ func TestAccWorkbenchInstance_updateBootDisk(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -570,11 +570,11 @@ func TestAccWorkbenchInstance_updateBootDisk(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateBootDisk(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -601,8 +601,8 @@ func TestAccWorkbenchInstance_updateDataDisk(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -611,11 +611,11 @@ func TestAccWorkbenchInstance_updateDataDisk(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateDataDisk(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -642,8 +642,8 @@ func TestAccWorkbenchInstance_updateBothDisks(t *testing.T) { { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -652,11 +652,11 @@ func TestAccWorkbenchInstance_updateBothDisks(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state"}, }, - { + { Config: testAccWorkbenchInstance_updateBothDisks(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { diff --git a/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.tmpl b/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.tmpl index 0e4b807a76ee..ead97f101f23 100644 --- a/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.tmpl +++ b/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.tmpl @@ -351,4 +351,3 @@ EOF } `, workflowName, kmsKeyName) } - diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.tmpl b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.tmpl index 20db7453d0bc..3016bcb7681d 100644 --- a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.tmpl +++ b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.tmpl @@ -136,7 +136,7 @@ func CidrOrSizeDiffSuppress(k, old, new string, d *schema.ResourceData) bool { } // Base64DiffSuppress compares two Base64 strings, ignoring differences -// between standard encoding and web safe URL encoding, padding, and +// between standard encoding and web safe URL encoding, padding, and // embedded line endings. func Base64DiffSuppress(_, old, new string, _ *schema.ResourceData) bool { r := strings.NewReplacer("\r", "", "\n", "", "+", "-", "/", "_", "=", "") diff --git a/mmv1/third_party/terraform/website/docs/d/compute_interconnect_location.html.markdown b/mmv1/third_party/terraform/website/docs/d/compute_interconnect_location.html.markdown new file mode 100644 index 000000000000..3809d5c67806 --- /dev/null +++ b/mmv1/third_party/terraform/website/docs/d/compute_interconnect_location.html.markdown @@ -0,0 +1,54 @@ +--- +subcategory: "Compute Engine" +description: |- + Get the details of a single interconnect location. +--- + +# google_compute_interconnect_location + +Get the details of a single interconnect location. For more information see +the official [API](https://cloud.google.com/compute/docs/reference/rest/v1/interconnectLocations/get) documentation. + +## Example Usage + +```hcl +data "google_compute_interconnect_location" "this" { + name = "iad-zone1-1" +} + +resource "google_compute_interconnect" "this" { + project = data.google_compute_interconnect_location.this.project + location = data.google_compute_interconnect_location.this.self_link + name = "my-dedicated-connection-1" +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the interconnect location. + +- - - + +* `project` - (Optional) The project in which the resource belongs. If it + is not provided, the provider project is used. + +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are +exported: + +* `self_link` - The URI of the created resource. +* `description` - A textual description of the resource. +* `peeringdb_facility_id` - The PeeringDB facility ID for this facility. +* `address` - The postal address of the Point of Presence. +* `facility_provider` - The name of the provider for this facility. +* `facility_provider_facility_id` - A provider-assigned Identifier for this facility. +* `status` - The status of this InterconnectLocation. +* `continent` - The continent for this location. +* `city` - The city for this location. +* `availability_zone` - The availability zone for this InterconnectLocation. +* `supports_pzs` - Reserved for future use. +* `available_features` - A list of features available at this InterconnectLocation. +* `available_link_types` - A list of link types available at this InterconnectLocation. diff --git a/mmv1/third_party/terraform/website/docs/d/compute_interconnect_locations.html.markdown b/mmv1/third_party/terraform/website/docs/d/compute_interconnect_locations.html.markdown new file mode 100644 index 000000000000..6da98be9d0e0 --- /dev/null +++ b/mmv1/third_party/terraform/website/docs/d/compute_interconnect_locations.html.markdown @@ -0,0 +1,47 @@ +--- +subcategory: "Compute Engine" +description: |- + Get a list of interconnect locations. +--- + +# google_compute_interconnect_locations + +Get a list of interconnect locations. For more information see +the official [API](https://cloud.google.com/compute/docs/reference/rest/v1/interconnectLocations/list) documentation. + +## Example Usage + +```hcl +data "google_compute_interconnect_locations" "all" {} + +output "interconnect_locations" { + value = data.google_compute_interconnect_locations.all.locations +} +``` + +## Argument Reference + +The following arguments are supported: + +* `project` - (Optional) The project in which the resource belongs. If it + is not provided, the provider project is used. + +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are +exported: + +* `locations` - A list of interconnect locations. Each location will have the following attributes: + * `self_link` - The URI of the created resource. + * `description` - A textual description of the resource. + * `peeringdb_facility_id` - The PeeringDB facility ID for this facility. + * `address` - The postal address of the Point of Presence. + * `facility_provider` - The name of the provider for this facility. + * `facility_provider_facility_id` - A provider-assigned Identifier for this facility. + * `status` - The status of this InterconnectLocation. + * `continent` - The continent for this location. + * `city` - The city for this location. + * `availability_zone` - The availability zone for this InterconnectLocation. + * `supports_pzs` - Reserved for future use. + * `available_features` - A list of features available at this InterconnectLocation. + * `available_link_types` - A list of link types available at this InterconnectLocation. diff --git a/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown b/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown index 0ad57f5ed54b..3cbea365b775 100644 --- a/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/cloudbuild_worker_pool.html.markdown @@ -107,7 +107,7 @@ The following arguments are supported: Immutable. Subnet IP range within the peered network. This is specified in CIDR notation with a slash and the subnet prefix size. You can optionally specify an IP address before the subnet prefix value. e.g. `192.168.0.0/29` would specify an IP range starting at 192.168.0.0 with a prefix size of 29 bits. `/16` would specify a prefix size of 16 bits, with an automatically determined IP within the peered VPC. If unspecified, a value of `/24` will be used. The `worker_config` block supports: - + * `disk_size_gb` - (Optional) Size of the disk attached to the worker, in GB. See [diskSizeGb](https://cloud.google.com/build/docs/private-pools/private-pool-config-file-schema#disksizegb). Specify a value of up to 1000. If `0` is specified, Cloud Build will use a standard disk size. diff --git a/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown b/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown index b053b083c696..4477d839a04f 100644 --- a/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/gke_hub_feature_membership.html.markdown @@ -445,9 +445,9 @@ The following arguments are supported: Configuring Policy Controller through the configmanagement feature is no longer recommended. Use the policycontroller feature instead. - + The `binauthz` block supports: - + * `enabled` - (Optional) Whether binauthz is enabled in this cluster. diff --git a/mmv1/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown b/mmv1/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown index 85b67ab8b973..d5de00b51b51 100644 --- a/mmv1/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/storage_bucket_object.html.markdown @@ -6,11 +6,11 @@ description: |- # google_storage_bucket_object -Creates a new object inside an existing bucket in Google cloud storage service (GCS). +Creates a new object inside an existing bucket in Google cloud storage service (GCS). [ACLs](https://cloud.google.com/storage/docs/access-control/lists) can be applied using the `google_storage_object_acl` resource. - For more information see -[the official documentation](https://cloud.google.com/storage/docs/key-terms#objects) -and + For more information see +[the official documentation](https://cloud.google.com/storage/docs/key-terms#objects) +and [API](https://cloud.google.com/storage/docs/json_api/v1/objects). A datasource can be used to retrieve the data of the stored object: diff --git a/mmv1/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown b/mmv1/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown index 3b51006a47ee..7320698b3186 100644 --- a/mmv1/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/storage_transfer_job.html.markdown @@ -316,13 +316,13 @@ The `azure_credentials` block supports: The `loggin_config` block supports: -* `log_actions` - (Optional) A list of actions to be logged. If empty, no logs are generated. Not supported for transfers with PosixFilesystem data sources; use enableOnpremGcsTransferLogs instead. +* `log_actions` - (Optional) A list of actions to be logged. If empty, no logs are generated. Not supported for transfers with PosixFilesystem data sources; use enableOnpremGcsTransferLogs instead. Each action may be one of `FIND`, `DELETE`, and `COPY`. * `log_action_states` - (Optional) A list of loggable action states. If empty, no logs are generated. Not supported for transfers with PosixFilesystem data sources; use enableOnpremGcsTransferLogs instead. Each action state may be one of `SUCCEEDED`, and `FAILED`. -* `enable_on_prem_gcs_transfer` - (Optional) For transfers with a PosixFilesystem source, this option enables the Cloud Storage transfer logs for this transfer. +* `enable_on_prem_gcs_transfer` - (Optional) For transfers with a PosixFilesystem source, this option enables the Cloud Storage transfer logs for this transfer. Defaults to false. ## Attributes Reference