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 <magic-modules@google.com>
hashicorp · Sep 25, 2023 · 4863cb6 · 4863cb6
1 parent de11867
commit 4863cb6
Show file tree

Hide file tree

Showing 233 changed files with 714 additions and 714 deletions.
diff --git a/.changelog/8913.txt 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
@@ -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<folder_id>[^/]+)/accessApprovalSettings",
-		"(?P<folder_id>[^/]+)",
+		"^folders/(?P<folder_id>[^/]+)/accessApprovalSettings$",
+		"^(?P<folder_id>[^/]+)$",
 	}, 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
@@ -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<organization_id>[^/]+)/accessApprovalSettings",
-		"(?P<organization_id>[^/]+)",
+		"^organizations/(?P<organization_id>[^/]+)/accessApprovalSettings$",
+		"^(?P<organization_id>[^/]+)$",
 	}, 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
@@ -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<project_id>[^/]+)/accessApprovalSettings",
-		"(?P<project_id>[^/]+)",
+		"^projects/(?P<project_id>[^/]+)/accessApprovalSettings$",
+		"^(?P<project_id>[^/]+)$",
 	}, 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
@@ -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<name>[^/]+)",
+		"^(?P<name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/global/domains/(?P<domain>[^/]+)/(?P<target_domain_name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<domain>[^/]+)/(?P<target_domain_name>[^/]+)",
-		"(?P<domain>[^/]+)/(?P<target_domain_name>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/global/domains/(?P<domain>[^/]+)/(?P<target_domain_name>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<domain>[^/]+)/(?P<target_domain_name>[^/]+)$",
+		"^(?P<domain>[^/]+)/(?P<target_domain_name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/backups/(?P<backup_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<backup_id>[^/]+)",
-		"(?P<location>[^/]+)/(?P<backup_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/backups/(?P<backup_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<backup_id>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<backup_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/clusters/(?P<cluster_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<cluster_id>[^/]+)",
-		"(?P<location>[^/]+)/(?P<cluster_id>[^/]+)",
-		"(?P<cluster_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/clusters/(?P<cluster_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<cluster_id>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<cluster_id>[^/]+)$",
+		"^(?P<cluster_id>[^/]+)$",
 	}, 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
@@ -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<name>[^/]+)/syncAuthorization",
-		"(?P<name>[^/]+)",
+		"^organizations/(?P<name>[^/]+)/syncAuthorization$",
+		"^(?P<name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)",
+		"^(?P<project>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/domainMappings/(?P<domain_name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<domain_name>[^/]+)",
-		"(?P<domain_name>[^/]+)",
+		"^apps/(?P<project>[^/]+)/domainMappings/(?P<domain_name>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<domain_name>[^/]+)$",
+		"^(?P<domain_name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/firewall/ingressRules/(?P<priority>[^/]+)",
-		"(?P<project>[^/]+)/(?P<priority>[^/]+)",
-		"(?P<priority>[^/]+)",
+		"^apps/(?P<project>[^/]+)/firewall/ingressRules/(?P<priority>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<priority>[^/]+)$",
+		"^(?P<priority>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/services/(?P<service>[^/]+)/versions/(?P<version_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<service>[^/]+)/(?P<version_id>[^/]+)",
-		"(?P<service>[^/]+)/(?P<version_id>[^/]+)",
+		"^apps/(?P<project>[^/]+)/services/(?P<service>[^/]+)/versions/(?P<version_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<service>[^/]+)/(?P<version_id>[^/]+)$",
+		"^(?P<service>[^/]+)/(?P<version_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/services/(?P<service>[^/]+)",
-		"(?P<project>[^/]+)/(?P<service>[^/]+)",
-		"(?P<service>[^/]+)",
+		"^apps/(?P<project>[^/]+)/services/(?P<service>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<service>[^/]+)$",
+		"^(?P<service>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/services/(?P<service>[^/]+)",
-		"(?P<project>[^/]+)/(?P<service>[^/]+)",
-		"(?P<service>[^/]+)",
+		"^apps/(?P<project>[^/]+)/services/(?P<service>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<service>[^/]+)$",
+		"^(?P<service>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/services/(?P<service>[^/]+)/versions/(?P<version_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<service>[^/]+)/(?P<version_id>[^/]+)",
-		"(?P<service>[^/]+)/(?P<version_id>[^/]+)",
+		"^apps/(?P<project>[^/]+)/services/(?P<service>[^/]+)/versions/(?P<version_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<service>[^/]+)/(?P<version_id>[^/]+)$",
+		"^(?P<service>[^/]+)/(?P<version_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/repositories/(?P<repository_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<repository_id>[^/]+)",
-		"(?P<location>[^/]+)/(?P<repository_id>[^/]+)",
-		"(?P<repository_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/repositories/(?P<repository_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<repository_id>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<repository_id>[^/]+)$",
+		"^(?P<repository_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<region>[^/]+)/appConnections/(?P<name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
-		"(?P<region>[^/]+)/(?P<name>[^/]+)",
-		"(?P<name>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/appConnections/(?P<name>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<region>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<region>[^/]+)/appConnectors/(?P<name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
-		"(?P<region>[^/]+)/(?P<name>[^/]+)",
-		"(?P<name>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/appConnectors/(?P<name>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<region>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<region>[^/]+)/appGateways/(?P<name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
-		"(?P<region>[^/]+)/(?P<name>[^/]+)",
-		"(?P<name>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/appGateways/(?P<name>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<region>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/catalogs/(?P<name>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<name>[^/]+)",
-		"(?P<location>[^/]+)/(?P<name>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/catalogs/(?P<name>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<name>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<name>[^/]+)$",
 	}, 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
@@ -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<catalog>.+)/databases/(?P<name>[^/]+)",
+		"^(?P<catalog>.+)/databases/(?P<name>[^/]+)$",
 	}, 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
@@ -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<database>.+)/tables/(?P<name>[^/]+)",
+		"^(?P<database>.+)/tables/(?P<name>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<dataset_id>[^/]+)",
-		"(?P<dataset_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<dataset_id>[^/]+)$",
+		"^(?P<dataset_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/jobs/(?P<job_id>[^/]+)/location/(?P<location>[^/]+)",
-		"projects/(?P<project>[^/]+)/jobs/(?P<job_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<job_id>[^/]+)/(?P<location>[^/]+)",
-		"(?P<job_id>[^/]+)/(?P<location>[^/]+)",
-		"(?P<project>[^/]+)/(?P<job_id>[^/]+)",
-		"(?P<job_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/jobs/(?P<job_id>[^/]+)/location/(?P<location>[^/]+)$",
+		"^projects/(?P<project>[^/]+)/jobs/(?P<job_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<job_id>[^/]+)/(?P<location>[^/]+)$",
+		"^(?P<job_id>[^/]+)/(?P<location>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<job_id>[^/]+)$",
+		"^(?P<job_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)/routines/(?P<routine_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<dataset_id>[^/]+)/(?P<routine_id>[^/]+)",
-		"(?P<dataset_id>[^/]+)/(?P<routine_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)/routines/(?P<routine_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<dataset_id>[^/]+)/(?P<routine_id>[^/]+)$",
+		"^(?P<dataset_id>[^/]+)/(?P<routine_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/dataExchanges/(?P<data_exchange_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)",
-		"(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)",
-		"(?P<data_exchange_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/dataExchanges/(?P<data_exchange_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)$",
+		"^(?P<data_exchange_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/dataExchanges/(?P<data_exchange_id>[^/]+)/listings/(?P<listing_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)/(?P<listing_id>[^/]+)",
-		"(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)/(?P<listing_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/dataExchanges/(?P<data_exchange_id>[^/]+)/listings/(?P<listing_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)/(?P<listing_id>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<data_exchange_id>[^/]+)/(?P<listing_id>[^/]+)$",
 	}, 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
@@ -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<project>[^/]+)/locations/(?P<location>[^/]+)/connections/(?P<connection_id>[^/]+)",
-		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<connection_id>[^/]+)",
-		"(?P<location>[^/]+)/(?P<connection_id>[^/]+)",
+		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/connections/(?P<connection_id>[^/]+)$",
+		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<connection_id>[^/]+)$",
+		"^(?P<location>[^/]+)/(?P<connection_id>[^/]+)$",
 	}, d, config); err != nil {
 		return nil, err
 	}