Fix Spanner Instance force_delete backup bug (#12836) (#21023)

modular-magician · web-flow · commit c29b7895fa69 · 2025-01-23T13:04:51.000-08:00
[upstream:17465b2bc0d3266584a31a378eba066dd546ab6e]

Signed-off-by: Modular Magician &lt;magic-modules@google.com&gt;
diff --git a/.changelog/12836.txt b/.changelog/12836.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+spanner: fixed bug with `google_spanner_instance.force_destroy` not setting `billing_project` value correctly
+```
diff --git a/google/services/spanner/resource_spanner_instance.go b/google/services/spanner/resource_spanner_instance.go
@@ -773,7 +773,7 @@ func resourceSpannerInstanceDelete(d *schema.ResourceData, meta interface{}) err
 			return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("SpannerInstance %q", d.Id()))
 		}
 
-		err = deleteSpannerBackups(d, config, resp, billingProject, userAgent)
+		err = deleteSpannerBackups(d, config, resp, userAgent, billingProject)
 		if err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+```release-note:bug
	`2`	+spanner: fixed bug with `google_spanner_instance.force_destroy` not setting `billing_project` value correctly
	`3`	+```
Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ func resourceSpannerInstanceDelete(d *schema.ResourceData, meta interface{}) err`
`773`	`773`	`return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("SpannerInstance %q", d.Id()))`
`774`	`774`	`}`
`775`	`775`
`776`		`- err = deleteSpannerBackups(d, config, resp, billingProject, userAgent)`
	`776`	`+ err = deleteSpannerBackups(d, config, resp, userAgent, billingProject)`
`777`	`777`	`if err != nil {`
`778`	`778`	`return err`
`779`	`779`	`}`