Handle bigquery_reservation_capacity_commitment creation when capacity_commitment_id is unspecified

.changelog/9293.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+bigqueryreservation: fixed bug of incorrect resource recreation when `capacity_commitment_id` is unspecified in resource `bigquery_reservation_capacity_commitment`
+```

google/services/bigqueryreservation/resource_bigquery_capacity_commitment.go

@@ -104,7 +104,7 @@ Examples: US, EU, asia-northeast1. The default value is US.`,
 			"renewal_plan": {
 				Type:        schema.TypeString,
 				Optional:    true,
-				Description: `The plan this capacity commitment is converted to after commitmentEndTime passes. Once the plan is changed, committed period is extended according to commitment plan. Only applicable some commitment plans.`,
+				Description: `The plan this capacity commitment is converted to after commitmentEndTime passes. Once the plan is changed, committed period is extended according to commitment plan. Only applicable for some commitment plans.`,
 			},
 			"commitment_end_time": {
 				Type:        schema.TypeString,
@@ -206,7 +206,7 @@ func resourceBigqueryReservationCapacityCommitmentCreate(d *schema.ResourceData,
 	}
 
 	// Store the ID now
-	id, err := tpgresource.ReplaceVars(d, config, "projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}")
+	id, err := tpgresource.ReplaceVars(d, config, "{{name}}")
 	if err != nil {
 		return fmt.Errorf("Error constructing id: %s", err)
 	}
@@ -224,7 +224,7 @@ func resourceBigqueryReservationCapacityCommitmentRead(d *schema.ResourceData, m
 		return err
 	}
 
-	url, err := tpgresource.ReplaceVars(d, config, "{{BigqueryReservationBasePath}}projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}")
+	url, err := tpgresource.ReplaceVars(d, config, "{{BigqueryReservationBasePath}}{{name}}")
 	if err != nil {
 		return err
 	}
@@ -314,7 +314,7 @@ func resourceBigqueryReservationCapacityCommitmentUpdate(d *schema.ResourceData,
 		obj["renewalPlan"] = renewalPlanProp
 	}
 
-	url, err := tpgresource.ReplaceVars(d, config, "{{BigqueryReservationBasePath}}projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}")
+	url, err := tpgresource.ReplaceVars(d, config, "{{BigqueryReservationBasePath}}{{name}}")
 	if err != nil {
 		return err
 	}
@@ -379,7 +379,7 @@ func resourceBigqueryReservationCapacityCommitmentDelete(d *schema.ResourceData,
 	}
 	billingProject = project
 
-	url, err := tpgresource.ReplaceVars(d, config, "{{BigqueryReservationBasePath}}projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}")
+	url, err := tpgresource.ReplaceVars(d, config, "{{BigqueryReservationBasePath}}{{name}}")
 	if err != nil {
 		return err
 	}
@@ -419,8 +419,13 @@ func resourceBigqueryReservationCapacityCommitmentImport(d *schema.ResourceData,
 		return nil, err
 	}
 
+	// Set name based on the components
+	if err := d.Set("name", "projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}"); err != nil {
+		return nil, fmt.Errorf("Error setting name: %s", err)
+	}
+
 	// Replace import id for the resource id
-	id, err := tpgresource.ReplaceVars(d, config, "projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}")
+	id, err := tpgresource.ReplaceVars(d, config, d.Get("name").(string))
 	if err != nil {
 		return nil, fmt.Errorf("Error constructing id: %s", err)
 	}

google/services/bigqueryreservation/resource_bigquery_capacity_commitment_generated_test.go

@@ -62,19 +62,66 @@ func TestAccBigqueryReservationCapacityCommitment_bigqueryReservationCapacityCom
 func testAccBigqueryReservationCapacityCommitment_bigqueryReservationCapacityCommitmentBasicExample(context map[string]interface{}) string {
 	return acctest.Nprintf(`
 resource "google_bigquery_capacity_commitment" "commitment" {
-	capacity_commitment_id = "capacity-tf-test%{random_suffix}"
+  capacity_commitment_id = "capacity-tf-test%{random_suffix}"
 
-	location   = "us-west2"
-	slot_count = 100
-	plan       = "FLEX_FLAT_RATE"
-	edition    = "ENTERPRISE"
+  location   = "us-west2"
+  slot_count = 100
+  plan       = "FLEX_FLAT_RATE"
+  edition    = "ENTERPRISE"
 }
 
 resource "time_sleep" "wait_61_seconds" {
 	depends_on = [google_bigquery_capacity_commitment.commitment]
-    
+
 	# Only needed for CI tests to be able to tear down the commitment once it's expired
-    create_duration = "61s"
+  create_duration = "61s"
+}
+`, context)
+}
+
+func TestAccBigqueryReservationCapacityCommitment_bigqueryReservationCapacityCommitmentNoIdExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"random": {},
+			"time":   {},
+		},
+		CheckDestroy: testAccCheckBigqueryReservationCapacityCommitmentDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccBigqueryReservationCapacityCommitment_bigqueryReservationCapacityCommitmentNoIdExample(context),
+			},
+			{
+				ResourceName:            "google_bigquery_capacity_commitment.commitment",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"capacity_commitment_id", "location", "enforce_single_admin_project_per_org"},
+			},
+		},
+	})
+}
+
+func testAccBigqueryReservationCapacityCommitment_bigqueryReservationCapacityCommitmentNoIdExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_bigquery_capacity_commitment" "commitment" {
+  location   = "us-west2"
+  slot_count = 100
+  plan       = "FLEX_FLAT_RATE"
+  edition    = "ENTERPRISE"
+}
+
+resource "time_sleep" "wait_61_seconds" {
+  depends_on = [google_bigquery_capacity_commitment.commitment]
+
+  # Only needed for CI tests to be able to tear down the commitment once it's expired
+  create_duration = "61s"
 }
 `, context)
 }
@@ -91,7 +138,7 @@ func testAccCheckBigqueryReservationCapacityCommitmentDestroyProducer(t *testing
 
 			config := acctest.GoogleProviderConfig(t)
 
-			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{BigqueryReservationBasePath}}projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}")
+			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{BigqueryReservationBasePath}}{{name}}")
 			if err != nil {
 				return err
 			}

google/services/bigqueryreservation/resource_bigquery_capacity_commitment_sweeper.go

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

website/docs/r/bigquery_capacity_commitment.html.markdown

@@ -63,7 +63,7 @@ The following arguments are supported:
 
 * `renewal_plan` -
   (Optional)
-  The plan this capacity commitment is converted to after commitmentEndTime passes. Once the plan is changed, committed period is extended according to commitment plan. Only applicable some commitment plans.
+  The plan this capacity commitment is converted to after commitmentEndTime passes. Once the plan is changed, committed period is extended according to commitment plan. Only applicable for some commitment plans.
 
 * `edition` -
   (Optional)
@@ -93,7 +93,7 @@ The following arguments are supported:
 
 In addition to the arguments listed above, the following computed attributes are exported:
 
-* `id` - an identifier for the resource with format `projects/{{project}}/locations/{{location}}/capacityCommitments/{{capacity_commitment_id}}`
+* `id` - an identifier for the resource with format `{{name}}`
 
 * `name` -
   The resource name of the capacity commitment, e.g., projects/myproject/locations/US/capacityCommitments/123