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.

Sign up for GitHub

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

Jump to bottom

Fix typo for rolesanywhere #26858

Merged
merged 5 commits into from
Sep 30, 2022
Merged

Fix typo for rolesanywhere #26858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a74af9
Fix typo for rolesanywhere's profile
cjsrkd3321 Sep 19, 2022
add2ba8
Fix type string to bool
cjsrkd3321 Sep 20, 2022
a9efc55
Add CHANGELOG entries.
ewbankkit Sep 30, 2022
2e0da9e
Add 'TestAccRolesAnywhereProfile_enabled'.
ewbankkit Sep 30, 2022
5d4151c
Add 'TestAccRolesAnywhereTrustAnchor_enabled'.
ewbankkit Sep 30, 2022
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
7 changes: 7 additions & 0 deletions .changelog/26858.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:bug
resource/aws_rolesanywhere_profile: Correctly handle updates to `enabled` and `session_policy`
```

```release-note:bug
resource/aws_rolesanywhere_trust_anchor: Correctly handle updates to `enabled`
```
4 changes: 2 additions & 2 deletions internal/service/rolesanywhere/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func resourceProfileUpdate(ctx context.Context, d *schema.ResourceData, meta int
}

if d.HasChange("session_policy") {
input.Name = aws.String(d.Get("session_policy").(string))
input.SessionPolicy = aws.String(d.Get("session_policy").(string))
}

log.Printf("[DEBUG] Updating RolesAnywhere Profile (%s): %#v", d.Id(), input)
Expand All @@ -199,7 +199,7 @@ func resourceProfileUpdate(ctx context.Context, d *schema.ResourceData, meta int

if d.HasChange("enabled") {
_, n := d.GetChange("enabled")
if n == "true" {
if n == true {
err := enableProfile(ctx, d.Id(), meta)
if err != nil {
diag.Errorf("enabling RolesAnywhere Profile (%s): %s", d.Id(), err)
Expand Down
55 changes: 53 additions & 2 deletions internal/service/rolesanywhere/profile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ func TestAccRolesAnywhereProfile_basic(t *testing.T) {
}

func TestAccRolesAnywhereProfile_tags(t *testing.T) {

rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
roleName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_rolesanywhere_profile.test"
Expand Down Expand Up @@ -92,7 +91,6 @@ func TestAccRolesAnywhereProfile_tags(t *testing.T) {
}

func TestAccRolesAnywhereProfile_disappears(t *testing.T) {

rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
roleName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_rolesanywhere_profile.test"
Expand All @@ -115,6 +113,47 @@ func TestAccRolesAnywhereProfile_disappears(t *testing.T) {
})
}

func TestAccRolesAnywhereProfile_enabled(t *testing.T) {
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
roleName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_rolesanywhere_profile.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); testAccPreCheck(t) },
ErrorCheck: acctest.ErrorCheck(t, names.RolesAnywhereEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckProfileDestroy,
Steps: []resource.TestStep{
{
Config: testAccProfileConfig_enabled(rName, roleName, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckProfileExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccProfileConfig_enabled(rName, roleName, false),
Check: resource.ComposeTestCheckFunc(
testAccCheckProfileExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
),
},
{
Config: testAccProfileConfig_enabled(rName, roleName, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckProfileExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
),
},
},
})
}

func testAccCheckProfileDestroy(s *terraform.State) error {
conn := acctest.Provider.Meta().(*conns.AWSClient).RolesAnywhereConn

Expand Down Expand Up @@ -225,3 +264,15 @@ resource "aws_rolesanywhere_profile" "test" {
}
`, rName, tag1, value1, tag2, value2))
}

func testAccProfileConfig_enabled(rName, roleName string, enabled bool) string {
return acctest.ConfigCompose(
testAccProfileConfig_base(roleName),
fmt.Sprintf(`
resource "aws_rolesanywhere_profile" "test" {
name = %[1]q
role_arns = [aws_iam_role.test.arn]
enabled = %[2]t
}
`, rName, enabled))
}
2 changes: 1 addition & 1 deletion internal/service/rolesanywhere/trust_anchor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func resourceTrustAnchorUpdate(ctx context.Context, d *schema.ResourceData, meta

if d.HasChange("enabled") {
_, n := d.GetChange("enabled")
if n == "true" {
if n == true {
if err := enableTrustAnchor(ctx, d.Id(), meta); err != nil {
diag.Errorf("enabling RolesAnywhere Trust Anchor (%s): %s", d.Id(), err)
}
Expand Down
59 changes: 59 additions & 0 deletions internal/service/rolesanywhere/trust_anchor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,46 @@ func TestAccRolesAnywhereTrustAnchor_certificateBundle(t *testing.T) {
})
}

func TestAccRolesAnywhereTrustAnchor_enabled(t *testing.T) {
rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
resourceName := "aws_rolesanywhere_trust_anchor.test"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acctest.PreCheck(t); testAccPreCheck(t) },
ErrorCheck: acctest.ErrorCheck(t, names.RolesAnywhereEndpointID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
CheckDestroy: testAccCheckTrustAnchorDestroy,
Steps: []resource.TestStep{
{
Config: testAccTrustAnchorConfig_enabled(rName, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckTrustAnchorExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
),
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccTrustAnchorConfig_enabled(rName, false),
Check: resource.ComposeTestCheckFunc(
testAccCheckTrustAnchorExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "enabled", "false"),
),
},
{
Config: testAccTrustAnchorConfig_enabled(rName, true),
Check: resource.ComposeTestCheckFunc(
testAccCheckTrustAnchorExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "enabled", "true"),
),
},
},
})
}

func testAccCheckTrustAnchorDestroy(s *terraform.State) error {
conn := acctest.Provider.Meta().(*conns.AWSClient).RolesAnywhereConn

Expand Down Expand Up @@ -302,6 +342,25 @@ resource "aws_rolesanywhere_trust_anchor" "test" {
`, rName, acctest.TLSPEMEscapeNewlines(caCertificate))
}

func testAccTrustAnchorConfig_enabled(rName string, enabled bool) string {
caKey := acctest.TLSRSAPrivateKeyPEM(2048)
caCertificate := acctest.TLSRSAX509SelfSignedCACertificateForRolesAnywhereTrustAnchorPEM(caKey)

return fmt.Sprintf(`
resource "aws_rolesanywhere_trust_anchor" "test" {
name = %[1]q
source {
source_data {
x509_certificate_data = "%[2]s"
}
source_type = "CERTIFICATE_BUNDLE"
}

enabled = %[3]t
}
`, rName, acctest.TLSPEMEscapeNewlines(caCertificate), enabled)
}

func testAccPreCheck(t *testing.T) {
acctest.PreCheckPartitionHasService(names.RolesAnywhereEndpointID, t)

Expand Down