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

Merge pull request #4829 from hashicorp/b-aws-efs-test-updates 

provider/aws: Update EFS test destroy methods
This commit is contained in:
Clint 2016-01-25 16:34:59 -06:00
parent 1a7c94def4 a3bfec2684
commit 2faf1c1422
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
builtin/providers/aws/resource_aws_efs_file_system_test.go
View File

@ -6,13 +6,14 @@ import (
"testing"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/efs"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
func TestAccAWSEFSFileSystem(t *testing.T) {
func TestAccAWSEFSFileSystem_basic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
@ -46,8 +47,25 @@ func TestAccAWSEFSFileSystem(t *testing.T) {
}
func testAccCheckEfsFileSystemDestroy(s *terraform.State) error {
if len(s.RootModule().Resources) > 0 {
return fmt.Errorf("Expected all resources to be gone, but found: %#v", s.RootModule().Resources)
conn := testAccProvider.Meta().(*AWSClient).efsconn
for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_efs_file_system" {
continue
}
resp, err := conn.DescribeFileSystems(&efs.DescribeFileSystemsInput{
FileSystemId: aws.String(rs.Primary.ID),
})
if err != nil {
if efsErr, ok := err.(awserr.Error); ok && efsErr.Code() == "FileSystemNotFound" {
// gone
return nil
}
return fmt.Errorf("Error describing EFS in tests: %s", err)
}
if len(resp.FileSystems) > 0 {
return fmt.Errorf("EFS file system %q still exists", rs.Primary.ID)
}
}
return nil

24
builtin/providers/aws/resource_aws_efs_mount_target_test.go
View File

@ -5,13 +5,14 @@ import (
"testing"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/efs"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
)
func TestAccAWSEFSMountTarget(t *testing.T) {
func TestAccAWSEFSMountTarget_basic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
@ -41,8 +42,25 @@ func TestAccAWSEFSMountTarget(t *testing.T) {
}
func testAccCheckEfsMountTargetDestroy(s *terraform.State) error {
if len(s.RootModule().Resources) > 0 {
return fmt.Errorf("Expected all resources to be gone, but found: %#v", s.RootModule().Resources)
conn := testAccProvider.Meta().(*AWSClient).efsconn
for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_efs_mount_target" {
continue
}
resp, err := conn.DescribeMountTargets(&efs.DescribeMountTargetsInput{
MountTargetId: aws.String(rs.Primary.ID),
})
if err != nil {
if efsErr, ok := err.(awserr.Error); ok && efsErr.Code() == "MountTargetNotFound" {
// gone
return nil
}
return fmt.Errorf("Error describing EFS Mount in tests: %s", err)
}
if len(resp.MountTargets) > 0 {
return fmt.Errorf("EFS Mount target %q still exists", rs.Primary.ID)
}
}
return nil