Merge pull request #4365 from TimeIncOSS/b-ecs-td-fix

provider/aws: Treat INACTIVE ECS TDs as deleted in acc tests
This commit is contained in:
Radek Simko 2015-12-17 17:38:46 +01:00
commit 8b30fd484d
1 changed files with 11 additions and 9 deletions

View File

@ -82,17 +82,19 @@ func testAccCheckAWSEcsTaskDefinitionDestroy(s *terraform.State) error {
continue
}
out, err := conn.DescribeTaskDefinition(&ecs.DescribeTaskDefinitionInput{
TaskDefinition: aws.String(rs.Primary.ID),
})
if err == nil {
if out.TaskDefinition != nil {
return fmt.Errorf("ECS task definition still exists:\n%#v", *out.TaskDefinition)
}
input := ecs.DescribeTaskDefinitionInput{
TaskDefinition: aws.String(rs.Primary.Attributes["arn"]),
}
return err
out, err := conn.DescribeTaskDefinition(&input)
if err != nil {
return err
}
if out.TaskDefinition != nil && *out.TaskDefinition.Status != "INACTIVE" {
return fmt.Errorf("ECS task definition still exists:\n%#v", *out.TaskDefinition)
}
}
return nil