Skip to content

Commit d1549bf

Browse files
modular-magicianchrisst
authored andcommitted
Sort import regex's (#3283)
Signed-off-by: Modular Magician <[email protected]>
1 parent 5bcb4d5 commit d1549bf

9 files changed

+9
-9
lines changed

google/resource_compute_autoscaler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ func resourceComputeAutoscalerDelete(d *schema.ResourceData, meta interface{}) e
385385

386386
func resourceComputeAutoscalerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
387387
config := meta.(*Config)
388-
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/autoscalers/(?P<name>[^/]+)", "(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
388+
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/zones/(?P<zone>[^/]+)/autoscalers/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<zone>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
389389
return nil, err
390390
}
391391

google/resource_compute_region_autoscaler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ func resourceComputeRegionAutoscalerDelete(d *schema.ResourceData, meta interfac
385385

386386
func resourceComputeRegionAutoscalerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
387387
config := meta.(*Config)
388-
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/autoscalers/(?P<name>[^/]+)", "(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
388+
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/autoscalers/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
389389
return nil, err
390390
}
391391

google/resource_compute_router.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ func resourceComputeRouterDelete(d *schema.ResourceData, meta interface{}) error
361361

362362
func resourceComputeRouterImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
363363
config := meta.(*Config)
364-
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/routers/(?P<name>[^/]+)", "(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
364+
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/routers/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
365365
return nil, err
366366
}
367367

google/resource_compute_subnetwork.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ func resourceComputeSubnetworkDelete(d *schema.ResourceData, meta interface{}) e
543543

544544
func resourceComputeSubnetworkImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
545545
config := meta.(*Config)
546-
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/subnetworks/(?P<name>[^/]+)", "(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
546+
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/regions/(?P<region>[^/]+)/subnetworks/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<region>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
547547
return nil, err
548548
}
549549

website/docs/r/compute_autoscaler.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ Autoscaler can be imported using any of these accepted formats:
348348

349349
```
350350
$ terraform import google_compute_autoscaler.default projects/{{project}}/zones/{{zone}}/autoscalers/{{name}}
351-
$ terraform import google_compute_autoscaler.default {{zone}}/{{name}}
352351
$ terraform import google_compute_autoscaler.default {{project}}/{{zone}}/{{name}}
352+
$ terraform import google_compute_autoscaler.default {{zone}}/{{name}}
353353
$ terraform import google_compute_autoscaler.default {{name}}
354354
```
355355

website/docs/r/compute_region_autoscaler.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ RegionAutoscaler can be imported using any of these accepted formats:
348348

349349
```
350350
$ terraform import google_compute_region_autoscaler.default projects/{{project}}/regions/{{region}}/autoscalers/{{name}}
351-
$ terraform import google_compute_region_autoscaler.default {{region}}/{{name}}
352351
$ terraform import google_compute_region_autoscaler.default {{project}}/{{region}}/{{name}}
352+
$ terraform import google_compute_region_autoscaler.default {{region}}/{{name}}
353353
$ terraform import google_compute_region_autoscaler.default {{name}}
354354
```
355355

website/docs/r/compute_router.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ Router can be imported using any of these accepted formats:
166166

167167
```
168168
$ terraform import google_compute_router.default projects/{{project}}/regions/{{region}}/routers/{{name}}
169-
$ terraform import google_compute_router.default {{region}}/{{name}}
170169
$ terraform import google_compute_router.default {{project}}/{{region}}/{{name}}
170+
$ terraform import google_compute_router.default {{region}}/{{name}}
171171
$ terraform import google_compute_router.default {{name}}
172172
```
173173

website/docs/r/compute_subnetwork.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ Subnetwork can be imported using any of these accepted formats:
188188

189189
```
190190
$ terraform import google_compute_subnetwork.default projects/{{project}}/regions/{{region}}/subnetworks/{{name}}
191-
$ terraform import google_compute_subnetwork.default {{region}}/{{name}}
192191
$ terraform import google_compute_subnetwork.default {{project}}/{{region}}/{{name}}
192+
$ terraform import google_compute_subnetwork.default {{region}}/{{name}}
193193
$ terraform import google_compute_subnetwork.default {{name}}
194194
```
195195

website/docs/r/container_node_pool.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ and [the API reference](https://cloud.google.com/container-engine/reference/rest
1818
resource "google_container_cluster" "primary" {
1919
name = "my-gke-cluster"
2020
location = "us-central1"
21-
21+
2222
# We can't create a cluster with no node pool defined, but we want to only use
2323
# separately managed node pools. So we create the smallest possible default
2424
# node pool and immediately delete it.

0 commit comments

Comments
 (0)