feat: add role attributes to launchdarkly_team_member
#289
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-5765/add-role-attributes-to-custom-roles
…nto imiller/REL-5765/add-role-attributes-to-member
ldhenry
reviewed
Feb 6, 2025
ldhenry
requested changes
Feb 6, 2025
Comment on lines
76
to
105
| new := roleAttributesFromResourceData(d.Get(ROLE_ATTRIBUTES).(*schema.Set).List()) | ||
| if new != nil { | ||
| if old == nil { | ||
| patch = append(patch, patchAdd("/roleAttributes", new)) | ||
| } else { | ||
| for k, v := range *new { | ||
| if _, ok := (*old)[k]; !ok { | ||
| patch = append(patch, patchAdd(fmt.Sprintf("/roleAttributes/%s", k), &v)) | ||
| } else { | ||
| if oldV := (*old)[k]; slices.Compare(oldV, v) == 0 { | ||
| continue | ||
| } else { | ||
| patch = append(patch, patchReplace(fmt.Sprintf("/roleAttributes/%s", k), &v)) | ||
| } | ||
| } | ||
| } | ||
| for k := range *old { | ||
| if _, ok := (*new)[k]; !ok { | ||
| patch = append(patch, patchRemove(fmt.Sprintf("/roleAttributes/%s", k))) | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| if old != nil { | ||
| for k := range *old { | ||
| patch = append(patch, patchRemove(fmt.Sprintf("/roleAttributes/%s", k))) | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This feels a little more complicated than it needs to be. Did you try just sending something like:
{
"action": "replace",
"path": "/roleAttributes",
"value": <The entire new role attributes map>
}
There was a problem hiding this comment.
Yes, unfortunately - it hits an 'unsupported json-patch operation' on some operations, although I can't remember which exactly
There was a problem hiding this comment.
This seems to work for me. Can you give it a try:
func getRoleAttributePatches(d *schema.ResourceData) []ldapi.PatchOperation {
var patch []ldapi.PatchOperation
if o, n := d.GetChange(ROLE_ATTRIBUTES); o != n {
new := roleAttributesFromResourceData(d.Get(ROLE_ATTRIBUTES).(*schema.Set).List())
if new != nil {
patch = append(patch, patchReplace("/roleAttributes", new))
} else {
patch = append(patch, patchReplace("/roleAttributes", make(map[string][]string)))
}
}
return patch
}There was a problem hiding this comment.
Looks like the tests are passing here. Feel free to merge it into this PR if it helps.
ldhenry
requested changes
Feb 6, 2025
Comment on lines
76
to
105
| new := roleAttributesFromResourceData(d.Get(ROLE_ATTRIBUTES).(*schema.Set).List()) | ||
| if new != nil { | ||
| if old == nil { | ||
| patch = append(patch, patchAdd("/roleAttributes", new)) | ||
| } else { | ||
| for k, v := range *new { | ||
| if _, ok := (*old)[k]; !ok { | ||
| patch = append(patch, patchAdd(fmt.Sprintf("/roleAttributes/%s", k), &v)) | ||
| } else { | ||
| if oldV := (*old)[k]; slices.Compare(oldV, v) == 0 { | ||
| continue | ||
| } else { | ||
| patch = append(patch, patchReplace(fmt.Sprintf("/roleAttributes/%s", k), &v)) | ||
| } | ||
| } | ||
| } | ||
| for k := range *old { | ||
| if _, ok := (*new)[k]; !ok { | ||
| patch = append(patch, patchRemove(fmt.Sprintf("/roleAttributes/%s", k))) | ||
| } | ||
| } | ||
| } | ||
| } else { | ||
| if old != nil { | ||
| for k := range *old { | ||
| patch = append(patch, patchRemove(fmt.Sprintf("/roleAttributes/%s", k))) | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Looks like the tests are passing here. Feel free to merge it into this PR if it helps.
Simplify roleAttributes logic
This was referenced Feb 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR defines the
role_attributesschema block and adds a newrole_attributesfield to thelaunchdarkly_team_memberresource and data source. It also adds tests and updates the docs accordingly.