Add retry logic to s3_bucket to prevent OperationAborted errors

builtin/providers/aws/resource_aws_s3_bucket.go

@@ -210,7 +210,20 @@ func resourceAwsS3BucketCreate(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	_, err := s3conn.CreateBucket(req)
+	err := resource.Retry(5*time.Minute, func() error {
+		log.Printf("[DEBUG] Trying to create new S3 bucket: %q", bucket)
+		_, err := s3conn.CreateBucket(req)
+		if awsErr, ok := err.(awserr.Error); ok {
+			if awsErr.Code() == "OperationAborted" {
+				log.Printf("[WARN] Got an error while trying to create S3 bucket %s: %s", bucket, err)
+				return fmt.Errorf("[WARN] Error creating S3 bucket %s, retrying: %s",
+					bucket, err)
+			}
+			return resource.RetryError{Err: err}
+		}
+		return nil
+	})
+
 	if err != nil {
 		return fmt.Errorf("Error creating S3 bucket: %s", err)
 	}