DXCDT-473: Fix how we guard against erasing unwanted changes in resources #645
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
sergiught
changed the title
sergiught
changed the title
sergiught
commented
Jun 20, 2023
Comment on lines
201
to
216
| alreadyEnabledConnectionsIDs := make([]string, len(alreadyEnabledConnections)) | ||
| for _, conn := range alreadyEnabledConnections { | ||
| alreadyEnabledConnectionsIDs = append(alreadyEnabledConnectionsIDs, conn.GetConnectionID()) | ||
| } | ||
|
|
||
| connectionIDsToAdd := make([]string, len(connectionsToAdd)) | ||
| for _, conn := range connectionsToAdd { | ||
| connectionIDsToAdd = append(connectionIDsToAdd, conn.GetConnectionID()) | ||
| } | ||
|
|
||
| if cmp.Equal(connectionIDsToAdd, alreadyEnabledConnectionsIDs) { | ||
| return nil | ||
| } |
There was a problem hiding this comment.
While the two objects are of the same type, the organization connections retrieves by the API contain a few additional details that will make the diff always fail. Considering we only care about the diff between connection IDs we loop through both objects and only collect those.
Comment on lines
175
to
185
| alreadyMemberIDs := make([]string, len(alreadyMembers)) | ||
| for _, member := range alreadyMembers { | ||
| alreadyMemberIDs = append(alreadyMemberIDs, member.GetUserID()) | ||
| } | ||
|
|
||
| if cmp.Equal(memberIDsToAdd, alreadyMemberIDs) { | ||
| return nil | ||
| } | ||
|
|
There was a problem hiding this comment.
Similar to the above comment, in this case we're only interested in member IDs.
sergiught
force-pushed
the
patch/DXCDT-473-fix-guard
branch
2 times, most recently
from
72a013e
to
3388f02
Compare
willvedd
approved these changes
Jun 20, 2023
sergiught
force-pushed
the
patch/DXCDT-473-fix-guard
branch
from
3388f02
to
edff628
Compare
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.
🔧 Changes
We have a few guards when creating specific resources spread across the provider, this is to ensure we don't overwrite blindly attributes when dealing with Auth0 resources that already exist. However some of these functions had a few issues in the diffing mechanism, please check comments for more details.
These guards are already covered by tests, however further tweaks will follow in another PR.
📚 References
🔬 Testing
📝 Checklist