From 13b05af817436d5fb21128a3e8cb47272d7b3891 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Tue, 13 May 2025 13:42:01 -0700 Subject: [PATCH 1/6] updoot --- ...idators.go.tmpl => provider_validators.go} | 0 ...> resource_backup_dr_backup_vault_test.go} | 0 ...ource_binary_authorization_policy_test.go} | 0 ...ource_chronicle_data_access_label_test.go} | 0 ...ource_chronicle_data_access_scope_test.go} | 0 ...resource_chronicle_reference_list_test.go} | 0 ...esource_chronicle_rule_deployment_test.go} | 0 ...o.tmpl => resource_chronicle_rule_test.go} | 0 ...l => resource_chronicle_watchlist_test.go} | 0 ...oogle_cloud_asset_search_all_resources.go} | 0 ..._cloud_asset_search_all_resources_test.go} | 0 ...ata_source_cloud_identity_group_lookup.go} | 0 ...mpl => resource_cloud_tasks_queue_test.go} | 0 ...omposer_user_workloads_config_map_test.go} | 0 ...le_composer_user_workloads_secret_test.go} | 0 ... => resource_composer_environment_test.go} | 0 ...omposer_user_workloads_config_map_test.go} | 0 ...ce_composer_user_workloads_secret_test.go} | 0 ....tmpl => compute_instance_helpers_test.go} | 0 ...l => data_source_google_compute_images.go} | 0 ...=> data_source_google_compute_instance.go} | 0 ...rce_google_compute_instance_group_test.go} | 0 ...ta_source_google_compute_instance_test.go} | 0 ... => data_source_google_compute_network.go} | 0 ...gle_compute_region_instance_group_test.go} | 0 ..._source_google_compute_resource_policy.go} | 0 ...urce_compute_firewall_policy_rule_test.go} | 0 ... resource_compute_firewall_policy_test.go} | 0 ...tmpl => resource_compute_firewall_test.go} | 0 ...> resource_compute_global_address_test.go} | 0 ...e_compute_global_network_endpoint_test.go} | 0 ...esource_compute_instance_settings_test.go} | 0 ...source_compute_network_attachment_test.go} | 0 ...ce_compute_network_endpoint_group_test.go} | 0 ...pute_network_firewall_policy_rule_test.go} | 0 ...pl => resource_compute_node_group_test.go} | 0 ...ource_compute_per_instance_config_test.go} | 0 ...gion_network_firewall_policy_rule_test.go} | 0 ...ompute_region_per_instance_config_test.go} | 0 ..._compute_region_target_http_proxy_test.go} | 0 ...e_compute_region_target_tcp_proxy_test.go} | 0 ...> resource_compute_region_url_map_test.go} | 0 ...source_compute_router_nat_address_test.go} | 0 ...pl => resource_compute_router_nat_test.go} | 0 ...ource_compute_router_route_policy_test.go} | 0 ...o.tmpl => resource_compute_router_test.go} | 0 ...urce_compute_security_policy_rule_test.go} | 0 ...source_compute_service_attachment_test.go} | 0 ...w_job.go.tmpl => resource_dataflow_job.go} | 0 ...tmpl => resource_dataproc_cluster_test.go} | 0 ...c_job.go.tmpl => resource_dataproc_job.go} | 0 ...source_dataproc_metastore_service_test.go} | 0 ...ataproc_metastore_service_diff_supress.go} | 0 ...source_dataproc_metastore_service_test.go} | 0 ...veloper_connect_account_connector_test.go} | 0 ...urce_developer_connect_connection_test.go} | 0 ...tmpl => resource_dialogflow_agent_test.go} | 0 ...> resource_dialogflow_entity_type_test.go} | 0 ...> resource_dialogflow_fulfillment_test.go} | 0 ...mpl => resource_dialogflow_intent_test.go} | 0 ...pl => resource_dialogflowcx_agent_test.go} | 0 ...st.go.tmpl => data_source_dns_key_test.go} | 0 ...mpl => data_source_dns_record_set_test.go} | 0 ...st.go.tmpl => resource_dns_policy_test.go} | 0 ...esource_firestore_database_update_test.go} | 0 ...pl => iam_gemini_repository_group_test.go} | 0 ...urce_gemini_code_repository_index_test.go} | 0 ...gemini_code_tools_setting_binding_test.go} | 0 ...esource_gemini_code_tools_setting_test.go} | 0 ...aring_with_google_setting_binding_test.go} | 0 ..._data_sharing_with_google_setting_test.go} | 0 ...ni_gcp_enablement_setting_binding_test.go} | 0 ...ini_gemini_gcp_enablement_setting_test.go} | 0 ...ce_gemini_logging_setting_binding_test.go} | 0 ...i_release_channel_setting_binding_test.go} | 0 ...ce_gemini_release_channel_setting_test.go} | 0 ... resource_gemini_repository_group_test.go} | 0 ...esource_gke_backup_backup_channel_test.go} | 0 ...> resource_gke_backup_backup_plan_test.go} | 0 ...source_gke_backup_restore_channel_test.go} | 0 ... resource_gke_backup_restore_plan_test.go} | 0 ...st.go.tmpl => iam_gke_hub_feature_test.go} | 0 ...eration.go.tmpl => gkeonprem_operation.go} | 0 ...urce_gkeonprem_bare_metal_cluster_test.go} | 0 ...ce_gkeonprem_bare_metal_node_pool_test.go} | 0 ...resource_gkeonprem_vmware_cluster_test.go} | 0 ...source_gkeonprem_vmware_node_pool_test.go} | 0 ....tmpl => resource_iam_deny_policy_test.go} | 0 ...source_iam_folders_policy_binding_test.go} | 0 ..._iam_organizations_policy_binding_test.go} | 0 ..._principal_access_boundary_policy_test.go} | 0 ...ource_iam_projects_policy_binding_test.go} | 0 ...m_workload_identity_pool_provider_test.go} | 0 ...source_iam_workload_identity_pool_test.go} | 0 ...rce_iam_workload_identity_pool_id_test.go} | 0 ...orkload_identity_pool_provider_id_test.go} | 0 ...m_workload_identity_pool_provider_test.go} | 0 ...source_iam_workload_identity_pool_test.go} | 0 ...ource_iam_oauth_client_credential_test.go} | 0 ...tmpl => resource_iam_oauth_client_test.go} | 0 ...pl => resource_iam_workforce_pool_test.go} | 0 ..._workforce_pool_workforce_pool_id_test.go} | 0 ...e_pool_workforce_pool_provider_id_test.go} | 0 ...=> resource_managed_kafka_cluster_test.go} | 0 ...l => resource_managed_kafka_topic_test.go} | 0 ...k_management_vpc_flow_logs_config_test.go} | 0 ...k_security_security_profile_group_test.go} | 0 ...network_security_security_profile_test.go} | 0 ...pl => resource_notebooks_instance_test.go} | 0 ...mpl => resource_notebooks_runtime_test.go} | 0 ...urce_org_policy_custom_constraint_test.go} | 0 ...v2_policy_orchestrator_for_folder_test.go} | 0 ...icy_orchestrator_for_organization_test.go} | 0 ..._os_config_v2_policy_orchestrator_test.go} | 0 ...ource_parameter_manager_parameter_test.go} | 0 ..._manager_parameter_version_render_test.go} | 0 ...rameter_manager_parameter_version_test.go} | 0 ...urce_parameter_manager_parameters_test.go} | 0 ...ource_parameter_manager_parameter_test.go} | 0 ...rameter_manager_parameter_version_test.go} | 0 ...ameter_manager_regional_parameter_test.go} | 0 ...regional_parameter_version_render_test.go} | 0 ...anager_regional_parameter_version_test.go} | 0 ...meter_manager_regional_parameters_test.go} | 0 ...ameter_manager_regional_parameter_test.go} | 0 ...anager_regional_parameter_version_test.go} | 0 ...ileged_access_manager_entitlement_test.go} | 0 ...go.tmpl => resource_redis_cluster_test.go} | 0 ....tmpl => data_source_google_iam_policy.go} | 0 ...source_google_project_iam_binding_test.go} | 0 ...esource_google_project_iam_member_test.go} | 0 ...esource_google_project_iam_policy_test.go} | 0 ...tmpl => iam_secret_manager_secret_test.go} | 0 ...=> resource_secret_manager_secret_test.go} | 0 ...rce_secret_manager_secret_version_test.go} | 0 ...am_secret_manager_regional_secret_test.go} | 0 ...ce_secret_manager_regional_secret_test.go} | 0 ...t_manager_regional_secret_version_test.go} | 0 ...tmpl => resource_spanner_database_test.go} | 0 ...o.tmpl => resource_storage_bucket_test.go} | 0 ...orkbench_instance_shielded_config_test.go} | 0 ...pl => resource_workbench_instance_test.go} | 0 ...pl => resource_workflows_workflow_test.go} | 0 ...ppress.go.tmpl => common_diff_suppress.go} | 0 mmv1/validate_third_party_test.go | 87 +++++++++++++++++++ 145 files changed, 87 insertions(+) rename mmv1/third_party/terraform/provider/{provider_validators.go.tmpl => provider_validators.go} (100%) rename mmv1/third_party/terraform/services/backupdr/{resource_backup_dr_backup_vault_test.go.tmpl => resource_backup_dr_backup_vault_test.go} (100%) rename mmv1/third_party/terraform/services/binaryauthorization/{resource_binary_authorization_policy_test.go.tmpl => resource_binary_authorization_policy_test.go} (100%) rename mmv1/third_party/terraform/services/chronicle/{resource_chronicle_data_access_label_test.go.tmpl => resource_chronicle_data_access_label_test.go} (100%) rename mmv1/third_party/terraform/services/chronicle/{resource_chronicle_data_access_scope_test.go.tmpl => resource_chronicle_data_access_scope_test.go} (100%) rename mmv1/third_party/terraform/services/chronicle/{resource_chronicle_reference_list_test.go.tmpl => resource_chronicle_reference_list_test.go} (100%) rename mmv1/third_party/terraform/services/chronicle/{resource_chronicle_rule_deployment_test.go.tmpl => resource_chronicle_rule_deployment_test.go} (100%) rename mmv1/third_party/terraform/services/chronicle/{resource_chronicle_rule_test.go.tmpl => resource_chronicle_rule_test.go} (100%) rename mmv1/third_party/terraform/services/chronicle/{resource_chronicle_watchlist_test.go.tmpl => resource_chronicle_watchlist_test.go} (100%) rename mmv1/third_party/terraform/services/cloudasset/{data_source_google_cloud_asset_search_all_resources.go.tmpl => data_source_google_cloud_asset_search_all_resources.go} (100%) rename mmv1/third_party/terraform/services/cloudasset/{data_source_google_cloud_asset_search_all_resources_test.go.tmpl => data_source_google_cloud_asset_search_all_resources_test.go} (100%) rename mmv1/third_party/terraform/services/cloudidentity/{data_source_cloud_identity_group_lookup.go.tmpl => data_source_cloud_identity_group_lookup.go} (100%) rename mmv1/third_party/terraform/services/cloudtasks/{resource_cloud_tasks_queue_test.go.tmpl => resource_cloud_tasks_queue_test.go} (100%) rename mmv1/third_party/terraform/services/composer/{data_source_google_composer_user_workloads_config_map_test.go.tmpl => data_source_google_composer_user_workloads_config_map_test.go} (100%) rename mmv1/third_party/terraform/services/composer/{data_source_google_composer_user_workloads_secret_test.go.tmpl => data_source_google_composer_user_workloads_secret_test.go} (100%) rename mmv1/third_party/terraform/services/composer/{resource_composer_environment_test.go.tmpl => resource_composer_environment_test.go} (100%) rename mmv1/third_party/terraform/services/composer/{resource_composer_user_workloads_config_map_test.go.tmpl => resource_composer_user_workloads_config_map_test.go} (100%) rename mmv1/third_party/terraform/services/composer/{resource_composer_user_workloads_secret_test.go.tmpl => resource_composer_user_workloads_secret_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{compute_instance_helpers_test.go.tmpl => compute_instance_helpers_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_images.go.tmpl => data_source_google_compute_images.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_instance.go.tmpl => data_source_google_compute_instance.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_instance_group_test.go.tmpl => data_source_google_compute_instance_group_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_instance_test.go.tmpl => data_source_google_compute_instance_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_network.go.tmpl => data_source_google_compute_network.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_region_instance_group_test.go.tmpl => data_source_google_compute_region_instance_group_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{data_source_google_compute_resource_policy.go.tmpl => data_source_google_compute_resource_policy.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_firewall_policy_rule_test.go.tmpl => resource_compute_firewall_policy_rule_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_firewall_policy_test.go.tmpl => resource_compute_firewall_policy_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_firewall_test.go.tmpl => resource_compute_firewall_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_global_address_test.go.tmpl => resource_compute_global_address_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_global_network_endpoint_test.go.tmpl => resource_compute_global_network_endpoint_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_instance_settings_test.go.tmpl => resource_compute_instance_settings_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_network_attachment_test.go.tmpl => resource_compute_network_attachment_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_network_endpoint_group_test.go.tmpl => resource_compute_network_endpoint_group_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_network_firewall_policy_rule_test.go.tmpl => resource_compute_network_firewall_policy_rule_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_node_group_test.go.tmpl => resource_compute_node_group_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_per_instance_config_test.go.tmpl => resource_compute_per_instance_config_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_region_network_firewall_policy_rule_test.go.tmpl => resource_compute_region_network_firewall_policy_rule_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_region_per_instance_config_test.go.tmpl => resource_compute_region_per_instance_config_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_region_target_http_proxy_test.go.tmpl => resource_compute_region_target_http_proxy_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_region_target_tcp_proxy_test.go.tmpl => resource_compute_region_target_tcp_proxy_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_region_url_map_test.go.tmpl => resource_compute_region_url_map_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_router_nat_address_test.go.tmpl => resource_compute_router_nat_address_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_router_nat_test.go.tmpl => resource_compute_router_nat_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_router_route_policy_test.go.tmpl => resource_compute_router_route_policy_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_router_test.go.tmpl => resource_compute_router_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_security_policy_rule_test.go.tmpl => resource_compute_security_policy_rule_test.go} (100%) rename mmv1/third_party/terraform/services/compute/{resource_compute_service_attachment_test.go.tmpl => resource_compute_service_attachment_test.go} (100%) rename mmv1/third_party/terraform/services/dataflow/{resource_dataflow_job.go.tmpl => resource_dataflow_job.go} (100%) rename mmv1/third_party/terraform/services/dataproc/{resource_dataproc_cluster_test.go.tmpl => resource_dataproc_cluster_test.go} (100%) rename mmv1/third_party/terraform/services/dataproc/{resource_dataproc_job.go.tmpl => resource_dataproc_job.go} (100%) rename mmv1/third_party/terraform/services/dataprocmetastore/{data_source_dataproc_metastore_service_test.go.tmpl => data_source_dataproc_metastore_service_test.go} (100%) rename mmv1/third_party/terraform/services/dataprocmetastore/{dataproc_metastore_service_diff_supress.go.tmpl => dataproc_metastore_service_diff_supress.go} (100%) rename mmv1/third_party/terraform/services/dataprocmetastore/{resource_dataproc_metastore_service_test.go.tmpl => resource_dataproc_metastore_service_test.go} (100%) rename mmv1/third_party/terraform/services/developerconnect/{resource_developer_connect_account_connector_test.go.tmpl => resource_developer_connect_account_connector_test.go} (100%) rename mmv1/third_party/terraform/services/developerconnect/{resource_developer_connect_connection_test.go.tmpl => resource_developer_connect_connection_test.go} (100%) rename mmv1/third_party/terraform/services/dialogflow/{resource_dialogflow_agent_test.go.tmpl => resource_dialogflow_agent_test.go} (100%) rename mmv1/third_party/terraform/services/dialogflow/{resource_dialogflow_entity_type_test.go.tmpl => resource_dialogflow_entity_type_test.go} (100%) rename mmv1/third_party/terraform/services/dialogflow/{resource_dialogflow_fulfillment_test.go.tmpl => resource_dialogflow_fulfillment_test.go} (100%) rename mmv1/third_party/terraform/services/dialogflow/{resource_dialogflow_intent_test.go.tmpl => resource_dialogflow_intent_test.go} (100%) rename mmv1/third_party/terraform/services/dialogflowcx/{resource_dialogflowcx_agent_test.go.tmpl => resource_dialogflowcx_agent_test.go} (100%) rename mmv1/third_party/terraform/services/dns/{data_source_dns_key_test.go.tmpl => data_source_dns_key_test.go} (100%) rename mmv1/third_party/terraform/services/dns/{data_source_dns_record_set_test.go.tmpl => data_source_dns_record_set_test.go} (100%) rename mmv1/third_party/terraform/services/dns/{resource_dns_policy_test.go.tmpl => resource_dns_policy_test.go} (100%) rename mmv1/third_party/terraform/services/firestore/{resource_firestore_database_update_test.go.tmpl => resource_firestore_database_update_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{iam_gemini_repository_group_test.go.tmpl => iam_gemini_repository_group_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_code_repository_index_test.go.tmpl => resource_gemini_code_repository_index_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_code_tools_setting_binding_test.go.tmpl => resource_gemini_code_tools_setting_binding_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_code_tools_setting_test.go.tmpl => resource_gemini_code_tools_setting_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_data_sharing_with_google_setting_binding_test.go.tmpl => resource_gemini_data_sharing_with_google_setting_binding_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_data_sharing_with_google_setting_test.go.tmpl => resource_gemini_data_sharing_with_google_setting_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_gemini_gcp_enablement_setting_binding_test.go.tmpl => resource_gemini_gemini_gcp_enablement_setting_binding_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_gemini_gcp_enablement_setting_test.go.tmpl => resource_gemini_gemini_gcp_enablement_setting_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_logging_setting_binding_test.go.tmpl => resource_gemini_logging_setting_binding_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_release_channel_setting_binding_test.go.tmpl => resource_gemini_release_channel_setting_binding_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_release_channel_setting_test.go.tmpl => resource_gemini_release_channel_setting_test.go} (100%) rename mmv1/third_party/terraform/services/gemini/{resource_gemini_repository_group_test.go.tmpl => resource_gemini_repository_group_test.go} (100%) rename mmv1/third_party/terraform/services/gkebackup/{resource_gke_backup_backup_channel_test.go.tmpl => resource_gke_backup_backup_channel_test.go} (100%) rename mmv1/third_party/terraform/services/gkebackup/{resource_gke_backup_backup_plan_test.go.tmpl => resource_gke_backup_backup_plan_test.go} (100%) rename mmv1/third_party/terraform/services/gkebackup/{resource_gke_backup_restore_channel_test.go.tmpl => resource_gke_backup_restore_channel_test.go} (100%) rename mmv1/third_party/terraform/services/gkebackup/{resource_gke_backup_restore_plan_test.go.tmpl => resource_gke_backup_restore_plan_test.go} (100%) rename mmv1/third_party/terraform/services/gkehub2/{iam_gke_hub_feature_test.go.tmpl => iam_gke_hub_feature_test.go} (100%) rename mmv1/third_party/terraform/services/gkeonprem/{gkeonprem_operation.go.tmpl => gkeonprem_operation.go} (100%) rename mmv1/third_party/terraform/services/gkeonprem/{resource_gkeonprem_bare_metal_cluster_test.go.tmpl => resource_gkeonprem_bare_metal_cluster_test.go} (100%) rename mmv1/third_party/terraform/services/gkeonprem/{resource_gkeonprem_bare_metal_node_pool_test.go.tmpl => resource_gkeonprem_bare_metal_node_pool_test.go} (100%) rename mmv1/third_party/terraform/services/gkeonprem/{resource_gkeonprem_vmware_cluster_test.go.tmpl => resource_gkeonprem_vmware_cluster_test.go} (100%) rename mmv1/third_party/terraform/services/gkeonprem/{resource_gkeonprem_vmware_node_pool_test.go.tmpl => resource_gkeonprem_vmware_node_pool_test.go} (100%) rename mmv1/third_party/terraform/services/iam2/{resource_iam_deny_policy_test.go.tmpl => resource_iam_deny_policy_test.go} (100%) rename mmv1/third_party/terraform/services/iam3/{resource_iam_folders_policy_binding_test.go.tmpl => resource_iam_folders_policy_binding_test.go} (100%) rename mmv1/third_party/terraform/services/iam3/{resource_iam_organizations_policy_binding_test.go.tmpl => resource_iam_organizations_policy_binding_test.go} (100%) rename mmv1/third_party/terraform/services/iam3/{resource_iam_principal_access_boundary_policy_test.go.tmpl => resource_iam_principal_access_boundary_policy_test.go} (100%) rename mmv1/third_party/terraform/services/iam3/{resource_iam_projects_policy_binding_test.go.tmpl => resource_iam_projects_policy_binding_test.go} (100%) rename mmv1/third_party/terraform/services/iambeta/{data_source_iam_workload_identity_pool_provider_test.go.tmpl => data_source_iam_workload_identity_pool_provider_test.go} (100%) rename mmv1/third_party/terraform/services/iambeta/{data_source_iam_workload_identity_pool_test.go.tmpl => data_source_iam_workload_identity_pool_test.go} (100%) rename mmv1/third_party/terraform/services/iambeta/{resource_iam_workload_identity_pool_id_test.go.tmpl => resource_iam_workload_identity_pool_id_test.go} (100%) rename mmv1/third_party/terraform/services/iambeta/{resource_iam_workload_identity_pool_provider_id_test.go.tmpl => resource_iam_workload_identity_pool_provider_id_test.go} (100%) rename mmv1/third_party/terraform/services/iambeta/{resource_iam_workload_identity_pool_provider_test.go.tmpl => resource_iam_workload_identity_pool_provider_test.go} (100%) rename mmv1/third_party/terraform/services/iambeta/{resource_iam_workload_identity_pool_test.go.tmpl => resource_iam_workload_identity_pool_test.go} (100%) rename mmv1/third_party/terraform/services/iamworkforcepool/{resource_iam_oauth_client_credential_test.go.tmpl => resource_iam_oauth_client_credential_test.go} (100%) rename mmv1/third_party/terraform/services/iamworkforcepool/{resource_iam_oauth_client_test.go.tmpl => resource_iam_oauth_client_test.go} (100%) rename mmv1/third_party/terraform/services/iamworkforcepool/{resource_iam_workforce_pool_test.go.tmpl => resource_iam_workforce_pool_test.go} (100%) rename mmv1/third_party/terraform/services/iamworkforcepool/{resource_iam_workforce_pool_workforce_pool_id_test.go.tmpl => resource_iam_workforce_pool_workforce_pool_id_test.go} (100%) rename mmv1/third_party/terraform/services/iamworkforcepool/{resource_iam_workforce_pool_workforce_pool_provider_id_test.go.tmpl => resource_iam_workforce_pool_workforce_pool_provider_id_test.go} (100%) rename mmv1/third_party/terraform/services/managedkafka/{resource_managed_kafka_cluster_test.go.tmpl => resource_managed_kafka_cluster_test.go} (100%) rename mmv1/third_party/terraform/services/managedkafka/{resource_managed_kafka_topic_test.go.tmpl => resource_managed_kafka_topic_test.go} (100%) rename mmv1/third_party/terraform/services/networkmanagement/{resource_network_management_vpc_flow_logs_config_test.go.tmpl => resource_network_management_vpc_flow_logs_config_test.go} (100%) rename mmv1/third_party/terraform/services/networksecurity/{resource_network_security_security_profile_group_test.go.tmpl => resource_network_security_security_profile_group_test.go} (100%) rename mmv1/third_party/terraform/services/networksecurity/{resource_network_security_security_profile_test.go.tmpl => resource_network_security_security_profile_test.go} (100%) rename mmv1/third_party/terraform/services/notebooks/{resource_notebooks_instance_test.go.tmpl => resource_notebooks_instance_test.go} (100%) rename mmv1/third_party/terraform/services/notebooks/{resource_notebooks_runtime_test.go.tmpl => resource_notebooks_runtime_test.go} (100%) rename mmv1/third_party/terraform/services/orgpolicy/{resource_org_policy_custom_constraint_test.go.tmpl => resource_org_policy_custom_constraint_test.go} (100%) rename mmv1/third_party/terraform/services/osconfigv2/{resource_os_config_v2_policy_orchestrator_for_folder_test.go.tmpl => resource_os_config_v2_policy_orchestrator_for_folder_test.go} (100%) rename mmv1/third_party/terraform/services/osconfigv2/{resource_os_config_v2_policy_orchestrator_for_organization_test.go.tmpl => resource_os_config_v2_policy_orchestrator_for_organization_test.go} (100%) rename mmv1/third_party/terraform/services/osconfigv2/{resource_os_config_v2_policy_orchestrator_test.go.tmpl => resource_os_config_v2_policy_orchestrator_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanager/{data_source_parameter_manager_parameter_test.go.tmpl => data_source_parameter_manager_parameter_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanager/{data_source_parameter_manager_parameter_version_render_test.go.tmpl => data_source_parameter_manager_parameter_version_render_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanager/{data_source_parameter_manager_parameter_version_test.go.tmpl => data_source_parameter_manager_parameter_version_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanager/{data_source_parameter_manager_parameters_test.go.tmpl => data_source_parameter_manager_parameters_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanager/{resource_parameter_manager_parameter_test.go.tmpl => resource_parameter_manager_parameter_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanager/{resource_parameter_manager_parameter_version_test.go.tmpl => resource_parameter_manager_parameter_version_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanagerregional/{data_source_parameter_manager_regional_parameter_test.go.tmpl => data_source_parameter_manager_regional_parameter_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanagerregional/{data_source_parameter_manager_regional_parameter_version_render_test.go.tmpl => data_source_parameter_manager_regional_parameter_version_render_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanagerregional/{data_source_parameter_manager_regional_parameter_version_test.go.tmpl => data_source_parameter_manager_regional_parameter_version_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanagerregional/{data_source_parameter_manager_regional_parameters_test.go.tmpl => data_source_parameter_manager_regional_parameters_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanagerregional/{resource_parameter_manager_regional_parameter_test.go.tmpl => resource_parameter_manager_regional_parameter_test.go} (100%) rename mmv1/third_party/terraform/services/parametermanagerregional/{resource_parameter_manager_regional_parameter_version_test.go.tmpl => resource_parameter_manager_regional_parameter_version_test.go} (100%) rename mmv1/third_party/terraform/services/privilegedaccessmanager/{resource_privileged_access_manager_entitlement_test.go.tmpl => resource_privileged_access_manager_entitlement_test.go} (100%) rename mmv1/third_party/terraform/services/redis/{resource_redis_cluster_test.go.tmpl => resource_redis_cluster_test.go} (100%) rename mmv1/third_party/terraform/services/resourcemanager/{data_source_google_iam_policy.go.tmpl => data_source_google_iam_policy.go} (100%) rename mmv1/third_party/terraform/services/resourcemanager/{resource_google_project_iam_binding_test.go.tmpl => resource_google_project_iam_binding_test.go} (100%) rename mmv1/third_party/terraform/services/resourcemanager/{resource_google_project_iam_member_test.go.tmpl => resource_google_project_iam_member_test.go} (100%) rename mmv1/third_party/terraform/services/resourcemanager/{resource_google_project_iam_policy_test.go.tmpl => resource_google_project_iam_policy_test.go} (100%) rename mmv1/third_party/terraform/services/secretmanager/{iam_secret_manager_secret_test.go.tmpl => iam_secret_manager_secret_test.go} (100%) rename mmv1/third_party/terraform/services/secretmanager/{resource_secret_manager_secret_test.go.tmpl => resource_secret_manager_secret_test.go} (100%) rename mmv1/third_party/terraform/services/secretmanager/{resource_secret_manager_secret_version_test.go.tmpl => resource_secret_manager_secret_version_test.go} (100%) rename mmv1/third_party/terraform/services/secretmanagerregional/{iam_secret_manager_regional_secret_test.go.tmpl => iam_secret_manager_regional_secret_test.go} (100%) rename mmv1/third_party/terraform/services/secretmanagerregional/{resource_secret_manager_regional_secret_test.go.tmpl => resource_secret_manager_regional_secret_test.go} (100%) rename mmv1/third_party/terraform/services/secretmanagerregional/{resource_secret_manager_regional_secret_version_test.go.tmpl => resource_secret_manager_regional_secret_version_test.go} (100%) rename mmv1/third_party/terraform/services/spanner/{resource_spanner_database_test.go.tmpl => resource_spanner_database_test.go} (100%) rename mmv1/third_party/terraform/services/storage/{resource_storage_bucket_test.go.tmpl => resource_storage_bucket_test.go} (100%) rename mmv1/third_party/terraform/services/workbench/{resource_workbench_instance_shielded_config_test.go.tmpl => resource_workbench_instance_shielded_config_test.go} (100%) rename mmv1/third_party/terraform/services/workbench/{resource_workbench_instance_test.go.tmpl => resource_workbench_instance_test.go} (100%) rename mmv1/third_party/terraform/services/workflows/{resource_workflows_workflow_test.go.tmpl => resource_workflows_workflow_test.go} (100%) rename mmv1/third_party/terraform/tpgresource/{common_diff_suppress.go.tmpl => common_diff_suppress.go} (100%) create mode 100644 mmv1/validate_third_party_test.go diff --git a/mmv1/third_party/terraform/provider/provider_validators.go.tmpl b/mmv1/third_party/terraform/provider/provider_validators.go similarity index 100% rename from mmv1/third_party/terraform/provider/provider_validators.go.tmpl rename to mmv1/third_party/terraform/provider/provider_validators.go diff --git a/mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go.tmpl b/mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go similarity index 100% rename from mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go.tmpl rename to mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go diff --git a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.tmpl b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go diff --git a/mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_label_test.go.tmpl b/mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_label_test.go similarity index 100% rename from mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_label_test.go.tmpl rename to mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_label_test.go diff --git a/mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_scope_test.go.tmpl b/mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_scope_test.go similarity index 100% rename from mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_scope_test.go.tmpl rename to mmv1/third_party/terraform/services/chronicle/resource_chronicle_data_access_scope_test.go diff --git a/mmv1/third_party/terraform/services/chronicle/resource_chronicle_reference_list_test.go.tmpl b/mmv1/third_party/terraform/services/chronicle/resource_chronicle_reference_list_test.go similarity index 100% rename from mmv1/third_party/terraform/services/chronicle/resource_chronicle_reference_list_test.go.tmpl rename to mmv1/third_party/terraform/services/chronicle/resource_chronicle_reference_list_test.go diff --git a/mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_deployment_test.go.tmpl b/mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_deployment_test.go similarity index 100% rename from mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_deployment_test.go.tmpl rename to mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_deployment_test.go diff --git a/mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_test.go.tmpl b/mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_test.go similarity index 100% rename from mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_test.go.tmpl rename to mmv1/third_party/terraform/services/chronicle/resource_chronicle_rule_test.go diff --git a/mmv1/third_party/terraform/services/chronicle/resource_chronicle_watchlist_test.go.tmpl b/mmv1/third_party/terraform/services/chronicle/resource_chronicle_watchlist_test.go similarity index 100% rename from mmv1/third_party/terraform/services/chronicle/resource_chronicle_watchlist_test.go.tmpl rename to mmv1/third_party/terraform/services/chronicle/resource_chronicle_watchlist_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go.tmpl rename to mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go.tmpl rename to mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go diff --git a/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup.go.tmpl b/mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup.go similarity index 100% rename from mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup.go.tmpl rename to mmv1/third_party/terraform/services/cloudidentity/data_source_cloud_identity_group_lookup.go diff --git a/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go.tmpl b/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go similarity index 100% rename from mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go.tmpl rename to mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go.tmpl b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go similarity index 100% rename from mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go.tmpl rename to mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_config_map_test.go diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go.tmpl b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go similarity index 100% rename from mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go.tmpl rename to mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go.tmpl rename to mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go.tmpl b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go similarity index 100% rename from mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go.tmpl rename to mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go.tmpl b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go similarity index 100% rename from mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go.tmpl rename to mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go diff --git a/mmv1/third_party/terraform/services/compute/compute_instance_helpers_test.go.tmpl b/mmv1/third_party/terraform/services/compute/compute_instance_helpers_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/compute_instance_helpers_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/compute_instance_helpers_test.go diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_images.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_images.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_images.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_images.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go.tmpl b/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go.tmpl rename to mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_attachment_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_network_attachment_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_network_attachment_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_network_attachment_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_node_group_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_router_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_router_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go similarity index 100% rename from mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go.tmpl rename to mmv1/third_party/terraform/services/compute/resource_compute_service_attachment_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go.tmpl rename to mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go.tmpl rename to mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go.tmpl b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go similarity index 100% rename from mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go.tmpl rename to mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go.tmpl b/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go.tmpl rename to mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/dataproc_metastore_service_diff_supress.go.tmpl b/mmv1/third_party/terraform/services/dataprocmetastore/dataproc_metastore_service_diff_supress.go similarity index 100% rename from mmv1/third_party/terraform/services/dataprocmetastore/dataproc_metastore_service_diff_supress.go.tmpl rename to mmv1/third_party/terraform/services/dataprocmetastore/dataproc_metastore_service_diff_supress.go diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go.tmpl b/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go.tmpl rename to mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go.tmpl rename to mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go.tmpl rename to mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.tmpl b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go.tmpl rename to mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.tmpl b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go.tmpl rename to mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_entity_type_test.go diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.tmpl b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go.tmpl rename to mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_fulfillment_test.go diff --git a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.tmpl b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go.tmpl rename to mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_intent_test.go diff --git a/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go.tmpl b/mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go.tmpl rename to mmv1/third_party/terraform/services/dialogflowcx/resource_dialogflowcx_agent_test.go diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go.tmpl b/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go.tmpl rename to mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go.tmpl b/mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go.tmpl rename to mmv1/third_party/terraform/services/dns/data_source_dns_record_set_test.go diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go.tmpl b/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go.tmpl b/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go similarity index 100% rename from mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go.tmpl rename to mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go diff --git a/mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/iam_gemini_repository_group_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_repository_index_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_repository_index_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_code_repository_index_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_code_repository_index_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_test.go diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go.tmpl b/mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go.tmpl rename to mmv1/third_party/terraform/services/gemini/resource_gemini_repository_group_test.go diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_channel_test.go.tmpl b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_channel_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_channel_test.go.tmpl rename to mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_channel_test.go diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.tmpl b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go.tmpl rename to mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_channel_test.go.tmpl b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_channel_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_channel_test.go.tmpl rename to mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_channel_test.go diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go.tmpl b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go.tmpl rename to mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go diff --git a/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.tmpl b/mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go.tmpl rename to mmv1/third_party/terraform/services/gkehub2/iam_gke_hub_feature_test.go diff --git a/mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go.tmpl b/mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go similarity index 100% rename from mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go.tmpl rename to mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go.tmpl rename to mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.tmpl b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go.tmpl rename to mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go.tmpl rename to mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.tmpl b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go similarity index 100% rename from mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go.tmpl rename to mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go diff --git a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.tmpl b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go.tmpl b/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go.tmpl b/mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go.tmpl b/mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go.tmpl b/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go diff --git a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go.tmpl rename to mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go diff --git a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go.tmpl rename to mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_id_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_id_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_id_test.go.tmpl rename to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_id_test.go diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_id_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_id_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_id_test.go.tmpl rename to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_id_test.go diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go.tmpl rename to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.tmpl b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go.tmpl rename to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go.tmpl b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go.tmpl rename to mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go.tmpl b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go.tmpl rename to mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go.tmpl b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go.tmpl rename to mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_id_test.go.tmpl b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_id_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_id_test.go.tmpl rename to mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_id_test.go diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_provider_id_test.go.tmpl b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_provider_id_test.go similarity index 100% rename from mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_provider_id_test.go.tmpl rename to mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_workforce_pool_provider_id_test.go diff --git a/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go.tmpl b/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go similarity index 100% rename from mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go.tmpl rename to mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_cluster_test.go diff --git a/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go.tmpl b/mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go similarity index 100% rename from mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go.tmpl rename to mmv1/third_party/terraform/services/managedkafka/resource_managed_kafka_topic_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go.tmpl rename to mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go similarity index 100% rename from mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go.tmpl rename to mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_group_test.go diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.tmpl b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go similarity index 100% rename from mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go.tmpl rename to mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go.tmpl b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go similarity index 100% rename from mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go.tmpl rename to mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go.tmpl b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go similarity index 100% rename from mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go.tmpl rename to mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go.tmpl rename to mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_test.go.tmpl rename to mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_folder_test.go diff --git a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go.tmpl b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go similarity index 100% rename from mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go.tmpl rename to mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go diff --git a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go.tmpl b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go similarity index 100% rename from mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go.tmpl rename to mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go diff --git a/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_test.go diff --git a/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_render_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_render_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_render_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_render_test.go diff --git a/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go diff --git a/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameters_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameters_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameters_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameters_test.go diff --git a/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go diff --git a/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_test.go diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_render_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_render_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_render_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_render_test.go diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameters_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameters_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameters_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameters_test.go diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_test.go.tmpl b/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_test.go similarity index 100% rename from mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_test.go.tmpl rename to mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_version_test.go diff --git a/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go.tmpl b/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go similarity index 100% rename from mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go.tmpl rename to mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go.tmpl rename to mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go diff --git a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go similarity index 100% rename from mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go.tmpl rename to mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go similarity index 100% rename from mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go.tmpl rename to mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go similarity index 100% rename from mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go.tmpl rename to mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.tmpl b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go similarity index 100% rename from mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go.tmpl rename to mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go diff --git a/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go.tmpl b/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go similarity index 100% rename from mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go.tmpl rename to mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.tmpl b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go similarity index 100% rename from mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go.tmpl rename to mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go.tmpl b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go similarity index 100% rename from mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go.tmpl rename to mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go diff --git a/mmv1/third_party/terraform/services/secretmanagerregional/iam_secret_manager_regional_secret_test.go.tmpl b/mmv1/third_party/terraform/services/secretmanagerregional/iam_secret_manager_regional_secret_test.go similarity index 100% rename from mmv1/third_party/terraform/services/secretmanagerregional/iam_secret_manager_regional_secret_test.go.tmpl rename to mmv1/third_party/terraform/services/secretmanagerregional/iam_secret_manager_regional_secret_test.go diff --git a/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go.tmpl b/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go similarity index 100% rename from mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go.tmpl rename to mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go diff --git a/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_version_test.go.tmpl b/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_version_test.go similarity index 100% rename from mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_version_test.go.tmpl rename to mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_version_test.go diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.tmpl b/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go similarity index 100% rename from mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go.tmpl rename to mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.tmpl b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go similarity index 100% rename from mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go.tmpl rename to mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go diff --git a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go.tmpl b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go similarity index 100% rename from mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go.tmpl rename to mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go.tmpl rename to mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go 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 similarity index 100% rename from mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go.tmpl rename to mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.tmpl b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go similarity index 100% rename from mmv1/third_party/terraform/tpgresource/common_diff_suppress.go.tmpl rename to mmv1/third_party/terraform/tpgresource/common_diff_suppress.go diff --git a/mmv1/validate_third_party_test.go b/mmv1/validate_third_party_test.go new file mode 100644 index 000000000000..a51660badc07 --- /dev/null +++ b/mmv1/validate_third_party_test.go @@ -0,0 +1,87 @@ +package main + +import ( + "os" + "path/filepath" + "regexp" + "runtime" + "strings" + "testing" +) + +func TestTemplatesStillNeedToBeTemplates(t *testing.T) { + // Get the directory where this test file is located + _, testFilePath, _, ok := runtime.Caller(0) + if !ok { + t.Fatal("Failed to get current test file path") + } + testDir := filepath.Dir(testFilePath) + + // Define the third_party directory relative to the test file + thirdPartyDir := filepath.Join(testDir, "third_party", "terraform") + + // Regular expression to match Go template syntax + templateSyntaxRegex := regexp.MustCompile(`\{\{.*?\}\}`) + + // Track files that no longer need to be templates + unnecessaryTemplates := []string{} + + // Walk through the third_party directory + err := filepath.Walk(thirdPartyDir, func(path string, info os.FileInfo, err error) error { + if err != nil { + // Handle case where third_party directory doesn't exist + if os.IsNotExist(err) && path == thirdPartyDir { + t.Logf("Warning: third_party directory not found at %s", thirdPartyDir) + return nil + } + return err + } + + // Skip directories + if info.IsDir() { + return nil + } + + // Only check .go.tmpl files + if filepath.Ext(path) != ".tmpl" || !strings.HasSuffix(path, ".go.tmpl") { + return nil + } + + // Read file content + content, err := os.ReadFile(path) + if err != nil { + t.Logf("Error reading file %s: %v", path, err) + return nil + } + + // Check if file contains any Go template syntax + hasTemplateSyntax := templateSyntaxRegex.Match(content) + + // If no template syntax found, add to the list + if !hasTemplateSyntax { + // Get relative path for cleaner output + relPath, _ := filepath.Rel(testDir, path) + unnecessaryTemplates = append(unnecessaryTemplates, relPath) + } + + return nil + }) + + if err != nil { + t.Fatalf("Error walking directory: %v", err) + } + + // Output results at the end + if len(unnecessaryTemplates) > 0 { + t.Errorf("\nThe following %d .go.tmpl files in third_party directory don't contain any template syntax "+ + "and no longer need to be templates:\n", len(unnecessaryTemplates)) + + for _, file := range unnecessaryTemplates { + t.Errorf(" - %s", file) + } + + t.Errorf("\nConsider removing the .tmpl extension from these files.") + } else { + t.Logf("All .go.tmpl files in third_party directory properly contain template syntax.") + } +} From 85a4f96cbc803aa692b0cc51709601b1133d1eef Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Tue, 13 May 2025 13:51:22 -0700 Subject: [PATCH 2/6] fix tgc build --- mmv1/provider/terraform_tgc_next.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mmv1/provider/terraform_tgc_next.go b/mmv1/provider/terraform_tgc_next.go index 6d48de141eb7..25b5ca70b334 100644 --- a/mmv1/provider/terraform_tgc_next.go +++ b/mmv1/provider/terraform_tgc_next.go @@ -74,9 +74,9 @@ func (tgc TerraformGoogleConversionNext) CompileCommonFiles(outputFolder string, // common "pkg/transport/config.go": "third_party/terraform/transport/config.go.tmpl", "pkg/transport/provider_handwritten_endpoint.go": "third_party/terraform/transport/provider_handwritten_endpoint.go.tmpl", - "pkg/tpgresource/common_diff_suppress.go": "third_party/terraform/tpgresource/common_diff_suppress.go.tmpl", + "pkg/tpgresource/common_diff_suppress.go": "third_party/terraform/tpgresource/common_diff_suppress.go", "pkg/provider/provider.go": "third_party/terraform/provider/provider.go.tmpl", - "pkg/provider/provider_validators.go": "third_party/terraform/provider/provider_validators.go.tmpl", + "pkg/provider/provider_validators.go": "third_party/terraform/provider/provider_validators.go", // tfplan2cai "pkg/tfplan2cai/converters/resource_converters.go": "templates/tgc_next/tfplan2cai/resource_converters.go.tmpl", From 936f56b3b596033212ffa0f3c549667f83b588d2 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Tue, 13 May 2025 13:57:49 -0700 Subject: [PATCH 3/6] add new workflow for composite mmv1 unit testing --- .github/workflows/mmv1-check-templates.yml | 30 --------------- ...nt-product-yaml.yml => unit-test-mmv1.yml} | 37 ++++++++++++++++++- 2 files changed, 35 insertions(+), 32 deletions(-) delete mode 100644 .github/workflows/mmv1-check-templates.yml rename .github/workflows/{mmv1-lint-product-yaml.yml => unit-test-mmv1.yml} (51%) diff --git a/.github/workflows/mmv1-check-templates.yml b/.github/workflows/mmv1-check-templates.yml deleted file mode 100644 index f8b1f4c052ce..000000000000 --- a/.github/workflows/mmv1-check-templates.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: mmv1-check-templates - -permissions: read-all - -on: - pull_request: - paths: - - 'mmv1/**/*.tmpl' - -jobs: - version-guard-check: - runs-on: ubuntu-22.04 - steps: - - name: Checkout Repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2 - with: - path: repo - fetch-depth: 0 - - name: Merge base branch - id: pull_request - run: | - cd repo - git config user.name "modular-magician" - git config user.email "magic-modules@google.com" - git fetch origin ${{ github.base_ref }} # Fetch the base branch - git merge --no-ff origin/${{ github.base_ref }} # Merge with the base branch - - name: Check for invalid version guards - run: | - cd repo/tools/template-check - git diff --name-only --diff-filter=d origin/${{ github.base_ref }} ../../*.tmpl | sed 's=^=../../=g' | go run main.go diff --git a/.github/workflows/mmv1-lint-product-yaml.yml b/.github/workflows/unit-test-mmv1.yml similarity index 51% rename from .github/workflows/mmv1-lint-product-yaml.yml rename to .github/workflows/unit-test-mmv1.yml index 41bdcfd65ace..7ab1de8edd4a 100644 --- a/.github/workflows/mmv1-lint-product-yaml.yml +++ b/.github/workflows/unit-test-mmv1.yml @@ -1,13 +1,33 @@ -name: mmv1-lint-product-yaml +name: mmv1 permissions: read-all on: pull_request: paths: - - 'mmv1/products/**' + - 'mmv1/**' jobs: + version-guard-check: + runs-on: ubuntu-22.04 + steps: + - name: Checkout Repository + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2 + with: + path: repo + fetch-depth: 0 + - name: Merge base branch + id: pull_request + run: | + cd repo + git config user.name "modular-magician" + git config user.email "magic-modules@google.com" + git fetch origin ${{ github.base_ref }} # Fetch the base branch + git merge --no-ff origin/${{ github.base_ref }} # Merge with the base branch + - name: Check for invalid version guards + run: | + cd repo/tools/template-check + git diff --name-only --diff-filter=d origin/${{ github.base_ref }} ../../*.tmpl | sed 's=^=../../=g' | go run main.go lint-yaml: runs-on: ubuntu-22.04 steps: @@ -34,3 +54,16 @@ jobs: - name: Lint YAML files if: ${{ !failure() && steps.pull_request.outputs.yamlfiles != '' }} run: yamllint -c repo/.yamllint ${{steps.pull_request.outputs.yamlfiles}} + unit-tests: + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.2 + - name: Set up Go + uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 + with: + go-version: '^1.23' + - name: Run mmv1 unit tests + run: | + cd mmv1 + go test ./... -v + From 9dcdf1b203d451edbc27ed80c8289756484f2c90 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Tue, 13 May 2025 14:02:23 -0700 Subject: [PATCH 4/6] fmt files --- .../terraform/provider/provider_validators.go | 2 +- .../resource_backup_dr_backup_vault_test.go | 6 +- ...source_binary_authorization_policy_test.go | 8 +- ...google_cloud_asset_search_all_resources.go | 13 +- ...e_cloud_asset_search_all_resources_test.go | 3 +- .../resource_cloud_tasks_queue_test.go | 27 +- ...gle_composer_user_workloads_secret_test.go | 2 +- .../resource_composer_environment_test.go | 450 +++++++-------- ...composer_user_workloads_config_map_test.go | 10 +- ...rce_composer_user_workloads_secret_test.go | 56 +- .../data_source_google_compute_instance.go | 4 +- ...urce_google_compute_instance_group_test.go | 4 +- ...ata_source_google_compute_instance_test.go | 2 +- .../data_source_google_compute_network.go | 4 +- ...ogle_compute_region_instance_group_test.go | 6 +- ...a_source_google_compute_resource_policy.go | 2 +- ...ource_compute_firewall_policy_rule_test.go | 148 ++--- .../resource_compute_firewall_policy_test.go | 6 +- .../compute/resource_compute_firewall_test.go | 4 +- .../resource_compute_global_address_test.go | 14 +- ...ce_compute_global_network_endpoint_test.go | 3 +- ...resource_compute_instance_settings_test.go | 2 +- ...rce_compute_network_endpoint_group_test.go | 2 +- ...mpute_network_firewall_policy_rule_test.go | 282 +++++---- ...source_compute_per_instance_config_test.go | 14 +- ...egion_network_firewall_policy_rule_test.go | 18 +- ...compute_region_per_instance_config_test.go | 3 +- ...e_compute_region_target_http_proxy_test.go | 2 +- ...ce_compute_region_target_tcp_proxy_test.go | 4 +- .../resource_compute_region_url_map_test.go | 4 +- ...esource_compute_router_nat_address_test.go | 2 +- .../resource_compute_router_nat_test.go | 17 +- ...source_compute_router_route_policy_test.go | 2 +- .../compute/resource_compute_router_test.go | 8 +- ...ource_compute_security_policy_rule_test.go | 45 +- .../dataflow/resource_dataflow_job.go | 43 +- .../resource_dataproc_cluster_test.go | 77 ++- .../dataproc/resource_dataproc_job.go | 12 +- ..._source_dataproc_metastore_service_test.go | 2 +- ...esource_dataproc_metastore_service_test.go | 4 +- ...eveloper_connect_account_connector_test.go | 541 +++++++++--------- ...ource_developer_connect_connection_test.go | 227 ++++---- .../resource_dialogflow_agent_test.go | 2 +- .../services/dns/data_source_dns_key_test.go | 1 - .../services/dns/resource_dns_policy_test.go | 2 +- ...resource_firestore_database_update_test.go | 38 +- ..._gemini_code_tools_setting_binding_test.go | 6 +- ...resource_gemini_code_tools_setting_test.go | 2 +- ...haring_with_google_setting_binding_test.go | 4 +- ...i_data_sharing_with_google_setting_test.go | 2 +- ...ini_gcp_enablement_setting_binding_test.go | 4 +- ...mini_gemini_gcp_enablement_setting_test.go | 2 +- ...rce_gemini_logging_setting_binding_test.go | 4 +- ...ni_release_channel_setting_binding_test.go | 4 +- .../resource_gke_backup_backup_plan_test.go | 42 +- .../resource_gke_backup_restore_plan_test.go | 9 +- .../services/gkeonprem/gkeonprem_operation.go | 8 +- ...ource_gkeonprem_bare_metal_cluster_test.go | 178 +++--- ...rce_gkeonprem_bare_metal_node_pool_test.go | 62 +- .../resource_gkeonprem_vmware_cluster_test.go | 182 +++--- ...esource_gkeonprem_vmware_node_pool_test.go | 62 +- .../iam2/resource_iam_deny_policy_test.go | 2 +- ...esource_iam_folders_policy_binding_test.go | 2 +- ...e_iam_organizations_policy_binding_test.go | 2 +- ...m_principal_access_boundary_policy_test.go | 1 + ...source_iam_projects_policy_binding_test.go | 7 +- ...am_workload_identity_pool_provider_test.go | 2 +- ..._source_iam_workload_identity_pool_test.go | 2 +- ...am_workload_identity_pool_provider_test.go | 4 +- ...source_iam_oauth_client_credential_test.go | 3 +- .../resource_iam_oauth_client_test.go | 4 +- .../resource_iam_workforce_pool_test.go | 2 +- ...rk_management_vpc_flow_logs_config_test.go | 69 ++- ..._network_security_security_profile_test.go | 2 +- .../resource_notebooks_instance_test.go | 2 +- .../resource_notebooks_runtime_test.go | 3 +- ...ource_org_policy_custom_constraint_test.go | 3 +- ...licy_orchestrator_for_organization_test.go | 7 +- ...e_os_config_v2_policy_orchestrator_test.go | 1 - ...arameter_manager_parameter_version_test.go | 2 +- ...source_parameter_manager_parameter_test.go | 6 +- ...manager_regional_parameter_version_test.go | 2 +- ...rameter_manager_regional_parameter_test.go | 6 +- ...vileged_access_manager_entitlement_test.go | 2 +- .../redis/resource_redis_cluster_test.go | 8 +- .../data_source_google_iam_policy.go | 16 +- ...esource_google_project_iam_binding_test.go | 4 +- ...resource_google_project_iam_member_test.go | 4 +- ...resource_google_project_iam_policy_test.go | 12 +- .../iam_secret_manager_secret_test.go | 2 +- .../resource_secret_manager_secret_test.go | 54 +- ...urce_secret_manager_secret_version_test.go | 20 +- ...rce_secret_manager_regional_secret_test.go | 60 +- .../spanner/resource_spanner_database_test.go | 2 +- .../storage/resource_storage_bucket_test.go | 42 +- ...workbench_instance_shielded_config_test.go | 344 +++++------ .../resource_workbench_instance_test.go | 183 +++--- .../resource_workflows_workflow_test.go | 5 +- .../tpgresource/common_diff_suppress.go | 4 +- 99 files changed, 1759 insertions(+), 1836 deletions(-) diff --git a/mmv1/third_party/terraform/provider/provider_validators.go b/mmv1/third_party/terraform/provider/provider_validators.go index 67012b616821..5d1081235716 100644 --- a/mmv1/third_party/terraform/provider/provider_validators.go +++ b/mmv1/third_party/terraform/provider/provider_validators.go @@ -85,4 +85,4 @@ func ValidateServiceAccountEmail(v interface{}, k string) (warnings []string, er } return -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go b/mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go index c851a5387309..1f8e0d4a4a3e 100644 --- a/mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go +++ b/mmv1/third_party/terraform/services/backupdr/resource_backup_dr_backup_vault_test.go @@ -18,9 +18,9 @@ func TestAccBackupDRBackupVault_fullUpdate(t *testing.T) { referenceTime := time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.UTC) context := map[string]interface{}{ - "project": envvar.GetTestProjectFromEnv(), + "project": envvar.GetTestProjectFromEnv(), "effective_time": referenceTime.Add(24 * time.Hour).Format(time.RFC3339), - "random_suffix": acctest.RandString(t, 10), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ @@ -97,4 +97,4 @@ resource "google_backup_dr_backup_vault" "backup-vault-test" { allow_missing = "true" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go index ddbde6e496c1..19400d6c7701 100644 --- a/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go +++ b/mmv1/third_party/terraform/services/binaryauthorization/resource_binary_authorization_policy_test.go @@ -21,7 +21,7 @@ func TestAccBinaryAuthorizationPolicy_basic(t *testing.T) { pid := "tf-test-" + acctest.RandString(t, 10) billingId := envvar.GetTestBillingAccountFromEnv(t) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -165,9 +165,9 @@ func testAccCheckBinaryAuthorizationPolicyDefault(t *testing.T, pid string) reso config := acctest.GoogleProviderConfig(t) url := fmt.Sprintf("https://binaryauthorization.googleapis.com/v1/projects/%s/policy", pid) pol, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "GET", - RawURL: url, + Config: config, + Method: "GET", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { diff --git a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go index 79a2b86d5a0f..4ae01603ef03 100644 --- a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go +++ b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources.go @@ -115,7 +115,7 @@ func DataSourceGoogleCloudAssetSearchAllResources() *schema.Resource { func datasourceGoogleCloudAssetSearchAllResourcesRead(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -147,10 +147,10 @@ func datasourceGoogleCloudAssetSearchAllResourcesRead(d *schema.ResourceData, me } res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Project: project, - Method: "GET", - RawURL: url, + Config: config, + Project: project, + Method: "GET", + RawURL: url, UserAgent: userAgent, }) if err != nil { @@ -195,7 +195,7 @@ func flattenDatasourceGoogleCloudAssetSearchAllResources(v interface{}) []map[st for _, raw := range ls { p := raw.(map[string]interface{}) - var mName, mAssetType, mProject, mFolders, mOrganization, mDisplayName, mDescription, mLocation, mLabels, mNetworkTags, mKmsKeys, mCreateTime, mUpdateTime, mState, mParentFullResourceName, mParentAssetType interface{} + var mName, mAssetType, mProject, mFolders, mOrganization, mDisplayName, mDescription, mLocation, mLabels, mNetworkTags, mKmsKeys, mCreateTime, mUpdateTime, mState, mParentFullResourceName, mParentAssetType interface{} if pName, ok := p["name"]; ok { mName = pName } @@ -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 b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go index ba59b309effe..9b30ddb5b382 100644 --- a/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go +++ b/mmv1/third_party/terraform/services/cloudasset/data_source_google_cloud_asset_search_all_resources_test.go @@ -5,9 +5,9 @@ import ( "regexp" "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" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDataSourceGoogleCloudAssetSearchAllResources_basic(t *testing.T) { @@ -46,4 +46,3 @@ data google_cloud_asset_search_all_resources resources { } `, project) } - diff --git a/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go b/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go index 98d3a3df2c6e..707509e9033e 100644 --- a/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go +++ b/mmv1/third_party/terraform/services/cloudtasks/resource_cloud_tasks_queue_test.go @@ -2,8 +2,8 @@ package cloudtasks_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -127,17 +127,17 @@ func TestAccCloudTasksQueue_HttpTargetOIDC_update(t *testing.T) { Config: testAccCloudTasksQueue_HttpTargetOIDC(name, serviceAccountID), }, { - ResourceName: "google_cloud_tasks_queue.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_cloud_tasks_queue.default", + ImportState: true, + ImportStateVerify: true, }, { Config: testAccCloudTasksQueue_basic(name), }, { - ResourceName: "google_cloud_tasks_queue.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_cloud_tasks_queue.default", + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -157,17 +157,17 @@ func TestAccCloudTasksQueue_HttpTargetOAuth_update(t *testing.T) { Config: testAccCloudTasksQueue_HttpTargetOAuth(name, serviceAccountID), }, { - ResourceName: "google_cloud_tasks_queue.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_cloud_tasks_queue.default", + ImportState: true, + ImportStateVerify: true, }, { Config: testAccCloudTasksQueue_basic(name), }, { - ResourceName: "google_cloud_tasks_queue.default", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_cloud_tasks_queue.default", + ImportState: true, + ImportStateVerify: true, }, }, }) @@ -332,7 +332,6 @@ resource "google_service_account" "test" { `, name, serviceAccountID) } - func testAccCloudTasksQueue_HttpTargetOAuth(name, serviceAccountID string) string { return fmt.Sprintf(` resource "google_cloud_tasks_queue" "default" { diff --git a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go index 2098a4aeb89e..713f3b5ac1c5 100644 --- a/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go +++ b/mmv1/third_party/terraform/services/composer/data_source_google_composer_user_workloads_secret_test.go @@ -54,7 +54,7 @@ func checkSecretDataSourceMatchesResource() resource.TestCheckFunc { } // ignore diff if it's due to secrets being masked. if strings.HasPrefix(k, "data.") { - if _, ok := dsAttr[k]; !ok{ + if _, ok := dsAttr[k]; !ok { errMsg += fmt.Sprintf("%s is defined in resource and not in datasource\n", k) } if dsAttr[k] == "**********" { diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go b/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go index 4afe6a9b76b0..0a9940f31fa8 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go +++ b/mmv1/third_party/terraform/services/composer/resource_composer_environment_test.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "github.com/hashicorp/terraform-provider-google/google/services/composer" + tpgcompute "github.com/hashicorp/terraform-provider-google/google/services/compute" "testing" "log" @@ -55,7 +55,7 @@ func TestAccComposerEnvironment_basic(t *testing.T) { network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -69,30 +69,29 @@ func TestAccComposerEnvironment_basic(t *testing.T) { resource.TestCheckResourceAttrSet("google_composer_environment.test", "config.0.node_config.0.machine_type")), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), + ResourceName: "google_composer_environment.test", + ImportState: true, + ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_basic(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_basic(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) } - // Checks private environment creation for composer 1 and 2. func TestAccComposerEnvironmentComposer1_private(t *testing.T) { t.Parallel() @@ -102,7 +101,7 @@ func TestAccComposerEnvironmentComposer1_private(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -110,24 +109,24 @@ func TestAccComposerEnvironmentComposer1_private(t *testing.T) { Config: testAccComposerEnvironmentComposer1_private(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), + ResourceName: "google_composer_environment.test", + ImportState: true, + ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironmentComposer1_private(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironmentComposer1_private(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -141,7 +140,7 @@ func TestAccComposerEnvironmentComposer2_private(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -149,24 +148,24 @@ func TestAccComposerEnvironmentComposer2_private(t *testing.T) { Config: testAccComposerEnvironmentComposer2_private(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), + ResourceName: "google_composer_environment.test", + ImportState: true, + ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironmentComposer2_private(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironmentComposer2_private(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -181,7 +180,7 @@ func TestAccComposerEnvironment_privateWithWebServerControl(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -189,32 +188,32 @@ func TestAccComposerEnvironment_privateWithWebServerControl(t *testing.T) { Config: testAccComposerEnvironment_privateWithWebServerControl(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, { Config: testAccComposerEnvironment_privateWithWebServerControlUpdated(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), + ResourceName: "google_composer_environment.test", + ImportState: true, + ImportStateId: fmt.Sprintf("projects/%s/locations/%s/environments/%s", envvar.GetTestProjectFromEnv(), "us-central1", envName), 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_privateWithWebServerControlUpdated(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_privateWithWebServerControlUpdated(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -227,7 +226,7 @@ func TestAccComposerEnvironment_withDatabaseConfig(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -238,18 +237,18 @@ func TestAccComposerEnvironment_withDatabaseConfig(t *testing.T) { Config: testAccComposerEnvironment_databaseCfgUpdated(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_databaseCfgUpdated(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_databaseCfgUpdated(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -266,7 +265,7 @@ func TestAccComposerEnvironment_withEncryptionConfigComposer1(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -274,18 +273,18 @@ func TestAccComposerEnvironment_withEncryptionConfigComposer1(t *testing.T) { Config: testAccComposerEnvironment_encryptionCfg(pid, "1", "1", envName, kms.CryptoKey.Name, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_encryptionCfg(pid, "1", "1", envName, kms.CryptoKey.Name, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_encryptionCfg(pid, "1", "1", envName, kms.CryptoKey.Name, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -303,7 +302,7 @@ func TestAccComposerEnvironment_withEncryptionConfigComposer2(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -311,18 +310,18 @@ func TestAccComposerEnvironment_withEncryptionConfigComposer2(t *testing.T) { Config: testAccComposerEnvironment_encryptionCfg(pid, "2", "2", envName, kms.CryptoKey.Name, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_encryptionCfg(pid, "2", "2", envName, kms.CryptoKey.Name, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_encryptionCfg(pid, "2", "2", envName, kms.CryptoKey.Name, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -336,7 +335,7 @@ func TestAccComposerEnvironment_withMaintenanceWindow(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -344,18 +343,18 @@ func TestAccComposerEnvironment_withMaintenanceWindow(t *testing.T) { Config: testAccComposerEnvironment_maintenanceWindow(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_maintenanceWindow(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_maintenanceWindow(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -369,7 +368,7 @@ func TestAccComposerEnvironment_maintenanceWindowUpdate(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -380,18 +379,18 @@ func TestAccComposerEnvironment_maintenanceWindowUpdate(t *testing.T) { Config: testAccComposerEnvironment_maintenanceWindowUpdate(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_maintenanceWindowUpdate(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_maintenanceWindowUpdate(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -405,7 +404,7 @@ func TestAccComposerEnvironment_ComposerV2(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -413,18 +412,18 @@ func TestAccComposerEnvironment_ComposerV2(t *testing.T) { Config: testAccComposerEnvironment_composerV2(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_composerV2(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_composerV2(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -449,60 +448,58 @@ func TestAccComposerEnvironment_UpdateComposerV2ImageVersion(t *testing.T) { Config: testAccComposerEnvironment_composerNewVersion(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_composerNewVersion(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_composerNewVersion(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) } func TestAccComposerEnvironment_UpdateComposerV2ResilienceMode(t *testing.T) { - t.Parallel() - - envName := fmt.Sprintf("%s-%d", testComposerEnvironmentPrefix, acctest.RandInt(t)) - network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) - subnetwork := network + "-1" - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccComposerEnvironment_composerV2HighResilience(envName, network, subnetwork), - }, - { - Config: testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork), - }, - { - ResourceName: "google_composer_environment.test", - ImportState: 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. - // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. - { - PlanOnly: true, - ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), - }, - }, - }) -} + t.Parallel() + envName := fmt.Sprintf("%s-%d", testComposerEnvironmentPrefix, acctest.RandInt(t)) + network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) + subnetwork := network + "-1" + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccComposerEnvironment_composerV2HighResilience(envName, network, subnetwork), + }, + { + Config: testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork), + }, + { + ResourceName: "google_composer_environment.test", + ImportState: 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. + // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. + { + PlanOnly: true, + ExpectNonEmptyPlan: false, + Config: testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + }, + }, + }) +} func TestAccComposerEnvironment_ComposerV2HighResilience(t *testing.T) { t.Parallel() @@ -512,7 +509,7 @@ func TestAccComposerEnvironment_ComposerV2HighResilience(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -520,18 +517,18 @@ func TestAccComposerEnvironment_ComposerV2HighResilience(t *testing.T) { Config: testAccComposerEnvironment_composerV2HighResilience(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_composerV2HighResilience(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_composerV2HighResilience(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -581,7 +578,7 @@ func TestAccComposerEnvironment_UpdateComposerV2(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -592,18 +589,18 @@ func TestAccComposerEnvironment_UpdateComposerV2(t *testing.T) { Config: testAccComposerEnvironment_updateComposerV2(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_updateComposerV2(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_updateComposerV2(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -616,7 +613,7 @@ func TestAccComposerEnvironment_composerV2PrivateServiceConnect(t *testing.T) { network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -624,18 +621,18 @@ func TestAccComposerEnvironment_composerV2PrivateServiceConnect(t *testing.T) { Config: testAccComposerEnvironment_composerV2PrivateServiceConnect(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_composerV2PrivateServiceConnect(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_composerV2PrivateServiceConnect(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -648,7 +645,7 @@ func TestAccComposerEnvironment_composerV1MasterAuthNetworks(t *testing.T) { network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -656,18 +653,18 @@ func TestAccComposerEnvironment_composerV1MasterAuthNetworks(t *testing.T) { Config: testAccComposerEnvironment_MasterAuthNetworks("1", "1", envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_MasterAuthNetworks("1", "1", envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_MasterAuthNetworks("1", "1", envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -680,7 +677,7 @@ func TestAccComposerEnvironment_composerV2MasterAuthNetworks(t *testing.T) { network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -688,18 +685,18 @@ func TestAccComposerEnvironment_composerV2MasterAuthNetworks(t *testing.T) { Config: testAccComposerEnvironment_MasterAuthNetworks("2", "2", envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_MasterAuthNetworks("2", "2", envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_MasterAuthNetworks("2", "2", envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -712,7 +709,7 @@ func TestAccComposerEnvironment_composerV1MasterAuthNetworksUpdate(t *testing.T) network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -723,18 +720,18 @@ func TestAccComposerEnvironment_composerV1MasterAuthNetworksUpdate(t *testing.T) Config: testAccComposerEnvironment_MasterAuthNetworksUpdate("1", "1", envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_MasterAuthNetworksUpdate("1", "1", envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_MasterAuthNetworksUpdate("1", "1", envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -747,7 +744,7 @@ func TestAccComposerEnvironment_composerV2MasterAuthNetworksUpdate(t *testing.T) network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -758,18 +755,18 @@ func TestAccComposerEnvironment_composerV2MasterAuthNetworksUpdate(t *testing.T) Config: testAccComposerEnvironment_MasterAuthNetworksUpdate("2", "2", envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO(dzarmola): Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_MasterAuthNetworksUpdate("2", "2", envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_MasterAuthNetworksUpdate("2", "2", envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -784,7 +781,7 @@ func TestAccComposer2Environment_withNodeConfig(t *testing.T) { serviceAccount := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -792,18 +789,18 @@ func TestAccComposer2Environment_withNodeConfig(t *testing.T) { Config: testAccComposer2Environment_nodeCfg(envName, network, subnetwork, serviceAccount), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposer2Environment_nodeCfg(envName, network, subnetwork, serviceAccount), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposer2Environment_nodeCfg(envName, network, subnetwork, serviceAccount), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -856,7 +853,7 @@ func TestAccComposerEnvironment_withSoftwareConfig(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -864,18 +861,18 @@ func TestAccComposerEnvironment_withSoftwareConfig(t *testing.T) { Config: testAccComposerEnvironment_softwareCfg(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_softwareCfg(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_softwareCfg(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -888,7 +885,7 @@ func TestAccComposerEnvironmentAirflow2_withSoftwareConfig(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -896,8 +893,8 @@ func TestAccComposerEnvironmentAirflow2_withSoftwareConfig(t *testing.T) { Config: testAccComposerEnvironment_airflow2SoftwareCfg(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, { @@ -906,13 +903,13 @@ 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, Config: testAccComposerEnvironmentUpdate_airflow2SoftwareCfg(envName, network, subnetwork), Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), @@ -931,7 +928,7 @@ func TestAccComposerEnvironment_withUpdateOnCreate(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -939,18 +936,18 @@ func TestAccComposerEnvironment_withUpdateOnCreate(t *testing.T) { Config: testAccComposerEnvironment_updateOnlyFields(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. // TODO: Remove this check if firewall rules bug gets fixed by Composer. { - PlanOnly: true, + PlanOnly: true, ExpectNonEmptyPlan: false, - Config: testAccComposerEnvironment_updateOnlyFields(envName, network, subnetwork), - Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), + Config: testAccComposerEnvironment_updateOnlyFields(envName, network, subnetwork), + Check: testAccCheckClearComposerEnvironmentFirewalls(t, network), }, }, }) @@ -999,8 +996,8 @@ func testAccComposerEnvironmentDestroyProducer(t *testing.T) func(s *terraform.S return fmt.Errorf("Invalid ID %q, expected format projects/{project}/regions/{region}/environments/{environment}", rs.Primary.ID) } envName := &composer.ComposerEnvironmentName{ - Project: idTokens[1], - Region: idTokens[3], + Project: idTokens[1], + Region: idTokens[3], Environment: idTokens[5], } @@ -1023,7 +1020,7 @@ func TestAccComposerEnvironment_customBucket(t *testing.T) { network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -1056,7 +1053,7 @@ func TestAccComposerEnvironment_customBucketWithUrl(t *testing.T) { network := fmt.Sprintf("%s-%d", testComposerNetworkPrefix, acctest.RandInt(t)) subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -1090,7 +1087,7 @@ func TestAccComposerEnvironmentComposer3_basic(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -1124,7 +1121,7 @@ func TestAccComposerEnvironmentComposer3_update(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ @@ -1135,8 +1132,8 @@ func TestAccComposerEnvironmentComposer3_update(t *testing.T) { Config: testAccComposerEnvironmentComposer3_update(envName, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, + ResourceName: "google_composer_environment.test", + ImportState: true, ImportStateVerify: true, }, // This is a terrible clean-up step in order to get destroy to succeed, @@ -1161,13 +1158,13 @@ func TestAccComposerEnvironmentComposer3_withNetworkSubnetworkAndAttachment_expe networkAttachment := fmt.Sprintf("%s-%d", testComposerNetworkAttachmentPrefix, acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer3_withNetworkSubnetworkAndAttachment_expectError(envName, networkAttachment, network, subnetwork), - ExpectError: regexp.MustCompile("Conflicting configuration arguments"), + Config: testAccComposerEnvironmentComposer3_withNetworkSubnetworkAndAttachment_expectError(envName, networkAttachment, network, subnetwork), + ExpectError: regexp.MustCompile("Conflicting configuration arguments"), }, // 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. @@ -1190,12 +1187,12 @@ func TestAccComposerEnvironmentComposer3_databaseRetention(t *testing.T) { subnetwork := network + "-1" acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer3_databaseRetention(envName, network, subnetwork), + Config: testAccComposerEnvironmentComposer3_databaseRetention(envName, network, subnetwork), }, { ResourceName: "google_composer_environment.test", @@ -1225,17 +1222,17 @@ func TestAccComposerEnvironmentComposer3_withNetworkAttachment(t *testing.T) { fullFormNetworkAttachmentName := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachment) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer3_withNetworkAttachment(envName, networkAttachment, network, subnetwork), + Config: testAccComposerEnvironmentComposer3_withNetworkAttachment(envName, networkAttachment, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. @@ -1260,20 +1257,20 @@ func TestAccComposerEnvironmentComposer3_updateWithNetworkAttachment(t *testing. fullFormNetworkAttachmentName := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachment) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer3_withNetworkAndSubnetwork(envName, networkAttachment, network, subnetwork), + Config: testAccComposerEnvironmentComposer3_withNetworkAndSubnetwork(envName, networkAttachment, network, subnetwork), }, { - Config: testAccComposerEnvironmentComposer3_withNetworkAttachment(envName, networkAttachment, network, subnetwork), + Config: testAccComposerEnvironmentComposer3_withNetworkAttachment(envName, networkAttachment, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. @@ -1298,20 +1295,20 @@ func TestAccComposerEnvironmentComposer3_updateWithNetworkAndSubnetwork(t *testi fullFormNetworkAttachmentName := fmt.Sprintf("projects/%s/regions/%s/networkAttachments/%s", envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv(), networkAttachment) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer3_withNetworkAttachment(envName, networkAttachment, network, subnetwork), + Config: testAccComposerEnvironmentComposer3_withNetworkAttachment(envName, networkAttachment, network, subnetwork), }, { - Config: testAccComposerEnvironmentComposer3_withNetworkAndSubnetwork(envName, networkAttachment, network, subnetwork), + Config: testAccComposerEnvironmentComposer3_withNetworkAndSubnetwork(envName, networkAttachment, network, subnetwork), }, { - ResourceName: "google_composer_environment.test", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_composer_environment.test", + ImportState: 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. @@ -1409,16 +1406,16 @@ func TestAccComposerEnvironmentComposer3_upgrade_expectError(t *testing.T) { errorRegExp, _ := regexp.Compile(".*upgrade to composer 3 is not yet supported.*") acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer2_empty(envName, network, subnetwork), + Config: testAccComposerEnvironmentComposer2_empty(envName, network, subnetwork), }, { - Config: testAccComposerEnvironmentComposer3_empty(envName, network, subnetwork), - ExpectError: errorRegExp, + Config: testAccComposerEnvironmentComposer3_empty(envName, network, subnetwork), + ExpectError: errorRegExp, }, // 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. @@ -1440,13 +1437,13 @@ func TestAccComposerEnvironmentComposer2_usesUnsupportedField_expectError(t *tes errorRegExp, _ := regexp.Compile(".*error in configuration, .* should only be used in Composer 3.*") acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer2_usesUnsupportedField(envName), - ExpectError: errorRegExp, + Config: testAccComposerEnvironmentComposer2_usesUnsupportedField(envName), + ExpectError: errorRegExp, }, }, }) @@ -1459,13 +1456,13 @@ func TestAccComposerEnvironmentComposer3_usesUnsupportedField_expectError(t *tes errorRegExp, _ := regexp.Compile(".*error in configuration, .* should not be used in Composer 3.*") acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerEnvironmentComposer3_usesUnsupportedField(envName), - ExpectError: errorRegExp, + Config: testAccComposerEnvironmentComposer3_usesUnsupportedField(envName), + ExpectError: errorRegExp, }, }, }) @@ -1906,10 +1903,9 @@ resource "google_compute_subnetwork" "test" { network = google_compute_network.test.self_link } `, - pid, kmsKey, name, compVersion, airflowVersion, kmsKey, network, subnetwork) + pid, kmsKey, name, compVersion, airflowVersion, kmsKey, network, subnetwork) } - func testAccComposerEnvironment_maintenanceWindow(envName, network, subnetwork string) string { return fmt.Sprintf(` resource "google_composer_environment" "test" { @@ -2329,9 +2325,8 @@ resource "google_compute_subnetwork" "test" { `, envName, compVersion, airflowVersion, network, subnetwork) } - func testAccComposerEnvironment_updateComposerV2StandardResilience(envName, network, subnetwork string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_composer_environment" "test" { name = "%s" region = "us-east1" @@ -2393,7 +2388,6 @@ resource "google_compute_subnetwork" "test" { `, envName, network, subnetwork) } - func testAccComposerEnvironment_MasterAuthNetworksUpdate(compVersion, airflowVersion, envName, network, subnetwork string) string { return fmt.Sprintf(` resource "google_composer_environment" "test" { @@ -3011,7 +3005,7 @@ resource "google_compute_subnetwork" "test" { } func testAccComposerEnvironmentComposer2_usesUnsupportedField(name string) string { -return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_composer_environment" "test" { name = "%s" region = "us-central1" @@ -3026,7 +3020,7 @@ resource "google_composer_environment" "test" { } func testAccComposerEnvironmentComposer3_usesUnsupportedField(name string) string { -return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_composer_environment" "test" { name = "%s" region = "us-central1" @@ -3138,7 +3132,7 @@ resource "google_compute_subnetwork" "test_1" { region = "us-central1" network = google_compute_network.test_1.self_link } -`, name, network, subnetwork, network + "-update", subnetwork + "update") +`, name, network, subnetwork, network+"-update", subnetwork+"update") } func testAccComposerEnvironmentComposer3_withNetworkAttachment(name, networkAttachment, network, subnetwork string) string { diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go index 37feb346b799..aaa97b101c05 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go +++ b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_config_map_test.go @@ -33,9 +33,9 @@ func TestAccComposerUserWorkloadsConfigMap_composerUserWorkloadsConfigMapBasicEx }, { Config: testAccComposerUserWorkloadsConfigMap_composerUserWorkloadsConfigMapBasicExample_update(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("google_composer_user_workloads_config_map.config_map", "data.db_host", "dbhost:5432"), - resource.TestCheckNoResourceAttr("google_composer_user_workloads_config_map.config_map", "data.api_host"), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr("google_composer_user_workloads_config_map.config_map", "data.db_host", "dbhost:5432"), + resource.TestCheckNoResourceAttr("google_composer_user_workloads_config_map.config_map", "data.api_host"), ), }, { @@ -69,8 +69,8 @@ func TestAccComposerUserWorkloadsConfigMap_composerUserWorkloadsConfigMapBasicEx }, { Config: testAccComposerUserWorkloadsConfigMap_composerUserWorkloadsConfigMapBasicExample_delete(context), - Check: resource.ComposeTestCheckFunc( - testAccComposerUserWorkloadsConfigMapDestroyed(t), + Check: resource.ComposeTestCheckFunc( + testAccComposerUserWorkloadsConfigMapDestroyed(t), ), }, }, diff --git a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go index cb83e29ce0d0..aa600b16a0f6 100644 --- a/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go +++ b/mmv1/third_party/terraform/services/composer/resource_composer_user_workloads_secret_test.go @@ -2,8 +2,8 @@ package composer_test import ( "fmt" - "testing" "strings" + "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" @@ -22,20 +22,20 @@ func TestAccComposerUserWorkloadsSecret_basic(t *testing.T) { secretName := fmt.Sprintf("%s-%d", testComposerUserWorkloadsSecretPrefix, acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.username"), - resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.password"), + Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.username"), + resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.password"), ), }, { - ResourceName: "google_composer_user_workloads_secret.test", - ImportState: true, + ResourceName: "google_composer_user_workloads_secret.test", + ImportState: true, }, }, }) @@ -48,19 +48,19 @@ func TestAccComposerUserWorkloadsSecret_update(t *testing.T) { secretName := fmt.Sprintf("%s-%d", testComposerUserWorkloadsSecretPrefix, acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()), + Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()), }, { - Config: testAccComposerUserWorkloadsSecret_update(envName, secretName), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.email"), - resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.password"), - resource.TestCheckNoResourceAttr("google_composer_user_workloads_secret.test", "data.username"), + Config: testAccComposerUserWorkloadsSecret_update(envName, secretName), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.email"), + resource.TestCheckResourceAttrSet("google_composer_user_workloads_secret.test", "data.password"), + resource.TestCheckNoResourceAttr("google_composer_user_workloads_secret.test", "data.username"), ), }, }, @@ -74,17 +74,17 @@ func TestAccComposerUserWorkloadsSecret_delete(t *testing.T) { secretName := fmt.Sprintf("%s-%d", testComposerUserWorkloadsSecretPrefix, acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccComposerEnvironmentDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()), + Config: testAccComposerUserWorkloadsSecret_basic(envName, secretName, envvar.GetTestProjectFromEnv(), envvar.GetTestRegionFromEnv()), }, { - Config: testAccComposerUserWorkloadsSecret_delete(envName), - Check: resource.ComposeTestCheckFunc( - testAccComposerUserWorkloadsSecretDestroyed(t), + Config: testAccComposerUserWorkloadsSecret_delete(envName), + Check: resource.ComposeTestCheckFunc( + testAccComposerUserWorkloadsSecretDestroyed(t), ), }, }, @@ -162,8 +162,8 @@ func testAccComposerUserWorkloadsSecretDestroyed(t *testing.T) func(s *terraform return fmt.Errorf("Invalid ID %q, expected format projects/{project}/regions/{region}/environments/{environment}/userWorkloadsSecrets/{name}", rs.Primary.ID) } secretName := &composer.UserWorkloadsSecretName{ - Project: idTokens[1], - Region: idTokens[3], + Project: idTokens[1], + Region: idTokens[3], Environment: idTokens[5], Secret: idTokens[7], } diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go index 6c7cd5b37862..9f28b771750d 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance.go @@ -204,11 +204,11 @@ func dataSourceGoogleComputeInstanceRead(d *schema.ResourceData, meta interface{ } if err := d.Set("key_revocation_action_type", instance.KeyRevocationActionType); err != nil { return fmt.Errorf("Error setting key_revocation_action_type: %s", err) - } + } 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_instance_group_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go index 1bf600dceffa..2603417e79f5 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_group_test.go @@ -8,10 +8,10 @@ import ( "strings" "testing" - "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-provider-google/google/tpgresource" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" + "github.com/hashicorp/terraform-provider-google/google/acctest" + "github.com/hashicorp/terraform-provider-google/google/tpgresource" ) func TestAccDataSourceGoogleComputeInstanceGroup_basic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go index 2a738c5614e0..5b7c9cd9b767 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_instance_test.go @@ -223,4 +223,4 @@ resource "google_compute_network_attachment" "net_attar_default" { connection_preference = "ACCEPT_AUTOMATIC" } `, instanceName, instanceName, instanceName, instanceName) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go index 0800230929f7..5c06a0c68572 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_network.go @@ -31,8 +31,8 @@ func DataSourceGoogleComputeNetwork() *schema.Resource { // Deprecated in favor of network_id "numeric_id": { - Type: schema.TypeString, - Computed: true, + Type: schema.TypeString, + Computed: true, Deprecated: "`numeric_id` is deprecated and will be removed in a future major release. Use `network_id` instead.", }, diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go index 0f30c8d653fe..24bbde48d011 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_region_instance_group_test.go @@ -2,10 +2,10 @@ package compute_test import ( "fmt" - "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" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "testing" ) func TestAccDataSourceRegionInstanceGroup(t *testing.T) { @@ -14,7 +14,7 @@ func TestAccDataSourceRegionInstanceGroup(t *testing.T) { t.Parallel() name := "tf-test-" + acctest.RandString(t, 6) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { diff --git a/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go b/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go index c86f5215b5a4..bfd165e60c5c 100644 --- a/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go +++ b/mmv1/third_party/terraform/services/compute/data_source_google_compute_resource_policy.go @@ -3,9 +3,9 @@ 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" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func DataSourceGoogleComputeResourcePolicy() *schema.Resource { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go index 3ee224c40dec..6699ec98e280 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_rule_test.go @@ -66,85 +66,85 @@ func TestAccComputeFirewallPolicyRule_update(t *testing.T) { } func TestAccComputeFirewallPolicyRule_multipleRules(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeFirewallPolicyRule_multiple(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule2", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeFirewallPolicyRule_multipleAdd(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule3", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeFirewallPolicyRule_multipleRemove(context), - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeFirewallPolicyRule_multiple(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule2", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeFirewallPolicyRule_multipleAdd(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule3", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeFirewallPolicyRule_multipleRemove(context), + }, + }, + }) } func TestAccComputeFirewallPolicyRule_securityProfileGroup_update(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeFirewallPolicyRule_securityProfileGroup_basic(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeFirewallPolicyRule_securityProfileGroup_update(context), - }, - { - ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy", "target_resources"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeFirewallPolicyRule_securityProfileGroup_basic(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeFirewallPolicyRule_securityProfileGroup_update(context), + }, + { + ResourceName: "google_compute_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy", "target_resources"}, + }, + }, + }) } func TestAccComputeFirewallPolicyRule_basic(t *testing.T) { @@ -223,7 +223,7 @@ resource "google_compute_firewall_policy_rule" "fw_policy_rule" { } func testAccComputeFirewallPolicyRule_securityProfileGroup_basic(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_folder" "folder" { display_name = "tf-test-folder-%{random_suffix}" parent = "%{org_name}" @@ -273,7 +273,7 @@ resource "google_compute_firewall_policy_rule" "fw_policy_rule1" { } func testAccComputeFirewallPolicyRule_securityProfileGroup_update(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_folder" "folder" { display_name = "tf-test-folder-%{random_suffix}" parent = "%{org_name}" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go index 5d45e5016768..76ccb0720cbf 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_policy_test.go @@ -2,9 +2,9 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -50,7 +50,7 @@ func TestAccComputeFirewallPolicy_update(t *testing.T) { } func testAccComputeFirewallPolicy_basic(org, policyName, folderName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_folder" "folder" { display_name = "%s" parent = "%s" @@ -66,7 +66,7 @@ resource "google_compute_firewall_policy" "default" { } func testAccComputeFirewallPolicy_update(org, policyName, folderName string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_folder" "folder" { display_name = "%s" parent = "%s" diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go index d0576311d631..ee3837129e55 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_firewall_test.go @@ -133,7 +133,7 @@ func TestAccComputeFirewall_noSource(t *testing.T) { CheckDestroy: testAccCheckComputeFirewallDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComputeFirewall_noSource(networkName, firewallName), + Config: testAccComputeFirewall_noSource(networkName, firewallName), ExpectError: regexp.MustCompile("one of source_tags, source_ranges, or source_service_accounts must be defined"), }, }, @@ -356,7 +356,6 @@ resource "google_compute_firewall" "foobar" { `, network, firewall) } - func testAccComputeFirewall_localRangesUpdate(network, firewall string) string { return fmt.Sprintf(` resource "google_compute_network" "foobar" { @@ -424,7 +423,6 @@ resource "google_compute_firewall" "foobar" { `, network, firewall) } - func testAccComputeFirewall_priority(network, firewall string, priority int) string { return fmt.Sprintf(` resource "google_compute_network" "foobar" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go index 7c4eb0fde00e..4748818ec51a 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_global_address_test.go @@ -2,8 +2,8 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/plancheck" @@ -25,9 +25,9 @@ func TestAccComputeGlobalAddress_update(t *testing.T) { Config: testAccComputeGlobalAddress_update1(context), }, { - ResourceName: "google_compute_global_address.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_compute_global_address.foobar", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { @@ -39,9 +39,9 @@ func TestAccComputeGlobalAddress_update(t *testing.T) { }, }, { - ResourceName: "google_compute_global_address.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_compute_global_address.foobar", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go index b60be89689e2..73a249356d51 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_global_network_endpoint_test.go @@ -1,11 +1,12 @@ package compute_test + import ( "fmt" "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" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccComputeGlobalNetworkEndpoint_networkEndpointsBasic(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go index 7567a28d28e8..b172d6e00f44 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_instance_settings_test.go @@ -12,7 +12,7 @@ func TestAccComputeInstanceSettings_update(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go index 388cdc74c2a1..fd4d0954f704 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_endpoint_group_test.go @@ -3,8 +3,8 @@ package compute_test import ( "testing" - "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccComputeNetworkEndpointGroup_networkEndpointGroup(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go index 3ce9ff750231..ded8779fd055 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_network_firewall_policy_rule_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-testing/plancheck" ) func TestAccComputeNetworkFirewallPolicyRule_update(t *testing.T) { @@ -34,7 +34,7 @@ func TestAccComputeNetworkFirewallPolicyRule_update(t *testing.T) { }, { Config: testAccComputeNetworkFirewallPolicyRule_update(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -49,7 +49,7 @@ func TestAccComputeNetworkFirewallPolicyRule_update(t *testing.T) { }, { Config: testAccComputeNetworkFirewallPolicyRule_removeConfigs(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -64,7 +64,7 @@ func TestAccComputeNetworkFirewallPolicyRule_update(t *testing.T) { }, { Config: testAccComputeNetworkFirewallPolicyRule_start(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -82,139 +82,139 @@ func TestAccComputeNetworkFirewallPolicyRule_update(t *testing.T) { } func TestAccComputeNetworkFirewallPolicyRule_multipleRules(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "project_name": envvar.GetTestProjectFromEnv(), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "project_name": envvar.GetTestProjectFromEnv(), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeNetworkFirewallPolicyRule_multiple(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule2", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeNetworkFirewallPolicyRule_multipleAdd(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeNetworkFirewallPolicyRule_multiple(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule2", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeNetworkFirewallPolicyRule_multipleAdd(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, }, - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule3", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeNetworkFirewallPolicyRule_multipleRemove(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule3", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeNetworkFirewallPolicyRule_multipleRemove(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule2", plancheck.ResourceActionDestroy), plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule3", plancheck.ResourceActionUpdate), }, }, - }, - }, - }) + }, + }, + }) } func TestAccComputeNetworkFirewallPolicyRule_addressGroupOrder(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "project": envvar.GetTestProjectFromEnv(), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "project": envvar.GetTestProjectFromEnv(), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeNetworkFirewallPolicyRule_addressGroupOrder(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.src_test", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - // Client-side reordering doesn't work with no state, so ignore on import - ImportStateVerifyIgnore: []string{"firewall_policy", "match.0.src_address_groups"}, - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.dest_test", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - // Client-side reordering doesn't work with no state, so ignore on import - ImportStateVerifyIgnore: []string{"firewall_policy", "match.0.dest_address_groups"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeNetworkFirewallPolicyRule_addressGroupOrder(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.src_test", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + // Client-side reordering doesn't work with no state, so ignore on import + ImportStateVerifyIgnore: []string{"firewall_policy", "match.0.src_address_groups"}, + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.dest_test", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + // Client-side reordering doesn't work with no state, so ignore on import + ImportStateVerifyIgnore: []string{"firewall_policy", "match.0.dest_address_groups"}, + }, + }, + }) } func TestAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - "security_profile_group_prefix": "//", - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + "security_profile_group_prefix": "//", + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_basic(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - { - Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_basic(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + { + Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, }, - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail - ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - }, - }) + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail + ImportStateVerifyIgnore: []string{"firewall_policy"}, + }, + }, + }) } func TestAccComputeNetworkFirewallPolicyRule_secureTags(t *testing.T) { @@ -239,12 +239,12 @@ func TestAccComputeNetworkFirewallPolicyRule_secureTags(t *testing.T) { ResourceName: "google_compute_network_firewall_policy_rule.primary", ImportState: true, ImportStateVerify: true, - // Referencing using ID causes import to fail + // Referencing using ID causes import to fail ImportStateVerifyIgnore: []string{"firewall_policy", "project"}, }, { Config: testAccComputeNetworkFirewallPolicyRule_secureTagsUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_network_firewall_policy_rule.primary", plancheck.ResourceActionUpdate), }, @@ -254,43 +254,40 @@ func TestAccComputeNetworkFirewallPolicyRule_secureTags(t *testing.T) { ResourceName: "google_compute_network_firewall_policy_rule.primary", ImportState: true, ImportStateVerify: true, - // Referencing using ID causes import to fail + // Referencing using ID causes import to fail ImportStateVerifyIgnore: []string{"firewall_policy", "project"}, }, }, }) } - func TestAccComputeNetworkFirewallSecurityProfileGroupDiffsuppress(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), - "security_profile_group_prefix": "/", - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + "org_name": fmt.Sprintf("organizations/%s", envvar.GetTestOrgFromEnv(t)), + "security_profile_group_prefix": "/", + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context), - }, - { - ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", - ImportState: true, - ImportStateVerify: true, - // Referencing using ID causes import to fail + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context), + }, + { + ResourceName: "google_compute_network_firewall_policy_rule.fw_policy_rule1", + ImportState: true, + ImportStateVerify: true, + // Referencing using ID causes import to fail ImportStateVerifyIgnore: []string{"firewall_policy"}, - }, - }, - }) + }, + }, + }) } - - func testAccComputeNetworkFirewallPolicyRule_secureTags(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_network_security_address_group" "basic_global_networksecurity_address_group" { @@ -434,7 +431,7 @@ resource "google_tags_tag_value" "basic_value" { } func testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_basic(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_compute_network" "network1" { name = "tf-test-%{random_suffix}" auto_create_subnetworks = false @@ -487,7 +484,7 @@ resource "google_compute_network_firewall_policy_rule" "fw_policy_rule1" { } func testAccComputeNetworkFirewallPolicyRule_securityProfileGroup_update(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_network_security_security_profile" "security_profile" { name = "tf-test-my-sp%{random_suffix}" type = "THREAT_PREVENTION" @@ -963,9 +960,8 @@ resource "google_compute_network_firewall_policy_rule" "fw_policy_rule3" { `, context) } - func testAccComputeNetworkFirewallPolicyRule_addressGroupOrder(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_compute_network_firewall_policy" "policy" { name = "tf-test-policy-%{random_suffix}" description = "Resource created for Terraform acceptance testing" @@ -1031,4 +1027,4 @@ resource "google_compute_network_firewall_policy_rule" "dest_test" { } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go index 2943de437d62..5b57791c967f 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_per_instance_config_test.go @@ -2,9 +2,9 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -688,9 +688,9 @@ func testAccComputePerInstanceConfigListInstances(t *testing.T, igmId string) (m url := fmt.Sprintf("%s%s/listManagedInstances", config.ComputeBasePath, igmId) res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - RawURL: url, + Config: config, + Method: "POST", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { @@ -715,9 +715,9 @@ func testAccComputePerInstanceConfigListNames(t *testing.T, igmId string) (map[s url := fmt.Sprintf("%s%s/listPerInstanceConfigs", config.ComputeBasePath, igmId) res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: config, - Method: "POST", - RawURL: url, + Config: config, + Method: "POST", + RawURL: url, UserAgent: config.UserAgent, }) if err != nil { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go index 3e157ac6b7e3..f416cff53491 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_network_firewall_policy_rule_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" - "github.com/hashicorp/terraform-plugin-testing/plancheck" ) func TestAccComputeRegionNetworkFirewallPolicyRule_update(t *testing.T) { @@ -35,7 +35,7 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_update(t *testing.T) { }, { Config: testAccComputeRegionNetworkFirewallPolicyRule_update(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -50,7 +50,7 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_update(t *testing.T) { }, { Config: testAccComputeRegionNetworkFirewallPolicyRule_removeConfigs(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -65,7 +65,7 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_update(t *testing.T) { }, { Config: testAccComputeRegionNetworkFirewallPolicyRule_start(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -114,7 +114,7 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_multipleRules(t *testing.T) { }, { Config: testAccComputeRegionNetworkFirewallPolicyRule_multipleAdd(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), }, @@ -129,7 +129,7 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_multipleRules(t *testing.T) { }, { Config: testAccComputeRegionNetworkFirewallPolicyRule_multipleRemove(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.fw_policy_rule1", plancheck.ResourceActionUpdate), plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.fw_policy_rule2", plancheck.ResourceActionDestroy), @@ -164,12 +164,12 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_secureTags(t *testing.T) { ResourceName: "google_compute_region_network_firewall_policy_rule.primary", ImportState: true, ImportStateVerify: true, - // Referencing using ID causes import to fail + // Referencing using ID causes import to fail ImportStateVerifyIgnore: []string{"firewall_policy", "project"}, }, { Config: testAccComputeRegionNetworkFirewallPolicyRule_secureTagsUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ + ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ plancheck.ExpectResourceAction("google_compute_region_network_firewall_policy_rule.primary", plancheck.ResourceActionUpdate), }, @@ -179,7 +179,7 @@ func TestAccComputeRegionNetworkFirewallPolicyRule_secureTags(t *testing.T) { ResourceName: "google_compute_region_network_firewall_policy_rule.primary", ImportState: true, ImportStateVerify: true, - // Referencing using ID causes import to fail + // Referencing using ID causes import to fail ImportStateVerifyIgnore: []string{"firewall_policy", "project"}, }, }, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go index 7de4e9725b1d..2a98a49462f2 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_per_instance_config_test.go @@ -2,9 +2,9 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -407,7 +407,6 @@ resource "google_compute_region_instance_group_manager" "rigm" { `, context) } - func testAccComputeRegionPerInstanceConfig_removeInstanceOnDestroyBefore(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_compute_network" "default" { diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go index ff6cd381af7f..e2b982856093 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_http_proxy_test.go @@ -2,8 +2,8 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go index 7964c51e6b68..2d34dbed13a5 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_target_tcp_proxy_test.go @@ -2,8 +2,8 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -152,4 +152,4 @@ resource "google_compute_region_health_check" "zero" { region = "us-central1" } `, target, backend, backend, hc) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go index 7a3bef847c29..2602db0de647 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_region_url_map_test.go @@ -2,8 +2,8 @@ package compute_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -1204,4 +1204,4 @@ resource "google_compute_region_backend_service" "home" { timeout_sec = 10 } `, randomSuffix, randomSuffix, randomSuffix) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go index de2498f991f8..f42099418d6d 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_address_test.go @@ -113,7 +113,7 @@ func TestAccComputeRouterNatAddress_withAddressRemoved(t *testing.T) { ExternalProviders: map[string]resource.ExternalProvider{ "random": {}, }, - CheckDestroy: testAccCheckComputeRouterNatAddressDestroyProducer(t), + CheckDestroy: testAccCheckComputeRouterNatAddressDestroyProducer(t), Steps: []resource.TestStep{ { Config: testAccComputeRouterNatAddressWithNatIps(routerName), diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go index dc4ae4f9a2be..160d65f0b505 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_nat_test.go @@ -31,7 +31,7 @@ func TestAccComputeRouterNat_basic(t *testing.T) { }, { // implicitly full ImportStateId - ResourceName: "google_compute_router_nat.foobar", + ResourceName: "google_compute_router_nat.foobar", ImportState: true, ImportStateVerify: true, }, @@ -171,7 +171,7 @@ func TestAccComputeRouterNat_withPortAllocationMethods(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccCheckComputeRouterNatDestroyProducer(t), Steps: []resource.TestStep{ - { + { Config: testAccComputeRouterNatWithAllocationMethod(routerName, false, true), }, { @@ -271,7 +271,6 @@ func TestAccComputeRouterNat_withNatIpsAndDrainNatIps(t *testing.T) { }) } - func TestAccComputeRouterNat_withNatRules(t *testing.T) { t.Parallel() @@ -291,7 +290,7 @@ func TestAccComputeRouterNat_withNatRules(t *testing.T) { Config: testAccComputeRouterNatRulesBasic_omitRules(routerName), }, { - ResourceName: "google_compute_router_nat.foobar", + ResourceName: "google_compute_router_nat.foobar", ImportState: true, ImportStateVerify: true, }, @@ -363,7 +362,7 @@ func TestAccComputeRouterNat_withNatRules(t *testing.T) { Config: testAccComputeRouterNatRulesBasic_omitAction(routerName, 100, ruleDescriptionUpdate, matchUpdate), }, { - ResourceName: "google_compute_router_nat.foobar", + ResourceName: "google_compute_router_nat.foobar", ImportState: true, ImportStateVerify: true, }, @@ -371,7 +370,7 @@ func TestAccComputeRouterNat_withNatRules(t *testing.T) { Config: testAccComputeRouterNatRulesBasic_omitDescription(routerName, 100, matchUpdate), }, { - ResourceName: "google_compute_router_nat.foobar", + ResourceName: "google_compute_router_nat.foobar", ImportState: true, ImportStateVerify: true, }, @@ -387,7 +386,7 @@ func TestAccComputeRouterNat_withNatRules(t *testing.T) { Config: testAccComputeRouterNatRulesBasic_omitRules(routerName), }, { - ResourceName: "google_compute_router_nat.foobar", + ResourceName: "google_compute_router_nat.foobar", ImportState: true, ImportStateVerify: true, }, @@ -468,10 +467,10 @@ func TestAccComputeRouterNat_AutoNetworkTier(t *testing.T) { CheckDestroy: testAccCheckComputeRouterNatDestroyProducer(t), Steps: []resource.TestStep{ { - Config: testAccComputeRouterNatWitAutoNetworkTier(routerName, hubName), + Config: testAccComputeRouterNatWitAutoNetworkTier(routerName, hubName), }, { - // implicitly full ImportStateId + // implicitly full ImportStateId ResourceName: "google_compute_router_nat.foobar", ImportState: true, ImportStateVerify: true, diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go index f4ac5f418e9d..104bab62a947 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_route_policy_test.go @@ -68,4 +68,4 @@ resource "google_compute_router_route_policy" "route_policy" { } } `, routerName, routePolicyName) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go index d02cab34f229..876e8ed61194 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_router_test.go @@ -91,9 +91,9 @@ func TestAccComputeRouter_advertisedIpRangesOrder(t *testing.T) { Config: testAccComputeRouterAdvertisedIpRangesOrder(routerName), }, { - ResourceName: "google_compute_router.foobar", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_compute_router.foobar", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"bgp.0.advertised_ip_ranges.0.range", "bgp.0.advertised_ip_ranges.1.range"}, }, }, @@ -386,4 +386,4 @@ resource "google_compute_router" "foobar" { } } `, routerName, routerName) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go index 50cd764a47c2..14e340833c97 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go +++ b/mmv1/third_party/terraform/services/compute/resource_compute_security_policy_rule_test.go @@ -1,10 +1,10 @@ package compute_test import ( - "fmt" - "regexp" - "testing" + "fmt" "github.com/hashicorp/terraform-provider-google/google/acctest" + "regexp" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -94,7 +94,7 @@ func TestAccComputeSecurityPolicyRule_extendedUpdate(t *testing.T) { ImportStateVerify: true, }, { - Config: testAccComputeSecurityPolicyRule_extPosUpdateSamePriority(context), + Config: testAccComputeSecurityPolicyRule_extPosUpdateSamePriority(context), ExpectError: regexp.MustCompile("Cannot have rules with the same priorities."), }, { @@ -130,9 +130,9 @@ func TestAccComputeSecurityPolicyRule_withPreconfiguredWafConfig(t *testing.T) { Config: testAccComputeSecurityPolicyRule_withPreconfiguredWafConfig_create(context), }, { - ResourceName: "google_compute_security_policy_rule.policy_rule", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_compute_security_policy_rule.policy_rule", + ImportState: true, + ImportStateVerify: true, }, { Config: testAccComputeSecurityPolicyRule_withPreconfiguredWafConfig_update(context), @@ -172,21 +172,21 @@ func TestAccComputeSecurityPolicyRule_withRateLimitOptions(t *testing.T) { { Config: testAccComputeSecurityPolicyRule_withRateLimitOptionsCreate(context), }, - { - ResourceName: "google_compute_security_policy_rule.policy_rule", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccComputeSecurityPolicyRule_withRateLimitOptionsUpdate(context), - }, - { - ResourceName: "google_compute_security_policy_rule.policy_rule", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + { + ResourceName: "google_compute_security_policy_rule.policy_rule", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccComputeSecurityPolicyRule_withRateLimitOptionsUpdate(context), + }, + { + ResourceName: "google_compute_security_policy_rule.policy_rule", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccComputeSecurityPolicyRule_withRateLimit_withEnforceOnKeyConfigs(t *testing.T) { @@ -241,7 +241,6 @@ func TestAccComputeSecurityPolicyRule_withRateLimitOption_withMultipleEnforceOnK }) } - func TestAccComputeSecurityPolicyRule_EnforceOnKeyUpdates(t *testing.T) { t.Parallel() diff --git a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go index fb6d4a649283..ecc4c9eda3c4 100644 --- a/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go +++ b/mmv1/third_party/terraform/services/dataflow/resource_dataflow_job.go @@ -68,17 +68,16 @@ func ResourceDataflowJobTemplateGcsPathDiffSuppress(k, old, new string, d *schem return isRegionSuffixedPathMatch(old, new) } - 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 - } - - return false + 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 + } + + return false } func ResourceDataflowJob() *schema.Resource { @@ -115,10 +114,10 @@ func ResourceDataflowJob() *schema.Resource { }, "template_gcs_path": { - Type: schema.TypeString, - Required: true, + Type: schema.TypeString, + Required: true, DiffSuppressFunc: ResourceDataflowJobTemplateGcsPathDiffSuppress, - Description: `The Google Cloud Storage path to the Dataflow job template.`, + Description: `The Google Cloud Storage path to the Dataflow job template.`, }, "temp_gcs_location": { @@ -158,9 +157,9 @@ func ResourceDataflowJob() *schema.Resource { }, "labels": { - Type: schema.TypeMap, - Optional: true, - Description: `User labels to be specified for the job. Keys and values should follow the restrictions specified in the labeling restrictions page. NOTE: This field is non-authoritative, and will only manage the labels present in your configuration. + Type: schema.TypeMap, + Optional: true, + Description: `User labels to be specified for the job. Keys and values should follow the restrictions specified in the labeling restrictions page. 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.`, }, @@ -322,7 +321,7 @@ func shouldStopDataflowJobDeleteQuery(state string, skipWait bool) bool { func resourceDataflowJobCreate(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -362,7 +361,7 @@ func resourceDataflowJobCreate(d *schema.ResourceData, meta interface{}) error { func resourceDataflowJobRead(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -457,7 +456,7 @@ func resourceDataflowJobUpdateByReplacement(d *schema.ResourceData, meta interfa if jobHasUpdate(d, ResourceDataflowJob().Schema) { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -494,7 +493,7 @@ func resourceDataflowJobUpdateByReplacement(d *schema.ResourceData, meta interfa response, updateErr = resourceDataflowJobLaunchTemplate(config, project, region, userAgent, d.Get("template_gcs_path").(string), &request) return updateErr }, - Timeout: time.Minute*time.Duration(5), + Timeout: time.Minute * time.Duration(5), ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsDataflowJobUpdateRetryableError}, }) if err != nil { @@ -512,7 +511,7 @@ func resourceDataflowJobUpdateByReplacement(d *schema.ResourceData, meta interfa func resourceDataflowJobDelete(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -570,7 +569,7 @@ func resourceDataflowJobDelete(d *schema.ResourceData, meta interface{}) error { } // Wait for state to reach terminal state (canceled/drained/done plus cancelling/draining if skipWait) - skipWait := d.Get("skip_wait_on_job_termination").(bool) + skipWait := d.Get("skip_wait_on_job_termination").(bool) ok := shouldStopDataflowJobDeleteQuery(d.Get("state").(string), skipWait) for !ok { log.Printf("[DEBUG] Waiting for job with job state %q to terminate...", d.Get("state").(string)) diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go index ce91b2dc7217..a97933fcb679 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_cluster_test.go @@ -280,48 +280,48 @@ func TestAccDataprocCluster_withShieldedConfig(t *testing.T) { } func TestAccDataprocCluster_withConfidentialCompute(t *testing.T) { - t.Parallel() + t.Parallel() - var cluster dataproc.Cluster - rnd := acctest.RandString(t, 10) + var cluster dataproc.Cluster + rnd := acctest.RandString(t, 10) networkName := acctest.BootstrapSharedTestNetwork(t, "dataproc-cluster") subnetworkName := acctest.BootstrapSubnet(t, "dataproc-cluster", networkName) acctest.BootstrapFirewallForDataprocSharedNetwork(t, "dataproc-cluster", networkName) imageUri := "https://www.googleapis.com/compute/v1/projects/cloud-dataproc/global/images/dataproc-2-1-ubu20-20241026-165100-rc01" - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckDataprocClusterDestroy(t), - Steps: []resource.TestStep{ - { - Config: testAccDataprocCluster_withConfidentialCompute(rnd, subnetworkName, imageUri), - Check: resource.ComposeTestCheckFunc( - testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.confidential", &cluster), - - // Check confidential compute - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.gce_cluster_config.0.confidential_instance_config.0.enable_confidential_compute", "true"), - - // Check master - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.master_config.0.machine_type", "n2d-standard-2"), - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.master_config.0.image_uri", imageUri), - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.master_config.0.min_cpu_platform", "AMD Rome"), - - // Check worker - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.worker_config.0.machine_type", "n2d-standard-2"), - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.worker_config.0.image_uri", imageUri), - resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", - "cluster_config.0.worker_config.0.min_cpu_platform", "AMD Rome"), - ), - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckDataprocClusterDestroy(t), + Steps: []resource.TestStep{ + { + Config: testAccDataprocCluster_withConfidentialCompute(rnd, subnetworkName, imageUri), + Check: resource.ComposeTestCheckFunc( + testAccCheckDataprocClusterExists(t, "google_dataproc_cluster.confidential", &cluster), + + // Check confidential compute + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.gce_cluster_config.0.confidential_instance_config.0.enable_confidential_compute", "true"), + + // Check master + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.master_config.0.machine_type", "n2d-standard-2"), + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.master_config.0.image_uri", imageUri), + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.master_config.0.min_cpu_platform", "AMD Rome"), + + // Check worker + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.worker_config.0.machine_type", "n2d-standard-2"), + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.worker_config.0.image_uri", imageUri), + resource.TestCheckResourceAttr("google_dataproc_cluster.confidential", + "cluster_config.0.worker_config.0.min_cpu_platform", "AMD Rome"), + ), + }, + }, + }) } func TestAccDataprocCluster_withMetadataAndTags(t *testing.T) { @@ -1055,7 +1055,7 @@ func TestAccDataprocCluster_KMS(t *testing.T) { acctest.BootstrapIamMembers(t, []acctest.IamMember{ { Member: "serviceAccount:service-{project_number}@compute-system.iam.gserviceaccount.com", - Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", + Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", }, }) @@ -1629,7 +1629,7 @@ resource "google_dataproc_cluster" "basic" { } func testAccDataprocCluster_withConfidentialCompute(rnd, subnetworkName string, imageUri string) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_dataproc_cluster" "confidential" { name = "tf-test-dproc-%s" region = "us-central1" @@ -2774,4 +2774,3 @@ resource "google_dataproc_metastore_service" "ms" { } `, clusterName, serviceId) } - diff --git a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go index 4fc7c56c3528..e08344fc40b4 100644 --- a/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go +++ b/mmv1/third_party/terraform/services/dataproc/resource_dataproc_job.go @@ -148,13 +148,13 @@ func ResourceDataprocJob() *schema.Resource { }, "labels": { - Type: schema.TypeMap, + Type: schema.TypeMap, Description: `Optional. The labels to associate with this job. **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.`, - Optional: true, - Elem: &schema.Schema{Type: schema.TypeString}, + Optional: true, + Elem: &schema.Schema{Type: schema.TypeString}, }, "terraform_labels": { @@ -219,7 +219,7 @@ func resourceDataprocJobUpdate(d *schema.ResourceData, meta interface{}) error { func resourceDataprocJobCreate(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -311,7 +311,7 @@ func resourceDataprocJobCreate(d *schema.ResourceData, meta interface{}) error { func resourceDataprocJobRead(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } @@ -406,7 +406,7 @@ func resourceDataprocJobRead(d *schema.ResourceData, meta interface{}) error { func resourceDataprocJobDelete(d *schema.ResourceData, meta interface{}) error { config := meta.(*transport_tpg.Config) - userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) + userAgent, err := tpgresource.GenerateUserAgentString(d, config.UserAgent) if err != nil { return err } diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go b/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go index ec98020e5c97..04109d7f2c73 100644 --- a/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go +++ b/mmv1/third_party/terraform/services/dataprocmetastore/data_source_dataproc_metastore_service_test.go @@ -2,8 +2,8 @@ package dataprocmetastore_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go b/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go index 58dc408b7ffd..4979c2114595 100644 --- a/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go +++ b/mmv1/third_party/terraform/services/dataprocmetastore/resource_dataproc_metastore_service_test.go @@ -2,8 +2,8 @@ package dataprocmetastore_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -166,4 +166,4 @@ resource "google_storage_bucket" "bucket" { location = "us-central1" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go index ea74a7e7dc09..a6f19404144d 100644 --- a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go +++ b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_account_connector_test.go @@ -4,52 +4,50 @@ import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-plugin-testing/plancheck" - + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorGithubUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_Github(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_GithubUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_Github(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_GithubUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_Github(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -62,9 +60,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_GithubUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -83,47 +80,45 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorGitlabUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_Gitlab(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_GitlabUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_Gitlab(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_GitlabUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_Gitlab(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -136,9 +131,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_GitlabUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -159,48 +153,46 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorGoogleUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_Google(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_GoogleUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_Google(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_GoogleUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_Google(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -213,9 +205,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_GoogleUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -236,48 +227,46 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorSentryUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_Sentry(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_SentryUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_Sentry(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_SentryUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_Sentry(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -290,9 +279,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_SentryUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -313,48 +301,46 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorRovoUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_Rovo(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_RovoUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_Rovo(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_RovoUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_Rovo(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -367,9 +353,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_RovoUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -390,48 +375,46 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorNewRelicUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_NewRelic(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_NewRelicUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_NewRelic(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_NewRelicUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_NewRelic(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -444,9 +427,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_NewRelicUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -467,48 +449,46 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func TestAccDeveloperConnectAccountConnector_developerConnectAccountConnectorDatastaxUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectAccountConnector_Datastax(context), - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - { - Config: testAccDeveloperConnectAccountConnector_DatastaxUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_account_connector.my-account-connector", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectAccountConnector_Datastax(context), + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + { + Config: testAccDeveloperConnectAccountConnector_DatastaxUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_account_connector.my-account-connector", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_account_connector.my-account-connector", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"account_connector_id", "annotations", "labels"}, + }, + }, + }) } - func testAccDeveloperConnectAccountConnector_Datastax(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -521,9 +501,8 @@ resource "google_developer_connect_account_connector" "my-account-connector" { `, context) } - func testAccDeveloperConnectAccountConnector_DatastaxUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_developer_connect_account_connector" "my-account-connector" { location = "us-central1" account_connector_id = "tf-test-ac%{random_suffix}" @@ -543,5 +522,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 b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go index d9be48f20c8b..0bc3bf5ae643 100644 --- a/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go +++ b/mmv1/third_party/terraform/services/developerconnect/resource_developer_connect_connection_test.go @@ -1,13 +1,11 @@ - package developerconnect_test import ( "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-plugin-testing/plancheck" - + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccDeveloperConnectConnection_developerConnectConnectionGithubUpdate(t *testing.T) { @@ -43,9 +41,8 @@ func TestAccDeveloperConnectConnection_developerConnectConnectionGithubUpdate(t }) } - func testAccDeveloperConnectConnection_Github(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}" @@ -61,7 +58,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func testAccDeveloperConnectConnection_GithubUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_developer_connect_connection" "my-connection" { @@ -86,7 +82,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func TestAccDeveloperConnectConnection_developerConnectConnectionGithubEnterpriseUpdate(t *testing.T) { t.Parallel() @@ -120,9 +115,8 @@ func TestAccDeveloperConnectConnection_developerConnectConnectionGithubEnterpris }) } - func testAccDeveloperConnectConnection_GithubEnterprise(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}" @@ -137,7 +131,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func testAccDeveloperConnectConnection_GithubEnterpriseUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_developer_connect_connection" "my-connection" { @@ -161,7 +154,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func TestAccDeveloperConnectConnection_GhePrivConnection(t *testing.T) { t.Parallel() @@ -186,9 +178,8 @@ func TestAccDeveloperConnectConnection_GhePrivConnection(t *testing.T) { }) } - func testAccDeveloperConnectConnection_GhePrivConnection(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}" @@ -213,7 +204,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func TestAccDeveloperConnectConnection_developerConnectConnectionGitlabUpdate(t *testing.T) { t.Parallel() @@ -247,9 +237,8 @@ func TestAccDeveloperConnectConnection_developerConnectConnectionGitlabUpdate(t }) } - func testAccDeveloperConnectConnection_Gitlab(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}" @@ -269,7 +258,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func testAccDeveloperConnectConnection_GitlabUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_developer_connect_connection" "my-connection" { @@ -321,9 +309,8 @@ func TestAccDeveloperConnectConnection_GlePrivConnection(t *testing.T) { }) } - func testAccDeveloperConnectConnection_GlePrivConnection(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}" @@ -355,7 +342,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func TestAccDeveloperConnectConnection_developerConnectConnectionGitlabEnterpriseUpdate(t *testing.T) { t.Parallel() @@ -389,9 +375,8 @@ func TestAccDeveloperConnectConnection_developerConnectConnectionGitlabEnterpris }) } - func testAccDeveloperConnectConnection_GitlabEnterprise(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}" @@ -413,7 +398,6 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func testAccDeveloperConnectConnection_GitlabEnterpriseUpdate(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_developer_connect_connection" "my-connection" { @@ -443,48 +427,46 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func TestAccDeveloperConnectConnection_developerConnectConnectionBitbucketCloudUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectConnection_BitbucketCloud(context), - }, - { - ResourceName: "google_developer_connect_connection.my-connection", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, - }, - { - Config: testAccDeveloperConnectConnection_BitbucketCloudUpdate(context), - ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_connection.my-connection", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_connection.my-connection", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, - }, - }, - }) -} + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectConnection_BitbucketCloud(context), + }, + { + ResourceName: "google_developer_connect_connection.my-connection", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, + }, + { + Config: testAccDeveloperConnectConnection_BitbucketCloudUpdate(context), + ConfigPlanChecks: resource.ConfigPlanChecks{ + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_connection.my-connection", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_connection.my-connection", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, + }, + }, + }) +} func testAccDeveloperConnectConnection_BitbucketCloud(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}" @@ -506,9 +488,8 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func testAccDeveloperConnectConnection_BitbucketCloudUpdate(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}" @@ -536,48 +517,46 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func TestAccDeveloperConnectConnection_developerConnectConnectionBitbucketDataCenterUpdate(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectConnection_BitbucketDataCenter(context), - }, - { - ResourceName: "google_developer_connect_connection.my-connection", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, - }, - { - Config: testAccDeveloperConnectConnection_BitbucketDataCenterUpdate(context), + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectConnection_BitbucketDataCenter(context), + }, + { + ResourceName: "google_developer_connect_connection.my-connection", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, + }, + { + Config: testAccDeveloperConnectConnection_BitbucketDataCenterUpdate(context), ConfigPlanChecks: resource.ConfigPlanChecks{ - PreApply: []plancheck.PlanCheck{ - plancheck.ExpectResourceAction("google_developer_connect_connection.my-connection", plancheck.ResourceActionUpdate), - }, - }, - }, - { - ResourceName: "google_developer_connect_connection.my-connection", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, - }, - }, - }) + PreApply: []plancheck.PlanCheck{ + plancheck.ExpectResourceAction("google_developer_connect_connection.my-connection", plancheck.ResourceActionUpdate), + }, + }, + }, + { + ResourceName: "google_developer_connect_connection.my-connection", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, + }, + }, + }) } - func testAccDeveloperConnectConnection_BitbucketDataCenter(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}" @@ -599,9 +578,8 @@ resource "google_developer_connect_connection" "my-connection" { `, context) } - func testAccDeveloperConnectConnection_BitbucketDataCenterUpdate(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}" @@ -630,32 +608,31 @@ resource "google_developer_connect_connection" "my-connection" { } func TestAccDeveloperConnectConnection_BbdcPrivConnection(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccDeveloperConnectConnection_BbdcPrivConnection(context), - }, - { - ResourceName: "google_developer_connect_connection.my-connection", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, - }, - }, - }) -} + t.Parallel() + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccDeveloperConnectConnection_BbdcPrivConnection(context), + }, + { + ResourceName: "google_developer_connect_connection.my-connection", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"connection_id", "location", "terraform_labels"}, + }, + }, + }) +} 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/dialogflow/resource_dialogflow_agent_test.go b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go index 8e9c3aed7b54..640d82c9e1e5 100644 --- a/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go +++ b/mmv1/third_party/terraform/services/dialogflow/resource_dialogflow_agent_test.go @@ -3,9 +3,9 @@ package dialogflow_test 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" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) func TestAccDialogflowAgent_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go b/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go index 8e652968ca40..eb6c37bad539 100644 --- a/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go +++ b/mmv1/third_party/terraform/services/dns/data_source_dns_key_test.go @@ -33,7 +33,6 @@ func TestAccDataSourceDNSKeys_basic(t *testing.T) { }) } - func TestAccDataSourceDNSKeys_noDnsSec(t *testing.T) { t.Parallel() diff --git a/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go b/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go index a4210409d1c6..5e4ea9ad6249 100644 --- a/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go +++ b/mmv1/third_party/terraform/services/dns/resource_dns_policy_test.go @@ -2,8 +2,8 @@ package dns_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go b/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go index d867090678b0..596a4ccb48ed 100644 --- a/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go +++ b/mmv1/third_party/terraform/services/firestore/resource_firestore_database_update_test.go @@ -2,9 +2,9 @@ package firestore_test import ( "fmt" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -26,18 +26,18 @@ func TestAccFirestoreDatabase_updateConcurrencyMode(t *testing.T) { Config: testAccFirestoreDatabase_concurrencyMode(projectId, randomSuffix, "OPTIMISTIC"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, { Config: testAccFirestoreDatabase_concurrencyMode(projectId, randomSuffix, "PESSIMISTIC"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, }, @@ -61,18 +61,18 @@ func TestAccFirestoreDatabase_updatePitrEnablement(t *testing.T) { Config: testAccFirestoreDatabase_pitrEnablement(projectId, randomSuffix, "POINT_IN_TIME_RECOVERY_ENABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, { Config: testAccFirestoreDatabase_pitrEnablement(projectId, randomSuffix, "POINT_IN_TIME_RECOVERY_DISABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, }, @@ -96,18 +96,18 @@ func TestAccFirestoreDatabase_updateDeleteProtectionState(t *testing.T) { Config: testAccFirestoreDatabase_deleteProtectionState(projectId, randomSuffix, "DELETE_PROTECTION_ENABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, { Config: testAccFirestoreDatabase_deleteProtectionState(projectId, randomSuffix, "DELETE_PROTECTION_DISABLED"), }, { - ResourceName: "google_firestore_database.database", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_firestore_database.database", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"etag", "project"}, }, }, diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go index d54ea63c659c..f9d053b35866 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_binding_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -15,7 +15,7 @@ func TestAccGeminiCodeToolsSettingBinding_update(t *testing.T) { context := map[string]interface{}{ "code_tools_setting_id": fmt.Sprintf("tf-test-ls-%s", acctest.RandString(t, 10)), - "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), + "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), } acctest.VcrTest(t, resource.TestCase{ @@ -109,4 +109,4 @@ resource "google_gemini_code_tools_setting_binding" "basic_binding" { product = "GEMINI_CODE_ASSIST" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go index 67a0da137674..5743e8d565b6 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_code_tools_setting_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go index b52680727430..c5481e98360f 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_binding_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -15,7 +15,7 @@ func TestAccGeminiDataSharingWithGoogleSettingBinding_update(t *testing.T) { context := map[string]interface{}{ "data_sharing_with_google_setting_id": fmt.Sprintf("tf-test-ls-%s", acctest.RandString(t, 10)), - "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), + "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go index 720fc3b8bd4a..ddf22216594a 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_data_sharing_with_google_setting_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go index 38b5fd383fa4..ba034eeccc40 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_binding_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -15,7 +15,7 @@ func TestAccGeminiGeminiGcpEnablementSettingBinding_update(t *testing.T) { context := map[string]interface{}{ "gemini_gcp_enablement_setting_id": fmt.Sprintf("tf-test-ls-%s", acctest.RandString(t, 10)), - "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), + "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go index 2f0edee86fe3..0d1294cbc08c 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_gemini_gcp_enablement_setting_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go index 363c71a9b2a6..dd0368926e09 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_logging_setting_binding_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -91,4 +91,4 @@ resource "google_gemini_logging_setting_binding" "basic_binding" { product = "GEMINI_CODE_ASSIST" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go b/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go index a68853e1714a..8012ed347746 100644 --- a/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go +++ b/mmv1/third_party/terraform/services/gemini/resource_gemini_release_channel_setting_binding_test.go @@ -1,7 +1,7 @@ package gemini_test import ( - "fmt" + "fmt" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -15,7 +15,7 @@ func TestAccGeminiReleaseChannelSettingBinding_update(t *testing.T) { context := map[string]interface{}{ "release_channel_setting_id": fmt.Sprintf("tf-test-ls-%s", acctest.RandString(t, 10)), - "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), + "setting_binding_id": fmt.Sprintf("tf-test-lsb-%s", acctest.RandString(t, 10)), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go index 613c30efa76c..658e79ce5b0b 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_backup_plan_test.go @@ -28,54 +28,54 @@ func TestAccGKEBackupBackupPlan_update(t *testing.T) { Config: testAccGKEBackupBackupPlan_basic(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, - { + { Config: testAccGKEBackupBackupPlan_permissive(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccGKEBackupBackupPlan_full(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, - { + { Config: testAccGKEBackupBackupPlan_rpo_daily_window(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, { Config: testAccGKEBackupBackupPlan_rpo_weekly_window(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, - { + { Config: testAccGKEBackupBackupPlan_full(context), }, { - ResourceName: "google_gke_backup_backup_plan.backupplan", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_gke_backup_backup_plan.backupplan", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "terraform_labels"}, }, }, diff --git a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go index cde094427e20..04c53ad5f927 100644 --- a/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go +++ b/mmv1/third_party/terraform/services/gkebackup/resource_gke_backup_restore_plan_test.go @@ -1,16 +1,13 @@ - - package gkebackup_test 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" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) - func TestAccGKEBackupRestorePlan_update(t *testing.T) { t.Parallel() @@ -35,7 +32,7 @@ func TestAccGKEBackupRestorePlan_update(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels"}, }, - { + { Config: testAccGKEBackupRestorePlan_update(context), }, { @@ -204,4 +201,4 @@ resource "google_gke_backup_restore_plan" "restore_plan" { } } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go b/mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go index 255f43439b96..b255c5011634 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go +++ b/mmv1/third_party/terraform/services/gkeonprem/gkeonprem_operation.go @@ -99,10 +99,10 @@ func (w *gkeonpremOperationWaiter) QueryOp() (interface{}, error) { url := fmt.Sprintf("%s%s", w.Config.GkeonpremBasePath, w.Op.Name) return transport_tpg.SendRequest(transport_tpg.SendRequestOptions{ - Config: w.Config, - Method: "GET", - Project: w.Project, - RawURL: url, + Config: w.Config, + Method: "GET", + Project: w.Project, + RawURL: url, UserAgent: w.UserAgent, }) } diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go index 7fa9b1323f19..e5d8fdf33ee4 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_cluster_test.go @@ -8,105 +8,105 @@ import ( ) func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBasic(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-metallb", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-manuallb", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_cluster.cluster-bgplb", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-metallb" { name = "cluster-metallb%{random_suffix}" @@ -184,7 +184,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLbStart(context } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-metallb" { name = "cluster-metallb%{random_suffix}" @@ -260,7 +260,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateMetalLb(context map[ } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-manuallb" { name = "cluster-manuallb%{random_suffix}" @@ -339,7 +339,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLbStart(contex } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-manuallb" { name = "cluster-manuallb%{random_suffix}" @@ -407,7 +407,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateManualLb(context map } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-bgplb" { name = "cluster-bgplb%{random_suffix}" @@ -491,7 +491,7 @@ func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLbStart(context m } func testAccGkeonpremBareMetalCluster_bareMetalClusterUpdateBgpLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster-bgplb" { name = "cluster-bgplb%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go index da81a36fe5cc..e0e430b79f3a 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_bare_metal_node_pool_test.go @@ -8,41 +8,41 @@ import ( ) func TestAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremBareMetalNodePoolDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context), - }, - { - ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremBareMetalNodePoolDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context), + }, + { + ResourceName: "google_gkeonprem_bare_metal_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -134,7 +134,7 @@ func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdateStart(context map[ } func testAccGkeonpremBareMetalNodePool_bareMetalNodePoolUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_bare_metal_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go index 8e380005fb16..4f495496da86 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_cluster_test.go @@ -8,107 +8,107 @@ import ( ) func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateBasic(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateF5Lb(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func TestAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(t *testing.T) { - // VCR fails to handle batched project services - acctest.SkipIfVcr(t) - t.Parallel() + // VCR fails to handle batched project services + acctest.SkipIfVcr(t) + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - { - Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context), - }, - { - ResourceName: "google_gkeonprem_vmware_cluster.cluster", - ImportState: true, - ImportStateVerify: true, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareClusterDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context), + }, + { + ResourceName: "google_gkeonprem_vmware_cluster.cluster", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -156,7 +156,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLbStart(context map[s } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -204,7 +204,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateMetalLb(context map[string } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -251,7 +251,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5LbStart(context map[stri } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -298,7 +298,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateF5lb(context map[string]in } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -392,7 +392,7 @@ func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLbStart(context map[ } func testAccGkeonpremVmwareCluster_vmwareClusterUpdateManualLb(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go index 37b54ef28f53..b89cdaff1768 100644 --- a/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go +++ b/mmv1/third_party/terraform/services/gkeonprem/resource_gkeonprem_vmware_node_pool_test.go @@ -8,41 +8,41 @@ import ( ) func TestAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckGkeonpremVmwareNodePoolDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context), - }, - { - ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - { - Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context), - }, - { - ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"annotations"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckGkeonpremVmwareNodePoolDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context), + }, + { + ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + { + Config: testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context), + }, + { + ResourceName: "google_gkeonprem_vmware_node_pool.nodepool", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"annotations"}, + }, + }, + }) } func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" @@ -127,7 +127,7 @@ func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdateStart(context map[string } func testAccGkeonpremVmwareNodePool_vmwareNodePoolUpdate(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_gkeonprem_vmware_cluster" "cluster" { name = "tf-test-cluster-%{random_suffix}" diff --git a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go index c1227b201afa..3725784c4660 100644 --- a/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go +++ b/mmv1/third_party/terraform/services/iam2/resource_iam_deny_policy_test.go @@ -76,7 +76,7 @@ func TestAccIAM2DenyPolicy_iamDenyPolicyFolderParent(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "parent"}, }, - { + { Config: testAccIAM2DenyPolicy_iamDenyPolicyFolderUpdate(context), }, { diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go b/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go index 8dedbe2d98f7..6a4856956932 100644 --- a/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go +++ b/mmv1/third_party/terraform/services/iam3/resource_iam_folders_policy_binding_test.go @@ -21,7 +21,7 @@ func TestAccIAM3FoldersPolicyBinding_iamFoldersPolicyBindingExample_update(t *te PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), ExternalProviders: map[string]resource.ExternalProvider{ - "time": {}, + "time": {}, }, CheckDestroy: testAccCheckIAM3FoldersPolicyBindingDestroyProducer(t), Steps: []resource.TestStep{ diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go b/mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go index 0e77227913ab..6eccb406b3f4 100644 --- a/mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go +++ b/mmv1/third_party/terraform/services/iam3/resource_iam_organizations_policy_binding_test.go @@ -21,7 +21,7 @@ func TestAccIAM3OrganizationsPolicyBinding_iam3OrganizationsPolicyBindingExample PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), CheckDestroy: testAccCheckIAM3OrganizationsPolicyBindingDestroyProducer(t), - ExternalProviders: map[string]resource.ExternalProvider{ + ExternalProviders: map[string]resource.ExternalProvider{ "time": {}, }, Steps: []resource.TestStep{ diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go b/mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go index 5603b10a2b9f..8aa95953b7a3 100644 --- a/mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go +++ b/mmv1/third_party/terraform/services/iam3/resource_iam_principal_access_boundary_policy_test.go @@ -1,4 +1,5 @@ package iam3_test + import ( "testing" diff --git a/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go b/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go index 70776bedcd6c..3e2ade2da282 100644 --- a/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go +++ b/mmv1/third_party/terraform/services/iam3/resource_iam_projects_policy_binding_test.go @@ -13,14 +13,14 @@ func TestAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_update(t * t.Parallel() context := map[string]interface{}{ - "org_id": envvar.GetTestOrgFromEnv(t), - "random_suffix": acctest.RandString(t, 10), + "org_id": envvar.GetTestOrgFromEnv(t), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckIAM3ProjectsPolicyBindingDestroyProducer(t), + CheckDestroy: testAccCheckIAM3ProjectsPolicyBindingDestroyProducer(t), ExternalProviders: map[string]resource.ExternalProvider{ "time": {}, }, @@ -52,7 +52,6 @@ func TestAccIAM3ProjectsPolicyBinding_iamProjectsPolicyBindingExample_update(t * ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "location", "policy_binding_id"}, }, - }, }) } diff --git a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go index 2a5d5d148483..83c712a330cc 100644 --- a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go +++ b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_provider_test.go @@ -1,8 +1,8 @@ package iambeta_test import ( - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go index da0d26fa2c88..0a303d908299 100644 --- a/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go +++ b/mmv1/third_party/terraform/services/iambeta/data_source_iam_workload_identity_pool_test.go @@ -1,8 +1,8 @@ package iambeta_test import ( - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) diff --git a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go index dc07534ed47d..89c530f5caf5 100644 --- a/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go +++ b/mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_provider_test.go @@ -1,8 +1,8 @@ package iambeta_test import ( - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -259,7 +259,7 @@ func TestAccIAMBetaWorkloadIdentityPoolProvider_x509(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"workload_identity_pool_id", "workload_identity_pool_provider_id"}, }, - { + { Config: testAccIAMBetaWorkloadIdentityPoolProvider_x509_update(context), }, { diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go index 3d1dacc3ca48..82167e5a58de 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go +++ b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_credential_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-provider-google/google/acctest" ) - func TestAccIAMWorkforcePoolOauthClientCredential_full(t *testing.T) { t.Parallel() @@ -131,4 +130,4 @@ resource "google_iam_oauth_client_credential" "example" { oauth_client_credential_id = "tf-test-cred-id%{random_suffix}" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go index 8e5ed6a79e0f..506fadd3c7ec 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go +++ b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_oauth_client_test.go @@ -30,7 +30,7 @@ func TestAccIAMWorkforcePoolOauthClient_full(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"location", "oauth_client_id"}, }, - { + { Config: testAccIAMWorkforcePoolOauthClient_full_update(context), ConfigPlanChecks: resource.ConfigPlanChecks{ PreApply: []plancheck.PlanCheck{ @@ -106,4 +106,4 @@ resource "google_iam_oauth_client" "example" { client_type = "CONFIDENTIAL_CLIENT" } `, context) -} \ No newline at end of file +} diff --git a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go index 0a2ba96b08cb..91c6c5211e3d 100644 --- a/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go +++ b/mmv1/third_party/terraform/services/iamworkforcepool/resource_iam_workforce_pool_test.go @@ -2,9 +2,9 @@ package iamworkforcepool_test import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" ) func TestAccIAMWorkforcePoolWorkforcePool_full(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go b/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go index 04c17b73a924..2c00b5c634a9 100644 --- a/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go +++ b/mmv1/third_party/terraform/services/networkmanagement/resource_network_management_vpc_flow_logs_config_test.go @@ -9,41 +9,41 @@ import ( ) func TestAccNetworkManagementVpcFlowLogsConfig_updateInterconnect(t *testing.T) { - t.Parallel() + t.Parallel() - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccNetworkManagementVpcFlowLogsConfig_fullInterconnect(context), - }, - { - ResourceName: "google_network_management_vpc_flow_logs_config.interconnect-test", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"}, - }, - { - Config: testAccNetworkManagementVpcFlowLogsConfig_updateInterconnect(context), - }, - { - ResourceName: "google_network_management_vpc_flow_logs_config.interconnect-test", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"}, - }, - }, - }) + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + CheckDestroy: testAccCheckNetworkManagementVpcFlowLogsConfigDestroyProducer(t), + Steps: []resource.TestStep{ + { + Config: testAccNetworkManagementVpcFlowLogsConfig_fullInterconnect(context), + }, + { + ResourceName: "google_network_management_vpc_flow_logs_config.interconnect-test", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"}, + }, + { + Config: testAccNetworkManagementVpcFlowLogsConfig_updateInterconnect(context), + }, + { + ResourceName: "google_network_management_vpc_flow_logs_config.interconnect-test", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"}, + }, + }, + }) } func testAccNetworkManagementVpcFlowLogsConfig_fullInterconnect(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` data "google_project" "project" { } @@ -77,7 +77,7 @@ resource "google_compute_interconnect_attachment" "attachment" { } func testAccNetworkManagementVpcFlowLogsConfig_updateInterconnect(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` data "google_project" "project" { } @@ -136,7 +136,7 @@ func TestAccNetworkManagementVpcFlowLogsConfig_updateVpn(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"labels", "location", "terraform_labels", "vpc_flow_logs_config_id"}, }, - { + { Config: testAccNetworkManagementVpcFlowLogsConfig_updateVpn(context), }, { @@ -160,7 +160,7 @@ resource "google_network_management_vpc_flow_logs_config" "example" { vpn_tunnel = "projects/${data.google_project.project.number}/regions/us-central1/vpnTunnels/${google_compute_vpn_tunnel.tunnel.name}" } `, context) - return fmt.Sprintf("%s\n\n%s\n\n", vpcFlowLogsCfg, testAccNetworkManagementVpcFlowLogsConfig_baseResources(context)) + return fmt.Sprintf("%s\n\n%s\n\n", vpcFlowLogsCfg, testAccNetworkManagementVpcFlowLogsConfig_baseResources(context)) } func testAccNetworkManagementVpcFlowLogsConfig_updateVpn(context map[string]interface{}) string { @@ -179,7 +179,7 @@ resource "google_network_management_vpc_flow_logs_config" "example" { metadata = "EXCLUDE_ALL_METADATA" } `, context) - return fmt.Sprintf("%s\n\n%s\n\n", vpcFlowLogsCfg, testAccNetworkManagementVpcFlowLogsConfig_baseResources(context)) + return fmt.Sprintf("%s\n\n%s\n\n", vpcFlowLogsCfg, testAccNetworkManagementVpcFlowLogsConfig_baseResources(context)) } func testAccNetworkManagementVpcFlowLogsConfig_baseResources(context map[string]interface{}) string { @@ -242,4 +242,3 @@ resource "google_compute_route" "route" { } `, context) } - diff --git a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go index f0ffccc8d9df..bdf6ae2e66dc 100644 --- a/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go +++ b/mmv1/third_party/terraform/services/networksecurity/resource_network_security_security_profile_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" ) diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go index 1a8a2ac91443..819738664e66 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_instance_test.go @@ -15,7 +15,7 @@ func TestAccNotebooksInstance_create_vm_image(t *testing.T) { prefix := fmt.Sprintf("%d", acctest.RandInt(t)) name := fmt.Sprintf("tf-%s", prefix) - acctest.VcrTest(t, resource.TestCase{ + acctest.VcrTest(t, resource.TestCase{ ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { diff --git a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go index d9bc74aace88..de8cff548f05 100644 --- a/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go +++ b/mmv1/third_party/terraform/services/notebooks/resource_notebooks_runtime_test.go @@ -3,8 +3,8 @@ package notebooks_test import ( "testing" - "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccNotebooksRuntime_update(t *testing.T) { @@ -48,7 +48,6 @@ func TestAccNotebooksRuntime_update(t *testing.T) { }) } - func testAccNotebooksRuntime_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_notebooks_runtime" "runtime" { diff --git a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go index fc13e6adcc10..87c14932c638 100644 --- a/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go +++ b/mmv1/third_party/terraform/services/orgpolicy/resource_org_policy_custom_constraint_test.go @@ -1,9 +1,9 @@ package orgpolicy_test import ( - "testing" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" ) @@ -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_organization_test.go b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go index d247ec7ea7cd..e34839ff36e1 100644 --- a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go +++ b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_for_organization_test.go @@ -24,11 +24,10 @@ func TestAccOSConfigV2PolicyOrchestratorForOrganization_basic(t *testing.T) { }, }) - context := map[string]interface{}{ - "org_id": envvar.GetTestOrgTargetFromEnv(t), - "zone": envvar.GetTestZoneFromEnv(), - "random_suffix": acctest.RandString(t, 10), + "org_id": envvar.GetTestOrgTargetFromEnv(t), + "zone": envvar.GetTestZoneFromEnv(), + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go index a51797992db9..4aed5eeac4ef 100644 --- a/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go +++ b/mmv1/third_party/terraform/services/osconfigv2/resource_os_config_v2_policy_orchestrator_test.go @@ -32,7 +32,6 @@ func TestAccOSConfigV2PolicyOrchestrator_basic(t *testing.T) { "random_suffix": acctest.RandString(t, 10), } - acctest.VcrTest(t, resource.TestCase{ PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), diff --git a/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go b/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go index dcd4666ea561..581fb8758070 100644 --- a/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go +++ b/mmv1/third_party/terraform/services/parametermanager/data_source_parameter_manager_parameter_version_test.go @@ -198,7 +198,7 @@ func TestAccDataSourceParameterManagerParameterVersion_withKmsKey(t *testing.T) }) context := map[string]interface{}{ - "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "global", "tf-parameter-manager-managed-1").CryptoKey.Name, + "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "global", "tf-parameter-manager-managed-1").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go b/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go index d7104eba2062..627cf6d03178 100644 --- a/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go +++ b/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_test.go @@ -3,8 +3,8 @@ package parametermanager_test import ( "testing" - "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -113,8 +113,8 @@ func TestAccParameterManagerParameter_kmsKeyUpdate(t *testing.T) { }) context := map[string]interface{}{ - "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "global", "tf-parameter-manager-managed-1").CryptoKey.Name, - "kms_key_other": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "global", "tf-parameter-manager-managed-2").CryptoKey.Name, + "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "global", "tf-parameter-manager-managed-1").CryptoKey.Name, + "kms_key_other": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "global", "tf-parameter-manager-managed-2").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go b/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go index 9e9083e19dbe..28ba96aa4166 100644 --- a/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go +++ b/mmv1/third_party/terraform/services/parametermanagerregional/data_source_parameter_manager_regional_parameter_version_test.go @@ -204,7 +204,7 @@ func TestAccDataSourceParameterManagerRegionalRegionalParameterVersion_withKmsKe }) context := map[string]interface{}{ - "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-parameter-manager-managed-central-key1").CryptoKey.Name, + "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-parameter-manager-managed-central-key1").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go b/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go index 046c0ea269ae..b49304df14ef 100644 --- a/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go +++ b/mmv1/third_party/terraform/services/parametermanagerregional/resource_parameter_manager_regional_parameter_test.go @@ -3,8 +3,8 @@ package parametermanagerregional_test import ( "testing" - "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/plancheck" "github.com/hashicorp/terraform-provider-google/google/acctest" ) @@ -160,8 +160,8 @@ func TestAccParameterManagerRegionalRegionalParameter_kmskeyUpdate(t *testing.T) }) context := map[string]interface{}{ - "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-parameter-manager-managed-central-key1").CryptoKey.Name, - "kms_key_other": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-parameter-manager-managed-central-key2").CryptoKey.Name, + "kms_key": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-parameter-manager-managed-central-key1").CryptoKey.Name, + "kms_key_other": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-parameter-manager-managed-central-key2").CryptoKey.Name, "random_suffix": acctest.RandString(t, 10), } diff --git a/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go b/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go index 55fa1c1a6ff3..fc1b2d8d4cd3 100644 --- a/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go +++ b/mmv1/third_party/terraform/services/privilegedaccessmanager/resource_privileged_access_manager_entitlement_test.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-google/google/acctest" - "github.com/hashicorp/terraform-provider-google/google/envvar" + "github.com/hashicorp/terraform-provider-google/google/envvar" ) func TestAccPrivilegedAccessManagerEntitlement_privilegedAccessManagerEntitlementProjectExample_update(t *testing.T) { diff --git a/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go b/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go index f67faddd73f3..2c7ffdf39f29 100644 --- a/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go +++ b/mmv1/third_party/terraform/services/redis/resource_redis_cluster_test.go @@ -3,17 +3,17 @@ package redis_test import ( "fmt" "log" + "strings" "testing" "time" - "strings" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" - "github.com/hashicorp/terraform-provider-google/google/services/redis" "github.com/hashicorp/terraform-provider-google/google/acctest" + "github.com/hashicorp/terraform-provider-google/google/services/redis" transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport" ) + func TestAccRedisCluster_createUpdateClusterWithNodeType(t *testing.T) { t.Parallel() @@ -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/resourcemanager/data_source_google_iam_policy.go b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go index ba67ce30dbf5..baf8cebe945b 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go +++ b/mmv1/third_party/terraform/services/resourcemanager/data_source_google_iam_policy.go @@ -18,14 +18,14 @@ import ( // to express a Google Cloud IAM policy in a data resource. This is an example // of how the schema would be used in a config: // -// data "google_iam_policy" "admin" { -// binding { -// role = "roles/storage.objectViewer" -// members = [ -// "user:evanbrown@google.com", -// ] -// } -// } +// data "google_iam_policy" "admin" { +// binding { +// role = "roles/storage.objectViewer" +// members = [ +// "user:evanbrown@google.com", +// ] +// } +// } func DataSourceGoogleIamPolicy() *schema.Resource { return &schema.Resource{ Read: dataSourceGoogleIamPolicyRead, diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go index 85711b8f8989..31b935ca707a 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_binding_test.go @@ -2,9 +2,9 @@ package resourcemanager_test import ( "fmt" - "regexp" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "regexp" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -266,7 +266,7 @@ func TestAccProjectIamBinding_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociateBindingBasic(pid, org, role, "admin@hashicorptest.com"), + Config: testAccProjectAssociateBindingBasic(pid, org, role, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value \"admin@hashicorptest.com\" for members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go index 248f9ab19bd3..443f1f6febc6 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_member_test.go @@ -2,9 +2,9 @@ package resourcemanager_test import ( "fmt" - "regexp" "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-provider-google/google/envvar" + "regexp" "testing" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -182,7 +182,7 @@ func TestAccProjectIamMember_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociateMemberBasic(pid, org, role, "admin@hashicorptest.com"), + Config: testAccProjectAssociateMemberBasic(pid, org, role, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value \"admin@hashicorptest.com\" for member \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go index 89593089fb69..fadec307ccd0 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_iam_policy_test.go @@ -55,7 +55,7 @@ func TestAccProjectIamPolicy_emptyMembers(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -72,7 +72,7 @@ func TestAccProjectIamPolicy_expanded(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -92,7 +92,7 @@ func TestAccProjectIamPolicy_basicAuditConfig(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ // Create a new project @@ -122,7 +122,7 @@ func TestAccProjectIamPolicy_expandedAuditConfig(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { @@ -141,7 +141,7 @@ func TestAccProjectIamPolicy_withCondition(t *testing.T) { org := envvar.GetTestOrgFromEnv(t) pid := fmt.Sprintf("tf-test-%d", acctest.RandInt(t)) acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, + PreCheck: func() { acctest.AccTestPreCheck(t) }, ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ // Create a new project @@ -176,7 +176,7 @@ func TestAccProjectIamPolicy_invalidMembers(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), Steps: []resource.TestStep{ { - Config: testAccProjectAssociatePolicyBasic(pid, org, "admin@hashicorptest.com"), + Config: testAccProjectAssociatePolicyBasic(pid, org, "admin@hashicorptest.com"), ExpectError: regexp.MustCompile("invalid value \"admin@hashicorptest.com\" for bindings\\.1\\.members\\.0 \\(IAM members must have one of the values outlined here: https://cloud.google.com/billing/docs/reference/rest/v1/Policy#Binding\\)"), }, { diff --git a/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go b/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go index 6e291254097d..0eb78e092355 100644 --- a/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/iam_secret_manager_secret_test.go @@ -15,7 +15,7 @@ func TestAccSecretManagerSecretIam_iamMemberConditionUpdate(t *testing.T) { context := map[string]interface{}{ "random_suffix": acctest.RandString(t, 10), - "role": "roles/secretmanager.secretAccessor", + "role": "roles/secretmanager.secretAccessor", } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go index 8e48e3a9690c..81ce574fe53a 100644 --- a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_test.go @@ -25,9 +25,9 @@ func TestAccSecretManagerSecret_import(t *testing.T) { Config: testAccSecretManagerSecret_basic(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, @@ -54,9 +54,9 @@ func TestAccSecretManagerSecret_cmek(t *testing.T) { Config: testAccSecretMangerSecret_cmek(context1), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, @@ -79,27 +79,27 @@ func TestAccSecretManagerSecret_annotationsUpdate(t *testing.T) { Config: testAccSecretManagerSecret_annotationsBasic(context), }, { - ResourceName: "google_secret_manager_secret.secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"}, }, { Config: testAccSecretManagerSecret_annotationsUpdate(context), }, { - ResourceName: "google_secret_manager_secret.secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"}, }, { Config: testAccSecretManagerSecret_annotationsBasic(context), }, { - ResourceName: "google_secret_manager_secret.secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels", "annotations"}, }, }, @@ -122,36 +122,36 @@ func TestAccSecretManagerSecret_versionAliasesUpdate(t *testing.T) { Config: testAccSecretManagerSecret_basicWithSecretVersions(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_versionAliasesBasic(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_versionAliasesUpdate(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, { Config: testAccSecretManagerSecret_basicWithSecretVersions(context), }, { - ResourceName: "google_secret_manager_secret.secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret.secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"ttl", "labels", "terraform_labels"}, }, }, diff --git a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go index a955b4f6d748..761ccde659bb 100644 --- a/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go +++ b/mmv1/third_party/terraform/services/secretmanager/resource_secret_manager_secret_version_test.go @@ -3,8 +3,8 @@ package secretmanager_test import ( "testing" - "github.com/hashicorp/terraform-provider-google/google/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccSecretManagerSecretVersion_update(t *testing.T) { @@ -23,18 +23,18 @@ func TestAccSecretManagerSecretVersion_update(t *testing.T) { Config: testAccSecretManagerSecretVersion_basic(context), }, { - ResourceName: "google_secret_manager_secret_version.secret-version-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret_version.secret-version-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"secret_data", "secret_data_wo_version"}, }, { Config: testAccSecretManagerSecretVersion_disable(context), }, { - ResourceName: "google_secret_manager_secret_version.secret-version-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret_version.secret-version-basic", + ImportState: true, + ImportStateVerify: true, // at this point the secret data is disabled and so reading the data on import will // give an empty string ImportStateVerifyIgnore: []string{"secret_data", "secret_data_wo_version"}, @@ -43,9 +43,9 @@ func TestAccSecretManagerSecretVersion_update(t *testing.T) { Config: testAccSecretManagerSecretVersion_basic(context), }, { - ResourceName: "google_secret_manager_secret_version.secret-version-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_secret_version.secret-version-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"secret_data", "secret_data_wo_version"}, }, }, diff --git a/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go b/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go index 0324798304b8..062f005b581d 100644 --- a/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go +++ b/mmv1/third_party/terraform/services/secretmanagerregional/resource_secret_manager_regional_secret_test.go @@ -24,9 +24,9 @@ func TestAccSecretManagerRegionalRegionalSecret_import(t *testing.T) { Config: testAccSecretManagerRegionalSecret_basic(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-basic", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-basic", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, }, @@ -49,36 +49,36 @@ func TestAccSecretManagerRegionalRegionalSecret_labelsUpdate(t *testing.T) { Config: testAccSecretManagerRegionalSecret_withoutLabels(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, { Config: testAccSecretManagerRegionalSecret_labelsUpdate(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, { Config: testAccSecretManagerRegionalSecret_labelsUpdateOther(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, { Config: testAccSecretManagerRegionalSecret_withoutLabels(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-labels", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, }, @@ -101,36 +101,36 @@ func TestAccSecretManagerRegionalRegionalSecret_annotationsUpdate(t *testing.T) Config: testAccSecretManagerRegionalSecret_withoutAnnotations(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, { Config: testAccSecretManagerRegionalSecret_annotationsUpdate(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, { Config: testAccSecretManagerRegionalSecret_annotationsUpdateOther(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, { Config: testAccSecretManagerRegionalSecret_withoutAnnotations(context), }, { - ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", - ImportState: true, - ImportStateVerify: true, + ResourceName: "google_secret_manager_regional_secret.regional-secret-with-annotations", + ImportState: true, + ImportStateVerify: true, ImportStateVerifyIgnore: []string{"annotations", "labels", "location", "secret_id", "terraform_labels"}, }, }, @@ -141,9 +141,9 @@ func TestAccSecretManagerRegionalRegionalSecret_cmekUpdate(t *testing.T) { t.Parallel() context := map[string]interface{}{ - "kms_key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-secret-manager-managed-central-key3").CryptoKey.Name, - "kms_key_name_other": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-secret-manager-managed-central-key4").CryptoKey.Name, - "random_suffix": acctest.RandString(t, 10), + "kms_key_name": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-secret-manager-managed-central-key3").CryptoKey.Name, + "kms_key_name_other": acctest.BootstrapKMSKeyWithPurposeInLocationAndName(t, "ENCRYPT_DECRYPT", "us-central1", "tf-secret-manager-managed-central-key4").CryptoKey.Name, + "random_suffix": acctest.RandString(t, 10), } acctest.VcrTest(t, resource.TestCase{ diff --git a/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go b/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go index ffd8cb5bed98..e3ee32694a0c 100644 --- a/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go +++ b/mmv1/third_party/terraform/services/spanner/resource_spanner_database_test.go @@ -625,7 +625,7 @@ func TestAccSpannerDatabase_cmek(t *testing.T) { acctest.BootstrapIamMembers(t, []acctest.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-spanner.iam.gserviceaccount.com", - Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", + Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", }, }) diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go index 7176ab4ad65b..4760f072487f 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_test.go @@ -140,7 +140,7 @@ func TestAccStorageBucket_AutoclassDiffSuppress(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_basicWithAutoclass(bucketName,false), + Config: testAccStorageBucket_basicWithAutoclass(bucketName, false), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -153,7 +153,7 @@ func TestAccStorageBucket_AutoclassDiffSuppress(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_basicWithAutoclass(bucketName,true), + Config: testAccStorageBucket_basicWithAutoclass(bucketName, true), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -353,7 +353,7 @@ func TestAccStorageBucket_dualLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_dualLocation_rpo(bucketName,"ASYNC_TURBO"), + Config: testAccStorageBucket_dualLocation_rpo(bucketName, "ASYNC_TURBO"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "ASYNC_TURBO"), @@ -366,7 +366,7 @@ func TestAccStorageBucket_dualLocation_rpo(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_dualLocation_rpo(bucketName,"DEFAULT"), + Config: testAccStorageBucket_dualLocation_rpo(bucketName, "DEFAULT"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr( "google_storage_bucket.bucket", "rpo", "DEFAULT"), @@ -427,7 +427,7 @@ func TestAccStorageBucket_lifecycleRulesMultiple(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero","lifecycle_rule.1.condition.0.send_age_if_zero","lifecycle_rule.2.condition.0.send_age_if_zero","lifecycle_rule.3.condition.0.send_age_if_zero","lifecycle_rule.4.condition.0.send_age_if_zero","lifecycle_rule.5.condition.0.send_age_if_zero","lifecycle_rule.6.condition.0.send_age_if_zero","lifecycle_rule.7.condition.0.send_age_if_zero","lifecycle_rule.8.condition.0.send_age_if_zero","lifecycle_rule.9.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero", "lifecycle_rule.1.condition.0.send_age_if_zero", "lifecycle_rule.2.condition.0.send_age_if_zero", "lifecycle_rule.3.condition.0.send_age_if_zero", "lifecycle_rule.4.condition.0.send_age_if_zero", "lifecycle_rule.5.condition.0.send_age_if_zero", "lifecycle_rule.6.condition.0.send_age_if_zero", "lifecycle_rule.7.condition.0.send_age_if_zero", "lifecycle_rule.8.condition.0.send_age_if_zero", "lifecycle_rule.9.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_lifecycleRulesMultiple_update(bucketName), @@ -436,7 +436,7 @@ func TestAccStorageBucket_lifecycleRulesMultiple(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero","lifecycle_rule.1.condition.0.send_age_if_zero","lifecycle_rule.2.condition.0.send_age_if_zero","lifecycle_rule.3.condition.0.send_age_if_zero","lifecycle_rule.4.condition.0.send_age_if_zero","lifecycle_rule.5.condition.0.send_age_if_zero","lifecycle_rule.6.condition.0.send_age_if_zero","lifecycle_rule.7.condition.0.send_age_if_zero","lifecycle_rule.8.condition.0.send_age_if_zero","lifecycle_rule.9.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero", "lifecycle_rule.1.condition.0.send_age_if_zero", "lifecycle_rule.2.condition.0.send_age_if_zero", "lifecycle_rule.3.condition.0.send_age_if_zero", "lifecycle_rule.4.condition.0.send_age_if_zero", "lifecycle_rule.5.condition.0.send_age_if_zero", "lifecycle_rule.6.condition.0.send_age_if_zero", "lifecycle_rule.7.condition.0.send_age_if_zero", "lifecycle_rule.8.condition.0.send_age_if_zero", "lifecycle_rule.9.condition.0.send_age_if_zero"}, }, }, }) @@ -465,7 +465,7 @@ func TestAccStorageBucket_lifecycleRuleStateLive(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero","lifecycle_rule.1.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero", "lifecycle_rule.1.condition.0.send_age_if_zero"}, }, }, }) @@ -494,7 +494,7 @@ func TestAccStorageBucket_lifecycleRuleStateArchived(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_lifecycleRule_withStateArchived(bucketName), @@ -508,7 +508,7 @@ func TestAccStorageBucket_lifecycleRuleStateArchived(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, }, }) @@ -537,7 +537,7 @@ func TestAccStorageBucket_lifecycleRuleStateAny(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_lifecycleRule_withStateLive(bucketName), @@ -551,7 +551,7 @@ func TestAccStorageBucket_lifecycleRuleStateAny(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero","lifecycle_rule.1.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero", "lifecycle_rule.1.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_lifecycleRule_withStateAny(bucketName), @@ -565,7 +565,7 @@ func TestAccStorageBucket_lifecycleRuleStateAny(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_lifecycleRule_withStateArchived(bucketName), @@ -579,7 +579,7 @@ func TestAccStorageBucket_lifecycleRuleStateAny(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, }, }) @@ -798,7 +798,7 @@ func TestAccStorageBucket_update(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_customAttributes_withLifecycle2(bucketName), @@ -814,7 +814,7 @@ func TestAccStorageBucket_update(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero","lifecycle_rule.1.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero", "lifecycle_rule.1.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_customAttributes_withLifecycle1Update(bucketName), @@ -830,7 +830,7 @@ func TestAccStorageBucket_update(t *testing.T) { ResourceName: "google_storage_bucket.bucket", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"force_destroy","lifecycle_rule.0.condition.0.send_age_if_zero"}, + ImportStateVerifyIgnore: []string{"force_destroy", "lifecycle_rule.0.condition.0.send_age_if_zero"}, }, { Config: testAccStorageBucket_customAttributes(bucketName), @@ -1462,7 +1462,7 @@ func TestAccStorageBucket_SoftDeletePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_SoftDeletePolicy(bucketName,7776000), + Config: testAccStorageBucket_SoftDeletePolicy(bucketName, 7776000), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -1477,7 +1477,7 @@ func TestAccStorageBucket_SoftDeletePolicy(t *testing.T) { ImportStateVerifyIgnore: []string{"force_destroy"}, }, { - Config: testAccStorageBucket_SoftDeletePolicy(bucketName,0), + Config: testAccStorageBucket_SoftDeletePolicy(bucketName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckStorageBucketExists( t, "google_storage_bucket.bucket", bucketName, &bucket), @@ -1894,7 +1894,7 @@ resource "google_storage_bucket" "bucket" { `, bucketName) } -func testAccStorageBucket_dualLocation_rpo(bucketName string,rpo string) string { +func testAccStorageBucket_dualLocation_rpo(bucketName string, rpo string) string { return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" @@ -1905,7 +1905,7 @@ resource "google_storage_bucket" "bucket" { } rpo = "%s" } -`, bucketName,rpo) +`, bucketName, rpo) } func testAccStorageBucket_customAttributes(bucketName string) string { @@ -2626,7 +2626,7 @@ resource "google_storage_bucket" "bucket" { } func testAccStorageBucket_SoftDeletePolicy(bucketName string, duration int) string { - return fmt.Sprintf(` + return fmt.Sprintf(` resource "google_storage_bucket" "bucket" { name = "%s" location = "US" diff --git a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go index 6a7e7be5c506..e72f63d05d14 100644 --- a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go +++ b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_shielded_config_test.go @@ -1,190 +1,190 @@ package workbench_test import ( - "testing" + "testing" - "github.com/hashicorp/terraform-plugin-testing/helper/resource" + "github.com/hashicorp/terraform-plugin-testing/helper/resource" - "github.com/hashicorp/terraform-provider-google/google/acctest" + "github.com/hashicorp/terraform-provider-google/google/acctest" ) func TestAccWorkbenchInstance_shielded_config_update(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccWorkbenchInstance_shielded_config_false(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccWorkbenchInstance_shielded_config_false(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + }, + }) } func TestAccWorkbenchInstance_shielded_config_remove(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_none(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_none(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + }, + }) } func TestAccWorkbenchInstance_shielded_config_double_apply(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - Steps: []resource.TestStep{ - { - Config: testAccWorkbenchInstance_shielded_config_none(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_none(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_false(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_false(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - { - Config: testAccWorkbenchInstance_shielded_config_true(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), - }, - { - ResourceName: "google_workbench_instance.instance", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, - }, - }, - }) + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(t, 10), + } + + acctest.VcrTest(t, resource.TestCase{ + PreCheck: func() { acctest.AccTestPreCheck(t) }, + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), + Steps: []resource.TestStep{ + { + Config: testAccWorkbenchInstance_shielded_config_none(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_none(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_false(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_false(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + { + Config: testAccWorkbenchInstance_shielded_config_true(context), + Check: resource.ComposeTestCheckFunc( + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), + }, + { + ResourceName: "google_workbench_instance.instance", + ImportState: true, + ImportStateVerify: true, + ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, + }, + }, + }) } func testAccWorkbenchInstance_shielded_config_true(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_workbench_instance" "instance" { name = "tf-test-workbench-instance%{random_suffix}" location = "us-central1-a" @@ -201,7 +201,7 @@ resource "google_workbench_instance" "instance" { } func testAccWorkbenchInstance_shielded_config_false(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_workbench_instance" "instance" { name = "tf-test-workbench-instance%{random_suffix}" location = "us-central1-a" @@ -219,7 +219,7 @@ resource "google_workbench_instance" "instance" { } func testAccWorkbenchInstance_shielded_config_none(context map[string]interface{}) string { - return acctest.Nprintf(` + return acctest.Nprintf(` resource "google_workbench_instance" "instance" { name = "tf-test-workbench-instance%{random_suffix}" location = "us-central1-a" diff --git a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go index 04fa6a2f27fc..325324b42bc3 100644 --- a/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go +++ b/mmv1/third_party/terraform/services/workbench/resource_workbench_instance_test.go @@ -22,9 +22,9 @@ func TestAccWorkbenchInstance_update(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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -32,12 +32,12 @@ func TestAccWorkbenchInstance_update(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_update(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -114,9 +114,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -124,12 +124,12 @@ func TestAccWorkbenchInstance_updateGpu(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -202,9 +202,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -212,12 +212,12 @@ func TestAccWorkbenchInstance_removeGpu(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_removeGpu(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -275,9 +275,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -285,12 +285,12 @@ func TestAccWorkbenchInstance_updateMetadata(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateMetadata(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -301,9 +301,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -329,9 +329,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -339,12 +339,12 @@ func TestAccWorkbenchInstance_updateMetadataKey(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -355,9 +355,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -427,9 +427,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -437,12 +437,12 @@ 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", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateState(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "STOPPED"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "STOPPED"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -450,12 +450,12 @@ 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", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_basic(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -493,9 +493,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -503,12 +503,12 @@ func TestAccWorkbenchInstance_empty_accelerator(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_empty_accelerator(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -519,9 +519,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -561,9 +561,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -571,12 +571,12 @@ func TestAccWorkbenchInstance_updateBootDisk(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateBootDisk(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -602,9 +602,9 @@ 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"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -612,12 +612,12 @@ func TestAccWorkbenchInstance_updateDataDisk(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateDataDisk(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), - ), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), + ), }, { ResourceName: "google_workbench_instance.instance", @@ -643,8 +643,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"), ), }, { @@ -653,11 +653,11 @@ func TestAccWorkbenchInstance_updateBothDisks(t *testing.T) { ImportStateVerify: true, ImportStateVerifyIgnore: []string{"name", "instance_owners", "location", "instance_id", "request_id", "labels", "terraform_labels", "desired_state", "update_time", "health_info", "health_state"}, }, - { + { Config: testAccWorkbenchInstance_updateBothDisks(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -730,8 +730,8 @@ func TestAccWorkbenchInstance_updatelabels(t *testing.T) { { Config: testAccWorkbenchInstance_label(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -743,8 +743,8 @@ func TestAccWorkbenchInstance_updatelabels(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"), ), }, { @@ -756,8 +756,8 @@ func TestAccWorkbenchInstance_updatelabels(t *testing.T) { { Config: testAccWorkbenchInstance_label(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -782,7 +782,6 @@ resource "google_workbench_instance" "instance" { `, context) } - func TestAccWorkbenchInstance_updateCustomContainers(t *testing.T) { t.Parallel() @@ -797,8 +796,8 @@ func TestAccWorkbenchInstance_updateCustomContainers(t *testing.T) { { Config: testAccWorkbenchInstance_customcontainer(context), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr( - "google_workbench_instance.instance", "state", "ACTIVE"), + resource.TestCheckResourceAttr( + "google_workbench_instance.instance", "state", "ACTIVE"), ), }, { @@ -810,8 +809,8 @@ func TestAccWorkbenchInstance_updateCustomContainers(t *testing.T) { { Config: testAccWorkbenchInstance_updatedcustomcontainer(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 b/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go index 0e4b807a76ee..4ac91af4ceec 100644 --- a/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go +++ b/mmv1/third_party/terraform/services/workflows/resource_workflows_workflow_test.go @@ -141,7 +141,7 @@ func TestAccWorkflowsWorkflow_UpdateDeletionProtectionFalseToTrue(t *testing.T) { Config: testAccWorkflowsWorkflow_Basic_DeletionProtectionTrue(workflowName), }, - { + { Config: testAccWorkflowsWorkflow_Basic_DeletionProtectionFalse(workflowName), }, }, @@ -297,7 +297,7 @@ func TestAccWorkflowsWorkflow_CMEK(t *testing.T) { acctest.BootstrapIamMembers(t, []acctest.IamMember{ { Member: "serviceAccount:service-{project_number}@gcp-sa-workflows.iam.gserviceaccount.com", - Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", + Role: "roles/cloudkms.cryptoKeyEncrypterDecrypter", }, }) @@ -351,4 +351,3 @@ EOF } `, workflowName, kmsKeyName) } - diff --git a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go index 20db7453d0bc..cbc7e442a25e 100644 --- a/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go +++ b/mmv1/third_party/terraform/tpgresource/common_diff_suppress.go @@ -136,11 +136,11 @@ 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", "", "+", "-", "/", "_", "=", "") normalizedOld := r.Replace(old) normalizedNew := r.Replace(new) return normalizedOld == normalizedNew -} \ No newline at end of file +} From 39fa46ded3ca015e858b9b1a273f4ed4e7433da6 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Tue, 13 May 2025 15:33:59 -0700 Subject: [PATCH 5/6] add support for all template files --- mmv1/provider/terraform.go | 2 +- ...manifest.json.tmpl => terraform-registry-manifest.json} | 0 mmv1/validate_third_party_test.go | 7 +++---- 3 files changed, 4 insertions(+), 5 deletions(-) rename mmv1/third_party/terraform/{terraform-registry-manifest.json.tmpl => terraform-registry-manifest.json} (100%) diff --git a/mmv1/provider/terraform.go b/mmv1/provider/terraform.go index c1a66ea89acb..877207535aac 100644 --- a/mmv1/provider/terraform.go +++ b/mmv1/provider/terraform.go @@ -344,7 +344,7 @@ func (t Terraform) getCommonCopyFiles(versionName string, generateCode, generate "go.sum": "third_party/terraform/go.sum", "go.mod": "third_party/terraform/go.mod", ".go-version": "third_party/terraform/.go-version", - "terraform-registry-manifest.json": "third_party/terraform/terraform-registry-manifest.json.tmpl", + "terraform-registry-manifest.json": "third_party/terraform/terraform-registry-manifest.json", } maps.Copy(commonCopyFiles, singleFiles) diff --git a/mmv1/third_party/terraform/terraform-registry-manifest.json.tmpl b/mmv1/third_party/terraform/terraform-registry-manifest.json similarity index 100% rename from mmv1/third_party/terraform/terraform-registry-manifest.json.tmpl rename to mmv1/third_party/terraform/terraform-registry-manifest.json diff --git a/mmv1/validate_third_party_test.go b/mmv1/validate_third_party_test.go index a51660badc07..e7c54b661013 100644 --- a/mmv1/validate_third_party_test.go +++ b/mmv1/validate_third_party_test.go @@ -5,7 +5,6 @@ import ( "path/filepath" "regexp" "runtime" - "strings" "testing" ) @@ -43,7 +42,7 @@ func TestTemplatesStillNeedToBeTemplates(t *testing.T) { } // Only check .go.tmpl files - if filepath.Ext(path) != ".tmpl" || !strings.HasSuffix(path, ".go.tmpl") { + if filepath.Ext(path) != ".tmpl" { return nil } @@ -73,7 +72,7 @@ func TestTemplatesStillNeedToBeTemplates(t *testing.T) { // Output results at the end if len(unnecessaryTemplates) > 0 { - t.Errorf("\nThe following %d .go.tmpl files in third_party directory don't contain any template syntax "+ + t.Errorf("\nThe following %d .tmpl files in third_party directory don't contain any template syntax "+ "and no longer need to be templates:\n", len(unnecessaryTemplates)) for _, file := range unnecessaryTemplates { @@ -82,6 +81,6 @@ func TestTemplatesStillNeedToBeTemplates(t *testing.T) { t.Errorf("\nConsider removing the .tmpl extension from these files.") } else { - t.Logf("All .go.tmpl files in third_party directory properly contain template syntax.") + t.Logf("All .tmpl files in third_party directory properly contain template syntax.") } } From c3e7ad903b246f3f92ed5191ee526e485adf3bf4 Mon Sep 17 00:00:00 2001 From: Scott Suarez Date: Tue, 13 May 2025 15:35:52 -0700 Subject: [PATCH 6/6] revise small comment --- mmv1/validate_third_party_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/validate_third_party_test.go b/mmv1/validate_third_party_test.go index e7c54b661013..2c94ae01c32c 100644 --- a/mmv1/validate_third_party_test.go +++ b/mmv1/validate_third_party_test.go @@ -41,7 +41,7 @@ func TestTemplatesStillNeedToBeTemplates(t *testing.T) { return nil } - // Only check .go.tmpl files + // Only check .tmpl files if filepath.Ext(path) != ".tmpl" { return nil }