Merge pull request #3586 from domdom82/tags_timeout_from_resource

tags should retry without time bounds on EC2 throttling
hashicorp · Nov 14, 2018 · c3c296c · c3c296c
2 parents 9ba9718 + 5df2e9a
commit c3c296c
Showing 1 changed file with 52 additions and 4 deletions.
diff --git a/aws/tags.go b/aws/tags.go
@@ -100,7 +100,19 @@ func setVolumeTags(conn *ec2.EC2, d *schema.ResourceData) error {
 				return nil
 			})
 			if err != nil {
-				return err
+				// Retry without time bounds for EC2 throttling
+				if isResourceTimeoutError(err) {
+					log.Printf("[DEBUG] Removing volume tags: %#v from %s", remove, d.Id())
+					_, err := conn.DeleteTags(&ec2.DeleteTagsInput{
+						Resources: volumeIds,
+						Tags:      remove,
+					})
+					if err != nil {
+						return err
+					}
+				} else {
+					return err
+				}
 			}
 		}
 		if len(create) > 0 {
@@ -120,7 +132,19 @@ func setVolumeTags(conn *ec2.EC2, d *schema.ResourceData) error {
 				return nil
 			})
 			if err != nil {
-				return err
+				// Retry without time bounds for EC2 throttling
+				if isResourceTimeoutError(err) {
+					log.Printf("[DEBUG] Creating vol tags: %s for %s", create, d.Id())
+					_, err := conn.CreateTags(&ec2.CreateTagsInput{
+						Resources: volumeIds,
+						Tags:      create,
+					})
+					if err != nil {
+						return err
+					}
+				} else {
+					return err
+				}
 			}
 		}
 	}
@@ -155,7 +179,19 @@ func setTags(conn *ec2.EC2, d *schema.ResourceData) error {
 				return nil
 			})
 			if err != nil {
-				return err
+				// Retry without time bounds for EC2 throttling
+				if isResourceTimeoutError(err) {
+					log.Printf("[DEBUG] Removing tags: %#v from %s", remove, d.Id())
+					_, err := conn.DeleteTags(&ec2.DeleteTagsInput{
+						Resources: []*string{aws.String(d.Id())},
+						Tags:      remove,
+					})
+					if err != nil {
+						return err
+					}
+				} else {
+					return err
+				}
 			}
 		}
 		if len(create) > 0 {
@@ -175,7 +211,19 @@ func setTags(conn *ec2.EC2, d *schema.ResourceData) error {
 				return nil
 			})
 			if err != nil {
-				return err
+				// Retry without time bounds for EC2 throttling
+				if isResourceTimeoutError(err) {
+					log.Printf("[DEBUG] Creating tags: %s for %s", create, d.Id())
+					_, err := conn.CreateTags(&ec2.CreateTagsInput{
+						Resources: []*string{aws.String(d.Id())},
+						Tags:      create,
+					})
+					if err != nil {
+						return err
+					}
+				} else {
+					return err
+				}
 			}
 		}
 	}