Skip to content

correctly update name attribute of vault_identity_entity_alias resources #610

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tyrannosaurus-becks merged 2 commits into from
Dec 5, 2019
Merged

correctly update name attribute of vault_identity_entity_alias resources #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4144776
correctly update name attribute of vault_identity_entity_alias resources
jcarrothers-sap Nov 15, 2019
b5e1c91
Merge remote-tracking branch 'origin/master' into fixEntityAlias
jcarrothers-sap Dec 3, 2019
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
3 changes: 3 additions & 0 deletions vault/resource_identity_entity_alias.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ func identityEntityAliasUpdate(d *schema.ResourceData, meta interface{}) error {
"canonical_id": resp.Data["canonical_id"],
}

if name, ok := d.GetOk("name"); ok {
data["name"] = name
}
if mountAccessor, ok := d.GetOk("mount_accessor"); ok {
data["mount_accessor"] = mountAccessor
}
Expand Down
72 changes: 58 additions & 14 deletions vault/resource_identity_entity_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
func TestAccIdentityEntityAlias(t *testing.T) {
entity := acctest.RandomWithPrefix("my-entity")

nameEntity := "vault_identity_entity.entity"
nameEntity := "vault_identity_entity.entityA"
nameEntityAlias := "vault_identity_entity_alias.entity-alias"
nameGithubA := "vault_auth_backend.githubA"

Expand All @@ -24,21 +24,55 @@ func TestAccIdentityEntityAlias(t *testing.T) {
CheckDestroy: testAccCheckIdentityEntityAliasDestroy,
Steps: []resource.TestStep{
{
Config: testAccIdentityEntityAliasConfig(entity, false),
Config: testAccIdentityEntityAliasConfig(entity, false, false),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(nameEntityAlias, "name", entity),
resource.TestCheckResourceAttrPair(nameEntityAlias, "name", nameEntity, "name"),
resource.TestCheckResourceAttrPair(nameEntityAlias, "canonical_id", nameEntity, "id"),
resource.TestCheckResourceAttrPair(nameEntityAlias, "mount_accessor", nameGithubA, "accessor"),
),
},
{
Config: testAccIdentityEntityAliasConfig(entity, true),
Config: testAccIdentityEntityAliasConfig(entity, true, false),
ExpectError: regexp.MustCompile(`IdentityEntityAlias.*already exists.*may be imported`),
},
},
})
}

func TestAccIdentityEntityAlias_Update(t *testing.T) {
entity := acctest.RandomWithPrefix("my-entity")

nameEntityA := "vault_identity_entity.entityA"
nameEntityB := "vault_identity_entity.entityB"
nameEntityAlias := "vault_identity_entity_alias.entity-alias"
nameGithubA := "vault_auth_backend.githubA"
nameGithubB := "vault_auth_backend.githubB"

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testProviders,
CheckDestroy: testAccCheckIdentityEntityAliasDestroy,
Steps: []resource.TestStep{
{
Config: testAccIdentityEntityAliasConfig(entity, false, false),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(nameEntityAlias, "name", nameEntityA, "name"),
resource.TestCheckResourceAttrPair(nameEntityAlias, "canonical_id", nameEntityA, "id"),
resource.TestCheckResourceAttrPair(nameEntityAlias, "mount_accessor", nameGithubA, "accessor"),
),
},
{
Config: testAccIdentityEntityAliasConfig(entity, false, true),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttrPair(nameEntityAlias, "name", nameEntityB, "name"),
resource.TestCheckResourceAttrPair(nameEntityAlias, "canonical_id", nameEntityB, "id"),
resource.TestCheckResourceAttrPair(nameEntityAlias, "mount_accessor", nameGithubB, "accessor"),
),
},
},
})
}

func testAccCheckIdentityEntityAliasDestroy(s *terraform.State) error {
client := testProvider.Meta().(*api.Client)

Expand All @@ -57,10 +91,20 @@ func testAccCheckIdentityEntityAliasDestroy(s *terraform.State) error {
return nil
}

func testAccIdentityEntityAliasConfig(entityName string, dupeAlias bool) string {
func testAccIdentityEntityAliasConfig(entityName string, dupeAlias bool, altTarget bool) string {
entityId := "A"
if altTarget {
entityId = "B"
}

ret := fmt.Sprintf(`
resource "vault_identity_entity" "entity" {
name = "%s"
resource "vault_identity_entity" "entityA" {
name = "%s-A"
policies = ["test"]
}

resource "vault_identity_entity" "entityB" {
name = "%s-B"
policies = ["test"]
}

Expand All @@ -75,22 +119,22 @@ resource "vault_auth_backend" "githubB" {
}

resource "vault_identity_entity_alias" "entity-alias" {
name = "%s"
mount_accessor = "${vault_auth_backend.githubA.accessor}"
canonical_id = "${vault_identity_entity.entity.id}"
name = "${vault_identity_entity.entity%s.name}"
mount_accessor = "${vault_auth_backend.github%s.accessor}"
canonical_id = "${vault_identity_entity.entity%s.id}"
}
`, entityName, entityName, entityName, entityName)
`, entityName, entityName, entityName, entityName, entityId, entityId, entityId)

// This duplicate alias tests the provider's handling of aliases that already exist but aren't
// known to the provider.
if dupeAlias {
ret += fmt.Sprintf(`
resource "vault_identity_entity_alias" "entity-alias-dupe" {
name = "%s"
name = "${vault_identity_entity.entity%s.name}"
mount_accessor = "${vault_auth_backend.githubA.accessor}"
canonical_id = "${vault_identity_entity.entity.id}"
canonical_id = "${vault_identity_entity.entity%s.id}"
}
`, entityName)
`, entityId, entityId)
}

return ret
Expand Down