ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aws: Fix CheckDestroy for ecs service

This commit is contained in:
Radek Simko 2015-12-23 10:17:52 +01:00
parent f8bb48b287
commit 95367bc0fc
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/providers/aws/resource_aws_ecs_service_test.go
View File

@ -209,6 +209,7 @@ func testAccCheckAWSEcsServiceDestroy(s *terraform.State) error {
out, err := conn.DescribeServices(&ecs.DescribeServicesInput{ out, err := conn.DescribeServices(&ecs.DescribeServicesInput{
Services: []*string{aws.String(rs.Primary.ID)}, Services: []*string{aws.String(rs.Primary.ID)},
Cluster: aws.String(rs.Primary.Attributes["cluster"]),
}) })
if awserr, ok := err.(awserr.Error); ok && awserr.Code() == "ClusterNotFoundException" { if awserr, ok := err.(awserr.Error); ok && awserr.Code() == "ClusterNotFoundException" {
@ -217,9 +218,20 @@ func testAccCheckAWSEcsServiceDestroy(s *terraform.State) error {
if err == nil { if err == nil {
if len(out.Services) > 0 { if len(out.Services) > 0 {
return fmt.Errorf("ECS service still exists:\n%#v", out.Services) var activeServices []*ecs.Service
for _, svc := range out.Services {
if *svc.Status != "INACTIVE" {
activeServices = append(activeServices, svc)
} }
} }
if len(activeServices) == 0 {
return nil
}
return fmt.Errorf("ECS service still exists:\n%#v", activeServices)
}
return nil
}
return err return err
} }