Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow empty permissions boundary field in AWS role. #5740

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Simplify role permission boundaries test by reusing existing role obj…
…ect.
  • Loading branch information
Mathieu Garstecki committed Aug 31, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 179c3b75a372f317729e748e4132597ecf3ebdb6
35 changes: 8 additions & 27 deletions aws/resource_aws_iam_role_test.go
Original file line number Diff line number Diff line change
@@ -242,7 +242,7 @@ func TestAccAWSIAMRole_PermissionsBoundary(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists(resourceName, &role),
resource.TestCheckResourceAttr(resourceName, "permissions_boundary", permissionsBoundary1),
testAccCheckAWSRolePermissionsBoundary(resourceName, permissionsBoundary1),
testAccCheckAWSRolePermissionsBoundary(&role, permissionsBoundary1),
),
},
// Test update
@@ -251,7 +251,7 @@ func TestAccAWSIAMRole_PermissionsBoundary(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists(resourceName, &role),
resource.TestCheckResourceAttr(resourceName, "permissions_boundary", permissionsBoundary2),
testAccCheckAWSRolePermissionsBoundary(resourceName, permissionsBoundary2),
testAccCheckAWSRolePermissionsBoundary(&role, permissionsBoundary2),
),
},
// Test import
@@ -267,7 +267,7 @@ func TestAccAWSIAMRole_PermissionsBoundary(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists(resourceName, &role),
resource.TestCheckResourceAttr(resourceName, "permissions_boundary", ""),
testAccCheckAWSRolePermissionsBoundary(resourceName, ""),
testAccCheckAWSRolePermissionsBoundary(&role, ""),
),
},
// Test addition
@@ -276,7 +276,7 @@ func TestAccAWSIAMRole_PermissionsBoundary(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists(resourceName, &role),
resource.TestCheckResourceAttr(resourceName, "permissions_boundary", permissionsBoundary1),
testAccCheckAWSRolePermissionsBoundary(resourceName, permissionsBoundary1),
testAccCheckAWSRolePermissionsBoundary(&role, permissionsBoundary1),
),
},
// Test empty value
@@ -285,7 +285,7 @@ func TestAccAWSIAMRole_PermissionsBoundary(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckAWSRoleExists(resourceName, &role),
resource.TestCheckResourceAttr(resourceName, "permissions_boundary", ""),
testAccCheckAWSRolePermissionsBoundary(resourceName, ""),
testAccCheckAWSRolePermissionsBoundary(&role, ""),
),
},
},
@@ -412,31 +412,12 @@ func testAccAddAwsIAMRolePolicy(n string) resource.TestCheckFunc {
}
}

func testAccCheckAWSRolePermissionsBoundary(n string, expectedPermissionsBoundaryArn string) resource.TestCheckFunc {
func testAccCheckAWSRolePermissionsBoundary(getRoleOutput *iam.GetRoleOutput, expectedPermissionsBoundaryArn string) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
return fmt.Errorf("Not found: %s", n)
}

if rs.Primary.ID == "" {
return fmt.Errorf("No Role name is set")
}

iamconn := testAccProvider.Meta().(*AWSClient).iamconn

resp, err := iamconn.GetRole(&iam.GetRoleInput{
RoleName: aws.String(rs.Primary.ID),
})

if err != nil {
return err
}

actualPermissionsBoundaryArn := ""

if resp.Role.PermissionsBoundary != nil {
actualPermissionsBoundaryArn = *resp.Role.PermissionsBoundary.PermissionsBoundaryArn
if getRoleOutput.Role.PermissionsBoundary != nil {
actualPermissionsBoundaryArn = *getRoleOutput.Role.PermissionsBoundary.PermissionsBoundaryArn
}

if actualPermissionsBoundaryArn != expectedPermissionsBoundaryArn {