Ensure SQL operations complete before reporting errors (GoogleCloudPlatform#16059)

shuyama1 · Gvantsats · commit 5b7c0003de41 · 2026-01-13T11:38:42.000Z
diff --git a/mmv1/third_party/terraform/services/sql/sqladmin_operation.go b/mmv1/third_party/terraform/services/sql/sqladmin_operation.go
@@ -31,7 +31,7 @@ func (w *SqlAdminOperationWaiter) State() string {
 }
 
 func (w *SqlAdminOperationWaiter) Error() error {
-	if w != nil && w.Op != nil && w.Op.Error != nil {
+	if w != nil && w.Op != nil && w.Op.Error != nil && w.Op.Status == "DONE" {
 		return SqlAdminOperationError(*w.Op.Error)
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ func (w *SqlAdminOperationWaiter) State() string {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`func (w *SqlAdminOperationWaiter) Error() error {`
`34`		`- if w != nil && w.Op != nil && w.Op.Error != nil {`
	`34`	`+ if w != nil && w.Op != nil && w.Op.Error != nil && w.Op.Status == "DONE" {`
`35`	`35`	`return SqlAdminOperationError(*w.Op.Error)`
`36`	`36`	`}`
`37`	`37`	`return nil`