Set bigquery connection import id correctly. (#4159)

Signed-off-by: Modular Magician <magic-modules@google.com>

.changelog/4159.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+bigqueryconnection: fixed failure to import a resource if it has a non-default project or location.
+```

google-beta/resource_bigquery_connection_connection.go

@@ -192,7 +192,7 @@ func resourceBigqueryConnectionConnectionCreate(d *schema.ResourceData, meta int
 	}
 
 	// Store the ID now
-	id, err := replaceVars(d, config, "{{name}}")
+	id, err := replaceVars(d, config, "projects/{{project}}/locations/{{location}}/connections/{{connection_id}}")
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
@@ -210,7 +210,7 @@ func resourceBigqueryConnectionConnectionRead(d *schema.ResourceData, meta inter
 		return err
 	}
 
-	url, err := replaceVars(d, config, "{{BigqueryConnectionBasePath}}{{name}}")
+	url, err := replaceVars(d, config, "{{BigqueryConnectionBasePath}}projects/{{project}}/locations/{{location}}/connections/{{connection_id}}")
 	if err != nil {
 		return err
 	}
@@ -291,7 +291,7 @@ func resourceBigqueryConnectionConnectionUpdate(d *schema.ResourceData, meta int
 		obj["cloudSql"] = cloudSqlProp
 	}
 
-	url, err := replaceVars(d, config, "{{BigqueryConnectionBasePath}}{{name}}")
+	url, err := replaceVars(d, config, "{{BigqueryConnectionBasePath}}projects/{{project}}/locations/{{location}}/connections/{{connection_id}}")
 	if err != nil {
 		return err
 	}
@@ -348,7 +348,7 @@ func resourceBigqueryConnectionConnectionDelete(d *schema.ResourceData, meta int
 	}
 	billingProject = project
 
-	url, err := replaceVars(d, config, "{{BigqueryConnectionBasePath}}{{name}}")
+	url, err := replaceVars(d, config, "{{BigqueryConnectionBasePath}}projects/{{project}}/locations/{{location}}/connections/{{connection_id}}")
 	if err != nil {
 		return err
 	}
@@ -373,13 +373,15 @@ func resourceBigqueryConnectionConnectionDelete(d *schema.ResourceData, meta int
 func resourceBigqueryConnectionConnectionImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	config := meta.(*Config)
 	if err := parseImportId([]string{
-		"(?P<name>[^/]+)",
+		"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
 	}
 
 	// Replace import id for the resource id
-	id, err := replaceVars(d, config, "{{name}}")
+	id, err := replaceVars(d, config, "projects/{{project}}/locations/{{location}}/connections/{{connection_id}}")
 	if err != nil {
 		return nil, fmt.Errorf("Error constructing id: %s", err)
 	}

google-beta/resource_bigquery_connection_connection_generated_test.go

@@ -183,7 +183,7 @@ func testAccCheckBigqueryConnectionConnectionDestroyProducer(t *testing.T) func(
 
 			config := googleProviderConfig(t)
 
-			url, err := replaceVarsForTest(config, rs, "{{BigqueryConnectionBasePath}}{{name}}")
+			url, err := replaceVarsForTest(config, rs, "{{BigqueryConnectionBasePath}}projects/{{project}}/locations/{{location}}/connections/{{connection_id}}")
 			if err != nil {
 				return err
 			}

google-beta/resource_bigquery_connection_connection_sweeper_test.go

@@ -87,19 +87,23 @@ func testSweepBigqueryConnectionConnection(region string) error {
 	nonPrefixCount := 0
 	for _, ri := range rl {
 		obj := ri.(map[string]interface{})
-		if obj["name"] == nil {
-			log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
+		var name string
+		// Id detected in the delete URL, attempt to use id.
+		if obj["id"] != nil {
+			name = GetResourceNameFromSelfLink(obj["id"].(string))
+		} else if obj["name"] != nil {
+			name = GetResourceNameFromSelfLink(obj["name"].(string))
+		} else {
+			log.Printf("[INFO][SWEEPER_LOG] %s resource name and id were nil", resourceName)
 			return nil
 		}
-
-		name := GetResourceNameFromSelfLink(obj["name"].(string))
 		// Skip resources that shouldn't be sweeped
 		if !isSweepableTestResource(name) {
 			nonPrefixCount++
 			continue
 		}
 
-		deleteTemplate := "https://bigqueryconnection.googleapis.com/v1beta1/{{name}}"
+		deleteTemplate := "https://bigqueryconnection.googleapis.com/v1beta1/projects/{{project}}/locations/{{location}}/connections/{{connection_id}}"
 		deleteUrl, err := replaceVars(d, config, deleteTemplate)
 		if err != nil {
 			log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)

google-beta/resource_bigquery_connection_test.go

@@ -26,9 +26,21 @@ func TestAccBigqueryConnectionConnection_bigqueryConnectionBasic(t *testing.T) {
 			{
 				Config: testAccBigqueryConnectionConnection_bigqueryConnectionBasic(context),
 			},
+			{
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"cloud_sql.0.credential.0.password", "cloud_sql.0.credential.0.username"},
+				ResourceName:            "google_bigquery_connection.connection",
+			},
 			{
 				Config: testAccBigqueryConnectionConnection_bigqueryConnectionBasicUpdate(context),
 			},
+			{
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"cloud_sql.0.credential.0.password", "cloud_sql.0.credential.0.username"},
+				ResourceName:            "google_bigquery_connection.connection",
+			},
 		},
 	})
 }

website/docs/r/bigquery_connection.html.markdown

@@ -220,7 +220,7 @@ The `credential` block supports:
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
-* `id` - an identifier for the resource with format `{{name}}`
+* `id` - an identifier for the resource with format `projects/{{project}}/locations/{{location}}/connections/{{connection_id}}`
 
 * `name` -
   The resource name of the connection in the form of: 
@@ -245,7 +245,9 @@ This resource provides the following
 Connection can be imported using any of these accepted formats:
 
 ```
-$ terraform import google_bigquery_connection.default {{name}}
+$ terraform import google_bigquery_connection.default projects/{{project}}/locations/{{location}}/connections/{{connection_id}}
+$ terraform import google_bigquery_connection.default {{project}}/{{location}}/{{connection_id}}
+$ terraform import google_bigquery_connection.default {{location}}/{{connection_id}}
 ```
 
 ## User Project Overrides