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

provider/aws: Retry IAM Role deletion on DeleteConflict (#14707) 

* provider/aws: Retry IAM Role deletion on DeleteConflict

* provider/aws: Add 'IAM' to relevant test names
This commit is contained in:
Radek Simko 2017-05-21 23:35:09 +02:00 committed by Paul Stack
parent 752c38bdc8
commit 4a671fc92e
3 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/providers/aws/import_aws_iam_role_test.go
View File

@ -17,7 +17,7 @@ func TestAccAWSIAMRole_importBasic(t *testing.T) {
CheckDestroy: testAccCheckAWSRoleDestroy, CheckDestroy: testAccCheckAWSRoleDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSRoleConfig(rName), Config: testAccAWSIAMRoleConfig(rName),
}, },
{ {

17
builtin/providers/aws/resource_aws_iam_role.go
View File

@ -258,8 +258,17 @@ func resourceAwsIamRoleDelete(d *schema.ResourceData, meta interface{}) error {
RoleName: aws.String(d.Id()), RoleName: aws.String(d.Id()),
} }
if _, err := iamconn.DeleteRole(request); err != nil { // IAM is eventually consistent and deletion of attached policies may take time
return fmt.Errorf("Error deleting IAM Role %s: %s", d.Id(), err) return resource.Retry(30*time.Second, func() *resource.RetryError {
} _, err := iamconn.DeleteRole(request)
return nil if err != nil {
awsErr, ok := err.(awserr.Error)
if ok && awsErr.Code() == "DeleteConflict" {
return resource.RetryableError(err)
}
return resource.NonRetryableError(fmt.Errorf("Error deleting IAM Role %s: %s", d.Id(), err))
}
return nil
})
} }

40
builtin/providers/aws/resource_aws_iam_role_test.go
View File

@ -15,7 +15,7 @@ import (
"github.com/hashicorp/terraform/terraform" "github.com/hashicorp/terraform/terraform"
) )
func TestAccAWSRole_basic(t *testing.T) { func TestAccAWSIAMRole_basic(t *testing.T) {
var conf iam.GetRoleOutput var conf iam.GetRoleOutput
rName := acctest.RandString(10) rName := acctest.RandString(10)
@ -25,7 +25,7 @@ func TestAccAWSRole_basic(t *testing.T) {
CheckDestroy: testAccCheckAWSRoleDestroy, CheckDestroy: testAccCheckAWSRoleDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSRoleConfig(rName), Config: testAccAWSIAMRoleConfig(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role", &conf), testAccCheckAWSRoleExists("aws_iam_role.role", &conf),
resource.TestCheckResourceAttr("aws_iam_role.role", "path", "/"), resource.TestCheckResourceAttr("aws_iam_role.role", "path", "/"),
@ -36,7 +36,7 @@ func TestAccAWSRole_basic(t *testing.T) {
}) })
} }
func TestAccAWSRole_basicWithDescription(t *testing.T) { func TestAccAWSIAMRole_basicWithDescription(t *testing.T) {
var conf iam.GetRoleOutput var conf iam.GetRoleOutput
rName := acctest.RandString(10) rName := acctest.RandString(10)
@ -46,7 +46,7 @@ func TestAccAWSRole_basicWithDescription(t *testing.T) {
CheckDestroy: testAccCheckAWSRoleDestroy, CheckDestroy: testAccCheckAWSRoleDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSRoleConfigWithDescription(rName), Config: testAccAWSIAMRoleConfigWithDescription(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role", &conf), testAccCheckAWSRoleExists("aws_iam_role.role", &conf),
resource.TestCheckResourceAttr("aws_iam_role.role", "path", "/"), resource.TestCheckResourceAttr("aws_iam_role.role", "path", "/"),
@ -54,7 +54,7 @@ func TestAccAWSRole_basicWithDescription(t *testing.T) {
), ),
}, },
{ {
Config: testAccAWSRoleConfigWithUpdatedDescription(rName), Config: testAccAWSIAMRoleConfigWithUpdatedDescription(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role", &conf), testAccCheckAWSRoleExists("aws_iam_role.role", &conf),
resource.TestCheckResourceAttr("aws_iam_role.role", "path", "/"), resource.TestCheckResourceAttr("aws_iam_role.role", "path", "/"),
@ -62,7 +62,7 @@ func TestAccAWSRole_basicWithDescription(t *testing.T) {
), ),
}, },
{ {
Config: testAccAWSRoleConfig(rName), Config: testAccAWSIAMRoleConfig(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role", &conf), testAccCheckAWSRoleExists("aws_iam_role.role", &conf),
resource.TestCheckResourceAttrSet("aws_iam_role.role", "create_date"), resource.TestCheckResourceAttrSet("aws_iam_role.role", "create_date"),
@ -73,7 +73,7 @@ func TestAccAWSRole_basicWithDescription(t *testing.T) {
}) })
} }
func TestAccAWSRole_namePrefix(t *testing.T) { func TestAccAWSIAMRole_namePrefix(t *testing.T) {
var conf iam.GetRoleOutput var conf iam.GetRoleOutput
rName := acctest.RandString(10) rName := acctest.RandString(10)
@ -85,7 +85,7 @@ func TestAccAWSRole_namePrefix(t *testing.T) {
CheckDestroy: testAccCheckAWSRoleDestroy, CheckDestroy: testAccCheckAWSRoleDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSRolePrefixNameConfig(rName), Config: testAccAWSIAMRolePrefixNameConfig(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role", &conf), testAccCheckAWSRoleExists("aws_iam_role.role", &conf),
testAccCheckAWSRoleGeneratedNamePrefix( testAccCheckAWSRoleGeneratedNamePrefix(
@ -96,7 +96,7 @@ func TestAccAWSRole_namePrefix(t *testing.T) {
}) })
} }
func TestAccAWSRole_testNameChange(t *testing.T) { func TestAccAWSIAMRole_testNameChange(t *testing.T) {
var conf iam.GetRoleOutput var conf iam.GetRoleOutput
rName := acctest.RandString(10) rName := acctest.RandString(10)
@ -106,14 +106,14 @@ func TestAccAWSRole_testNameChange(t *testing.T) {
CheckDestroy: testAccCheckAWSRoleDestroy, CheckDestroy: testAccCheckAWSRoleDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSRolePre(rName), Config: testAccAWSIAMRolePre(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role_update_test", &conf), testAccCheckAWSRoleExists("aws_iam_role.role_update_test", &conf),
), ),
}, },
{ {
Config: testAccAWSRolePost(rName), Config: testAccAWSIAMRolePost(rName),
Check: resource.ComposeTestCheckFunc( Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists("aws_iam_role.role_update_test", &conf), testAccCheckAWSRoleExists("aws_iam_role.role_update_test", &conf),
), ),
@ -122,7 +122,7 @@ func TestAccAWSRole_testNameChange(t *testing.T) {
}) })
} }
func TestAccAWSRole_badJSON(t *testing.T) { func TestAccAWSIAMRole_badJSON(t *testing.T) {
rName := acctest.RandString(10) rName := acctest.RandString(10)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
@ -131,7 +131,7 @@ func TestAccAWSRole_badJSON(t *testing.T) {
CheckDestroy: testAccCheckAWSRoleDestroy, CheckDestroy: testAccCheckAWSRoleDestroy,
Steps: []resource.TestStep{ Steps: []resource.TestStep{
{ {
Config: testAccAWSRoleConfig_badJson(rName), Config: testAccAWSIAMRoleConfig_badJson(rName),
ExpectError: regexp.MustCompile(`.*contains an invalid JSON:.*`), ExpectError: regexp.MustCompile(`.*contains an invalid JSON:.*`),
}, },
}, },
@ -210,7 +210,7 @@ func testAccCheckAWSRoleGeneratedNamePrefix(resource, prefix string) resource.Te
} }
} }
func testAccAWSRoleConfig(rName string) string { func testAccAWSIAMRoleConfig(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "role" { resource "aws_iam_role" "role" {
name = "test-role-%s" name = "test-role-%s"
@ -220,7 +220,7 @@ resource "aws_iam_role" "role" {
`, rName) `, rName)
} }
func testAccAWSRoleConfigWithDescription(rName string) string { func testAccAWSIAMRoleConfigWithDescription(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "role" { resource "aws_iam_role" "role" {
name = "test-role-%s" name = "test-role-%s"
@ -231,7 +231,7 @@ resource "aws_iam_role" "role" {
`, rName) `, rName)
} }
func testAccAWSRoleConfigWithUpdatedDescription(rName string) string { func testAccAWSIAMRoleConfigWithUpdatedDescription(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "role" { resource "aws_iam_role" "role" {
name = "test-role-%s" name = "test-role-%s"
@ -242,7 +242,7 @@ resource "aws_iam_role" "role" {
`, rName) `, rName)
} }
func testAccAWSRolePrefixNameConfig(rName string) string { func testAccAWSIAMRolePrefixNameConfig(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "role" { resource "aws_iam_role" "role" {
name_prefix = "test-role-%s" name_prefix = "test-role-%s"
@ -252,7 +252,7 @@ resource "aws_iam_role" "role" {
`, rName) `, rName)
} }
func testAccAWSRolePre(rName string) string { func testAccAWSIAMRolePre(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "role_update_test" { resource "aws_iam_role" "role_update_test" {
name = "tf_old_name_%s" name = "tf_old_name_%s"
@ -302,7 +302,7 @@ resource "aws_iam_instance_profile" "role_update_test" {
`, rName, rName, rName) `, rName, rName, rName)
} }
func testAccAWSRolePost(rName string) string { func testAccAWSIAMRolePost(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "role_update_test" { resource "aws_iam_role" "role_update_test" {
name = "tf_new_name_%s" name = "tf_new_name_%s"
@ -352,7 +352,7 @@ resource "aws_iam_instance_profile" "role_update_test" {
`, rName, rName, rName) `, rName, rName, rName)
} }
func testAccAWSRoleConfig_badJson(rName string) string { func testAccAWSIAMRoleConfig_badJson(rName string) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "aws_iam_role" "my_instance_role" { resource "aws_iam_role" "my_instance_role" {
name = "test-role-%s" name = "test-role-%s"