From 6531ef57e1cb9a4554fffcb172f0a267db057806 Mon Sep 17 00:00:00 2001 From: Paddy Date: Fri, 3 Mar 2017 16:45:25 -0800 Subject: [PATCH] provider/google: log the op name in sql op errors. To aid in tracking down the error that's causing TestAccGoogleSqlDatabaseInstance_basic to fail (it's claiming an op can't be found?) I've added the op name (which is unique) to the error output for op errors. --- builtin/providers/google/sqladmin_operation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/google/sqladmin_operation.go b/builtin/providers/google/sqladmin_operation.go index c096bab2b..00e929732 100644 --- a/builtin/providers/google/sqladmin_operation.go +++ b/builtin/providers/google/sqladmin_operation.go @@ -68,7 +68,7 @@ func sqladminOperationWait(config *Config, op *sqladmin.Operation, activity stri state.MinTimeout = 2 * time.Second opRaw, err := state.WaitForState() if err != nil { - return fmt.Errorf("Error waiting for %s: %s", activity, err) + return fmt.Errorf("Error waiting for %s (op %s): %s", activity, op.Name, err) } op = opRaw.(*sqladmin.Operation)