Merge pull request #4510 from hashicorp/b-aws-resources-tests

provider/aws:Updating AWS Acceptance tests
This commit is contained in:
Clint 2016-01-05 10:24:39 -06:00
commit dedc17072e
4 changed files with 75 additions and 12 deletions

View File

@ -8,6 +8,7 @@ import (
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/directoryservice" "github.com/aws/aws-sdk-go/service/directoryservice"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
) )
@ -252,6 +253,8 @@ func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta int
input := directoryservice.DeleteDirectoryInput{ input := directoryservice.DeleteDirectoryInput{
DirectoryId: aws.String(d.Id()), DirectoryId: aws.String(d.Id()),
} }
log.Printf("[DEBUG] Delete Directory input: %s", input)
_, err := dsconn.DeleteDirectory(&input) _, err := dsconn.DeleteDirectory(&input)
if err != nil { if err != nil {
return err return err
@ -261,17 +264,20 @@ func resourceAwsDirectoryServiceDirectoryDelete(d *schema.ResourceData, meta int
log.Printf("[DEBUG] Waiting for DS (%q) to be deleted", d.Id()) log.Printf("[DEBUG] Waiting for DS (%q) to be deleted", d.Id())
stateConf := &resource.StateChangeConf{ stateConf := &resource.StateChangeConf{
Pending: []string{"Deleting"}, Pending: []string{"Deleting"},
Target: "", Target: "Deleted",
Refresh: func() (interface{}, string, error) { Refresh: func() (interface{}, string, error) {
resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{ resp, err := dsconn.DescribeDirectories(&directoryservice.DescribeDirectoriesInput{
DirectoryIds: []*string{aws.String(d.Id())}, DirectoryIds: []*string{aws.String(d.Id())},
}) })
if err != nil { if err != nil {
return nil, "", err if dserr, ok := err.(awserr.Error); ok && dserr.Code() == "EntityDoesNotExistException" {
return 42, "Deleted", nil
}
return nil, "error", err
} }
if len(resp.DirectoryDescriptions) == 0 { if len(resp.DirectoryDescriptions) == 0 {
return nil, "", nil return 42, "Deleted", nil
} }
ds := resp.DirectoryDescriptions[0] ds := resp.DirectoryDescriptions[0]

View File

@ -5,6 +5,7 @@ import (
"testing" "testing"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/aws/aws-sdk-go/service/directoryservice" "github.com/aws/aws-sdk-go/service/directoryservice"
"github.com/hashicorp/terraform/helper/resource" "github.com/hashicorp/terraform/helper/resource"
@ -65,12 +66,33 @@ func TestAccAWSDirectoryServiceDirectory_withAliasAndSso(t *testing.T) {
} }
func testAccCheckDirectoryServiceDirectoryDestroy(s *terraform.State) error { func testAccCheckDirectoryServiceDirectoryDestroy(s *terraform.State) error {
if len(s.RootModule().Resources) > 0 { dsconn := testAccProvider.Meta().(*AWSClient).dsconn
return fmt.Errorf("Expected all resources to be gone, but found: %#v",
s.RootModule().Resources) for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_directory_service_directory" {
continue
}
input := directoryservice.DescribeDirectoriesInput{
DirectoryIds: []*string{aws.String(rs.Primary.ID)},
}
out, err := dsconn.DescribeDirectories(&input)
if err != nil {
// EntityDoesNotExistException means it's gone, this is good
if dserr, ok := err.(awserr.Error); ok && dserr.Code() == "EntityDoesNotExistException" {
return nil
}
return err
}
if out != nil && len(out.DirectoryDescriptions) > 0 {
return fmt.Errorf("Expected AWS Directory Service Directory to be gone, but was still found")
}
return nil
} }
return nil return fmt.Errorf("Default error in Service Directory Test")
} }
func testAccCheckServiceDirectoryExists(name string) resource.TestCheckFunc { func testAccCheckServiceDirectoryExists(name string) resource.TestCheckFunc {

View File

@ -7,6 +7,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
@ -660,6 +661,37 @@ func resourceAwsDynamoDbTableDelete(d *schema.ResourceData, meta interface{}) er
if err != nil { if err != nil {
return err return err
} }
params := &dynamodb.DescribeTableInput{
TableName: aws.String(d.Id()),
}
err = resource.Retry(10*time.Minute, func() error {
t, err := dynamodbconn.DescribeTable(params)
if err != nil {
if awserr, ok := err.(awserr.Error); ok && awserr.Code() == "ResourceNotFoundException" {
return nil
}
// Didn't recognize the error, so shouldn't retry.
return resource.RetryError{Err: err}
}
if t != nil {
if t.Table.TableStatus != nil && strings.ToLower(*t.Table.TableStatus) == "deleting" {
log.Printf("[DEBUG] AWS Dynamo DB table (%s) is still deleting", d.Id())
return fmt.Errorf("still deleting")
}
}
// we should be not found or deleting, so error here
return resource.RetryError{Err: fmt.Errorf("[ERR] Error deleting Dynamo DB table, unexpected state: %s", t)}
})
// check error from retry
if err != nil {
return err
}
return nil return nil
} }

View File

@ -2,6 +2,7 @@ package aws
import ( import (
"fmt" "fmt"
"log"
"testing" "testing"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
@ -11,7 +12,7 @@ import (
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccAWSDynamoDbTable(t *testing.T) { func TestAccAWSDynamoDbTable_basic(t *testing.T) {
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders, Providers: testAccProviders,
@ -101,21 +102,23 @@ func testAccCheckAWSDynamoDbTableDestroy(s *terraform.State) error {
continue continue
} }
fmt.Printf("[DEBUG] Checking if DynamoDB table %s exists", rs.Primary.ID) log.Printf("[DEBUG] Checking if DynamoDB table %s exists", rs.Primary.ID)
// Check if queue exists by checking for its attributes // Check if queue exists by checking for its attributes
params := &dynamodb.DescribeTableInput{ params := &dynamodb.DescribeTableInput{
TableName: aws.String(rs.Primary.ID), TableName: aws.String(rs.Primary.ID),
} }
_, err := conn.DescribeTable(params) _, err := conn.DescribeTable(params)
if err == nil { if err == nil {
return fmt.Errorf("DynamoDB table %s still exists. Failing!", rs.Primary.ID) return fmt.Errorf("DynamoDB table %s still exists. Failing!", rs.Primary.ID)
} }
// Verify the error is what we want // Verify the error is what we want
_, ok := err.(awserr.Error) if dbErr, ok := err.(awserr.Error); ok && dbErr.Code() == "ResourceNotFoundException" {
if !ok { return nil
return err
} }
return err
} }
return nil return nil