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

update website doc to depict the use of sets in members resource #767

Merged
merged 2 commits into from
Jan 19, 2023
Merged

update website doc to depict the use of sets in members resource #767

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
4af7758
update website doc to depict the use of sets in members resource
Uk1288 Jan 13, 2023
8c16712
update changelog
Uk1288 Jan 16, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ BUG FIXES:

ENHANCEMENTS:
* Update API doc links from terraform.io to developer.hashicorp domain by @uk1288 [#764](https://github.com/hashicorp/terraform-provider-tfe/pull/764)
* Update website docs to depict the use of set with `tfe_team_organization_members` and `tfe_team_members` by @uk1288 [#767](https://github.com/hashicorp/terraform-provider-tfe/pull/767)

FEATURES:
* r/tfe_team: Teams can now be imported using `<ORGANIZATION NAME>/<TEAM NAME>` ([#745](https://github.com/hashicorp/terraform-provider-tfe/pull/745))
Expand Down
4 changes: 2 additions & 2 deletions tfe/resource_tfe_team_members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func resourceTFETeamMembersRead(d *schema.ResourceData, meta interface{}) error
users, err := tfeClient.TeamMembers.List(ctx, d.Id())
if err != nil {
if err == tfe.ErrResourceNotFound {
log.Printf("[DEBUG] Users do no longer exist")
log.Printf("[DEBUG] Users no longer exist")
d.SetId("")
return nil
}
Expand All @@ -82,7 +82,7 @@ func resourceTFETeamMembersRead(d *schema.ResourceData, meta interface{}) error
if len(usernames) > 0 {
d.Set("usernames", usernames)
} else {
log.Printf("[DEBUG] Users do no longer exist")
log.Printf("[DEBUG] Users no longer exist")
d.SetId("")
}

Expand Down
6 changes: 3 additions & 3 deletions tfe/resource_tfe_team_organization_members.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ func resourceTFETeamOrganizationMembersRead(d *schema.ResourceData, meta interfa
organizationMemberships, err := tfeClient.TeamMembers.ListOrganizationMemberships(ctx, d.Id())
if err != nil {
if errors.Is(err, tfe.ErrResourceNotFound) {
log.Printf("[DEBUG] Organization memberships for team %s do no longer exist", d.Id())
log.Printf("[DEBUG] Organization memberships for team %s no longer exist", d.Id())
d.SetId("")
return nil
}
Expand All @@ -88,7 +88,7 @@ func resourceTFETeamOrganizationMembersRead(d *schema.ResourceData, meta interfa
d.Set("team_id", d.Id())
d.Set("organization_membership_ids", organizationMembershipIDs)
} else {
log.Printf("[DEBUG] Organization memberships for team %s do no longer exist", d.Id())
log.Printf("[DEBUG] Organization memberships for team %s no longer exist", d.Id())
d.SetId("")
}

Expand Down Expand Up @@ -180,7 +180,7 @@ func resourceTFETeamOrganizationMembersDelete(d *schema.ResourceData, meta inter
organizationMemberships, err := tfeClient.TeamMembers.ListOrganizationMemberships(ctx, d.Id())
if err != nil {
if errors.Is(err, tfe.ErrResourceNotFound) {
log.Printf("[DEBUG] Organization memberships for team %s do no longer exist", d.Id())
log.Printf("[DEBUG] Organization memberships for team %s no longer exist", d.Id())
d.SetId("")
return nil
}
Expand Down
21 changes: 21 additions & 0 deletions website/docs/r/team_members.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,27 @@ resource "tfe_team_members" "test" {
}
```

With a set of usernames:

```hcl
locals {
all_usernames = toset([
"user1",
"user2",
])
}

resource "tfe_team" "test" {
name = "my-team-name"
organization = "my-org-name"
}

resource "tfe_team_members" "test" {
team_id = tfe_team.test.id
usernames = [for user in local.all_usernames : user]
}
```

## Argument Reference

The following arguments are supported:
Expand Down
27 changes: 27 additions & 0 deletions website/docs/r/team_organization_members.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,33 @@ resource "tfe_team_organization_members" "test" {
}
```

With a set of organization members:

```hcl
locals {
all_users = toset([
"[email protected]",
"[email protected]",
])
}

resource "tfe_team" "test" {
name = "my-team-name"
organization = "my-org-name"
}

resource "tfe_organization_membership" "all_membership" {
organization = "my-org-name"
for_each = local.all_users
email = each.key
}

resource "tfe_team_organization_members" "test" {
team_id = tfe_team.test.id
organization_membership_ids = [for member in local.all_users : tfe_organization_membership.all_membership[member].id]
}
```

## Argument Reference

The following arguments are supported:
Expand Down