From 3cb5107bd2fde912babf9b7457ac16c5c8007862 Mon Sep 17 00:00:00 2001
From: Paddy <paddy@hashicorp.com>
Date: Thu, 2 Mar 2017 16:42:28 -0800
Subject: [PATCH] provider/google: retry storage creation/deletion on rate
 limiting

Our GCP storage tests are really flaky right now due to rate limiting.
In theory, this could also impact Terraform users that are
deleting/creating large numbers of Google Cloud Storage buckets at once.

To fix, I'm detecting the specific error code that GCP returns when it's
a rate limit error, and using that with resource.Retry to try the
request again.
---
 .../google/resource_storage_bucket.go         | 34 +++++++++++++++----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/builtin/providers/google/resource_storage_bucket.go b/builtin/providers/google/resource_storage_bucket.go
index 6183ee72e..afd2ad493 100644
--- a/builtin/providers/google/resource_storage_bucket.go
+++ b/builtin/providers/google/resource_storage_bucket.go
@@ -4,7 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"time"
 
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 
 	"google.golang.org/api/googleapi"
@@ -122,12 +124,23 @@ func resourceStorageBucketCreate(d *schema.ResourceData, meta interface{}) error
 		}
 	}
 
-	call := config.clientStorage.Buckets.Insert(project, sb)
-	if v, ok := d.GetOk("predefined_acl"); ok {
-		call = call.PredefinedAcl(v.(string))
-	}
+	var res *storage.Bucket
 
-	res, err := call.Do()
+	err = resource.Retry(1*time.Minute, func() *resource.RetryError {
+		call := config.clientStorage.Buckets.Insert(project, sb)
+		if v, ok := d.GetOk("predefined_acl"); ok {
+			call = call.PredefinedAcl(v.(string))
+		}
+
+		res, err = call.Do()
+		if err == nil {
+			return nil
+		}
+		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 429 {
+			return resource.RetryableError(gerr)
+		}
+		return resource.NonRetryableError(err)
+	})
 
 	if err != nil {
 		fmt.Printf("Error creating bucket %s: %v", bucket, err)
@@ -260,7 +273,16 @@ func resourceStorageBucketDelete(d *schema.ResourceData, meta interface{}) error
 	}
 
 	// remove empty bucket
-	err := config.clientStorage.Buckets.Delete(bucket).Do()
+	err := resource.Retry(1*time.Minute, func() *resource.RetryError {
+		err := config.clientStorage.Buckets.Delete(bucket).Do()
+		if err == nil {
+			return nil
+		}
+		if gerr, ok := err.(*googleapi.Error); ok && gerr.Code == 429 {
+			return resource.RetryableError(gerr)
+		}
+		return resource.NonRetryableError(err)
+	})
 	if err != nil {
 		fmt.Printf("Error deleting bucket %s: %v\n\n", bucket, err)
 		return err