From a1b3961a1d0badabee1e5e0fd3a18c3fbace4162 Mon Sep 17 00:00:00 2001
From: chaodaiG <45011425+chaodaiG@users.noreply.github.com>
Date: Tue, 24 Sep 2019 12:12:43 -0700
Subject: [PATCH] Fix cluster creation lib return not up-to-date cluster issue
 (#718)

---
 testutils/clustermanager/gke.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/testutils/clustermanager/gke.go b/testutils/clustermanager/gke.go
index c66557486..8fe4f43af 100644
--- a/testutils/clustermanager/gke.go
+++ b/testutils/clustermanager/gke.go
@@ -290,12 +290,10 @@ func (gc *GKECluster) Acquire() error {
 		}
 		// Creating cluster only if previous step succeeded
 		if err == nil {
-			log.Printf("Creating cluster %q in %q", clusterName, clusterLoc)
+			log.Printf("Creating cluster %q in %q with:\n%+v", clusterName, clusterLoc, gc.Request)
 			op, err = gc.operations.create(*gc.Project, clusterLoc, rb)
 			if err == nil {
-				if err = gc.wait(clusterLoc, op.Name, creationTimeout); err == nil {
-					cluster, err = gc.operations.get(*gc.Project, clusterLoc, rb.Cluster.Name)
-				}
+				err = gc.wait(clusterLoc, op.Name, creationTimeout)
 			}
 			if err == nil { // Enable autoscaling and set limits
 				arb := &container.SetNodePoolAutoscalingRequest{
@@ -311,6 +309,9 @@ func (gc *GKECluster) Acquire() error {
 					err = gc.wait(clusterLoc, op.Name, autoscalingTimeout)
 				}
 			}
+			if err == nil { // Get cluster at last
+				cluster, err = gc.operations.get(*gc.Project, clusterLoc, rb.Cluster.Name)
+			}
 		}
 		if err != nil {
 			errMsg := fmt.Sprintf("Error during cluster creation: '%v'. ", err)