Catch nil values for FoundSubjectsByResourceID map and return as errors #1008
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
github-actions
bot
added
the
area/tooling
jakedt
requested changes
Nov 21, 2022
internal/graph/lookupsubjects.go
Outdated
| @@ -460,7 +464,10 @@ func (lsu *lookupSubjectsUnion) CompletedChildOperations() error { | |||
|
|
|||
| for _, result := range collector.Results() { | |||
| metadata = combineResponseMetadata(metadata, result.Metadata) | |||
| foundSubjects.UnionWith(result.FoundSubjectsByResourceId) | |||
| err := foundSubjects.UnionWith(result.FoundSubjectsByResourceId) | |||
There was a problem hiding this comment.
You should use the if err := thing(); err != nil pattern here and at other callsites.
internal/graph/lookupsubjects.go
Outdated
| foundSubjects.UnionWith(result.FoundSubjectsByResourceId) | ||
| err := foundSubjects.UnionWith(result.FoundSubjectsByResourceId) | ||
| if err != nil { | ||
| return err |
There was a problem hiding this comment.
Wrap these errors with higher level context about why you were trying to Union, so we can trace which callsite caused the problem.
| @@ -36,12 +42,22 @@ func (ssr SubjectSetByResourceID) AddFromRelationship(relationship *core.Relatio | |||
| } | |||
|
|
|||
| // UnionWith unions the map's sets with the other map of sets provided. | |||
| func (ssr SubjectSetByResourceID) UnionWith(other map[string]*v1.FoundSubjects) { | |||
| func (ssr SubjectSetByResourceID) UnionWith(other map[string]*v1.FoundSubjects) error { | |||
There was a problem hiding this comment.
Can you create a test which reproduces why this happens in real running-systems to verify the fix?
josephschorr
force-pushed
the
ensure-no-nil
branch
from
fe88057 to
a59ac72
Compare
|
Updated |
jakedt
reviewed
Nov 21, 2022
| for _, subject := range subjects.FoundSubjects { | ||
| ssr.add(resourceID, subject) | ||
| err := ssr.add(resourceID, subject) |
Also ensure we never add nils in the first place
josephschorr
force-pushed
the
ensure-no-nil
branch
from
a59ac72 to
5518ee1
Compare
jakedt
approved these changes
Nov 21, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Also ensure we never add nils in the first place