From 4863cb6e7dba82f34ddc98f4f708d0c72386baaa Mon Sep 17 00:00:00 2001 From: The Magician Date: Mon, 25 Sep 2023 13:15:16 -0400 Subject: [PATCH] Update to wrap generated import format regex in ^ and $ (#8913) (#15977) * updated regex * removing prefix fron vpntunnel text, updating billing info for allowing supplied uris wth a trailing * replacing importstateid, skipping import in generated sample * incorrect var Signed-off-by: Modular Magician --- .changelog/8913.txt | 3 +++ .../resource_folder_access_approval_settings.go | 4 ++-- ...resource_organization_access_approval_settings.go | 4 ++-- .../resource_project_access_approval_settings.go | 4 ++-- .../resource_access_context_manager_access_policy.go | 2 +- .../resource_active_directory_domain_trust.go | 6 +++--- google/services/alloydb/resource_alloydb_backup.go | 6 +++--- google/services/alloydb/resource_alloydb_cluster.go | 8 ++++---- .../apigee/resource_apigee_sync_authorization.go | 4 ++-- ...urce_app_engine_application_url_dispatch_rules.go | 2 +- .../appengine/resource_app_engine_domain_mapping.go | 6 +++--- .../appengine/resource_app_engine_firewall_rule.go | 6 +++--- .../resource_app_engine_flexible_app_version.go | 6 +++--- .../resource_app_engine_service_network_settings.go | 6 +++--- .../resource_app_engine_service_split_traffic.go | 6 +++--- .../resource_app_engine_standard_app_version.go | 6 +++--- .../resource_artifact_registry_repository.go | 8 ++++---- .../beyondcorp/resource_beyondcorp_app_connection.go | 8 ++++---- .../beyondcorp/resource_beyondcorp_app_connector.go | 8 ++++---- .../beyondcorp/resource_beyondcorp_app_gateway.go | 8 ++++---- google/services/biglake/resource_biglake_catalog.go | 6 +++--- google/services/biglake/resource_biglake_database.go | 2 +- google/services/biglake/resource_biglake_table.go | 2 +- .../services/bigquery/resource_bigquery_dataset.go | 6 +++--- google/services/bigquery/resource_bigquery_job.go | 12 ++++++------ .../services/bigquery/resource_bigquery_routine.go | 6 +++--- .../resource_bigquery_analytics_hub_data_exchange.go | 8 ++++---- .../resource_bigquery_analytics_hub_listing.go | 6 +++--- .../resource_bigquery_connection.go | 6 +++--- .../resource_bigquery_datapolicy_data_policy.go | 6 +++--- .../resource_bigquery_bi_reservation.go | 6 +++--- .../resource_bigquery_capacity_commitment.go | 6 +++--- .../resource_bigquery_reservation.go | 6 +++--- .../bigtable/resource_bigtable_app_profile.go | 6 +++--- google/services/billing/resource_billing_budget.go | 6 +++--- .../resource_binary_authorization_attestor.go | 6 +++--- .../resource_binary_authorization_policy.go | 4 ++-- .../resource_certificate_manager_certificate.go | 6 +++--- ...ertificate_manager_certificate_issuance_config.go | 6 +++--- .../resource_certificate_manager_certificate_map.go | 6 +++--- ...urce_certificate_manager_certificate_map_entry.go | 6 +++--- ...resource_certificate_manager_dns_authorization.go | 6 +++--- .../resource_certificate_manager_trust_config.go | 6 +++--- .../resource_cloudbuild_bitbucket_server_config.go | 6 +++--- .../cloudbuild/resource_cloudbuild_trigger.go | 8 ++++---- .../resource_cloudfunctions2_function.go | 6 +++--- .../resource_cloud_identity_group_membership.go | 2 +- .../services/cloudids/resource_cloud_ids_endpoint.go | 6 +++--- .../cloudrun/resource_cloud_run_domain_mapping.go | 6 +++--- .../services/cloudrun/resource_cloud_run_service.go | 6 +++--- .../services/cloudrunv2/resource_cloud_run_v2_job.go | 6 +++--- .../cloudrunv2/resource_cloud_run_v2_service.go | 6 +++--- .../cloudscheduler/resource_cloud_scheduler_job.go | 8 ++++---- .../cloudtasks/resource_cloud_tasks_queue.go | 6 +++--- google/services/compute/resource_compute_address.go | 8 ++++---- .../services/compute/resource_compute_autoscaler.go | 8 ++++---- .../compute/resource_compute_backend_bucket.go | 6 +++--- .../compute/resource_compute_backend_service.go | 6 +++--- google/services/compute/resource_compute_disk.go | 8 ++++---- ...source_compute_disk_resource_policy_attachment.go | 8 ++++---- .../compute/resource_compute_external_vpn_gateway.go | 6 +++--- google/services/compute/resource_compute_firewall.go | 6 +++--- .../compute/resource_compute_forwarding_rule.go | 8 ++++---- .../compute/resource_compute_global_address.go | 6 +++--- .../resource_compute_global_forwarding_rule.go | 6 +++--- ...resource_compute_global_network_endpoint_group.go | 6 +++--- .../compute/resource_compute_ha_vpn_gateway.go | 8 ++++---- .../compute/resource_compute_health_check.go | 6 +++--- .../compute/resource_compute_http_health_check.go | 6 +++--- .../compute/resource_compute_https_health_check.go | 6 +++--- google/services/compute/resource_compute_image.go | 6 +++--- .../resource_compute_instance_group_named_port.go | 8 ++++---- .../resource_compute_interconnect_attachment.go | 8 ++++---- .../resource_compute_managed_ssl_certificate.go | 6 +++--- google/services/compute/resource_compute_network.go | 6 +++--- .../resource_compute_network_endpoint_group.go | 8 ++++---- .../compute/resource_compute_network_endpoints.go | 8 ++++---- ...resource_compute_network_peering_routes_config.go | 6 +++--- .../services/compute/resource_compute_node_group.go | 8 ++++---- .../compute/resource_compute_node_template.go | 8 ++++---- .../compute/resource_compute_packet_mirroring.go | 8 ++++---- .../compute/resource_compute_per_instance_config.go | 8 ++++---- .../resource_compute_public_advertised_prefix.go | 6 +++--- .../resource_compute_public_delegated_prefix.go | 8 ++++---- .../compute/resource_compute_region_autoscaler.go | 8 ++++---- .../resource_compute_region_backend_service.go | 8 ++++---- .../compute/resource_compute_region_commitment.go | 8 ++++---- .../services/compute/resource_compute_region_disk.go | 8 ++++---- ...compute_region_disk_resource_policy_attachment.go | 8 ++++---- .../compute/resource_compute_region_health_check.go | 8 ++++---- ...resource_compute_region_network_endpoint_group.go | 8 ++++---- .../resource_compute_region_per_instance_config.go | 8 ++++---- .../resource_compute_region_ssl_certificate.go | 8 ++++---- .../compute/resource_compute_region_ssl_policy.go | 8 ++++---- .../resource_compute_region_target_http_proxy.go | 8 ++++---- .../resource_compute_region_target_https_proxy.go | 8 ++++---- .../resource_compute_region_target_tcp_proxy.go | 8 ++++---- .../compute/resource_compute_region_url_map.go | 8 ++++---- .../services/compute/resource_compute_reservation.go | 8 ++++---- .../compute/resource_compute_resource_policy.go | 8 ++++---- google/services/compute/resource_compute_route.go | 6 +++--- google/services/compute/resource_compute_router.go | 8 ++++---- .../services/compute/resource_compute_router_nat.go | 8 ++++---- .../services/compute/resource_compute_router_peer.go | 8 ++++---- .../compute/resource_compute_service_attachment.go | 8 ++++---- google/services/compute/resource_compute_snapshot.go | 6 +++--- .../compute/resource_compute_ssl_certificate.go | 6 +++--- .../services/compute/resource_compute_ssl_policy.go | 6 +++--- .../services/compute/resource_compute_subnetwork.go | 8 ++++---- .../compute/resource_compute_target_grpc_proxy.go | 6 +++--- .../compute/resource_compute_target_http_proxy.go | 6 +++--- .../compute/resource_compute_target_https_proxy.go | 6 +++--- .../compute/resource_compute_target_instance.go | 8 ++++---- .../compute/resource_compute_target_ssl_proxy.go | 6 +++--- .../compute/resource_compute_target_tcp_proxy.go | 6 +++--- google/services/compute/resource_compute_url_map.go | 6 +++--- .../services/compute/resource_compute_vpn_gateway.go | 8 ++++---- .../services/compute/resource_compute_vpn_tunnel.go | 8 ++++---- .../compute/resource_compute_vpn_tunnel_test.go | 1 - .../resource_container_analysis_note.go | 6 +++--- .../resource_container_analysis_occurrence.go | 6 +++--- .../resource_container_attached_cluster.go | 6 +++--- .../corebilling/resource_billing_project_info.go | 4 ++-- .../resource_billing_project_info_generated_test.go | 5 ----- .../resource_google_billing_project_info_test.go | 3 +++ ..._database_migration_service_connection_profile.go | 6 +++--- .../datafusion/resource_data_fusion_instance.go | 8 ++++---- .../datapipeline/resource_data_pipeline_pipeline.go | 8 ++++---- .../services/dataplex/resource_dataplex_datascan.go | 8 ++++---- google/services/dataplex/resource_dataplex_task.go | 6 +++--- .../dataproc/resource_dataproc_autoscaling_policy.go | 6 +++--- .../resource_dataproc_metastore_service.go | 6 +++--- .../services/datastore/resource_datastore_index.go | 6 +++--- .../resource_datastream_connection_profile.go | 6 +++--- .../resource_datastream_private_connection.go | 6 +++--- .../datastream/resource_datastream_stream.go | 6 +++--- .../resource_deployment_manager_deployment.go | 6 +++--- .../services/dialogflow/resource_dialogflow_agent.go | 2 +- .../dialogflowcx/resource_dialogflow_cx_agent.go | 6 +++--- .../resource_dialogflow_cx_security_settings.go | 6 +++--- .../dialogflowcx/resource_dialogflow_cx_test_case.go | 2 +- google/services/dns/resource_dns_managed_zone.go | 6 +++--- google/services/dns/resource_dns_policy.go | 6 +++--- google/services/dns/resource_dns_response_policy.go | 6 +++--- .../dns/resource_dns_response_policy_rule.go | 6 +++--- .../documentai/resource_document_ai_processor.go | 6 +++--- ...resource_document_ai_processor_default_version.go | 2 +- .../edgenetwork/resource_edgenetwork_network.go | 10 +++++----- .../edgenetwork/resource_edgenetwork_subnet.go | 10 +++++----- .../resource_essential_contacts_contact.go | 2 +- .../services/filestore/resource_filestore_backup.go | 6 +++--- .../filestore/resource_filestore_instance.go | 6 +++--- .../filestore/resource_filestore_snapshot.go | 6 +++--- .../firestore/resource_firestore_database.go | 6 +++--- .../gkebackup/resource_gke_backup_backup_plan.go | 6 +++--- .../gkebackup/resource_gke_backup_restore_plan.go | 6 +++--- .../services/gkehub/resource_gke_hub_membership.go | 6 +++--- google/services/gkehub2/resource_gke_hub_feature.go | 6 +++--- .../gkehub2/resource_gke_hub_membership_binding.go | 6 +++--- .../services/gkehub2/resource_gke_hub_namespace.go | 6 +++--- google/services/gkehub2/resource_gke_hub_scope.go | 6 +++--- .../resource_gke_hub_scope_rbac_role_binding.go | 6 +++--- .../healthcare/resource_healthcare_consent_store.go | 2 +- .../healthcare/resource_healthcare_dataset.go | 6 +++--- .../iam2/resource_iam_access_boundary_policy.go | 2 +- google/services/iam2/resource_iam_deny_policy.go | 2 +- .../iambeta/resource_iam_workload_identity_pool.go | 6 +++--- .../resource_iam_workload_identity_pool_provider.go | 6 +++--- .../iamworkforcepool/resource_iam_workforce_pool.go | 4 ++-- .../resource_iam_workforce_pool_provider.go | 4 ++-- .../resource_identity_platform_config.go | 6 +++--- ...identity_platform_default_supported_idp_config.go | 6 +++--- ...resource_identity_platform_inbound_saml_config.go | 6 +++--- .../resource_identity_platform_oauth_idp_config.go | 6 +++--- ...ource_identity_platform_project_default_config.go | 6 +++--- .../resource_identity_platform_tenant.go | 6 +++--- ...y_platform_tenant_default_supported_idp_config.go | 6 +++--- ...e_identity_platform_tenant_inbound_saml_config.go | 6 +++--- ...urce_identity_platform_tenant_oauth_idp_config.go | 6 +++--- google/services/kms/resource_kms_key_ring.go | 6 +++--- .../logging/resource_logging_linked_dataset.go | 2 +- google/services/logging/resource_logging_log_view.go | 2 +- google/services/looker/resource_looker_instance.go | 8 ++++---- .../services/memcache/resource_memcache_instance.go | 8 ++++---- google/services/mlengine/resource_ml_engine_model.go | 6 +++--- .../monitoring/resource_monitoring_service.go | 6 +++--- ...network_connectivity_service_connection_policy.go | 6 +++--- ..._network_management_connectivity_test_resource.go | 6 +++--- .../resource_network_security_address_group.go | 2 +- ...ource_network_security_gateway_security_policy.go | 6 +++--- ..._network_security_gateway_security_policy_rule.go | 6 +++--- .../resource_network_security_url_lists.go | 6 +++--- .../resource_network_services_edge_cache_keyset.go | 6 +++--- .../resource_network_services_edge_cache_origin.go | 6 +++--- .../resource_network_services_edge_cache_service.go | 6 +++--- .../resource_network_services_gateway.go | 6 +++--- .../notebooks/resource_notebooks_environment.go | 6 +++--- .../notebooks/resource_notebooks_instance.go | 6 +++--- .../notebooks/resource_notebooks_location.go | 6 +++--- .../services/notebooks/resource_notebooks_runtime.go | 6 +++--- .../oslogin/resource_os_login_ssh_public_key.go | 4 ++-- .../services/privateca/resource_privateca_ca_pool.go | 6 +++--- .../privateca/resource_privateca_certificate.go | 6 +++--- .../resource_privateca_certificate_authority.go | 6 +++--- google/services/pubsub/resource_pubsub_schema.go | 6 +++--- .../services/pubsub/resource_pubsub_subscription.go | 6 +++--- google/services/pubsub/resource_pubsub_topic.go | 6 +++--- .../pubsublite/resource_pubsub_lite_reservation.go | 8 ++++---- .../pubsublite/resource_pubsub_lite_subscription.go | 8 ++++---- .../pubsublite/resource_pubsub_lite_topic.go | 8 ++++---- google/services/redis/resource_redis_instance.go | 8 ++++---- .../resource_resource_manager_lien.go | 2 +- .../secretmanager/resource_secret_manager_secret.go | 6 +++--- .../resource_scc_project_custom_module.go | 6 +++--- .../sourcerepo/resource_sourcerepo_repository.go | 4 ++-- google/services/spanner/resource_spanner_database.go | 8 ++++---- google/services/spanner/resource_spanner_instance.go | 6 +++--- google/services/sql/resource_sql_database.go | 10 +++++----- .../resource_sql_source_representation_instance.go | 6 +++--- .../resource_storage_bucket_access_control.go | 2 +- ...resource_storage_default_object_access_control.go | 2 +- google/services/storage/resource_storage_hmac_key.go | 6 +++--- .../resource_storage_object_access_control.go | 2 +- .../resource_storage_insights_report_config.go | 6 +++--- .../resource_storage_transfer_agent_pool.go | 6 +++--- google/services/tags/resource_tags_tag_key.go | 4 ++-- google/services/tags/resource_tags_tag_value.go | 4 ++-- google/services/tpu/resource_tpu_node.go | 8 ++++---- .../services/vertexai/resource_vertex_ai_endpoint.go | 6 +++--- .../vertexai/resource_vertex_ai_featurestore.go | 8 ++++---- google/services/vertexai/resource_vertex_ai_index.go | 8 ++++---- .../vertexai/resource_vertex_ai_index_endpoint.go | 8 ++++---- .../vpcaccess/resource_vpc_access_connector.go | 8 ++++---- 233 files changed, 714 insertions(+), 714 deletions(-) create mode 100644 .changelog/8913.txt diff --git a/.changelog/8913.txt b/.changelog/8913.txt new file mode 100644 index 00000000000..26715c56830 --- /dev/null +++ b/.changelog/8913.txt @@ -0,0 +1,3 @@ +```release-note:breaking-change +provider: fixed many import functions throughout the provider that matched a subset of the provided input when possible. Now, the GCP resource id supplied to "terraform import" must match exactly. +``` diff --git a/google/services/accessapproval/resource_folder_access_approval_settings.go b/google/services/accessapproval/resource_folder_access_approval_settings.go index 3aad595b38c..8e805031122 100644 --- a/google/services/accessapproval/resource_folder_access_approval_settings.go +++ b/google/services/accessapproval/resource_folder_access_approval_settings.go @@ -454,8 +454,8 @@ func resourceAccessApprovalFolderSettingsDelete(d *schema.ResourceData, meta int func resourceAccessApprovalFolderSettingsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "folders/(?P[^/]+)/accessApprovalSettings", - "(?P[^/]+)", + "^folders/(?P[^/]+)/accessApprovalSettings$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/accessapproval/resource_organization_access_approval_settings.go b/google/services/accessapproval/resource_organization_access_approval_settings.go index fa5f477051f..c98b4c8370a 100644 --- a/google/services/accessapproval/resource_organization_access_approval_settings.go +++ b/google/services/accessapproval/resource_organization_access_approval_settings.go @@ -414,8 +414,8 @@ func resourceAccessApprovalOrganizationSettingsDelete(d *schema.ResourceData, me func resourceAccessApprovalOrganizationSettingsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "organizations/(?P[^/]+)/accessApprovalSettings", - "(?P[^/]+)", + "^organizations/(?P[^/]+)/accessApprovalSettings$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/accessapproval/resource_project_access_approval_settings.go b/google/services/accessapproval/resource_project_access_approval_settings.go index a5f644fa2cc..35a47a06e57 100644 --- a/google/services/accessapproval/resource_project_access_approval_settings.go +++ b/google/services/accessapproval/resource_project_access_approval_settings.go @@ -445,8 +445,8 @@ func resourceAccessApprovalProjectSettingsDelete(d *schema.ResourceData, meta in func resourceAccessApprovalProjectSettingsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/accessApprovalSettings", - "(?P[^/]+)", + "^projects/(?P[^/]+)/accessApprovalSettings$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/accesscontextmanager/resource_access_context_manager_access_policy.go b/google/services/accesscontextmanager/resource_access_context_manager_access_policy.go index 46ba93d541a..60b60fff2cd 100644 --- a/google/services/accesscontextmanager/resource_access_context_manager_access_policy.go +++ b/google/services/accesscontextmanager/resource_access_context_manager_access_policy.go @@ -370,7 +370,7 @@ func resourceAccessContextManagerAccessPolicyDelete(d *schema.ResourceData, meta func resourceAccessContextManagerAccessPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/activedirectory/resource_active_directory_domain_trust.go b/google/services/activedirectory/resource_active_directory_domain_trust.go index ccc0ed50a15..23c158fcb83 100644 --- a/google/services/activedirectory/resource_active_directory_domain_trust.go +++ b/google/services/activedirectory/resource_active_directory_domain_trust.go @@ -518,9 +518,9 @@ func resourceActiveDirectoryDomainTrustDelete(d *schema.ResourceData, meta inter func resourceActiveDirectoryDomainTrustImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/domains/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/domains/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/alloydb/resource_alloydb_backup.go b/google/services/alloydb/resource_alloydb_backup.go index 62e4c4ca16a..26b227f0b27 100644 --- a/google/services/alloydb/resource_alloydb_backup.go +++ b/google/services/alloydb/resource_alloydb_backup.go @@ -504,9 +504,9 @@ func resourceAlloydbBackupDelete(d *schema.ResourceData, meta interface{}) error func resourceAlloydbBackupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/backups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/backups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/alloydb/resource_alloydb_cluster.go b/google/services/alloydb/resource_alloydb_cluster.go index 2efa583c1dd..4bdf9ae9861 100644 --- a/google/services/alloydb/resource_alloydb_cluster.go +++ b/google/services/alloydb/resource_alloydb_cluster.go @@ -967,10 +967,10 @@ func resourceAlloydbClusterDelete(d *schema.ResourceData, meta interface{}) erro func resourceAlloydbClusterImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/clusters/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/clusters/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/apigee/resource_apigee_sync_authorization.go b/google/services/apigee/resource_apigee_sync_authorization.go index bc988ecbd1f..12a36558855 100644 --- a/google/services/apigee/resource_apigee_sync_authorization.go +++ b/google/services/apigee/resource_apigee_sync_authorization.go @@ -243,8 +243,8 @@ func resourceApigeeSyncAuthorizationDelete(d *schema.ResourceData, meta interfac func resourceApigeeSyncAuthorizationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "organizations/(?P[^/]+)/syncAuthorization", - "(?P[^/]+)", + "^organizations/(?P[^/]+)/syncAuthorization$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_application_url_dispatch_rules.go b/google/services/appengine/resource_app_engine_application_url_dispatch_rules.go index 6b863498248..22150bd60a8 100644 --- a/google/services/appengine/resource_app_engine_application_url_dispatch_rules.go +++ b/google/services/appengine/resource_app_engine_application_url_dispatch_rules.go @@ -350,7 +350,7 @@ func resourceAppEngineApplicationUrlDispatchRulesDelete(d *schema.ResourceData, func resourceAppEngineApplicationUrlDispatchRulesImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_domain_mapping.go b/google/services/appengine/resource_app_engine_domain_mapping.go index 7d203d72b9c..2043bc89b5e 100644 --- a/google/services/appengine/resource_app_engine_domain_mapping.go +++ b/google/services/appengine/resource_app_engine_domain_mapping.go @@ -458,9 +458,9 @@ func resourceAppEngineDomainMappingDelete(d *schema.ResourceData, meta interface func resourceAppEngineDomainMappingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "apps/(?P[^/]+)/domainMappings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^apps/(?P[^/]+)/domainMappings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_firewall_rule.go b/google/services/appengine/resource_app_engine_firewall_rule.go index 12446571927..fdefd248571 100644 --- a/google/services/appengine/resource_app_engine_firewall_rule.go +++ b/google/services/appengine/resource_app_engine_firewall_rule.go @@ -434,9 +434,9 @@ func resourceAppEngineFirewallRuleDelete(d *schema.ResourceData, meta interface{ func resourceAppEngineFirewallRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "apps/(?P[^/]+)/firewall/ingressRules/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^apps/(?P[^/]+)/firewall/ingressRules/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_flexible_app_version.go b/google/services/appengine/resource_app_engine_flexible_app_version.go index 9a1510c5782..10630fac89d 100644 --- a/google/services/appengine/resource_app_engine_flexible_app_version.go +++ b/google/services/appengine/resource_app_engine_flexible_app_version.go @@ -1536,9 +1536,9 @@ func resourceAppEngineFlexibleAppVersionDelete(d *schema.ResourceData, meta inte func resourceAppEngineFlexibleAppVersionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "apps/(?P[^/]+)/services/(?P[^/]+)/versions/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^apps/(?P[^/]+)/services/(?P[^/]+)/versions/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_service_network_settings.go b/google/services/appengine/resource_app_engine_service_network_settings.go index 9094c506824..5ca80749720 100644 --- a/google/services/appengine/resource_app_engine_service_network_settings.go +++ b/google/services/appengine/resource_app_engine_service_network_settings.go @@ -321,9 +321,9 @@ func resourceAppEngineServiceNetworkSettingsDelete(d *schema.ResourceData, meta func resourceAppEngineServiceNetworkSettingsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "apps/(?P[^/]+)/services/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^apps/(?P[^/]+)/services/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_service_split_traffic.go b/google/services/appengine/resource_app_engine_service_split_traffic.go index ac0fa4caf0e..1e3614c810c 100644 --- a/google/services/appengine/resource_app_engine_service_split_traffic.go +++ b/google/services/appengine/resource_app_engine_service_split_traffic.go @@ -328,9 +328,9 @@ func resourceAppEngineServiceSplitTrafficDelete(d *schema.ResourceData, meta int func resourceAppEngineServiceSplitTrafficImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "apps/(?P[^/]+)/services/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^apps/(?P[^/]+)/services/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/appengine/resource_app_engine_standard_app_version.go b/google/services/appengine/resource_app_engine_standard_app_version.go index 069d8681a75..7df4504dc4e 100644 --- a/google/services/appengine/resource_app_engine_standard_app_version.go +++ b/google/services/appengine/resource_app_engine_standard_app_version.go @@ -1002,9 +1002,9 @@ func resourceAppEngineStandardAppVersionDelete(d *schema.ResourceData, meta inte func resourceAppEngineStandardAppVersionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "apps/(?P[^/]+)/services/(?P[^/]+)/versions/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^apps/(?P[^/]+)/services/(?P[^/]+)/versions/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/artifactregistry/resource_artifact_registry_repository.go b/google/services/artifactregistry/resource_artifact_registry_repository.go index 0eca15c5f2c..0722d9eaea8 100644 --- a/google/services/artifactregistry/resource_artifact_registry_repository.go +++ b/google/services/artifactregistry/resource_artifact_registry_repository.go @@ -720,10 +720,10 @@ func resourceArtifactRegistryRepositoryDelete(d *schema.ResourceData, meta inter func resourceArtifactRegistryRepositoryImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/repositories/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/repositories/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/beyondcorp/resource_beyondcorp_app_connection.go b/google/services/beyondcorp/resource_beyondcorp_app_connection.go index 9d7f6118f68..b6b24076dde 100644 --- a/google/services/beyondcorp/resource_beyondcorp_app_connection.go +++ b/google/services/beyondcorp/resource_beyondcorp_app_connection.go @@ -516,10 +516,10 @@ func resourceBeyondcorpAppConnectionDelete(d *schema.ResourceData, meta interfac func resourceBeyondcorpAppConnectionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/appConnections/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/appConnections/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/beyondcorp/resource_beyondcorp_app_connector.go b/google/services/beyondcorp/resource_beyondcorp_app_connector.go index 877c9525794..a2817936580 100644 --- a/google/services/beyondcorp/resource_beyondcorp_app_connector.go +++ b/google/services/beyondcorp/resource_beyondcorp_app_connector.go @@ -433,10 +433,10 @@ func resourceBeyondcorpAppConnectorDelete(d *schema.ResourceData, meta interface func resourceBeyondcorpAppConnectorImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/appConnectors/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/appConnectors/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/beyondcorp/resource_beyondcorp_app_gateway.go b/google/services/beyondcorp/resource_beyondcorp_app_gateway.go index 33560003791..b8d244cecfd 100644 --- a/google/services/beyondcorp/resource_beyondcorp_app_gateway.go +++ b/google/services/beyondcorp/resource_beyondcorp_app_gateway.go @@ -371,10 +371,10 @@ func resourceBeyondcorpAppGatewayDelete(d *schema.ResourceData, meta interface{} func resourceBeyondcorpAppGatewayImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/appGateways/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/appGateways/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/biglake/resource_biglake_catalog.go b/google/services/biglake/resource_biglake_catalog.go index 78879420f03..bcb4ce08a2d 100644 --- a/google/services/biglake/resource_biglake_catalog.go +++ b/google/services/biglake/resource_biglake_catalog.go @@ -259,9 +259,9 @@ func resourceBiglakeCatalogDelete(d *schema.ResourceData, meta interface{}) erro func resourceBiglakeCatalogImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/catalogs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/catalogs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/biglake/resource_biglake_database.go b/google/services/biglake/resource_biglake_database.go index 70625bde8ec..ec1b14aa474 100644 --- a/google/services/biglake/resource_biglake_database.go +++ b/google/services/biglake/resource_biglake_database.go @@ -347,7 +347,7 @@ func resourceBiglakeDatabaseDelete(d *schema.ResourceData, meta interface{}) err func resourceBiglakeDatabaseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/databases/(?P[^/]+)", + "^(?P.+)/databases/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/biglake/resource_biglake_table.go b/google/services/biglake/resource_biglake_table.go index 794f1c721ab..6dc714abd47 100644 --- a/google/services/biglake/resource_biglake_table.go +++ b/google/services/biglake/resource_biglake_table.go @@ -386,7 +386,7 @@ func resourceBiglakeTableDelete(d *schema.ResourceData, meta interface{}) error func resourceBiglakeTableImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/tables/(?P[^/]+)", + "^(?P.+)/tables/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigquery/resource_bigquery_dataset.go b/google/services/bigquery/resource_bigquery_dataset.go index 483625548ee..a83cd333786 100644 --- a/google/services/bigquery/resource_bigquery_dataset.go +++ b/google/services/bigquery/resource_bigquery_dataset.go @@ -862,9 +862,9 @@ func resourceBigQueryDatasetDelete(d *schema.ResourceData, meta interface{}) err func resourceBigQueryDatasetImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/datasets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/datasets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigquery/resource_bigquery_job.go b/google/services/bigquery/resource_bigquery_job.go index 20c6115f2e3..aad07d02295 100644 --- a/google/services/bigquery/resource_bigquery_job.go +++ b/google/services/bigquery/resource_bigquery_job.go @@ -1206,12 +1206,12 @@ func resourceBigQueryJobDelete(d *schema.ResourceData, meta interface{}) error { func resourceBigQueryJobImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/jobs/(?P[^/]+)/location/(?P[^/]+)", - "projects/(?P[^/]+)/jobs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/jobs/(?P[^/]+)/location/(?P[^/]+)$", + "^projects/(?P[^/]+)/jobs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigquery/resource_bigquery_routine.go b/google/services/bigquery/resource_bigquery_routine.go index 975c5e70837..a8a657a6dd5 100644 --- a/google/services/bigquery/resource_bigquery_routine.go +++ b/google/services/bigquery/resource_bigquery_routine.go @@ -560,9 +560,9 @@ func resourceBigQueryRoutineDelete(d *schema.ResourceData, meta interface{}) err func resourceBigQueryRoutineImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/datasets/(?P[^/]+)/routines/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/datasets/(?P[^/]+)/routines/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange.go b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange.go index 04e4b898fb2..286c6fa93e3 100644 --- a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange.go +++ b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_data_exchange.go @@ -416,10 +416,10 @@ func resourceBigqueryAnalyticsHubDataExchangeDelete(d *schema.ResourceData, meta func resourceBigqueryAnalyticsHubDataExchangeImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/dataExchanges/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/dataExchanges/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing.go b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing.go index 4e2fd7b977b..ff45840d781 100644 --- a/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing.go +++ b/google/services/bigqueryanalyticshub/resource_bigquery_analytics_hub_listing.go @@ -577,9 +577,9 @@ func resourceBigqueryAnalyticsHubListingDelete(d *schema.ResourceData, meta inte func resourceBigqueryAnalyticsHubListingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/dataExchanges/(?P[^/]+)/listings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/dataExchanges/(?P[^/]+)/listings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigqueryconnection/resource_bigquery_connection.go b/google/services/bigqueryconnection/resource_bigquery_connection.go index b9aa9bc2ced..010c8f2f243 100644 --- a/google/services/bigqueryconnection/resource_bigquery_connection.go +++ b/google/services/bigqueryconnection/resource_bigquery_connection.go @@ -654,9 +654,9 @@ func resourceBigqueryConnectionConnectionDelete(d *schema.ResourceData, meta int func resourceBigqueryConnectionConnectionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/connections/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/connections/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy.go b/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy.go index 73d9e6ac4a1..58b00c3c20c 100644 --- a/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy.go +++ b/google/services/bigquerydatapolicy/resource_bigquery_datapolicy_data_policy.go @@ -382,9 +382,9 @@ func resourceBigqueryDatapolicyDataPolicyDelete(d *schema.ResourceData, meta int func resourceBigqueryDatapolicyDataPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/dataPolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/dataPolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigqueryreservation/resource_bigquery_bi_reservation.go b/google/services/bigqueryreservation/resource_bigquery_bi_reservation.go index 9562582a980..c4f36be3d3f 100644 --- a/google/services/bigqueryreservation/resource_bigquery_bi_reservation.go +++ b/google/services/bigqueryreservation/resource_bigquery_bi_reservation.go @@ -375,9 +375,9 @@ func resourceBigqueryReservationBiReservationDelete(d *schema.ResourceData, meta func resourceBigqueryReservationBiReservationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/biReservation", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/biReservation$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigqueryreservation/resource_bigquery_capacity_commitment.go b/google/services/bigqueryreservation/resource_bigquery_capacity_commitment.go index cee84ec7d62..27f9f5f5e83 100644 --- a/google/services/bigqueryreservation/resource_bigquery_capacity_commitment.go +++ b/google/services/bigqueryreservation/resource_bigquery_capacity_commitment.go @@ -408,9 +408,9 @@ func resourceBigqueryReservationCapacityCommitmentDelete(d *schema.ResourceData, func resourceBigqueryReservationCapacityCommitmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/capacityCommitments/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/capacityCommitments/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigqueryreservation/resource_bigquery_reservation.go b/google/services/bigqueryreservation/resource_bigquery_reservation.go index ea779e8dbdc..59e3959c49a 100644 --- a/google/services/bigqueryreservation/resource_bigquery_reservation.go +++ b/google/services/bigqueryreservation/resource_bigquery_reservation.go @@ -435,9 +435,9 @@ func resourceBigqueryReservationReservationDelete(d *schema.ResourceData, meta i func resourceBigqueryReservationReservationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/reservations/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/reservations/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/bigtable/resource_bigtable_app_profile.go b/google/services/bigtable/resource_bigtable_app_profile.go index 6f1ee2926f5..38358cb0244 100644 --- a/google/services/bigtable/resource_bigtable_app_profile.go +++ b/google/services/bigtable/resource_bigtable_app_profile.go @@ -432,9 +432,9 @@ func resourceBigtableAppProfileDelete(d *schema.ResourceData, meta interface{}) func resourceBigtableAppProfileImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/instances/(?P[^/]+)/appProfiles/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/instances/(?P[^/]+)/appProfiles/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/billing/resource_billing_budget.go b/google/services/billing/resource_billing_budget.go index c90d7b967bd..193a393f155 100644 --- a/google/services/billing/resource_billing_budget.go +++ b/google/services/billing/resource_billing_budget.go @@ -698,9 +698,9 @@ func resourceBillingBudgetDelete(d *schema.ResourceData, meta interface{}) error func resourceBillingBudgetImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "billingAccounts/(?P[^/]+)/budgets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^billingAccounts/(?P[^/]+)/budgets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/binaryauthorization/resource_binary_authorization_attestor.go b/google/services/binaryauthorization/resource_binary_authorization_attestor.go index d8933468a63..badeb570c3c 100644 --- a/google/services/binaryauthorization/resource_binary_authorization_attestor.go +++ b/google/services/binaryauthorization/resource_binary_authorization_attestor.go @@ -453,9 +453,9 @@ func resourceBinaryAuthorizationAttestorDelete(d *schema.ResourceData, meta inte func resourceBinaryAuthorizationAttestorImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/attestors/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/attestors/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/binaryauthorization/resource_binary_authorization_policy.go b/google/services/binaryauthorization/resource_binary_authorization_policy.go index 27f7759ed3d..f84df2582e6 100644 --- a/google/services/binaryauthorization/resource_binary_authorization_policy.go +++ b/google/services/binaryauthorization/resource_binary_authorization_policy.go @@ -499,8 +499,8 @@ func resourceBinaryAuthorizationPolicyDelete(d *schema.ResourceData, meta interf func resourceBinaryAuthorizationPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate.go b/google/services/certificatemanager/resource_certificate_manager_certificate.go index cc95bbe6848..2658815b84a 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate.go @@ -584,9 +584,9 @@ func resourceCertificateManagerCertificateDelete(d *schema.ResourceData, meta in func resourceCertificateManagerCertificateImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/certificates/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/certificates/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config.go b/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config.go index 960eb0ec7b2..b1b9be7ba9d 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_issuance_config.go @@ -402,9 +402,9 @@ func resourceCertificateManagerCertificateIssuanceConfigDelete(d *schema.Resourc func resourceCertificateManagerCertificateIssuanceConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/certificateIssuanceConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/certificateIssuanceConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_map.go b/google/services/certificatemanager/resource_certificate_manager_certificate_map.go index 86468d5309f..410a792031a 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_map.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_map.go @@ -434,9 +434,9 @@ func resourceCertificateManagerCertificateMapDelete(d *schema.ResourceData, meta func resourceCertificateManagerCertificateMapImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/certificateMaps/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/certificateMaps/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry.go b/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry.go index 5c351ea3bec..ef8c5dfd503 100644 --- a/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry.go +++ b/google/services/certificatemanager/resource_certificate_manager_certificate_map_entry.go @@ -477,9 +477,9 @@ func resourceCertificateManagerCertificateMapEntryDelete(d *schema.ResourceData, func resourceCertificateManagerCertificateMapEntryImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/certificateMaps/(?P[^/]+)/certificateMapEntries/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/certificateMaps/(?P[^/]+)/certificateMapEntries/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/certificatemanager/resource_certificate_manager_dns_authorization.go b/google/services/certificatemanager/resource_certificate_manager_dns_authorization.go index af960b07b71..421a606a92b 100644 --- a/google/services/certificatemanager/resource_certificate_manager_dns_authorization.go +++ b/google/services/certificatemanager/resource_certificate_manager_dns_authorization.go @@ -414,9 +414,9 @@ func resourceCertificateManagerDnsAuthorizationDelete(d *schema.ResourceData, me func resourceCertificateManagerDnsAuthorizationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/dnsAuthorizations/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/dnsAuthorizations/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/certificatemanager/resource_certificate_manager_trust_config.go b/google/services/certificatemanager/resource_certificate_manager_trust_config.go index e1f2d016244..0312d5e6ad9 100644 --- a/google/services/certificatemanager/resource_certificate_manager_trust_config.go +++ b/google/services/certificatemanager/resource_certificate_manager_trust_config.go @@ -435,9 +435,9 @@ func resourceCertificateManagerTrustConfigDelete(d *schema.ResourceData, meta in func resourceCertificateManagerTrustConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/trustConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/trustConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config.go b/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config.go index b2cf1a1fe45..87b101563ae 100644 --- a/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config.go +++ b/google/services/cloudbuild/resource_cloudbuild_bitbucket_server_config.go @@ -700,9 +700,9 @@ func resourceCloudBuildBitbucketServerConfigDelete(d *schema.ResourceData, meta func resourceCloudBuildBitbucketServerConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/bitbucketServerConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/bitbucketServerConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudbuild/resource_cloudbuild_trigger.go b/google/services/cloudbuild/resource_cloudbuild_trigger.go index 604b5a7953f..3cd216d684b 100644 --- a/google/services/cloudbuild/resource_cloudbuild_trigger.go +++ b/google/services/cloudbuild/resource_cloudbuild_trigger.go @@ -1870,10 +1870,10 @@ func resourceCloudBuildTriggerDelete(d *schema.ResourceData, meta interface{}) e func resourceCloudBuildTriggerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/triggers/(?P[^/]+)", - "projects/(?P[^/]+)/triggers/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/triggers/(?P[^/]+)$", + "^projects/(?P[^/]+)/triggers/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudfunctions2/resource_cloudfunctions2_function.go b/google/services/cloudfunctions2/resource_cloudfunctions2_function.go index 69785288e60..f40041e4e74 100644 --- a/google/services/cloudfunctions2/resource_cloudfunctions2_function.go +++ b/google/services/cloudfunctions2/resource_cloudfunctions2_function.go @@ -907,9 +907,9 @@ func resourceCloudfunctions2functionDelete(d *schema.ResourceData, meta interfac func resourceCloudfunctions2functionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/functions/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/functions/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudidentity/resource_cloud_identity_group_membership.go b/google/services/cloudidentity/resource_cloud_identity_group_membership.go index 1e7c042b221..1e4046f1fae 100644 --- a/google/services/cloudidentity/resource_cloud_identity_group_membership.go +++ b/google/services/cloudidentity/resource_cloud_identity_group_membership.go @@ -374,7 +374,7 @@ func resourceCloudIdentityGroupMembershipDelete(d *schema.ResourceData, meta int func resourceCloudIdentityGroupMembershipImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)", + "^(?P.+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudids/resource_cloud_ids_endpoint.go b/google/services/cloudids/resource_cloud_ids_endpoint.go index 9190fa5cfed..d9435932857 100644 --- a/google/services/cloudids/resource_cloud_ids_endpoint.go +++ b/google/services/cloudids/resource_cloud_ids_endpoint.go @@ -431,9 +431,9 @@ func resourceCloudIdsEndpointDelete(d *schema.ResourceData, meta interface{}) er func resourceCloudIdsEndpointImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/endpoints/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/endpoints/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudrun/resource_cloud_run_domain_mapping.go b/google/services/cloudrun/resource_cloud_run_domain_mapping.go index 72e77252c28..26930502067 100644 --- a/google/services/cloudrun/resource_cloud_run_domain_mapping.go +++ b/google/services/cloudrun/resource_cloud_run_domain_mapping.go @@ -547,9 +547,9 @@ func resourceCloudRunDomainMappingDelete(d *schema.ResourceData, meta interface{ func resourceCloudRunDomainMappingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "locations/(?P[^/]+)/namespaces/(?P[^/]+)/domainmappings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^locations/(?P[^/]+)/namespaces/(?P[^/]+)/domainmappings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudrun/resource_cloud_run_service.go b/google/services/cloudrun/resource_cloud_run_service.go index f1f1d20836d..e1ecb29e06e 100644 --- a/google/services/cloudrun/resource_cloud_run_service.go +++ b/google/services/cloudrun/resource_cloud_run_service.go @@ -1495,9 +1495,9 @@ func resourceCloudRunServiceDelete(d *schema.ResourceData, meta interface{}) err func resourceCloudRunServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "locations/(?P[^/]+)/namespaces/(?P[^/]+)/services/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^locations/(?P[^/]+)/namespaces/(?P[^/]+)/services/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_job.go b/google/services/cloudrunv2/resource_cloud_run_v2_job.go index e639fd66885..31db25658ba 100644 --- a/google/services/cloudrunv2/resource_cloud_run_v2_job.go +++ b/google/services/cloudrunv2/resource_cloud_run_v2_job.go @@ -1108,9 +1108,9 @@ func resourceCloudRunV2JobDelete(d *schema.ResourceData, meta interface{}) error func resourceCloudRunV2JobImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/jobs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/jobs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudrunv2/resource_cloud_run_v2_service.go b/google/services/cloudrunv2/resource_cloud_run_v2_service.go index 529e02abf4c..3eceb79b7b9 100644 --- a/google/services/cloudrunv2/resource_cloud_run_v2_service.go +++ b/google/services/cloudrunv2/resource_cloud_run_v2_service.go @@ -1457,9 +1457,9 @@ func resourceCloudRunV2ServiceDelete(d *schema.ResourceData, meta interface{}) e func resourceCloudRunV2ServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/services/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/services/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudscheduler/resource_cloud_scheduler_job.go b/google/services/cloudscheduler/resource_cloud_scheduler_job.go index a4774dfdc43..daa960a198d 100644 --- a/google/services/cloudscheduler/resource_cloud_scheduler_job.go +++ b/google/services/cloudscheduler/resource_cloud_scheduler_job.go @@ -874,10 +874,10 @@ func resourceCloudSchedulerJobDelete(d *schema.ResourceData, meta interface{}) e func resourceCloudSchedulerJobImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/jobs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/jobs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/cloudtasks/resource_cloud_tasks_queue.go b/google/services/cloudtasks/resource_cloud_tasks_queue.go index aeb8653a3e0..eb0581221c7 100644 --- a/google/services/cloudtasks/resource_cloud_tasks_queue.go +++ b/google/services/cloudtasks/resource_cloud_tasks_queue.go @@ -536,9 +536,9 @@ func resourceCloudTasksQueueDelete(d *schema.ResourceData, meta interface{}) err func resourceCloudTasksQueueImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/queues/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/queues/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_address.go b/google/services/compute/resource_compute_address.go index a38d238251e..f19d00a0956 100644 --- a/google/services/compute/resource_compute_address.go +++ b/google/services/compute/resource_compute_address.go @@ -485,10 +485,10 @@ func resourceComputeAddressDelete(d *schema.ResourceData, meta interface{}) erro func resourceComputeAddressImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/addresses/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/addresses/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_autoscaler.go b/google/services/compute/resource_compute_autoscaler.go index 9efb8cfa6ec..0123f737a9c 100644 --- a/google/services/compute/resource_compute_autoscaler.go +++ b/google/services/compute/resource_compute_autoscaler.go @@ -643,10 +643,10 @@ func resourceComputeAutoscalerDelete(d *schema.ResourceData, meta interface{}) e func resourceComputeAutoscalerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/autoscalers/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/autoscalers/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_backend_bucket.go b/google/services/compute/resource_compute_backend_bucket.go index 2b3fa23fb72..e773422827e 100644 --- a/google/services/compute/resource_compute_backend_bucket.go +++ b/google/services/compute/resource_compute_backend_bucket.go @@ -652,9 +652,9 @@ func resourceComputeBackendBucketDelete(d *schema.ResourceData, meta interface{} func resourceComputeBackendBucketImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/backendBuckets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/backendBuckets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_backend_service.go b/google/services/compute/resource_compute_backend_service.go index bef1a03b39c..cec9d0f6b73 100644 --- a/google/services/compute/resource_compute_backend_service.go +++ b/google/services/compute/resource_compute_backend_service.go @@ -1982,9 +1982,9 @@ func resourceComputeBackendServiceDelete(d *schema.ResourceData, meta interface{ func resourceComputeBackendServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/backendServices/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/backendServices/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_disk.go b/google/services/compute/resource_compute_disk.go index 59ddacd8920..09b852c848c 100644 --- a/google/services/compute/resource_compute_disk.go +++ b/google/services/compute/resource_compute_disk.go @@ -1395,10 +1395,10 @@ func resourceComputeDiskDelete(d *schema.ResourceData, meta interface{}) error { func resourceComputeDiskImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/disks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/disks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_disk_resource_policy_attachment.go b/google/services/compute/resource_compute_disk_resource_policy_attachment.go index 7a5bccb5443..8d37a7e33c2 100644 --- a/google/services/compute/resource_compute_disk_resource_policy_attachment.go +++ b/google/services/compute/resource_compute_disk_resource_policy_attachment.go @@ -318,10 +318,10 @@ func resourceComputeDiskResourcePolicyAttachmentDelete(d *schema.ResourceData, m func resourceComputeDiskResourcePolicyAttachmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/disks/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/disks/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_external_vpn_gateway.go b/google/services/compute/resource_compute_external_vpn_gateway.go index ea43b71f55c..8aa7ea752c0 100644 --- a/google/services/compute/resource_compute_external_vpn_gateway.go +++ b/google/services/compute/resource_compute_external_vpn_gateway.go @@ -445,9 +445,9 @@ func resourceComputeExternalVpnGatewayDelete(d *schema.ResourceData, meta interf func resourceComputeExternalVpnGatewayImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/externalVpnGateways/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/externalVpnGateways/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_firewall.go b/google/services/compute/resource_compute_firewall.go index 62fc3b4fed3..5de7372794f 100644 --- a/google/services/compute/resource_compute_firewall.go +++ b/google/services/compute/resource_compute_firewall.go @@ -880,9 +880,9 @@ func resourceComputeFirewallDelete(d *schema.ResourceData, meta interface{}) err func resourceComputeFirewallImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/firewalls/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/firewalls/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_forwarding_rule.go b/google/services/compute/resource_compute_forwarding_rule.go index f9d3ae2d092..6323332a903 100644 --- a/google/services/compute/resource_compute_forwarding_rule.go +++ b/google/services/compute/resource_compute_forwarding_rule.go @@ -1185,10 +1185,10 @@ func resourceComputeForwardingRuleDelete(d *schema.ResourceData, meta interface{ func resourceComputeForwardingRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/forwardingRules/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/forwardingRules/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_global_address.go b/google/services/compute/resource_compute_global_address.go index d1758da5e12..40028dd8120 100644 --- a/google/services/compute/resource_compute_global_address.go +++ b/google/services/compute/resource_compute_global_address.go @@ -392,9 +392,9 @@ func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{} func resourceComputeGlobalAddressImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/addresses/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/addresses/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_global_forwarding_rule.go b/google/services/compute/resource_compute_global_forwarding_rule.go index 59a63f8df04..adb44ef0a12 100644 --- a/google/services/compute/resource_compute_global_forwarding_rule.go +++ b/google/services/compute/resource_compute_global_forwarding_rule.go @@ -866,9 +866,9 @@ func resourceComputeGlobalForwardingRuleDelete(d *schema.ResourceData, meta inte func resourceComputeGlobalForwardingRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/forwardingRules/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/forwardingRules/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_global_network_endpoint_group.go b/google/services/compute/resource_compute_global_network_endpoint_group.go index a25378c41c7..32f3dde3c57 100644 --- a/google/services/compute/resource_compute_global_network_endpoint_group.go +++ b/google/services/compute/resource_compute_global_network_endpoint_group.go @@ -302,9 +302,9 @@ func resourceComputeGlobalNetworkEndpointGroupDelete(d *schema.ResourceData, met func resourceComputeGlobalNetworkEndpointGroupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/networkEndpointGroups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/networkEndpointGroups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_ha_vpn_gateway.go b/google/services/compute/resource_compute_ha_vpn_gateway.go index 4faa91a1161..a0c0bcc5bbe 100644 --- a/google/services/compute/resource_compute_ha_vpn_gateway.go +++ b/google/services/compute/resource_compute_ha_vpn_gateway.go @@ -364,10 +364,10 @@ func resourceComputeHaVpnGatewayDelete(d *schema.ResourceData, meta interface{}) func resourceComputeHaVpnGatewayImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/vpnGateways/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/vpnGateways/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_health_check.go b/google/services/compute/resource_compute_health_check.go index 67582a17b23..8cfce6c534e 100644 --- a/google/services/compute/resource_compute_health_check.go +++ b/google/services/compute/resource_compute_health_check.go @@ -1101,9 +1101,9 @@ func resourceComputeHealthCheckDelete(d *schema.ResourceData, meta interface{}) func resourceComputeHealthCheckImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/healthChecks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/healthChecks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_http_health_check.go b/google/services/compute/resource_compute_http_health_check.go index 1272d6e6a9f..2310c0f9528 100644 --- a/google/services/compute/resource_compute_http_health_check.go +++ b/google/services/compute/resource_compute_http_health_check.go @@ -500,9 +500,9 @@ func resourceComputeHttpHealthCheckDelete(d *schema.ResourceData, meta interface func resourceComputeHttpHealthCheckImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/httpHealthChecks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/httpHealthChecks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_https_health_check.go b/google/services/compute/resource_compute_https_health_check.go index b493c15a69b..ee21ba2ac43 100644 --- a/google/services/compute/resource_compute_https_health_check.go +++ b/google/services/compute/resource_compute_https_health_check.go @@ -500,9 +500,9 @@ func resourceComputeHttpsHealthCheckDelete(d *schema.ResourceData, meta interfac func resourceComputeHttpsHealthCheckImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/httpsHealthChecks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/httpsHealthChecks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_image.go b/google/services/compute/resource_compute_image.go index 90a6e5859db..cfe657e61e3 100644 --- a/google/services/compute/resource_compute_image.go +++ b/google/services/compute/resource_compute_image.go @@ -666,9 +666,9 @@ func resourceComputeImageDelete(d *schema.ResourceData, meta interface{}) error func resourceComputeImageImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/images/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/images/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_instance_group_named_port.go b/google/services/compute/resource_compute_instance_group_named_port.go index 05cdef26ce9..6662c87841d 100644 --- a/google/services/compute/resource_compute_instance_group_named_port.go +++ b/google/services/compute/resource_compute_instance_group_named_port.go @@ -320,10 +320,10 @@ func resourceComputeInstanceGroupNamedPortDelete(d *schema.ResourceData, meta in func resourceComputeInstanceGroupNamedPortImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/instanceGroups/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/instanceGroups/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_interconnect_attachment.go b/google/services/compute/resource_compute_interconnect_attachment.go index 93977a7f3b4..a598554f228 100644 --- a/google/services/compute/resource_compute_interconnect_attachment.go +++ b/google/services/compute/resource_compute_interconnect_attachment.go @@ -711,10 +711,10 @@ func resourceComputeInterconnectAttachmentDelete(d *schema.ResourceData, meta in func resourceComputeInterconnectAttachmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/interconnectAttachments/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/interconnectAttachments/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_managed_ssl_certificate.go b/google/services/compute/resource_compute_managed_ssl_certificate.go index 0420180d2e6..586927cea66 100644 --- a/google/services/compute/resource_compute_managed_ssl_certificate.go +++ b/google/services/compute/resource_compute_managed_ssl_certificate.go @@ -358,9 +358,9 @@ func resourceComputeManagedSslCertificateDelete(d *schema.ResourceData, meta int func resourceComputeManagedSslCertificateImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/sslCertificates/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/sslCertificates/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_network.go b/google/services/compute/resource_compute_network.go index 75d71928816..7b37692115e 100644 --- a/google/services/compute/resource_compute_network.go +++ b/google/services/compute/resource_compute_network.go @@ -525,9 +525,9 @@ func resourceComputeNetworkDelete(d *schema.ResourceData, meta interface{}) erro func resourceComputeNetworkImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/networks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/networks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_network_endpoint_group.go b/google/services/compute/resource_compute_network_endpoint_group.go index 96fca7b2d2c..2576a585d43 100644 --- a/google/services/compute/resource_compute_network_endpoint_group.go +++ b/google/services/compute/resource_compute_network_endpoint_group.go @@ -375,10 +375,10 @@ func resourceComputeNetworkEndpointGroupDelete(d *schema.ResourceData, meta inte func resourceComputeNetworkEndpointGroupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/networkEndpointGroups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/networkEndpointGroups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_network_endpoints.go b/google/services/compute/resource_compute_network_endpoints.go index 723b8823957..7f9789ef24c 100644 --- a/google/services/compute/resource_compute_network_endpoints.go +++ b/google/services/compute/resource_compute_network_endpoints.go @@ -609,10 +609,10 @@ func resourceComputeNetworkEndpointsDelete(d *schema.ResourceData, meta interfac func resourceComputeNetworkEndpointsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/networkEndpointGroups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/networkEndpointGroups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_network_peering_routes_config.go b/google/services/compute/resource_compute_network_peering_routes_config.go index f7c9b81c9aa..6715285321d 100644 --- a/google/services/compute/resource_compute_network_peering_routes_config.go +++ b/google/services/compute/resource_compute_network_peering_routes_config.go @@ -340,9 +340,9 @@ func resourceComputeNetworkPeeringRoutesConfigDelete(d *schema.ResourceData, met func resourceComputeNetworkPeeringRoutesConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/networks/(?P[^/]+)/networkPeerings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/global/networks/(?P[^/]+)/networkPeerings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_node_group.go b/google/services/compute/resource_compute_node_group.go index f59012b3b86..2993ee21cd0 100644 --- a/google/services/compute/resource_compute_node_group.go +++ b/google/services/compute/resource_compute_node_group.go @@ -544,10 +544,10 @@ func resourceComputeNodeGroupDelete(d *schema.ResourceData, meta interface{}) er func resourceComputeNodeGroupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/nodeGroups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/nodeGroups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_node_template.go b/google/services/compute/resource_compute_node_template.go index a6e72ba2cea..5bbe68b6124 100644 --- a/google/services/compute/resource_compute_node_template.go +++ b/google/services/compute/resource_compute_node_template.go @@ -422,10 +422,10 @@ func resourceComputeNodeTemplateDelete(d *schema.ResourceData, meta interface{}) func resourceComputeNodeTemplateImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/nodeTemplates/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/nodeTemplates/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_packet_mirroring.go b/google/services/compute/resource_compute_packet_mirroring.go index e57b56351cb..d5a82b52eba 100644 --- a/google/services/compute/resource_compute_packet_mirroring.go +++ b/google/services/compute/resource_compute_packet_mirroring.go @@ -542,10 +542,10 @@ func resourceComputePacketMirroringDelete(d *schema.ResourceData, meta interface func resourceComputePacketMirroringImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/packetMirrorings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/packetMirrorings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_per_instance_config.go b/google/services/compute/resource_compute_per_instance_config.go index 418fe14fec2..27830da4687 100644 --- a/google/services/compute/resource_compute_per_instance_config.go +++ b/google/services/compute/resource_compute_per_instance_config.go @@ -580,10 +580,10 @@ func resourceComputePerInstanceConfigDelete(d *schema.ResourceData, meta interfa func resourceComputePerInstanceConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/instanceGroupManagers/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/instanceGroupManagers/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_public_advertised_prefix.go b/google/services/compute/resource_compute_public_advertised_prefix.go index da0ced6be8c..bd6aaa7f04f 100644 --- a/google/services/compute/resource_compute_public_advertised_prefix.go +++ b/google/services/compute/resource_compute_public_advertised_prefix.go @@ -296,9 +296,9 @@ func resourceComputePublicAdvertisedPrefixDelete(d *schema.ResourceData, meta in func resourceComputePublicAdvertisedPrefixImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/publicAdvertisedPrefixes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/publicAdvertisedPrefixes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_public_delegated_prefix.go b/google/services/compute/resource_compute_public_delegated_prefix.go index bd4c423c526..2f01c092400 100644 --- a/google/services/compute/resource_compute_public_delegated_prefix.go +++ b/google/services/compute/resource_compute_public_delegated_prefix.go @@ -318,10 +318,10 @@ func resourceComputePublicDelegatedPrefixDelete(d *schema.ResourceData, meta int func resourceComputePublicDelegatedPrefixImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/publicDelegatedPrefixes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/publicDelegatedPrefixes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_autoscaler.go b/google/services/compute/resource_compute_region_autoscaler.go index f4145b5ffae..7e9ee486f9d 100644 --- a/google/services/compute/resource_compute_region_autoscaler.go +++ b/google/services/compute/resource_compute_region_autoscaler.go @@ -643,10 +643,10 @@ func resourceComputeRegionAutoscalerDelete(d *schema.ResourceData, meta interfac func resourceComputeRegionAutoscalerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/autoscalers/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/autoscalers/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_backend_service.go b/google/services/compute/resource_compute_region_backend_service.go index 1887cc0b9bc..da60e124cee 100644 --- a/google/services/compute/resource_compute_region_backend_service.go +++ b/google/services/compute/resource_compute_region_backend_service.go @@ -1655,10 +1655,10 @@ func resourceComputeRegionBackendServiceDelete(d *schema.ResourceData, meta inte func resourceComputeRegionBackendServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/backendServices/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/backendServices/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_commitment.go b/google/services/compute/resource_compute_region_commitment.go index acea4e56ef2..f7493d3adf6 100644 --- a/google/services/compute/resource_compute_region_commitment.go +++ b/google/services/compute/resource_compute_region_commitment.go @@ -445,10 +445,10 @@ func resourceComputeRegionCommitmentDelete(d *schema.ResourceData, meta interfac func resourceComputeRegionCommitmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/commitments/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/commitments/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_disk.go b/google/services/compute/resource_compute_region_disk.go index 152d6601b93..8c4ad1fdfbd 100644 --- a/google/services/compute/resource_compute_region_disk.go +++ b/google/services/compute/resource_compute_region_disk.go @@ -886,10 +886,10 @@ func resourceComputeRegionDiskDelete(d *schema.ResourceData, meta interface{}) e func resourceComputeRegionDiskImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/disks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/disks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_disk_resource_policy_attachment.go b/google/services/compute/resource_compute_region_disk_resource_policy_attachment.go index 86c99ebfb4b..ccca1ea9fab 100644 --- a/google/services/compute/resource_compute_region_disk_resource_policy_attachment.go +++ b/google/services/compute/resource_compute_region_disk_resource_policy_attachment.go @@ -300,10 +300,10 @@ func resourceComputeRegionDiskResourcePolicyAttachmentDelete(d *schema.ResourceD func resourceComputeRegionDiskResourcePolicyAttachmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/disks/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/disks/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_health_check.go b/google/services/compute/resource_compute_region_health_check.go index 856d92ed59d..c89f942000d 100644 --- a/google/services/compute/resource_compute_region_health_check.go +++ b/google/services/compute/resource_compute_region_health_check.go @@ -1041,10 +1041,10 @@ func resourceComputeRegionHealthCheckDelete(d *schema.ResourceData, meta interfa func resourceComputeRegionHealthCheckImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/healthChecks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/healthChecks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_network_endpoint_group.go b/google/services/compute/resource_compute_region_network_endpoint_group.go index 10876d549e5..12f31800ac5 100644 --- a/google/services/compute/resource_compute_region_network_endpoint_group.go +++ b/google/services/compute/resource_compute_region_network_endpoint_group.go @@ -503,10 +503,10 @@ func resourceComputeRegionNetworkEndpointGroupDelete(d *schema.ResourceData, met func resourceComputeRegionNetworkEndpointGroupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/networkEndpointGroups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/networkEndpointGroups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_per_instance_config.go b/google/services/compute/resource_compute_region_per_instance_config.go index 3267c76545d..e9f72a1ab2a 100644 --- a/google/services/compute/resource_compute_region_per_instance_config.go +++ b/google/services/compute/resource_compute_region_per_instance_config.go @@ -581,10 +581,10 @@ func resourceComputeRegionPerInstanceConfigDelete(d *schema.ResourceData, meta i func resourceComputeRegionPerInstanceConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/instanceGroupManagers/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/instanceGroupManagers/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_ssl_certificate.go b/google/services/compute/resource_compute_region_ssl_certificate.go index ccddcdf9766..08b7e8db1a7 100644 --- a/google/services/compute/resource_compute_region_ssl_certificate.go +++ b/google/services/compute/resource_compute_region_ssl_certificate.go @@ -366,10 +366,10 @@ func resourceComputeRegionSslCertificateDelete(d *schema.ResourceData, meta inte func resourceComputeRegionSslCertificateImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/sslCertificates/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/sslCertificates/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_ssl_policy.go b/google/services/compute/resource_compute_region_ssl_policy.go index 6ada891fc5e..1fa12acb6f1 100644 --- a/google/services/compute/resource_compute_region_ssl_policy.go +++ b/google/services/compute/resource_compute_region_ssl_policy.go @@ -485,10 +485,10 @@ func resourceComputeRegionSslPolicyDelete(d *schema.ResourceData, meta interface func resourceComputeRegionSslPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/sslPolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/sslPolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_target_http_proxy.go b/google/services/compute/resource_compute_region_target_http_proxy.go index e4100c78bd8..c1565466d64 100644 --- a/google/services/compute/resource_compute_region_target_http_proxy.go +++ b/google/services/compute/resource_compute_region_target_http_proxy.go @@ -384,10 +384,10 @@ func resourceComputeRegionTargetHttpProxyDelete(d *schema.ResourceData, meta int func resourceComputeRegionTargetHttpProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/targetHttpProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/targetHttpProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_target_https_proxy.go b/google/services/compute/resource_compute_region_target_https_proxy.go index 994289ffba3..35595b984b7 100644 --- a/google/services/compute/resource_compute_region_target_https_proxy.go +++ b/google/services/compute/resource_compute_region_target_https_proxy.go @@ -464,10 +464,10 @@ func resourceComputeRegionTargetHttpsProxyDelete(d *schema.ResourceData, meta in func resourceComputeRegionTargetHttpsProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/targetHttpsProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/targetHttpsProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_target_tcp_proxy.go b/google/services/compute/resource_compute_region_target_tcp_proxy.go index c38d0738dc4..4e8e535065b 100644 --- a/google/services/compute/resource_compute_region_target_tcp_proxy.go +++ b/google/services/compute/resource_compute_region_target_tcp_proxy.go @@ -353,10 +353,10 @@ func resourceComputeRegionTargetTcpProxyDelete(d *schema.ResourceData, meta inte func resourceComputeRegionTargetTcpProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/targetTcpProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/targetTcpProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_region_url_map.go b/google/services/compute/resource_compute_region_url_map.go index c133cf9c52a..d1e94017051 100644 --- a/google/services/compute/resource_compute_region_url_map.go +++ b/google/services/compute/resource_compute_region_url_map.go @@ -2568,10 +2568,10 @@ func resourceComputeRegionUrlMapDelete(d *schema.ResourceData, meta interface{}) func resourceComputeRegionUrlMapImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/urlMaps/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/urlMaps/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_reservation.go b/google/services/compute/resource_compute_reservation.go index 8775620f81c..b3eb9a2a714 100644 --- a/google/services/compute/resource_compute_reservation.go +++ b/google/services/compute/resource_compute_reservation.go @@ -639,10 +639,10 @@ func resourceComputeReservationDelete(d *schema.ResourceData, meta interface{}) func resourceComputeReservationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/reservations/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/reservations/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_resource_policy.go b/google/services/compute/resource_compute_resource_policy.go index 3fe4e091c0c..6cfd731ec31 100644 --- a/google/services/compute/resource_compute_resource_policy.go +++ b/google/services/compute/resource_compute_resource_policy.go @@ -643,10 +643,10 @@ func resourceComputeResourcePolicyDelete(d *schema.ResourceData, meta interface{ func resourceComputeResourcePolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/resourcePolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/resourcePolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_route.go b/google/services/compute/resource_compute_route.go index 8213032c099..a9b807e51d1 100644 --- a/google/services/compute/resource_compute_route.go +++ b/google/services/compute/resource_compute_route.go @@ -498,9 +498,9 @@ func resourceComputeRouteDelete(d *schema.ResourceData, meta interface{}) error func resourceComputeRouteImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/routes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/routes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_router.go b/google/services/compute/resource_compute_router.go index 9b391348d37..2c566df60db 100644 --- a/google/services/compute/resource_compute_router.go +++ b/google/services/compute/resource_compute_router.go @@ -523,10 +523,10 @@ func resourceComputeRouterDelete(d *schema.ResourceData, meta interface{}) error func resourceComputeRouterImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/routers/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/routers/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_router_nat.go b/google/services/compute/resource_compute_router_nat.go index c1e48012746..0d00f5a25df 100644 --- a/google/services/compute/resource_compute_router_nat.go +++ b/google/services/compute/resource_compute_router_nat.go @@ -988,10 +988,10 @@ func resourceComputeRouterNatDelete(d *schema.ResourceData, meta interface{}) er func resourceComputeRouterNatImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/routers/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/routers/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_router_peer.go b/google/services/compute/resource_compute_router_peer.go index 59a778aed94..dc26bf2ca86 100644 --- a/google/services/compute/resource_compute_router_peer.go +++ b/google/services/compute/resource_compute_router_peer.go @@ -785,10 +785,10 @@ func resourceComputeRouterBgpPeerDelete(d *schema.ResourceData, meta interface{} func resourceComputeRouterBgpPeerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/routers/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/routers/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_service_attachment.go b/google/services/compute/resource_compute_service_attachment.go index b8d5060f49c..4b52a356d7f 100644 --- a/google/services/compute/resource_compute_service_attachment.go +++ b/google/services/compute/resource_compute_service_attachment.go @@ -591,10 +591,10 @@ func resourceComputeServiceAttachmentDelete(d *schema.ResourceData, meta interfa func resourceComputeServiceAttachmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/serviceAttachments/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/serviceAttachments/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_snapshot.go b/google/services/compute/resource_compute_snapshot.go index 19bfc493438..008f4318722 100644 --- a/google/services/compute/resource_compute_snapshot.go +++ b/google/services/compute/resource_compute_snapshot.go @@ -616,9 +616,9 @@ func resourceComputeSnapshotDelete(d *schema.ResourceData, meta interface{}) err func resourceComputeSnapshotImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/snapshots/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/snapshots/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_ssl_certificate.go b/google/services/compute/resource_compute_ssl_certificate.go index 20d53e0ff2a..c7c989a9868 100644 --- a/google/services/compute/resource_compute_ssl_certificate.go +++ b/google/services/compute/resource_compute_ssl_certificate.go @@ -348,9 +348,9 @@ func resourceComputeSslCertificateDelete(d *schema.ResourceData, meta interface{ func resourceComputeSslCertificateImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/sslCertificates/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/sslCertificates/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_ssl_policy.go b/google/services/compute/resource_compute_ssl_policy.go index 0b0ef3aeeb2..78810be92e8 100644 --- a/google/services/compute/resource_compute_ssl_policy.go +++ b/google/services/compute/resource_compute_ssl_policy.go @@ -468,9 +468,9 @@ func resourceComputeSslPolicyDelete(d *schema.ResourceData, meta interface{}) er func resourceComputeSslPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/sslPolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/sslPolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_subnetwork.go b/google/services/compute/resource_compute_subnetwork.go index 5469405d8a8..65f0d604e45 100644 --- a/google/services/compute/resource_compute_subnetwork.go +++ b/google/services/compute/resource_compute_subnetwork.go @@ -1043,10 +1043,10 @@ func resourceComputeSubnetworkDelete(d *schema.ResourceData, meta interface{}) e func resourceComputeSubnetworkImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/subnetworks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/subnetworks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_target_grpc_proxy.go b/google/services/compute/resource_compute_target_grpc_proxy.go index 40ddfeb8526..0a61efb591e 100644 --- a/google/services/compute/resource_compute_target_grpc_proxy.go +++ b/google/services/compute/resource_compute_target_grpc_proxy.go @@ -414,9 +414,9 @@ func resourceComputeTargetGrpcProxyDelete(d *schema.ResourceData, meta interface func resourceComputeTargetGrpcProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/targetGrpcProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/targetGrpcProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_target_http_proxy.go b/google/services/compute/resource_compute_target_http_proxy.go index 820ec37c5a8..f264198afbb 100644 --- a/google/services/compute/resource_compute_target_http_proxy.go +++ b/google/services/compute/resource_compute_target_http_proxy.go @@ -403,9 +403,9 @@ func resourceComputeTargetHttpProxyDelete(d *schema.ResourceData, meta interface func resourceComputeTargetHttpProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/targetHttpProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/targetHttpProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_target_https_proxy.go b/google/services/compute/resource_compute_target_https_proxy.go index 3006b90bc73..d1a40467336 100644 --- a/google/services/compute/resource_compute_target_https_proxy.go +++ b/google/services/compute/resource_compute_target_https_proxy.go @@ -667,9 +667,9 @@ func resourceComputeTargetHttpsProxyDelete(d *schema.ResourceData, meta interfac func resourceComputeTargetHttpsProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/targetHttpsProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/targetHttpsProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_target_instance.go b/google/services/compute/resource_compute_target_instance.go index afb6075b606..4b3741d9c7c 100644 --- a/google/services/compute/resource_compute_target_instance.go +++ b/google/services/compute/resource_compute_target_instance.go @@ -333,10 +333,10 @@ func resourceComputeTargetInstanceDelete(d *schema.ResourceData, meta interface{ func resourceComputeTargetInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/zones/(?P[^/]+)/targetInstances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/zones/(?P[^/]+)/targetInstances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_target_ssl_proxy.go b/google/services/compute/resource_compute_target_ssl_proxy.go index 14543004ae2..897486ee153 100644 --- a/google/services/compute/resource_compute_target_ssl_proxy.go +++ b/google/services/compute/resource_compute_target_ssl_proxy.go @@ -606,9 +606,9 @@ func resourceComputeTargetSslProxyDelete(d *schema.ResourceData, meta interface{ func resourceComputeTargetSslProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/targetSslProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/targetSslProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_target_tcp_proxy.go b/google/services/compute/resource_compute_target_tcp_proxy.go index 3703d98a687..10d1a3fac6d 100644 --- a/google/services/compute/resource_compute_target_tcp_proxy.go +++ b/google/services/compute/resource_compute_target_tcp_proxy.go @@ -442,9 +442,9 @@ func resourceComputeTargetTcpProxyDelete(d *schema.ResourceData, meta interface{ func resourceComputeTargetTcpProxyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/targetTcpProxies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/targetTcpProxies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_url_map.go b/google/services/compute/resource_compute_url_map.go index 6e75d57b7ef..34e4d5a8d83 100644 --- a/google/services/compute/resource_compute_url_map.go +++ b/google/services/compute/resource_compute_url_map.go @@ -3178,9 +3178,9 @@ func resourceComputeUrlMapDelete(d *schema.ResourceData, meta interface{}) error func resourceComputeUrlMapImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/global/urlMaps/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/global/urlMaps/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_vpn_gateway.go b/google/services/compute/resource_compute_vpn_gateway.go index d1c41aae8df..b5433dad4c1 100644 --- a/google/services/compute/resource_compute_vpn_gateway.go +++ b/google/services/compute/resource_compute_vpn_gateway.go @@ -316,10 +316,10 @@ func resourceComputeVpnGatewayDelete(d *schema.ResourceData, meta interface{}) e func resourceComputeVpnGatewayImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/targetVpnGateways/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/targetVpnGateways/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_vpn_tunnel.go b/google/services/compute/resource_compute_vpn_tunnel.go index 3325989d99f..32f77999509 100644 --- a/google/services/compute/resource_compute_vpn_tunnel.go +++ b/google/services/compute/resource_compute_vpn_tunnel.go @@ -639,10 +639,10 @@ func resourceComputeVpnTunnelDelete(d *schema.ResourceData, meta interface{}) er func resourceComputeVpnTunnelImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/regions/(?P[^/]+)/vpnTunnels/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/regions/(?P[^/]+)/vpnTunnels/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/compute/resource_compute_vpn_tunnel_test.go b/google/services/compute/resource_compute_vpn_tunnel_test.go index e79a0228c4a..e6cfa97a4e5 100644 --- a/google/services/compute/resource_compute_vpn_tunnel_test.go +++ b/google/services/compute/resource_compute_vpn_tunnel_test.go @@ -33,7 +33,6 @@ func TestAccComputeVpnTunnel_regionFromGateway(t *testing.T) { ResourceName: "google_compute_vpn_tunnel.foobar", ImportState: true, ImportStateVerify: true, - ImportStateIdPrefix: fmt.Sprintf("%s/%s/", envvar.GetTestProjectFromEnv(), region), ImportStateVerifyIgnore: []string{"shared_secret", "detailed_status"}, }, }, diff --git a/google/services/containeranalysis/resource_container_analysis_note.go b/google/services/containeranalysis/resource_container_analysis_note.go index d8bdf66809d..01ab4841e66 100644 --- a/google/services/containeranalysis/resource_container_analysis_note.go +++ b/google/services/containeranalysis/resource_container_analysis_note.go @@ -549,9 +549,9 @@ func resourceContainerAnalysisNoteDelete(d *schema.ResourceData, meta interface{ func resourceContainerAnalysisNoteImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/notes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/notes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/containeranalysis/resource_container_analysis_occurrence.go b/google/services/containeranalysis/resource_container_analysis_occurrence.go index 53d2161af74..b3cbd3108b9 100644 --- a/google/services/containeranalysis/resource_container_analysis_occurrence.go +++ b/google/services/containeranalysis/resource_container_analysis_occurrence.go @@ -488,9 +488,9 @@ func resourceContainerAnalysisOccurrenceDelete(d *schema.ResourceData, meta inte func resourceContainerAnalysisOccurrenceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/occurrences/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/occurrences/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/containerattached/resource_container_attached_cluster.go b/google/services/containerattached/resource_container_attached_cluster.go index 0a6385d1e18..625618d4fd0 100644 --- a/google/services/containerattached/resource_container_attached_cluster.go +++ b/google/services/containerattached/resource_container_attached_cluster.go @@ -860,9 +860,9 @@ func resourceContainerAttachedClusterDelete(d *schema.ResourceData, meta interfa func resourceContainerAttachedClusterImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/attachedClusters/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/attachedClusters/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/corebilling/resource_billing_project_info.go b/google/services/corebilling/resource_billing_project_info.go index bf3a5f08de4..7b4ca75bf6c 100644 --- a/google/services/corebilling/resource_billing_project_info.go +++ b/google/services/corebilling/resource_billing_project_info.go @@ -301,8 +301,8 @@ func resourceCoreBillingProjectInfoDelete(d *schema.ResourceData, meta interface func resourceCoreBillingProjectInfoImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P.+)$", + "^(?P.+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/corebilling/resource_billing_project_info_generated_test.go b/google/services/corebilling/resource_billing_project_info_generated_test.go index 0f341461d9c..6c02c550472 100644 --- a/google/services/corebilling/resource_billing_project_info_generated_test.go +++ b/google/services/corebilling/resource_billing_project_info_generated_test.go @@ -48,11 +48,6 @@ func TestAccCoreBillingProjectInfo_billingProjectInfoBasicExample(t *testing.T) { Config: testAccCoreBillingProjectInfo_billingProjectInfoBasicExample(context), }, - { - ResourceName: "google_billing_project_info.default", - ImportState: true, - ImportStateVerify: true, - }, }, }) } diff --git a/google/services/corebilling/resource_google_billing_project_info_test.go b/google/services/corebilling/resource_google_billing_project_info_test.go index 5c27f499629..3fbfba64242 100644 --- a/google/services/corebilling/resource_google_billing_project_info_test.go +++ b/google/services/corebilling/resource_google_billing_project_info_test.go @@ -31,6 +31,7 @@ func TestAccBillingProjectInfo_update(t *testing.T) { ResourceName: "google_billing_project_info.info", ImportState: true, ImportStateVerify: true, + ImportStateId: fmt.Sprintf("projects/%s", projectId), }, { Config: testAccBillingProjectInfo_basic(projectId, orgId, ""), @@ -39,6 +40,7 @@ func TestAccBillingProjectInfo_update(t *testing.T) { ResourceName: "google_billing_project_info.info", ImportState: true, ImportStateVerify: true, + ImportStateId: fmt.Sprintf("projects/%s", projectId), }, { Config: testAccBillingProjectInfo_basic(projectId, orgId, billingAccount), @@ -47,6 +49,7 @@ func TestAccBillingProjectInfo_update(t *testing.T) { ResourceName: "google_billing_project_info.info", ImportState: true, ImportStateVerify: true, + ImportStateId: fmt.Sprintf("projects/%s", projectId), }, }, }) diff --git a/google/services/databasemigrationservice/resource_database_migration_service_connection_profile.go b/google/services/databasemigrationservice/resource_database_migration_service_connection_profile.go index 9b7823dd15e..5aa22f7793c 100644 --- a/google/services/databasemigrationservice/resource_database_migration_service_connection_profile.go +++ b/google/services/databasemigrationservice/resource_database_migration_service_connection_profile.go @@ -981,9 +981,9 @@ func resourceDatabaseMigrationServiceConnectionProfileDelete(d *schema.ResourceD func resourceDatabaseMigrationServiceConnectionProfileImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/connectionProfiles/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/connectionProfiles/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/datafusion/resource_data_fusion_instance.go b/google/services/datafusion/resource_data_fusion_instance.go index 98d1b70ec22..6e73b85576c 100644 --- a/google/services/datafusion/resource_data_fusion_instance.go +++ b/google/services/datafusion/resource_data_fusion_instance.go @@ -830,10 +830,10 @@ func resourceDataFusionInstanceDelete(d *schema.ResourceData, meta interface{}) func resourceDataFusionInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/datapipeline/resource_data_pipeline_pipeline.go b/google/services/datapipeline/resource_data_pipeline_pipeline.go index f351044bd85..12ead18b1a3 100644 --- a/google/services/datapipeline/resource_data_pipeline_pipeline.go +++ b/google/services/datapipeline/resource_data_pipeline_pipeline.go @@ -830,10 +830,10 @@ func resourceDataPipelinePipelineDelete(d *schema.ResourceData, meta interface{} func resourceDataPipelinePipelineImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/pipelines/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/pipelines/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dataplex/resource_dataplex_datascan.go b/google/services/dataplex/resource_dataplex_datascan.go index 5c22e6f1f6e..b438f392430 100644 --- a/google/services/dataplex/resource_dataplex_datascan.go +++ b/google/services/dataplex/resource_dataplex_datascan.go @@ -952,10 +952,10 @@ func resourceDataplexDatascanDelete(d *schema.ResourceData, meta interface{}) er func resourceDataplexDatascanImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/dataScans/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/dataScans/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dataplex/resource_dataplex_task.go b/google/services/dataplex/resource_dataplex_task.go index 0e580496771..f1b54cc7e02 100644 --- a/google/services/dataplex/resource_dataplex_task.go +++ b/google/services/dataplex/resource_dataplex_task.go @@ -949,9 +949,9 @@ func resourceDataplexTaskDelete(d *schema.ResourceData, meta interface{}) error func resourceDataplexTaskImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/lakes/(?P[^/]+)/tasks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/lakes/(?P[^/]+)/tasks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dataproc/resource_dataproc_autoscaling_policy.go b/google/services/dataproc/resource_dataproc_autoscaling_policy.go index f96bf9a8786..692d68d1a12 100644 --- a/google/services/dataproc/resource_dataproc_autoscaling_policy.go +++ b/google/services/dataproc/resource_dataproc_autoscaling_policy.go @@ -510,9 +510,9 @@ func resourceDataprocAutoscalingPolicyDelete(d *schema.ResourceData, meta interf func resourceDataprocAutoscalingPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/autoscalingPolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/autoscalingPolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dataprocmetastore/resource_dataproc_metastore_service.go b/google/services/dataprocmetastore/resource_dataproc_metastore_service.go index 67dbbb6a239..5e5f35fa210 100644 --- a/google/services/dataprocmetastore/resource_dataproc_metastore_service.go +++ b/google/services/dataprocmetastore/resource_dataproc_metastore_service.go @@ -786,9 +786,9 @@ func resourceDataprocMetastoreServiceDelete(d *schema.ResourceData, meta interfa func resourceDataprocMetastoreServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/services/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/services/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/datastore/resource_datastore_index.go b/google/services/datastore/resource_datastore_index.go index 81269a3095c..0df6f65cddf 100644 --- a/google/services/datastore/resource_datastore_index.go +++ b/google/services/datastore/resource_datastore_index.go @@ -315,9 +315,9 @@ func resourceDatastoreIndexDelete(d *schema.ResourceData, meta interface{}) erro func resourceDatastoreIndexImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/indexes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/indexes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/datastream/resource_datastream_connection_profile.go b/google/services/datastream/resource_datastream_connection_profile.go index 1b68afad4ce..320a36beae9 100644 --- a/google/services/datastream/resource_datastream_connection_profile.go +++ b/google/services/datastream/resource_datastream_connection_profile.go @@ -783,9 +783,9 @@ func resourceDatastreamConnectionProfileDelete(d *schema.ResourceData, meta inte func resourceDatastreamConnectionProfileImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/connectionProfiles/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/connectionProfiles/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/datastream/resource_datastream_private_connection.go b/google/services/datastream/resource_datastream_private_connection.go index bdc5ddec550..b013b409460 100644 --- a/google/services/datastream/resource_datastream_private_connection.go +++ b/google/services/datastream/resource_datastream_private_connection.go @@ -413,9 +413,9 @@ func resourceDatastreamPrivateConnectionDelete(d *schema.ResourceData, meta inte func resourceDatastreamPrivateConnectionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/privateConnections/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/privateConnections/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/datastream/resource_datastream_stream.go b/google/services/datastream/resource_datastream_stream.go index 24ccec67cfe..90ef3cd857a 100644 --- a/google/services/datastream/resource_datastream_stream.go +++ b/google/services/datastream/resource_datastream_stream.go @@ -1734,9 +1734,9 @@ func resourceDatastreamStreamDelete(d *schema.ResourceData, meta interface{}) er func resourceDatastreamStreamImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/streams/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/streams/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/deploymentmanager/resource_deployment_manager_deployment.go b/google/services/deploymentmanager/resource_deployment_manager_deployment.go index a7ce5500475..8f2b6921b40 100644 --- a/google/services/deploymentmanager/resource_deployment_manager_deployment.go +++ b/google/services/deploymentmanager/resource_deployment_manager_deployment.go @@ -592,9 +592,9 @@ func resourceDeploymentManagerDeploymentDelete(d *schema.ResourceData, meta inte func resourceDeploymentManagerDeploymentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/deployments/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/deployments/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dialogflow/resource_dialogflow_agent.go b/google/services/dialogflow/resource_dialogflow_agent.go index 19a43268c7e..582abcf71d1 100644 --- a/google/services/dialogflow/resource_dialogflow_agent.go +++ b/google/services/dialogflow/resource_dialogflow_agent.go @@ -513,7 +513,7 @@ func resourceDialogflowAgentDelete(d *schema.ResourceData, meta interface{}) err func resourceDialogflowAgentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_agent.go b/google/services/dialogflowcx/resource_dialogflow_cx_agent.go index 1aa52a3905e..cb135836888 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_agent.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_agent.go @@ -541,9 +541,9 @@ func resourceDialogflowCXAgentDelete(d *schema.ResourceData, meta interface{}) e func resourceDialogflowCXAgentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/agents/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/agents/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_security_settings.go b/google/services/dialogflowcx/resource_dialogflow_cx_security_settings.go index 67dbcd9cc2b..818b6dcc42e 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_security_settings.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_security_settings.go @@ -584,9 +584,9 @@ func resourceDialogflowCXSecuritySettingsDelete(d *schema.ResourceData, meta int func resourceDialogflowCXSecuritySettingsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/securitySettings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/securitySettings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dialogflowcx/resource_dialogflow_cx_test_case.go b/google/services/dialogflowcx/resource_dialogflow_cx_test_case.go index c3cf37732a7..e75f15f41c0 100644 --- a/google/services/dialogflowcx/resource_dialogflow_cx_test_case.go +++ b/google/services/dialogflowcx/resource_dialogflow_cx_test_case.go @@ -911,7 +911,7 @@ func resourceDialogflowCXTestCaseDelete(d *schema.ResourceData, meta interface{} func resourceDialogflowCXTestCaseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/testCases/(?P[^/]+)", + "^(?P.+)/testCases/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dns/resource_dns_managed_zone.go b/google/services/dns/resource_dns_managed_zone.go index 955c4c5567a..b71f33d63fb 100644 --- a/google/services/dns/resource_dns_managed_zone.go +++ b/google/services/dns/resource_dns_managed_zone.go @@ -817,9 +817,9 @@ func resourceDNSManagedZoneDelete(d *schema.ResourceData, meta interface{}) erro func resourceDNSManagedZoneImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/managedZones/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/managedZones/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dns/resource_dns_policy.go b/google/services/dns/resource_dns_policy.go index d9b56c6de49..8a96b320c4d 100644 --- a/google/services/dns/resource_dns_policy.go +++ b/google/services/dns/resource_dns_policy.go @@ -476,9 +476,9 @@ func resourceDNSPolicyDelete(d *schema.ResourceData, meta interface{}) error { func resourceDNSPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/policies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/policies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dns/resource_dns_response_policy.go b/google/services/dns/resource_dns_response_policy.go index eced1493afe..df37601d504 100644 --- a/google/services/dns/resource_dns_response_policy.go +++ b/google/services/dns/resource_dns_response_policy.go @@ -403,9 +403,9 @@ func resourceDNSResponsePolicyDelete(d *schema.ResourceData, meta interface{}) e func resourceDNSResponsePolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/responsePolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/responsePolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/dns/resource_dns_response_policy_rule.go b/google/services/dns/resource_dns_response_policy_rule.go index 24477f03288..6135764572c 100644 --- a/google/services/dns/resource_dns_response_policy_rule.go +++ b/google/services/dns/resource_dns_response_policy_rule.go @@ -359,9 +359,9 @@ func resourceDNSResponsePolicyRuleDelete(d *schema.ResourceData, meta interface{ func resourceDNSResponsePolicyRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/responsePolicies/(?P[^/]+)/rules/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/responsePolicies/(?P[^/]+)/rules/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/documentai/resource_document_ai_processor.go b/google/services/documentai/resource_document_ai_processor.go index 1d81e05058a..1f2b7fe3143 100644 --- a/google/services/documentai/resource_document_ai_processor.go +++ b/google/services/documentai/resource_document_ai_processor.go @@ -268,9 +268,9 @@ func resourceDocumentAIProcessorDelete(d *schema.ResourceData, meta interface{}) func resourceDocumentAIProcessorImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/processors/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/processors/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/documentai/resource_document_ai_processor_default_version.go b/google/services/documentai/resource_document_ai_processor_default_version.go index 8047a1942bc..8471de1eb20 100644 --- a/google/services/documentai/resource_document_ai_processor_default_version.go +++ b/google/services/documentai/resource_document_ai_processor_default_version.go @@ -183,7 +183,7 @@ func resourceDocumentAIProcessorDefaultVersionDelete(d *schema.ResourceData, met func resourceDocumentAIProcessorDefaultVersionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)", + "^(?P.+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/edgenetwork/resource_edgenetwork_network.go b/google/services/edgenetwork/resource_edgenetwork_network.go index 66c9cac77b6..edbf2d97149 100644 --- a/google/services/edgenetwork/resource_edgenetwork_network.go +++ b/google/services/edgenetwork/resource_edgenetwork_network.go @@ -318,11 +318,11 @@ func resourceEdgenetworkNetworkDelete(d *schema.ResourceData, meta interface{}) func resourceEdgenetworkNetworkImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/zones/(?P[^/]+)/networks/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/zones/(?P[^/]+)/networks/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/edgenetwork/resource_edgenetwork_subnet.go b/google/services/edgenetwork/resource_edgenetwork_subnet.go index 1aff6fd0c96..f5238ff5307 100644 --- a/google/services/edgenetwork/resource_edgenetwork_subnet.go +++ b/google/services/edgenetwork/resource_edgenetwork_subnet.go @@ -379,11 +379,11 @@ func resourceEdgenetworkSubnetDelete(d *schema.ResourceData, meta interface{}) e func resourceEdgenetworkSubnetImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/zones/(?P[^/]+)/subnets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/zones/(?P[^/]+)/subnets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/essentialcontacts/resource_essential_contacts_contact.go b/google/services/essentialcontacts/resource_essential_contacts_contact.go index 1c124a0f2cd..e25ef51516b 100644 --- a/google/services/essentialcontacts/resource_essential_contacts_contact.go +++ b/google/services/essentialcontacts/resource_essential_contacts_contact.go @@ -308,7 +308,7 @@ func resourceEssentialContactsContactDelete(d *schema.ResourceData, meta interfa func resourceEssentialContactsContactImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)", + "^(?P.+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/filestore/resource_filestore_backup.go b/google/services/filestore/resource_filestore_backup.go index 3b0d48b7c80..d370b30fa5f 100644 --- a/google/services/filestore/resource_filestore_backup.go +++ b/google/services/filestore/resource_filestore_backup.go @@ -508,9 +508,9 @@ func resourceFilestoreBackupDelete(d *schema.ResourceData, meta interface{}) err func resourceFilestoreBackupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/backups/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/backups/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/filestore/resource_filestore_instance.go b/google/services/filestore/resource_filestore_instance.go index e69f39d71af..2b8cd5432b8 100644 --- a/google/services/filestore/resource_filestore_instance.go +++ b/google/services/filestore/resource_filestore_instance.go @@ -637,9 +637,9 @@ func resourceFilestoreInstanceDelete(d *schema.ResourceData, meta interface{}) e func resourceFilestoreInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/filestore/resource_filestore_snapshot.go b/google/services/filestore/resource_filestore_snapshot.go index b80c16f8911..402f012c671 100644 --- a/google/services/filestore/resource_filestore_snapshot.go +++ b/google/services/filestore/resource_filestore_snapshot.go @@ -443,9 +443,9 @@ func resourceFilestoreSnapshotDelete(d *schema.ResourceData, meta interface{}) e func resourceFilestoreSnapshotImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)/snapshots/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)/snapshots/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/firestore/resource_firestore_database.go b/google/services/firestore/resource_firestore_database.go index 7c6d75890e4..e5a2db6203f 100644 --- a/google/services/firestore/resource_firestore_database.go +++ b/google/services/firestore/resource_firestore_database.go @@ -514,9 +514,9 @@ func resourceFirestoreDatabaseDelete(d *schema.ResourceData, meta interface{}) e func resourceFirestoreDatabaseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/databases/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/databases/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkebackup/resource_gke_backup_backup_plan.go b/google/services/gkebackup/resource_gke_backup_backup_plan.go index a8c327dac90..da4131cc2fb 100644 --- a/google/services/gkebackup/resource_gke_backup_backup_plan.go +++ b/google/services/gkebackup/resource_gke_backup_backup_plan.go @@ -703,9 +703,9 @@ func resourceGKEBackupBackupPlanDelete(d *schema.ResourceData, meta interface{}) func resourceGKEBackupBackupPlanImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/backupPlans/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/backupPlans/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkebackup/resource_gke_backup_restore_plan.go b/google/services/gkebackup/resource_gke_backup_restore_plan.go index f75922221c3..746d870cc3d 100644 --- a/google/services/gkebackup/resource_gke_backup_restore_plan.go +++ b/google/services/gkebackup/resource_gke_backup_restore_plan.go @@ -771,9 +771,9 @@ func resourceGKEBackupRestorePlanDelete(d *schema.ResourceData, meta interface{} func resourceGKEBackupRestorePlanImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/restorePlans/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/restorePlans/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkehub/resource_gke_hub_membership.go b/google/services/gkehub/resource_gke_hub_membership.go index ec8f2aaac0b..adf6fdb1439 100644 --- a/google/services/gkehub/resource_gke_hub_membership.go +++ b/google/services/gkehub/resource_gke_hub_membership.go @@ -453,9 +453,9 @@ func resourceGKEHubMembershipDelete(d *schema.ResourceData, meta interface{}) er func resourceGKEHubMembershipImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/memberships/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/memberships/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkehub2/resource_gke_hub_feature.go b/google/services/gkehub2/resource_gke_hub_feature.go index 1aef0420610..fac23fefafa 100644 --- a/google/services/gkehub2/resource_gke_hub_feature.go +++ b/google/services/gkehub2/resource_gke_hub_feature.go @@ -543,9 +543,9 @@ func resourceGKEHub2FeatureDelete(d *schema.ResourceData, meta interface{}) erro func resourceGKEHub2FeatureImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/features/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/features/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkehub2/resource_gke_hub_membership_binding.go b/google/services/gkehub2/resource_gke_hub_membership_binding.go index f4ffe7b6ce1..c25f422dfa5 100644 --- a/google/services/gkehub2/resource_gke_hub_membership_binding.go +++ b/google/services/gkehub2/resource_gke_hub_membership_binding.go @@ -450,9 +450,9 @@ func resourceGKEHub2MembershipBindingDelete(d *schema.ResourceData, meta interfa func resourceGKEHub2MembershipBindingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/memberships/(?P[^/]+)/bindings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/memberships/(?P[^/]+)/bindings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkehub2/resource_gke_hub_namespace.go b/google/services/gkehub2/resource_gke_hub_namespace.go index 7d457d605a7..e87ec2bec45 100644 --- a/google/services/gkehub2/resource_gke_hub_namespace.go +++ b/google/services/gkehub2/resource_gke_hub_namespace.go @@ -463,9 +463,9 @@ func resourceGKEHub2NamespaceDelete(d *schema.ResourceData, meta interface{}) er func resourceGKEHub2NamespaceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/scopes/(?P[^/]+)/namespaces/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/scopes/(?P[^/]+)/namespaces/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkehub2/resource_gke_hub_scope.go b/google/services/gkehub2/resource_gke_hub_scope.go index 1bd513ccee0..f174433fa0f 100644 --- a/google/services/gkehub2/resource_gke_hub_scope.go +++ b/google/services/gkehub2/resource_gke_hub_scope.go @@ -412,9 +412,9 @@ func resourceGKEHub2ScopeDelete(d *schema.ResourceData, meta interface{}) error func resourceGKEHub2ScopeImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/scopes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/scopes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding.go b/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding.go index 2ea64057765..34af9183f62 100644 --- a/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding.go +++ b/google/services/gkehub2/resource_gke_hub_scope_rbac_role_binding.go @@ -509,9 +509,9 @@ func resourceGKEHub2ScopeRBACRoleBindingDelete(d *schema.ResourceData, meta inte func resourceGKEHub2ScopeRBACRoleBindingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/scopes/(?P[^/]+)/rbacrolebindings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/scopes/(?P[^/]+)/rbacrolebindings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/healthcare/resource_healthcare_consent_store.go b/google/services/healthcare/resource_healthcare_consent_store.go index a98bc3d519f..f4e2c26b2ac 100644 --- a/google/services/healthcare/resource_healthcare_consent_store.go +++ b/google/services/healthcare/resource_healthcare_consent_store.go @@ -350,7 +350,7 @@ func resourceHealthcareConsentStoreDelete(d *schema.ResourceData, meta interface func resourceHealthcareConsentStoreImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/consentStores/(?P[^/]+)", + "^(?P.+)/consentStores/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/healthcare/resource_healthcare_dataset.go b/google/services/healthcare/resource_healthcare_dataset.go index f90947403ac..0e49107261c 100644 --- a/google/services/healthcare/resource_healthcare_dataset.go +++ b/google/services/healthcare/resource_healthcare_dataset.go @@ -333,9 +333,9 @@ func resourceHealthcareDatasetDelete(d *schema.ResourceData, meta interface{}) e func resourceHealthcareDatasetImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/datasets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/datasets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/iam2/resource_iam_access_boundary_policy.go b/google/services/iam2/resource_iam_access_boundary_policy.go index 8d449a69401..cb5052341a1 100644 --- a/google/services/iam2/resource_iam_access_boundary_policy.go +++ b/google/services/iam2/resource_iam_access_boundary_policy.go @@ -380,7 +380,7 @@ func resourceIAM2AccessBoundaryPolicyDelete(d *schema.ResourceData, meta interfa func resourceIAM2AccessBoundaryPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)/(?P[^/]+)", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/iam2/resource_iam_deny_policy.go b/google/services/iam2/resource_iam_deny_policy.go index 34968070e24..b745bdaa85f 100644 --- a/google/services/iam2/resource_iam_deny_policy.go +++ b/google/services/iam2/resource_iam_deny_policy.go @@ -403,7 +403,7 @@ func resourceIAM2DenyPolicyDelete(d *schema.ResourceData, meta interface{}) erro func resourceIAM2DenyPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)/(?P[^/]+)", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/iambeta/resource_iam_workload_identity_pool.go b/google/services/iambeta/resource_iam_workload_identity_pool.go index ca220a7c8e6..ceed525c50c 100644 --- a/google/services/iambeta/resource_iam_workload_identity_pool.go +++ b/google/services/iambeta/resource_iam_workload_identity_pool.go @@ -439,9 +439,9 @@ func resourceIAMBetaWorkloadIdentityPoolDelete(d *schema.ResourceData, meta inte func resourceIAMBetaWorkloadIdentityPoolImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/workloadIdentityPools/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/workloadIdentityPools/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/iambeta/resource_iam_workload_identity_pool_provider.go b/google/services/iambeta/resource_iam_workload_identity_pool_provider.go index 13ced2064f9..50979f88abc 100644 --- a/google/services/iambeta/resource_iam_workload_identity_pool_provider.go +++ b/google/services/iambeta/resource_iam_workload_identity_pool_provider.go @@ -688,9 +688,9 @@ func resourceIAMBetaWorkloadIdentityPoolProviderDelete(d *schema.ResourceData, m func resourceIAMBetaWorkloadIdentityPoolProviderImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/workloadIdentityPools/(?P[^/]+)/providers/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/workloadIdentityPools/(?P[^/]+)/providers/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool.go b/google/services/iamworkforcepool/resource_iam_workforce_pool.go index 9bb3edc80a6..848b0cc8781 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool.go @@ -443,8 +443,8 @@ func resourceIAMWorkforcePoolWorkforcePoolDelete(d *schema.ResourceData, meta in func resourceIAMWorkforcePoolWorkforcePoolImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "locations/(?P[^/]+)/workforcePools/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^locations/(?P[^/]+)/workforcePools/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider.go b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider.go index 33ca036a830..c24c2006bfc 100644 --- a/google/services/iamworkforcepool/resource_iam_workforce_pool_provider.go +++ b/google/services/iamworkforcepool/resource_iam_workforce_pool_provider.go @@ -718,8 +718,8 @@ func resourceIAMWorkforcePoolWorkforcePoolProviderDelete(d *schema.ResourceData, func resourceIAMWorkforcePoolWorkforcePoolProviderImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "locations/(?P[^/]+)/workforcePools/(?P[^/]+)/providers/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^locations/(?P[^/]+)/workforcePools/(?P[^/]+)/providers/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_config.go b/google/services/identityplatform/resource_identity_platform_config.go index ee6be832f4b..4703923f911 100644 --- a/google/services/identityplatform/resource_identity_platform_config.go +++ b/google/services/identityplatform/resource_identity_platform_config.go @@ -520,9 +520,9 @@ func resourceIdentityPlatformConfigDelete(d *schema.ResourceData, meta interface func resourceIdentityPlatformConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/config", - "projects/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/config$", + "^projects/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_default_supported_idp_config.go b/google/services/identityplatform/resource_identity_platform_default_supported_idp_config.go index f9921812de3..bd1a2f38dae 100644 --- a/google/services/identityplatform/resource_identity_platform_default_supported_idp_config.go +++ b/google/services/identityplatform/resource_identity_platform_default_supported_idp_config.go @@ -373,9 +373,9 @@ func resourceIdentityPlatformDefaultSupportedIdpConfigDelete(d *schema.ResourceD func resourceIdentityPlatformDefaultSupportedIdpConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/defaultSupportedIdpConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/defaultSupportedIdpConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_inbound_saml_config.go b/google/services/identityplatform/resource_identity_platform_inbound_saml_config.go index 8780619beed..c71a2b3e08f 100644 --- a/google/services/identityplatform/resource_identity_platform_inbound_saml_config.go +++ b/google/services/identityplatform/resource_identity_platform_inbound_saml_config.go @@ -441,9 +441,9 @@ func resourceIdentityPlatformInboundSamlConfigDelete(d *schema.ResourceData, met func resourceIdentityPlatformInboundSamlConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/inboundSamlConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/inboundSamlConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_oauth_idp_config.go b/google/services/identityplatform/resource_identity_platform_oauth_idp_config.go index cb7218c7fbf..037676983d1 100644 --- a/google/services/identityplatform/resource_identity_platform_oauth_idp_config.go +++ b/google/services/identityplatform/resource_identity_platform_oauth_idp_config.go @@ -399,9 +399,9 @@ func resourceIdentityPlatformOauthIdpConfigDelete(d *schema.ResourceData, meta i func resourceIdentityPlatformOauthIdpConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/oauthIdpConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/oauthIdpConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_project_default_config.go b/google/services/identityplatform/resource_identity_platform_project_default_config.go index 284a8da5218..613d3668f2c 100644 --- a/google/services/identityplatform/resource_identity_platform_project_default_config.go +++ b/google/services/identityplatform/resource_identity_platform_project_default_config.go @@ -405,9 +405,9 @@ func resourceIdentityPlatformProjectDefaultConfigDelete(d *schema.ResourceData, func resourceIdentityPlatformProjectDefaultConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/config/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/config/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_tenant.go b/google/services/identityplatform/resource_identity_platform_tenant.go index 115e423a491..9bb72d7aa50 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant.go +++ b/google/services/identityplatform/resource_identity_platform_tenant.go @@ -388,9 +388,9 @@ func resourceIdentityPlatformTenantDelete(d *schema.ResourceData, meta interface func resourceIdentityPlatformTenantImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/tenants/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/tenants/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config.go b/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config.go index dae03376f85..e4693cb3194 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_default_supported_idp_config.go @@ -379,9 +379,9 @@ func resourceIdentityPlatformTenantDefaultSupportedIdpConfigDelete(d *schema.Res func resourceIdentityPlatformTenantDefaultSupportedIdpConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/tenants/(?P[^/]+)/defaultSupportedIdpConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/tenants/(?P[^/]+)/defaultSupportedIdpConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config.go b/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config.go index 1a18d23144e..00c17cab901 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_inbound_saml_config.go @@ -447,9 +447,9 @@ func resourceIdentityPlatformTenantInboundSamlConfigDelete(d *schema.ResourceDat func resourceIdentityPlatformTenantInboundSamlConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/tenants/(?P[^/]+)/inboundSamlConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/tenants/(?P[^/]+)/inboundSamlConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config.go b/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config.go index 489406e0f79..20ac51c1b41 100644 --- a/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config.go +++ b/google/services/identityplatform/resource_identity_platform_tenant_oauth_idp_config.go @@ -405,9 +405,9 @@ func resourceIdentityPlatformTenantOauthIdpConfigDelete(d *schema.ResourceData, func resourceIdentityPlatformTenantOauthIdpConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/tenants/(?P[^/]+)/oauthIdpConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/tenants/(?P[^/]+)/oauthIdpConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/kms/resource_kms_key_ring.go b/google/services/kms/resource_kms_key_ring.go index 03705c9a6fd..72fed68b8d1 100644 --- a/google/services/kms/resource_kms_key_ring.go +++ b/google/services/kms/resource_kms_key_ring.go @@ -215,9 +215,9 @@ func resourceKMSKeyRingDelete(d *schema.ResourceData, meta interface{}) error { func resourceKMSKeyRingImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/keyRings/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/keyRings/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/logging/resource_logging_linked_dataset.go b/google/services/logging/resource_logging_linked_dataset.go index ad850aa979e..f73383c95bd 100644 --- a/google/services/logging/resource_logging_linked_dataset.go +++ b/google/services/logging/resource_logging_linked_dataset.go @@ -303,7 +303,7 @@ func resourceLoggingLinkedDatasetDelete(d *schema.ResourceData, meta interface{} func resourceLoggingLinkedDatasetImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/locations/(?P[^/]+)/buckets/(?P[^/]+)/links/(?P[^/]+)", + "^(?P.+)/locations/(?P[^/]+)/buckets/(?P[^/]+)/links/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/logging/resource_logging_log_view.go b/google/services/logging/resource_logging_log_view.go index 56cda502946..e13dfe5ea3c 100644 --- a/google/services/logging/resource_logging_log_view.go +++ b/google/services/logging/resource_logging_log_view.go @@ -334,7 +334,7 @@ func resourceLoggingLogViewDelete(d *schema.ResourceData, meta interface{}) erro func resourceLoggingLogViewImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/locations/(?P[^/]+)/buckets/(?P[^/]+)/views/(?P[^/]+)", + "^(?P.+)/locations/(?P[^/]+)/buckets/(?P[^/]+)/views/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/looker/resource_looker_instance.go b/google/services/looker/resource_looker_instance.go index 67d26214515..6585ccb0286 100644 --- a/google/services/looker/resource_looker_instance.go +++ b/google/services/looker/resource_looker_instance.go @@ -886,10 +886,10 @@ func resourceLookerInstanceDelete(d *schema.ResourceData, meta interface{}) erro func resourceLookerInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/memcache/resource_memcache_instance.go b/google/services/memcache/resource_memcache_instance.go index 1d5215f303e..1763b6e8c74 100644 --- a/google/services/memcache/resource_memcache_instance.go +++ b/google/services/memcache/resource_memcache_instance.go @@ -750,10 +750,10 @@ func resourceMemcacheInstanceDelete(d *schema.ResourceData, meta interface{}) er func resourceMemcacheInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/mlengine/resource_ml_engine_model.go b/google/services/mlengine/resource_ml_engine_model.go index 9ec41dcfd63..30e3de14092 100644 --- a/google/services/mlengine/resource_ml_engine_model.go +++ b/google/services/mlengine/resource_ml_engine_model.go @@ -358,9 +358,9 @@ func resourceMLEngineModelDelete(d *schema.ResourceData, meta interface{}) error func resourceMLEngineModelImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/models/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/models/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/monitoring/resource_monitoring_service.go b/google/services/monitoring/resource_monitoring_service.go index 570de6ebfcf..993c3f620ba 100644 --- a/google/services/monitoring/resource_monitoring_service.go +++ b/google/services/monitoring/resource_monitoring_service.go @@ -396,9 +396,9 @@ func resourceMonitoringGenericServiceDelete(d *schema.ResourceData, meta interfa func resourceMonitoringGenericServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/services/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/services/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networkconnectivity/resource_network_connectivity_service_connection_policy.go b/google/services/networkconnectivity/resource_network_connectivity_service_connection_policy.go index 7ac9a816a06..0afde6f4e39 100644 --- a/google/services/networkconnectivity/resource_network_connectivity_service_connection_policy.go +++ b/google/services/networkconnectivity/resource_network_connectivity_service_connection_policy.go @@ -602,9 +602,9 @@ func resourceNetworkConnectivityServiceConnectionPolicyDelete(d *schema.Resource func resourceNetworkConnectivityServiceConnectionPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/serviceConnectionPolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/serviceConnectionPolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networkmanagement/resource_network_management_connectivity_test_resource.go b/google/services/networkmanagement/resource_network_management_connectivity_test_resource.go index 8a529c65060..3a201954a08 100644 --- a/google/services/networkmanagement/resource_network_management_connectivity_test_resource.go +++ b/google/services/networkmanagement/resource_network_management_connectivity_test_resource.go @@ -628,9 +628,9 @@ func resourceNetworkManagementConnectivityTestDelete(d *schema.ResourceData, met func resourceNetworkManagementConnectivityTestImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/connectivityTests/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/connectivityTests/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networksecurity/resource_network_security_address_group.go b/google/services/networksecurity/resource_network_security_address_group.go index 404f77d54fb..18ac195a0f5 100644 --- a/google/services/networksecurity/resource_network_security_address_group.go +++ b/google/services/networksecurity/resource_network_security_address_group.go @@ -438,7 +438,7 @@ func resourceNetworkSecurityAddressGroupDelete(d *schema.ResourceData, meta inte func resourceNetworkSecurityAddressGroupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P.+)/locations/(?P[^/]+)/addressGroups/(?P[^/]+)", + "^(?P.+)/locations/(?P[^/]+)/addressGroups/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networksecurity/resource_network_security_gateway_security_policy.go b/google/services/networksecurity/resource_network_security_gateway_security_policy.go index 4ec3eea0cfc..d71998ce918 100644 --- a/google/services/networksecurity/resource_network_security_gateway_security_policy.go +++ b/google/services/networksecurity/resource_network_security_gateway_security_policy.go @@ -355,9 +355,9 @@ func resourceNetworkSecurityGatewaySecurityPolicyDelete(d *schema.ResourceData, func resourceNetworkSecurityGatewaySecurityPolicyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/gatewaySecurityPolicies/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/gatewaySecurityPolicies/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networksecurity/resource_network_security_gateway_security_policy_rule.go b/google/services/networksecurity/resource_network_security_gateway_security_policy_rule.go index 85915715ff1..520df457a64 100644 --- a/google/services/networksecurity/resource_network_security_gateway_security_policy_rule.go +++ b/google/services/networksecurity/resource_network_security_gateway_security_policy_rule.go @@ -508,9 +508,9 @@ func resourceNetworkSecurityGatewaySecurityPolicyRuleDelete(d *schema.ResourceDa func resourceNetworkSecurityGatewaySecurityPolicyRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/gatewaySecurityPolicies/(?P[^/]+)/rules/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/gatewaySecurityPolicies/(?P[^/]+)/rules/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networksecurity/resource_network_security_url_lists.go b/google/services/networksecurity/resource_network_security_url_lists.go index f2949be2fde..d8ff41ea88d 100644 --- a/google/services/networksecurity/resource_network_security_url_lists.go +++ b/google/services/networksecurity/resource_network_security_url_lists.go @@ -372,9 +372,9 @@ func resourceNetworkSecurityUrlListsDelete(d *schema.ResourceData, meta interfac func resourceNetworkSecurityUrlListsImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/urlLists/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/urlLists/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networkservices/resource_network_services_edge_cache_keyset.go b/google/services/networkservices/resource_network_services_edge_cache_keyset.go index 12f7e46d82c..918bfdd7df4 100644 --- a/google/services/networkservices/resource_network_services_edge_cache_keyset.go +++ b/google/services/networkservices/resource_network_services_edge_cache_keyset.go @@ -472,9 +472,9 @@ func resourceNetworkServicesEdgeCacheKeysetDelete(d *schema.ResourceData, meta i func resourceNetworkServicesEdgeCacheKeysetImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/edgeCacheKeysets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/edgeCacheKeysets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networkservices/resource_network_services_edge_cache_origin.go b/google/services/networkservices/resource_network_services_edge_cache_origin.go index 9b87a50ef8d..d291f8322b3 100644 --- a/google/services/networkservices/resource_network_services_edge_cache_origin.go +++ b/google/services/networkservices/resource_network_services_edge_cache_origin.go @@ -821,9 +821,9 @@ func resourceNetworkServicesEdgeCacheOriginDelete(d *schema.ResourceData, meta i func resourceNetworkServicesEdgeCacheOriginImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/edgeCacheOrigins/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/edgeCacheOrigins/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networkservices/resource_network_services_edge_cache_service.go b/google/services/networkservices/resource_network_services_edge_cache_service.go index 08eadc5c3c6..4e868499002 100644 --- a/google/services/networkservices/resource_network_services_edge_cache_service.go +++ b/google/services/networkservices/resource_network_services_edge_cache_service.go @@ -1448,9 +1448,9 @@ func resourceNetworkServicesEdgeCacheServiceDelete(d *schema.ResourceData, meta func resourceNetworkServicesEdgeCacheServiceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/global/edgeCacheServices/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/global/edgeCacheServices/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/networkservices/resource_network_services_gateway.go b/google/services/networkservices/resource_network_services_gateway.go index 6e37fa15728..03c2f239665 100644 --- a/google/services/networkservices/resource_network_services_gateway.go +++ b/google/services/networkservices/resource_network_services_gateway.go @@ -708,9 +708,9 @@ func resourceNetworkServicesGatewayDelete(d *schema.ResourceData, meta interface func resourceNetworkServicesGatewayImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/gateways/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/gateways/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/notebooks/resource_notebooks_environment.go b/google/services/notebooks/resource_notebooks_environment.go index 3f0cfa69199..ce0d2065e8a 100644 --- a/google/services/notebooks/resource_notebooks_environment.go +++ b/google/services/notebooks/resource_notebooks_environment.go @@ -453,9 +453,9 @@ func resourceNotebooksEnvironmentDelete(d *schema.ResourceData, meta interface{} func resourceNotebooksEnvironmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/environments/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/environments/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/notebooks/resource_notebooks_instance.go b/google/services/notebooks/resource_notebooks_instance.go index 6de06dcf41d..99bbce4a290 100644 --- a/google/services/notebooks/resource_notebooks_instance.go +++ b/google/services/notebooks/resource_notebooks_instance.go @@ -984,9 +984,9 @@ func resourceNotebooksInstanceDelete(d *schema.ResourceData, meta interface{}) e func resourceNotebooksInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/notebooks/resource_notebooks_location.go b/google/services/notebooks/resource_notebooks_location.go index afe92610cdd..9a193238b9e 100644 --- a/google/services/notebooks/resource_notebooks_location.go +++ b/google/services/notebooks/resource_notebooks_location.go @@ -323,9 +323,9 @@ func resourceNotebooksLocationDelete(d *schema.ResourceData, meta interface{}) e func resourceNotebooksLocationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/notebooks/resource_notebooks_runtime.go b/google/services/notebooks/resource_notebooks_runtime.go index ce450d14237..8529ca308e6 100644 --- a/google/services/notebooks/resource_notebooks_runtime.go +++ b/google/services/notebooks/resource_notebooks_runtime.go @@ -939,9 +939,9 @@ func resourceNotebooksRuntimeDelete(d *schema.ResourceData, meta interface{}) er func resourceNotebooksRuntimeImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/runtimes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/runtimes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/oslogin/resource_os_login_ssh_public_key.go b/google/services/oslogin/resource_os_login_ssh_public_key.go index 3f4fa642ff4..5df8f9acbdd 100644 --- a/google/services/oslogin/resource_os_login_ssh_public_key.go +++ b/google/services/oslogin/resource_os_login_ssh_public_key.go @@ -315,8 +315,8 @@ func resourceOSLoginSSHPublicKeyDelete(d *schema.ResourceData, meta interface{}) func resourceOSLoginSSHPublicKeyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "users/(?P[^/]+)/sshPublicKeys/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^users/(?P[^/]+)/sshPublicKeys/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/privateca/resource_privateca_ca_pool.go b/google/services/privateca/resource_privateca_ca_pool.go index 3b0180d1866..996db4de3a9 100644 --- a/google/services/privateca/resource_privateca_ca_pool.go +++ b/google/services/privateca/resource_privateca_ca_pool.go @@ -925,9 +925,9 @@ func resourcePrivatecaCaPoolDelete(d *schema.ResourceData, meta interface{}) err func resourcePrivatecaCaPoolImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/caPools/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/caPools/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/privateca/resource_privateca_certificate.go b/google/services/privateca/resource_privateca_certificate.go index 0a997395624..411f7a03784 100644 --- a/google/services/privateca/resource_privateca_certificate.go +++ b/google/services/privateca/resource_privateca_certificate.go @@ -1567,9 +1567,9 @@ func resourcePrivatecaCertificateDelete(d *schema.ResourceData, meta interface{} func resourcePrivatecaCertificateImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/caPools/(?P[^/]+)/certificates/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/caPools/(?P[^/]+)/certificates/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/privateca/resource_privateca_certificate_authority.go b/google/services/privateca/resource_privateca_certificate_authority.go index 204740d3ff1..5768c1169cc 100644 --- a/google/services/privateca/resource_privateca_certificate_authority.go +++ b/google/services/privateca/resource_privateca_certificate_authority.go @@ -1309,9 +1309,9 @@ func resourcePrivatecaCertificateAuthorityDelete(d *schema.ResourceData, meta in func resourcePrivatecaCertificateAuthorityImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/caPools/(?P[^/]+)/certificateAuthorities/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/caPools/(?P[^/]+)/certificateAuthorities/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/pubsub/resource_pubsub_schema.go b/google/services/pubsub/resource_pubsub_schema.go index df5de4ab8c1..d7184229e54 100644 --- a/google/services/pubsub/resource_pubsub_schema.go +++ b/google/services/pubsub/resource_pubsub_schema.go @@ -374,9 +374,9 @@ func resourcePubsubSchemaDelete(d *schema.ResourceData, meta interface{}) error func resourcePubsubSchemaImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/schemas/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/schemas/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/pubsub/resource_pubsub_subscription.go b/google/services/pubsub/resource_pubsub_subscription.go index f71b2a37ec3..81d330eff7d 100644 --- a/google/services/pubsub/resource_pubsub_subscription.go +++ b/google/services/pubsub/resource_pubsub_subscription.go @@ -989,9 +989,9 @@ func resourcePubsubSubscriptionDelete(d *schema.ResourceData, meta interface{}) func resourcePubsubSubscriptionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/subscriptions/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/subscriptions/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/pubsub/resource_pubsub_topic.go b/google/services/pubsub/resource_pubsub_topic.go index 4f8a7e1e846..920f7c9a911 100644 --- a/google/services/pubsub/resource_pubsub_topic.go +++ b/google/services/pubsub/resource_pubsub_topic.go @@ -535,9 +535,9 @@ func resourcePubsubTopicDelete(d *schema.ResourceData, meta interface{}) error { func resourcePubsubTopicImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/topics/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/topics/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/pubsublite/resource_pubsub_lite_reservation.go b/google/services/pubsublite/resource_pubsub_lite_reservation.go index fc0408e0d43..9348952642d 100644 --- a/google/services/pubsublite/resource_pubsub_lite_reservation.go +++ b/google/services/pubsublite/resource_pubsub_lite_reservation.go @@ -302,10 +302,10 @@ func resourcePubsubLiteReservationDelete(d *schema.ResourceData, meta interface{ func resourcePubsubLiteReservationImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/reservations/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/reservations/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/pubsublite/resource_pubsub_lite_subscription.go b/google/services/pubsublite/resource_pubsub_lite_subscription.go index c5c4c6d0517..238a78a5317 100644 --- a/google/services/pubsublite/resource_pubsub_lite_subscription.go +++ b/google/services/pubsublite/resource_pubsub_lite_subscription.go @@ -344,10 +344,10 @@ func resourcePubsubLiteSubscriptionDelete(d *schema.ResourceData, meta interface func resourcePubsubLiteSubscriptionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/subscriptions/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/subscriptions/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/pubsublite/resource_pubsub_lite_topic.go b/google/services/pubsublite/resource_pubsub_lite_topic.go index f2558f8a61d..4214040b543 100644 --- a/google/services/pubsublite/resource_pubsub_lite_topic.go +++ b/google/services/pubsublite/resource_pubsub_lite_topic.go @@ -424,10 +424,10 @@ func resourcePubsubLiteTopicDelete(d *schema.ResourceData, meta interface{}) err func resourcePubsubLiteTopicImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/topics/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/topics/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/redis/resource_redis_instance.go b/google/services/redis/resource_redis_instance.go index 504212098d6..536c49e34e0 100644 --- a/google/services/redis/resource_redis_instance.go +++ b/google/services/redis/resource_redis_instance.go @@ -1192,10 +1192,10 @@ func resourceRedisInstanceDelete(d *schema.ResourceData, meta interface{}) error func resourceRedisInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/resourcemanager/resource_resource_manager_lien.go b/google/services/resourcemanager/resource_resource_manager_lien.go index 9679cc21045..a1c7fe2c9f7 100644 --- a/google/services/resourcemanager/resource_resource_manager_lien.go +++ b/google/services/resourcemanager/resource_resource_manager_lien.go @@ -310,7 +310,7 @@ func resourceResourceManagerLienDelete(d *schema.ResourceData, meta interface{}) func resourceResourceManagerLienImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)/(?P[^/]+)", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/secretmanager/resource_secret_manager_secret.go b/google/services/secretmanager/resource_secret_manager_secret.go index 3d81c08cf66..5367bb6018a 100644 --- a/google/services/secretmanager/resource_secret_manager_secret.go +++ b/google/services/secretmanager/resource_secret_manager_secret.go @@ -684,9 +684,9 @@ func resourceSecretManagerSecretDelete(d *schema.ResourceData, meta interface{}) func resourceSecretManagerSecretImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/secrets/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/secrets/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/securitycenter/resource_scc_project_custom_module.go b/google/services/securitycenter/resource_scc_project_custom_module.go index 9d6b63bcf48..b559878b385 100644 --- a/google/services/securitycenter/resource_scc_project_custom_module.go +++ b/google/services/securitycenter/resource_scc_project_custom_module.go @@ -532,9 +532,9 @@ func resourceSecurityCenterProjectCustomModuleDelete(d *schema.ResourceData, met func resourceSecurityCenterProjectCustomModuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/securityHealthAnalyticsSettings/customModules/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/securityHealthAnalyticsSettings/customModules/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/sourcerepo/resource_sourcerepo_repository.go b/google/services/sourcerepo/resource_sourcerepo_repository.go index 09f69f9b23f..227407e260f 100644 --- a/google/services/sourcerepo/resource_sourcerepo_repository.go +++ b/google/services/sourcerepo/resource_sourcerepo_repository.go @@ -377,8 +377,8 @@ func resourceSourceRepoRepositoryDelete(d *schema.ResourceData, meta interface{} func resourceSourceRepoRepositoryImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/repos/(?P.+)", - "(?P.+)", + "^projects/(?P[^/]+)/repos/(?P.+)$", + "^(?P.+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/spanner/resource_spanner_database.go b/google/services/spanner/resource_spanner_database.go index e68ebe1702c..50a5d375515 100644 --- a/google/services/spanner/resource_spanner_database.go +++ b/google/services/spanner/resource_spanner_database.go @@ -798,10 +798,10 @@ func resourceSpannerDatabaseDelete(d *schema.ResourceData, meta interface{}) err func resourceSpannerDatabaseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/instances/(?P[^/]+)/databases/(?P[^/]+)", - "instances/(?P[^/]+)/databases/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/instances/(?P[^/]+)/databases/(?P[^/]+)$", + "^instances/(?P[^/]+)/databases/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/spanner/resource_spanner_instance.go b/google/services/spanner/resource_spanner_instance.go index 64dddb42044..7feeb5d27b1 100644 --- a/google/services/spanner/resource_spanner_instance.go +++ b/google/services/spanner/resource_spanner_instance.go @@ -589,9 +589,9 @@ func resourceSpannerInstanceDelete(d *schema.ResourceData, meta interface{}) err func resourceSpannerInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/sql/resource_sql_database.go b/google/services/sql/resource_sql_database.go index 7a3a1fd068d..471d069b282 100644 --- a/google/services/sql/resource_sql_database.go +++ b/google/services/sql/resource_sql_database.go @@ -425,11 +425,11 @@ func resourceSQLDatabaseDelete(d *schema.ResourceData, meta interface{}) error { func resourceSQLDatabaseImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/instances/(?P[^/]+)/databases/(?P[^/]+)", - "instances/(?P[^/]+)/databases/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/instances/(?P[^/]+)/databases/(?P[^/]+)$", + "^instances/(?P[^/]+)/databases/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/sql/resource_sql_source_representation_instance.go b/google/services/sql/resource_sql_source_representation_instance.go index 5ee11ed0345..fa3c050e0e6 100644 --- a/google/services/sql/resource_sql_source_representation_instance.go +++ b/google/services/sql/resource_sql_source_representation_instance.go @@ -370,9 +370,9 @@ func resourceSQLSourceRepresentationInstanceDelete(d *schema.ResourceData, meta func resourceSQLSourceRepresentationInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/instances/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/instances/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/storage/resource_storage_bucket_access_control.go b/google/services/storage/resource_storage_bucket_access_control.go index ee300a0bcd6..871b2678c6b 100644 --- a/google/services/storage/resource_storage_bucket_access_control.go +++ b/google/services/storage/resource_storage_bucket_access_control.go @@ -333,7 +333,7 @@ func resourceStorageBucketAccessControlDelete(d *schema.ResourceData, meta inter func resourceStorageBucketAccessControlImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)/(?P[^/]+)", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/storage/resource_storage_default_object_access_control.go b/google/services/storage/resource_storage_default_object_access_control.go index 390bd24265f..8ed2128dd1f 100644 --- a/google/services/storage/resource_storage_default_object_access_control.go +++ b/google/services/storage/resource_storage_default_object_access_control.go @@ -381,7 +381,7 @@ func resourceStorageDefaultObjectAccessControlDelete(d *schema.ResourceData, met func resourceStorageDefaultObjectAccessControlImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)/(?P[^/]+)", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/storage/resource_storage_hmac_key.go b/google/services/storage/resource_storage_hmac_key.go index 0d883c44556..0e475c478a8 100644 --- a/google/services/storage/resource_storage_hmac_key.go +++ b/google/services/storage/resource_storage_hmac_key.go @@ -485,9 +485,9 @@ func resourceStorageHmacKeyDelete(d *schema.ResourceData, meta interface{}) erro func resourceStorageHmacKeyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/hmacKeys/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/hmacKeys/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/storage/resource_storage_object_access_control.go b/google/services/storage/resource_storage_object_access_control.go index 241e340cbab..2423583e6ed 100644 --- a/google/services/storage/resource_storage_object_access_control.go +++ b/google/services/storage/resource_storage_object_access_control.go @@ -384,7 +384,7 @@ func resourceStorageObjectAccessControlDelete(d *schema.ResourceData, meta inter func resourceStorageObjectAccessControlImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "(?P[^/]+)/(?P.+)/(?P[^/]+)", + "^(?P[^/]+)/(?P.+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/storageinsights/resource_storage_insights_report_config.go b/google/services/storageinsights/resource_storage_insights_report_config.go index 30e4c082a00..d6c309bf91b 100644 --- a/google/services/storageinsights/resource_storage_insights_report_config.go +++ b/google/services/storageinsights/resource_storage_insights_report_config.go @@ -511,9 +511,9 @@ func resourceStorageInsightsReportConfigDelete(d *schema.ResourceData, meta inte func resourceStorageInsightsReportConfigImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/reportConfigs/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/reportConfigs/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/storagetransfer/resource_storage_transfer_agent_pool.go b/google/services/storagetransfer/resource_storage_transfer_agent_pool.go index 1af8039cf41..7a2442a7821 100644 --- a/google/services/storagetransfer/resource_storage_transfer_agent_pool.go +++ b/google/services/storagetransfer/resource_storage_transfer_agent_pool.go @@ -374,9 +374,9 @@ func resourceStorageTransferAgentPoolDelete(d *schema.ResourceData, meta interfa func resourceStorageTransferAgentPoolImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/agentPools/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/agentPools/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/tags/resource_tags_tag_key.go b/google/services/tags/resource_tags_tag_key.go index 667394d9b92..87f6ccc881e 100644 --- a/google/services/tags/resource_tags_tag_key.go +++ b/google/services/tags/resource_tags_tag_key.go @@ -416,8 +416,8 @@ func resourceTagsTagKeyDelete(d *schema.ResourceData, meta interface{}) error { func resourceTagsTagKeyImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "tagKeys/(?P[^/]+)", - "(?P[^/]+)", + "^tagKeys/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/tags/resource_tags_tag_value.go b/google/services/tags/resource_tags_tag_value.go index f4e2d8ce6b1..4290dba3d28 100644 --- a/google/services/tags/resource_tags_tag_value.go +++ b/google/services/tags/resource_tags_tag_value.go @@ -380,8 +380,8 @@ func resourceTagsTagValueDelete(d *schema.ResourceData, meta interface{}) error func resourceTagsTagValueImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "tagValues/(?P[^/]+)", - "(?P[^/]+)", + "^tagValues/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/tpu/resource_tpu_node.go b/google/services/tpu/resource_tpu_node.go index bf21e6aed31..05768087e36 100644 --- a/google/services/tpu/resource_tpu_node.go +++ b/google/services/tpu/resource_tpu_node.go @@ -590,10 +590,10 @@ func resourceTPUNodeDelete(d *schema.ResourceData, meta interface{}) error { func resourceTPUNodeImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/nodes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/nodes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/vertexai/resource_vertex_ai_endpoint.go b/google/services/vertexai/resource_vertex_ai_endpoint.go index 5cde1cec607..904ff0218a3 100644 --- a/google/services/vertexai/resource_vertex_ai_endpoint.go +++ b/google/services/vertexai/resource_vertex_ai_endpoint.go @@ -640,9 +640,9 @@ func resourceVertexAIEndpointDelete(d *schema.ResourceData, meta interface{}) er func resourceVertexAIEndpointImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/endpoints/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/endpoints/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/vertexai/resource_vertex_ai_featurestore.go b/google/services/vertexai/resource_vertex_ai_featurestore.go index 0976bf2519c..68a7a6a34e1 100644 --- a/google/services/vertexai/resource_vertex_ai_featurestore.go +++ b/google/services/vertexai/resource_vertex_ai_featurestore.go @@ -488,10 +488,10 @@ func resourceVertexAIFeaturestoreDelete(d *schema.ResourceData, meta interface{} func resourceVertexAIFeaturestoreImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/featurestores/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/featurestores/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/vertexai/resource_vertex_ai_index.go b/google/services/vertexai/resource_vertex_ai_index.go index 6268c6914e6..38c7c4ab4ce 100644 --- a/google/services/vertexai/resource_vertex_ai_index.go +++ b/google/services/vertexai/resource_vertex_ai_index.go @@ -669,10 +669,10 @@ func resourceVertexAIIndexDelete(d *schema.ResourceData, meta interface{}) error func resourceVertexAIIndexImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/indexes/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/indexes/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/vertexai/resource_vertex_ai_index_endpoint.go b/google/services/vertexai/resource_vertex_ai_index_endpoint.go index 9ac70f03944..75fa9d1d525 100644 --- a/google/services/vertexai/resource_vertex_ai_index_endpoint.go +++ b/google/services/vertexai/resource_vertex_ai_index_endpoint.go @@ -462,10 +462,10 @@ func resourceVertexAIIndexEndpointDelete(d *schema.ResourceData, meta interface{ func resourceVertexAIIndexEndpointImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/indexEndpoints/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/indexEndpoints/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err } diff --git a/google/services/vpcaccess/resource_vpc_access_connector.go b/google/services/vpcaccess/resource_vpc_access_connector.go index ec595127b3b..08e8b1959f1 100644 --- a/google/services/vpcaccess/resource_vpc_access_connector.go +++ b/google/services/vpcaccess/resource_vpc_access_connector.go @@ -466,10 +466,10 @@ func resourceVPCAccessConnectorDelete(d *schema.ResourceData, meta interface{}) func resourceVPCAccessConnectorImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { config := meta.(*transport_tpg.Config) if err := tpgresource.ParseImportId([]string{ - "projects/(?P[^/]+)/locations/(?P[^/]+)/connectors/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)/(?P[^/]+)", - "(?P[^/]+)", + "^projects/(?P[^/]+)/locations/(?P[^/]+)/connectors/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)/(?P[^/]+)$", + "^(?P[^/]+)$", }, d, config); err != nil { return nil, err }