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

set values to role ID's in resourceCloudflareAccountMemberRead #1202

Merged
merged 10 commits into from
Sep 22, 2021
Merged

set values to role ID's in resourceCloudflareAccountMemberRead #1202

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e89e654
set values for role id's in account member read
shubhambjadhavar Sep 16, 2021
0803bd9
add change log entry
shubhambjadhavar Sep 16, 2021
7407c8d
update changelog
shubhambjadhavar Sep 17, 2021
ec983e9
add test file for account member
shubhambjadhavar Sep 22, 2021
01a40ab
Merge branch 'master' of https://github.com/shubhambjadhavar/terrafor…
shubhambjadhavar Sep 22, 2021
dadd898
update test to use example.com as the domain
jacobbednarz Sep 22, 2021
fe3b298
fix whitespace on test assertion HCL
jacobbednarz Sep 22, 2021
c49e255
use SDK v2 from upstream changes
jacobbednarz Sep 22, 2021
72ad135
use SDK v2 from upstream changes
jacobbednarz Sep 22, 2021
93402b4
s/mamber/member
jacobbednarz Sep 22, 2021
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 .changelog/1202.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
resource/cloudflare_account_member: fix the issue - provider not able to detect changes made via UI for account member role Id's
```
jacobbednarz marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 8 additions & 1 deletion cloudflare/resource_cloudflare_account_member.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func resourceCloudflareAccountMember() *schema.Resource {
func resourceCloudflareAccountMemberRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*cloudflare.API)

_, err := client.AccountMember(context.Background(), client.AccountID, d.Id())
member, err := client.AccountMember(context.Background(), client.AccountID, d.Id())
if err != nil {
if strings.Contains(err.Error(), "Member not found") ||
strings.Contains(err.Error(), "HTTP status 404") {
Expand All @@ -50,6 +50,13 @@ func resourceCloudflareAccountMemberRead(d *schema.ResourceData, meta interface{
return err
}

var memberIDs []string
for _, role := range member.Roles {
memberIDs = append(memberIDs, role.ID)
}

d.Set("email_address", member.User.Email)
d.Set("role_ids", memberIDs)
d.SetId(d.Id())

return nil
Expand Down