Allow import of logging_metric in a non-default project. (#3270) (#5944)

Signed-off-by: Modular Magician <[email protected]>
hashicorp · Mar 20, 2020 · 740822e · 740822e
1 parent 96f640e
commit 740822e
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 6 deletions.
diff --git a/.changelog/3270.txt b/.changelog/3270.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+logging: Fixed import issue with `google_logging_metric` in a non-default project.
+```
diff --git a/google/resource_bigquery_data_transfer_config.go b/google/resource_bigquery_data_transfer_config.go
@@ -364,7 +364,7 @@ func resourceBigqueryDataTransferConfigImport(d *schema.ResourceData, meta inter
 	config := meta.(*Config)
 
 	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"(?P<project>[^ ]+) (?P<name>[^ ]+)", "(?P<name>[^ ]+)"}, d, config); err != nil {
 		return nil, err
 	}
 

diff --git a/google/resource_logging_metric.go b/google/resource_logging_metric.go
@@ -505,7 +505,7 @@ func resourceLoggingMetricImport(d *schema.ResourceData, meta interface{}) ([]*s
 	config := meta.(*Config)
 
 	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"(?P<project>[^ ]+) (?P<name>[^ ]+)", "(?P<name>[^ ]+)"}, d, config); err != nil {
 		return nil, err
 	}
 

diff --git a/google/resource_monitoring_alert_policy.go b/google/resource_monitoring_alert_policy.go
@@ -1023,7 +1023,7 @@ func resourceMonitoringAlertPolicyImport(d *schema.ResourceData, meta interface{
 	config := meta.(*Config)
 
 	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"(?P<project>[^ ]+) (?P<name>[^ ]+)", "(?P<name>[^ ]+)"}, d, config); err != nil {
 		return nil, err
 	}
 

diff --git a/google/resource_monitoring_group.go b/google/resource_monitoring_group.go
@@ -291,7 +291,7 @@ func resourceMonitoringGroupImport(d *schema.ResourceData, meta interface{}) ([]
 	config := meta.(*Config)
 
 	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"(?P<project>[^ ]+) (?P<name>[^ ]+)", "(?P<name>[^ ]+)"}, d, config); err != nil {
 		return nil, err
 	}
 

diff --git a/google/resource_monitoring_notification_channel.go b/google/resource_monitoring_notification_channel.go
@@ -416,7 +416,7 @@ func resourceMonitoringNotificationChannelImport(d *schema.ResourceData, meta in
 	config := meta.(*Config)
 
 	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"(?P<project>[^ ]+) (?P<name>[^ ]+)", "(?P<name>[^ ]+)"}, d, config); err != nil {
 		return nil, err
 	}
 

diff --git a/google/resource_monitoring_uptime_check_config.go b/google/resource_monitoring_uptime_check_config.go
@@ -566,7 +566,7 @@ func resourceMonitoringUptimeCheckConfigImport(d *schema.ResourceData, meta inte
 	config := meta.(*Config)
 
 	// current import_formats can't import fields with forward slashes in their value
-	if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil {
+	if err := parseImportId([]string{"(?P<project>[^ ]+) (?P<name>[^ ]+)", "(?P<name>[^ ]+)"}, d, config); err != nil {
 		return nil, err
 	}
 

diff --git a/website/docs/r/logging_metric.html.markdown b/website/docs/r/logging_metric.html.markdown
@@ -298,6 +298,7 @@ This resource provides the following
 Metric can be imported using any of these accepted formats:
 
 ```
+$ terraform import google_logging_metric.default {{project}} {{name}}
 $ terraform import google_logging_metric.default {{name}}
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -298,6 +298,7 @@ This resource provides the following @@
     Metric can be imported using any of these accepted formats:
     ```
+    $ terraform import google_logging_metric.default {{project}} {{name}}
     $ terraform import google_logging_metric.default {{name}}
     ```
@@ Expand Down @@