From c867fd8ba85a62e07d269e57e559244e06a74c87 Mon Sep 17 00:00:00 2001 From: Shuya Ma <87669292+shuyama1@users.noreply.github.com> Date: Fri, 2 Jan 2026 11:27:15 -0800 Subject: [PATCH 1/2] Update sqladmin_operation.go --- mmv1/third_party/terraform/services/sql/sqladmin_operation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/services/sql/sqladmin_operation.go b/mmv1/third_party/terraform/services/sql/sqladmin_operation.go index 842b4739b3a1..cb876bacec86 100644 --- 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 != "RUNNING" { return SqlAdminOperationError(*w.Op.Error) } return nil From 27d5472b7e300dcc43336916b22bc45978e626f6 Mon Sep 17 00:00:00 2001 From: Shuya Ma Date: Fri, 9 Jan 2026 13:53:59 -0800 Subject: [PATCH 2/2] change op status to done --- mmv1/third_party/terraform/services/sql/sqladmin_operation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mmv1/third_party/terraform/services/sql/sqladmin_operation.go b/mmv1/third_party/terraform/services/sql/sqladmin_operation.go index cb876bacec86..5da1ba28b5c9 100644 --- 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 && w.Op.Status != "RUNNING" { + if w != nil && w.Op != nil && w.Op.Error != nil && w.Op.Status == "DONE" { return SqlAdminOperationError(*w.Op.Error) } return nil