Tweak ofga list objects return type #1032
Merged
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
babakks
approved these changes
Aug 23, 2023
internal/openfga/openfga.go
Outdated
| @@ -111,7 +107,7 @@ func (o *OFGAClient) RemoveRelation(ctx context.Context, tuples ...Tuple) error | |||
| } | |||
|
|
|||
| // ListObjects returns all object IDs of <objType> that a user has the relation <relation> to. | |||
| func (o *OFGAClient) ListObjects(ctx context.Context, user string, relation string, objType string, contextualTuples []Tuple) ([]string, error) { | |||
| func (o *OFGAClient) ListObjects(ctx context.Context, user string, relation string, objType string, contextualTuples []Tuple) ([]cofga.Entity, error) { | |||
There was a problem hiding this comment.
Let's not directly use cofga types in the internal/openfga package API. There's Tag (which is an alias for cofga.Entity) in the package that you can use.
There was a problem hiding this comment.
Ah good point, thank you
internal/openfga/openfga.go
Outdated
| @@ -80,7 +80,7 @@ func (o *OFGAClient) getRelatedObjects(ctx context.Context, tuple Tuple, pageSiz | |||
| // must NOT include the ID, i.e., | |||
| // | |||
| // - "group:" vs "group:mygroup", where "mygroup" is the ID and the correct objType would be "group". | |||
| func (o *OFGAClient) listObjects(ctx context.Context, user string, relation string, objType string, contextualTuples []Tuple) (objectIds []string, err error) { | |||
| func (o *OFGAClient) listObjects(ctx context.Context, user string, relation string, objType string, contextualTuples []Tuple) (objectIds []cofga.Entity, err error) { | |||
internal/openfga/openfga_test.go
Outdated
| @@ -435,9 +435,12 @@ func (s *openFGATestSuite) TestListObjectsWithContextualTuples(c *gc.C) { | |||
| "30000000-0000-0000-0000-000000000000", | |||
| } | |||
|
|
|||
| expected := make([]string, len(modelUUIDs)) | |||
| expected := make([]cofga.Entity, len(modelUUIDs)) | |||
internal/openfga/openfga_test.go
Outdated
| for i, v := range modelUUIDs { | ||
| expected[i] = "model:" + v | ||
| expected[i] = cofga.Entity{ |
internal/openfga/openfga_test.go
Outdated
| @@ -474,8 +477,8 @@ func (s *openFGATestSuite) TestListObjectsWithContextualTuples(c *gc.C) { | |||
| c.Assert(cmp.Equal( | |||
| ids, | |||
| expected, | |||
| cmpopts.SortSlices(func(want string, expected string) bool { | |||
| return want < expected | |||
| cmpopts.SortSlices(func(want cofga.Entity, expected cofga.Entity) bool { | |||
internal/openfga/openfga_test.go
Outdated
| @@ -489,9 +492,12 @@ func (s *openFGATestSuite) TestListObjectsWithPeristedTuples(c *gc.C) { | |||
| "30000000-0000-0000-0000-000000000000", | |||
| } | |||
|
|
|||
| expected := make([]string, len(modelUUIDs)) | |||
| expected := make([]cofga.Entity, len(modelUUIDs)) | |||
internal/openfga/openfga_test.go
Outdated
| for i, v := range modelUUIDs { | ||
| expected[i] = "model:" + v | ||
| expected[i] = cofga.Entity{ |
internal/openfga/openfga_test.go
Outdated
| @@ -531,8 +537,8 @@ func (s *openFGATestSuite) TestListObjectsWithPeristedTuples(c *gc.C) { | |||
| c.Assert(cmp.Equal( | |||
| ids, | |||
| expected, | |||
| cmpopts.SortSlices(func(want string, expected string) bool { | |||
| return want < expected | |||
| cmpopts.SortSlices(func(want cofga.Entity, expected cofga.Entity) bool { | |||
| @@ -217,7 +217,15 @@ func (u *User) UnsetApplicationOfferAccess(ctx context.Context, resource names.A | |||
|
|
|||
| // ListModels returns a slice of model UUIDs this user has at least reader access to. | |||
| func (u *User) ListModels(ctx context.Context) ([]string, error) { | |||
There was a problem hiding this comment.
As I checked this method is also called in internal/jujuapi/jimm.go:500 again with splitting around :. Could you please remove that part, too?
There was a problem hiding this comment.
@babakks That should already be removed, are you still seeing it?
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.
Description
Follow up to #1030, instead of parsing ofga entities which are of the form kind:id, instead let's return the entity further up the call stack and then allow the caller to extract the bits they need.
Engineering checklist
Check only items that apply