check for done redis operations before waiting on them

GoogleCloudPlatform · Jun 8, 2018 · f517a7e · f517a7e
1 parent d791a88
commit f517a7e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/templates/terraform/redis_operation.go b/templates/terraform/redis_operation.go
@@ -41,6 +41,13 @@ func redisOperationWait(service *redis.Service, op *redis.Operation, project, ac
 }
 
 func redisOperationWaitTime(service *redis.Service, op *redis.Operation, project, activity string, timeoutMin int) error {
+	if op.Done {
+		if op.Error != nil {
+			return fmt.Errorf("Error code %v, message: %s", op.Error.Code, op.Error.Message)
+		}
+		return nil
+	}
+
 	w := &RedisOperationWaiter{
 		Service: service.Projects.Locations,
 		Op:      op,