Skip to content

Commit a1d8ac9

Browse files
shuyama1shuyama1
authored
Revert "Fix partial match regexes" (#14814)
1 parent 94a80ec commit a1d8ac9

25 files changed

Lines changed: 69 additions & 70 deletions

‎mmv1/templates/terraform/custom_import/extract_taxonomy.go.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
config := meta.(*transport_tpg.Config)
22

33
if err := tpgresource.ParseImportId([]string{
4-
"^(?P<taxonomy>projects/[^/]+/locations/[^/]+/taxonomies/[^/]+)/policyTags/(?P<name>.+)$"}, d, config); err != nil {
4+
"(?P<taxonomy>projects/[^/]+/locations/[^/]+/taxonomies/[^/]+)/policyTags/(?P<name>.+)"}, d, config); err != nil {
55
return nil, err
66
}
77

‎mmv1/templates/terraform/custom_import/vertex_ai_tensorboard_import.go.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
config := meta.(*transport_tpg.Config)
22
if err := tpgresource.ParseImportId([]string{
3-
"^projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/tensorboards/(?P<name>[^/]+)$",
4-
"^(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)$",
5-
"^(?P<region>[^/]+)/(?P<name>[^/]+)$",
6-
"^(?P<name>[^/]+)$",
3+
"projects/(?P<project>[^/]+)/locations/(?P<region>[^/]+)/tensorboards/(?P<name>[^/]+)",
4+
"(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)",
5+
"(?P<region>[^/]+)/(?P<name>[^/]+)",
6+
"(?P<name>[^/]+)",
77
}, d, config); err != nil {
88
return nil, err
99
}

‎mmv1/third_party/terraform/services/apigee/resource_apigee_api.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ func resourceApigeeApiDelete(d *schema.ResourceData, meta interface{}) error {
324324
func resourceApigeeApiImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
325325
config := meta.(*transport_tpg.Config)
326326
if err := tpgresource.ParseImportId([]string{
327-
"^organizations/(?P<org_id>[^/]+)/apis/(?P<name>[^/]+)$",
328-
"^(?P<org_id>[^/]+)/(?P<name>[^/]+)$",
327+
"organizations/(?P<org_id>[^/]+)/apis/(?P<name>[^/]+)",
328+
"(?P<org_id>[^/]+)/(?P<name>[^/]+)",
329329
}, d, config); err != nil {
330330
return nil, err
331331
}

‎mmv1/third_party/terraform/services/apigee/resource_apigee_flowhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ func resourceApigeeFlowhookDelete(d *schema.ResourceData, meta interface{}) erro
223223
func resourceApigeeFlowhookImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
224224
config := meta.(*transport_tpg.Config)
225225
if err := tpgresource.ParseImportId([]string{
226-
"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/flowhooks/(?P<flow_hook_point>[^/]+)$",
227-
"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<flow_hook_point>[^/]+)$",
226+
"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/flowhooks/(?P<flow_hook_point>[^/]+)",
227+
"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<flow_hook_point>[^/]+)",
228228
}, d, config); err != nil {
229229
return nil, err
230230
}

‎mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_key_cert_file.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,8 @@ func resourceApigeeKeystoresAliasesKeyCertFileDelete(d *schema.ResourceData, met
362362
func resourceApigeeKeystoresAliasesKeyCertFileImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
363363
config := meta.(*transport_tpg.Config)
364364
if err := tpgresource.ParseImportId([]string{
365-
"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)$",
366-
"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)$",
365+
"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)",
366+
"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)",
367367
}, d, config); err != nil {
368368
return nil, err
369369
}

‎mmv1/third_party/terraform/services/apigee/resource_apigee_keystores_aliases_pkcs12.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,8 @@ func ResourceApigeeKeystoresAliasesPkcs12Delete(d *schema.ResourceData, meta int
299299
func ResourceApigeeKeystoresAliasesPkcs12Import(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
300300
config := meta.(*transport_tpg.Config)
301301
if err := tpgresource.ParseImportId([]string{
302-
"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)$",
303-
"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)$",
302+
"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/keystores/(?P<keystore>[^/]+)/aliases/(?P<alias>[^/]+)",
303+
"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<keystore>[^/]+)/(?P<alias>[^/]+)",
304304
}, d, config); err != nil {
305305
return nil, err
306306
}

‎mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ func resourceApigeeSharedFlowDelete(d *schema.ResourceData, meta interface{}) er
324324
func resourceApigeeSharedFlowImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
325325
config := meta.(*transport_tpg.Config)
326326
if err := tpgresource.ParseImportId([]string{
327-
"^organizations/(?P<org_id>[^/]+)/sharedflows/(?P<name>[^/]+)$",
328-
"^(?P<org_id>[^/]+)/(?P<name>[^/]+)$",
327+
"organizations/(?P<org_id>[^/]+)/sharedflows/(?P<name>[^/]+)",
328+
"(?P<org_id>[^/]+)/(?P<name>[^/]+)",
329329
}, d, config); err != nil {
330330
return nil, err
331331
}

‎mmv1/third_party/terraform/services/apigee/resource_apigee_sharedflow_deployment.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,8 @@ func resourceApigeeSharedflowDeploymentDelete(d *schema.ResourceData, meta inter
228228
func resourceApigeeSharedflowDeploymentImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
229229
config := meta.(*transport_tpg.Config)
230230
if err := tpgresource.ParseImportId([]string{
231-
"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/sharedflows/(?P<sharedflow_id>[^/]+)/revisions/(?P<revision>[^/]+)$",
232-
"^organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/sharedflows/(?P<sharedflow_id>[^/]+)/revisions/(?P<revision>[^/]+)/deployments$",
233-
"^(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<sharedflow_id>[^/]+)/(?P<revision>[^/]+)$",
231+
"organizations/(?P<org_id>[^/]+)/environments/(?P<environment>[^/]+)/sharedflows/(?P<sharedflow_id>[^/]+)/revisions/(?P<revision>[^/]+)",
232+
"(?P<org_id>[^/]+)/(?P<environment>[^/]+)/(?P<sharedflow_id>[^/]+)/(?P<revision>[^/]+)",
234233
}, d, config); err != nil {
235234
return nil, err
236235
}

‎mmv1/third_party/terraform/services/bigquery/resource_bigquery_table.go.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3501,9 +3501,9 @@ func flattenSerDeInfo(si *bigquery.SerDeInfo) []map[string]interface{} {
35013501
func resourceBigQueryTableImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
35023502
config := meta.(*transport_tpg.Config)
35033503
if err := tpgresource.ParseImportId([]string{
3504-
"^projects/(?P<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)/tables/(?P<table_id>[^/]+)$",
3505-
"^(?P<project>[^/]+)/(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)$",
3506-
"^(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)$",
3504+
"projects/(?P<project>[^/]+)/datasets/(?P<dataset_id>[^/]+)/tables/(?P<table_id>[^/]+)",
3505+
"(?P<project>[^/]+)/(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)",
3506+
"(?P<dataset_id>[^/]+)/(?P<table_id>[^/]+)",
35073507
}, d, config); err != nil {
35083508
return nil, err
35093509
}

‎mmv1/third_party/terraform/services/bigtable/resource_bigtable_authorized_view.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,9 @@ func resourceBigtableAuthorizedViewDestroy(d *schema.ResourceData, meta interfac
355355
func resourceBigtableAuthorizedViewImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
356356
config := meta.(*transport_tpg.Config)
357357
if err := tpgresource.ParseImportId([]string{
358-
"^projects/(?P<project>[^/]+)/instances/(?P<instance_name>[^/]+)/tables/(?P<table_name>[^/]+)/authorizedViews/(?P<name>[^/]+)$",
359-
"^(?P<project>[^/]+)/(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)$",
360-
"^(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)$",
358+
"projects/(?P<project>[^/]+)/instances/(?P<instance_name>[^/]+)/tables/(?P<table_name>[^/]+)/authorizedViews/(?P<name>[^/]+)",
359+
"(?P<project>[^/]+)/(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)",
360+
"(?P<instance_name>[^/]+)/(?P<table_name>[^/]+)/(?P<name>[^/]+)",
361361
}, d, config); err != nil {
362362
return nil, err
363363
}

0 commit comments

Comments
 (0)