Issue hashicorp#2174 Need to wait for creation before setting tags

cloudbees · Apr 11, 2016 · c6c0f00 · c6c0f00
1 parent 60e56b5
commit c6c0f00
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/builtin/providers/aws/resource_aws_internet_gateway.go b/builtin/providers/aws/resource_aws_internet_gateway.go
@@ -51,11 +51,6 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{})
 
 	f.WriteString(fmt.Sprintf("InternetGateway ID: %s\n", d.Id()))
 
-	err = setTags(conn, d)
-	if err != nil {
-		return err
-	}
-
 	resource.Retry(5*time.Minute, func() *resource.RetryError {
 		f.WriteString(fmt.Sprintf("Checking that InternetGateway is created\n"))
 		igRaw, _, err := IGStateRefreshFunc(conn, d.Id())()
@@ -72,6 +67,11 @@ func resourceAwsInternetGatewayCreate(d *schema.ResourceData, meta interface{})
 		}
 	})
 
+	err = setTags(conn, d)
+	if err != nil {
+		return err
+	}
+
 	// Attach the new gateway to the correct vpc
 	return resourceAwsInternetGatewayAttach(d, meta)
 }