Revert "Fix partial match regexes (#14610) (#10469)"

shuyama1 · shuyama1 · commit 358739898b85 · 2025-08-11T14:01:10.000-07:00
This reverts commit a830530.
diff --git a/.changelog/14610.txt b/.changelog/14610.txt
diff --git a/google-beta/services/apigee/resource_apigee_api.go b/google-beta/services/apigee/resource_apigee_api.go
@@ -340,8 +340,8 @@ func resourceApigeeApiDelete(d *schema.ResourceData, meta interface{}) error {
 func resourceApigeeApiImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^organizations/(?P<org_id>[^/]+)/apis/(?P<name>[^/]+)$",
-		"^(?P<org_id>[^/]+)/(?P<name>[^/]+)$",
+		"organizations/(?P<org_id>[^/]+)/apis/(?P<name>[^/]+)",
+		"(?P<org_id>[^/]+)/(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/apigee/resource_apigee_flowhook.go b/google-beta/services/apigee/resource_apigee_flowhook.go
@@ -239,8 +239,8 @@ func resourceApigeeFlowhookDelete(d *schema.ResourceData, meta interface{}) erro
 func resourceApigeeFlowhookImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/flowhooks/(?P<flow_hook_point>[^/]+)$",
-		"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<flow_hook_point>[^/]+)$",
+		"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/flowhooks/(?P<flow_hook_point>[^/]+)",
+		"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<flow_hook_point>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go
@@ -378,8 +378,8 @@ func resourceApigeeKeystoresAliasesKeyCertFileDelete(d *schema.ResourceData, met
 func resourceApigeeKeystoresAliasesKeyCertFileImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)$",
-		"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)$",
+		"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)",
+		"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12.go b/google-beta/services/apigee/resource_apigee_keystores_aliases_pkcs12.go
@@ -315,8 +315,8 @@ func ResourceApigeeKeystoresAliasesPkcs12Delete(d *schema.ResourceData, meta int
 func ResourceApigeeKeystoresAliasesPkcs12Import(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)$",
-		"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)$",
+		"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)",
+		"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/apigee/resource_apigee_sharedflow.go b/google-beta/services/apigee/resource_apigee_sharedflow.go
@@ -340,8 +340,8 @@ func resourceApigeeSharedFlowDelete(d *schema.ResourceData, meta interface{}) er
 func resourceApigeeSharedFlowImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^organizations/(?P<org_id>[^/]+)/sharedflows/(?P<name>[^/]+)$",
-		"^(?P<org_id>[^/]+)/(?P<name>[^/]+)$",
+		"organizations/(?P<org_id>[^/]+)/sharedflows/(?P<name>[^/]+)",
+		"(?P<org_id>[^/]+)/(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/apigee/resource_apigee_sharedflow_deployment.go b/google-beta/services/apigee/resource_apigee_sharedflow_deployment.go
@@ -244,8 +244,8 @@ func resourceApigeeSharedflowDeploymentDelete(d *schema.ResourceData, meta inter
 func resourceApigeeSharedflowDeploymentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/sharedflows/(?P<sharedflow_id>[^/]+)/revisions/(?P<revision>[^/]+)$",
-		"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<sharedflow_id>[^/]+)/(?P<revision>[^/]+)$",
+		"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/sharedflows/(?P<sharedflow_id>[^/]+)/revisions/(?P<revision>[^/]+)",
+		"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<sharedflow_id>[^/]+)/(?P<revision>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/bigquery/resource_bigquery_table.go b/google-beta/services/bigquery/resource_bigquery_table.go
@@ -3517,9 +3517,9 @@ func flattenSerDeInfo(si *bigquery.SerDeInfo) []map[string]interface{} {
 func resourceBigQueryTableImport(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>[^/]+)/tables/(?P<table_id>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)$",
-		"^(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)$",
+		"projects/(?P<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)/tables/(?P<table_id>[^/]+)",
+		"(?P<project>[^/]+)/(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)",
+		"(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/bigtable/resource_bigtable_authorized_view.go b/google-beta/services/bigtable/resource_bigtable_authorized_view.go
@@ -371,9 +371,9 @@ func resourceBigtableAuthorizedViewDestroy(d *schema.ResourceData, meta interfac
 func resourceBigtableAuthorizedViewImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/instances/(?P<instance_name>[^/]+)/tables/(?P<table_name>[^/]+)/authorizedViews/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/instances/(?P<instance_name>[^/]+)/tables/(?P<table_name>[^/]+)/authorizedViews/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)",
+		"(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/bigtable/resource_bigtable_instance.go b/google-beta/services/bigtable/resource_bigtable_instance.go
@@ -845,9 +845,9 @@ func resourceBigtableInstanceClusterReorderTypeListFunc(diff tpgresource.Terrafo
 func resourceBigtableInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/instances/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/instances/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<name>[^/]+)",
+		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/bigtable/resource_bigtable_table.go b/google-beta/services/bigtable/resource_bigtable_table.go
@@ -702,9 +702,9 @@ func FlattenColumnFamily(families []bigtable.FamilyInfo) ([]map[string]interface
 func resourceBigtableTableImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/instances/(?P<instance_name>[^/]+)/tables/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<instance_name>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<instance_name>[^/]+)/(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/instances/(?P<instance_name>[^/]+)/tables/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<instance_name>[^/]+)/(?P<name>[^/]+)",
+		"(?P<instance_name>[^/]+)/(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/cloudfunctions/resource_cloudfunctions_function.go b/google-beta/services/cloudfunctions/resource_cloudfunctions_function.go
@@ -81,9 +81,9 @@ func (s *CloudFunctionId) locationId() string {
 
 func parseCloudFunctionId(d *schema.ResourceData, config *transport_tpg.Config) (*CloudFunctionId, error) {
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/functions/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/functions/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/compute/resource_compute_instance.go b/google-beta/services/compute/resource_compute_instance.go
@@ -3403,9 +3403,9 @@ func resourceComputeInstanceDelete(d *schema.ResourceData, meta interface{}) err
 func resourceComputeInstanceImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instances/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instances/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/compute/resource_compute_instance_group.go b/google-beta/services/compute/resource_compute_instance_group.go
@@ -467,9 +467,9 @@ func resourceComputeInstanceGroupDelete(d *schema.ResourceData, meta interface{}
 func resourceComputeInstanceGroupImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instanceGroups/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<zone>[^/]+)/(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/instanceGroups/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)",
+		"(?P<zone>[^/]+)/(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/compute/resource_compute_project_metadata_item.go b/google-beta/services/compute/resource_compute_project_metadata_item.go
@@ -196,8 +196,8 @@ func resourceComputeProjectMetadataItemDelete(d *schema.ResourceData, meta inter
 func resourceComputeProjectMetadataItemImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/meta-data/(?P<key>[^/]+)$",
-		"^(?P<key>[^/]+)$",
+		"projects/(?P<project>[^/]+)/meta-data/(?P<key>[^/]+)",
+		"(?P<key>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/compute/resource_compute_target_pool.go b/google-beta/services/compute/resource_compute_target_pool.go
@@ -575,10 +575,10 @@ func resourceComputeTargetPoolDelete(d *schema.ResourceData, meta interface{}) e
 func resourceTargetPoolStateImporter(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/targetPools/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<region>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/targetPools/(?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-beta/services/datacatalog/resource_data_catalog_policy_tag.go b/google-beta/services/datacatalog/resource_data_catalog_policy_tag.go
@@ -353,7 +353,7 @@ func resourceDataCatalogPolicyTagImport(d *schema.ResourceData, meta interface{}
 	config := meta.(*transport_tpg.Config)
 
 	if err := tpgresource.ParseImportId([]string{
-		"^(?P<taxonomy>projects/[^/]+/locations/[^/]+/taxonomies/[^/]+)/policyTags/(?P<name>.+)$"}, d, config); err != nil {
+		"(?P<taxonomy>projects/[^/]+/locations/[^/]+/taxonomies/[^/]+)/policyTags/(?P<name>.+)"}, d, config); err != nil {
 		return nil, err
 	}
 
diff --git a/google-beta/services/dns/resource_dns_record_set.go b/google-beta/services/dns/resource_dns_record_set.go
@@ -664,9 +664,9 @@ func resourceDnsRecordSetUpdate(d *schema.ResourceData, meta interface{}) error
 func resourceDnsRecordSetImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/managedZones/(?P<managed_zone>[^/]+)/rrsets/(?P<name>[^/]+)/(?P<type>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<managed_zone>[^/]+)/(?P<name>[^/]+)/(?P<type>[^/]+)$",
-		"^(?P<managed_zone>[^/]+)/(?P<name>[^/]+)/(?P<type>[^/]+)$",
+		"projects/(?P<project>[^/]+)/managedZones/(?P<managed_zone>[^/]+)/rrsets/(?P<name>[^/]+)/(?P<type>[^/]+)",
+		"(?P<project>[^/]+)/(?P<managed_zone>[^/]+)/(?P<name>[^/]+)/(?P<type>[^/]+)",
+		"(?P<managed_zone>[^/]+)/(?P<name>[^/]+)/(?P<type>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/osconfig/resource_os_config_os_policy_assignment.go b/google-beta/services/osconfig/resource_os_config_os_policy_assignment.go
@@ -1461,9 +1461,9 @@ func resourceOSConfigOSPolicyAssignmentDelete(d *schema.ResourceData, meta inter
 func resourceOSConfigOSPolicyAssignmentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/osPolicyAssignments/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<location>[^/]+)/(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/locations/(?P<location>[^/]+)/osPolicyAssignments/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<location>[^/]+)/(?P<name>[^/]+)",
+		"(?P<location>[^/]+)/(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/resourcemanager/resource_google_folder_organization_policy.go b/google-beta/services/resourcemanager/resource_google_folder_organization_policy.go
@@ -63,9 +63,9 @@ func resourceFolderOrgPolicyImporter(d *schema.ResourceData, meta interface{}) (
 	config := meta.(*transport_tpg.Config)
 
 	if err := tpgresource.ParseImportId([]string{
-		"^folders/(?P<folder>[^/]+)/constraints/(?P<constraint>[^/]+)$",
-		"^folders/(?P<folder>[^/]+)/(?P<constraint>[^/]+)$",
-		"^(?P<folder>[^/]+)/(?P<constraint>[^/]+)$"},
+		"folders/(?P<folder>[^/]+)/constraints/(?P<constraint>[^/]+)",
+		"folders/(?P<folder>[^/]+)/(?P<constraint>[^/]+)",
+		"(?P<folder>[^/]+)/(?P<constraint>[^/]+)"},
 		d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/resourcemanager/resource_google_project_iam_custom_role.go b/google-beta/services/resourcemanager/resource_google_project_iam_custom_role.go
@@ -254,9 +254,9 @@ func resourceGoogleProjectIamCustomRoleDelete(d *schema.ResourceData, meta inter
 func resourceGoogleProjectIamCustomRoleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/roles/(?P<role_id>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<role_id>[^/]+)$",
-		"^(?P<role_id>[^/]+)$",
+		"projects/(?P<project>[^/]+)/roles/(?P<role_id>[^/]+)",
+		"(?P<project>[^/]+)/(?P<role_id>[^/]+)",
+		"(?P<role_id>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/resourcemanager/resource_google_project_organization_policy.go b/google-beta/services/resourcemanager/resource_google_project_organization_policy.go
@@ -63,9 +63,9 @@ func resourceProjectOrgPolicyImporter(d *schema.ResourceData, meta interface{})
 	config := meta.(*transport_tpg.Config)
 
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+):constraints/(?P<constraint>[^/]+)$",
-		"^(?P<project>[^/]+):constraints/(?P<constraint>[^/]+)$",
-		"^(?P<project>[^/]+):(?P<constraint>[^/]+)$"},
+		"projects/(?P<project>[^/]+):constraints/(?P<constraint>[^/]+)",
+		"(?P<project>[^/]+):constraints/(?P<constraint>[^/]+)",
+		"(?P<project>[^/]+):(?P<constraint>[^/]+)"},
 		d, config); err != nil {
 		return nil, err
 	}
diff --git a/google-beta/services/resourcemanager/resource_google_service_account.go b/google-beta/services/resourcemanager/resource_google_service_account.go
@@ -337,9 +337,9 @@ func resourceGoogleServiceAccountUpdate(d *schema.ResourceData, meta interface{}
 func resourceGoogleServiceAccountImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/serviceAccounts/(?P<email>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<email>[^/]+)$",
-		"^(?P<email>[^/]+)$"}, d, config); err != nil {
+		"projects/(?P<project>[^/]+)/serviceAccounts/(?P<email>[^/]+)",
+		"(?P<project>[^/]+)/(?P<email>[^/]+)",
+		"(?P<email>[^/]+)"}, d, config); err != nil {
 		return nil, err
 	}
 
diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
@@ -2378,9 +2378,9 @@ func resourceSqlDatabaseInstanceDelete(d *schema.ResourceData, meta interface{})
 func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/instances/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<name>[^/]+)$"}, d, config); err != nil {
+		"projects/(?P<project>[^/]+)/instances/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<name>[^/]+)",
+		"(?P<name>[^/]+)"}, d, config); err != nil {
 		return nil, err
 	}
 
diff --git a/google-beta/services/vertexai/resource_vertex_ai_tensorboard.go b/google-beta/services/vertexai/resource_vertex_ai_tensorboard.go
@@ -490,10 +490,10 @@ func resourceVertexAITensorboardDelete(d *schema.ResourceData, meta interface{})
 func resourceVertexAITensorboardImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*transport_tpg.Config)
 	if err := tpgresource.ParseImportId([]string{
-		"^projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/tensorboards/(?P<name>[^/]+)$",
-		"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<region>[^/]+)/(?P<name>[^/]+)$",
-		"^(?P<name>[^/]+)$",
+		"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/tensorboards/(?P<name>[^/]+)",
+		"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<region>[^/]+)/(?P<name>[^/]+)",
+		"(?P<name>[^/]+)",
 	}, d, config); err != nil {
 		return nil, err
 	}
