Merge pull request #5515 from hashicorp/b-aws-acc-test-updates

provider/aws: Retry DB Creation on IAM propigation error

builtin/providers/aws/resource_aws_db_instance.go

@@ -534,7 +534,18 @@ func resourceAwsDbInstanceCreate(d *schema.ResourceData, meta interface{}) error
 
 		log.Printf("[DEBUG] DB Instance create configuration: %#v", opts)
 		var err error
-		_, err = conn.CreateDBInstance(&opts)
+		err = resource.Retry(5*time.Minute, func() error {
+			_, err = conn.CreateDBInstance(&opts)
+			if err != nil {
+				if awsErr, ok := err.(awserr.Error); ok {
+					if awsErr.Code() == "InvalidParameterValue" && strings.Contains(awsErr.Message(), "ENHANCED_MONITORING") {
+						return awsErr
+					}
+				}
+				return resource.RetryError{Err: err}
+			}
+			return nil
+		})
 		if err != nil {
 			return fmt.Errorf("Error creating DB Instance: %s", err)
 		}

builtin/providers/aws/resource_aws_db_instance_test.go

@@ -514,7 +514,7 @@ resource "aws_db_instance" "enhanced_monitoring" {
 	allocated_storage = 5
 	engine = "mysql"
 	engine_version = "5.6.21"
-	instance_class = "db.t2.small"
+	instance_class = "db.m3.medium"
 	name = "baz"
 	password = "barbarbarbar"
 	username = "foo"