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

Jump to bottom

Tweak ofga list objects return type #1032

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Tweak ofga list objects return type #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f033bca
Tweak ofga list objects return type
kian99 Aug 23, 2023
2c229ec
Fix tests
kian99 Aug 23, 2023
5f20de9
Renamed to internal package tag
kian99 Aug 23, 2023
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
4 changes: 0 additions & 4 deletions internal/jujuapi/jimm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,10 +501,6 @@ func (r *controllerRoot) CrossModelQuery(ctx context.Context, req apiparams.Cros
if err != nil {
return apiparams.CrossModelQueryResponse{}, errors.E(op, errors.Code("failed to list user's model access"))
}
// UUIDs are returned in the form "model:uuid"
for i, uuid := range modelUUIDs {
modelUUIDs[i] = strings.Split(uuid, ":")[1]
}
models, err := r.jimm.Database.GetModelsByUUID(ctx, modelUUIDs)
if err != nil {
return apiparams.CrossModelQueryResponse{}, errors.E(op, errors.Code("failed to get models for user"))
Expand Down
12 changes: 4 additions & 8 deletions internal/openfga/openfga.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,20 @@ 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 []Tag, err error) {
userEntity, err := cofga.ParseEntity(user)
if err != nil {
return nil, err
}
entities, err := o.cofgaClient.FindAccessibleObjectsByRelation(ctx, Tuple{
Object: &userEntity,
Relation: cofga.Relation(relation),
Target: &cofga.Entity{Kind: cofga.Kind(objType)},
Target: &Tag{Kind: cofga.Kind(objType)},
}, contextualTuples...)
if err != nil {
return nil, err
}
result := make([]string, len(entities))
for i, entity := range entities {
result[i] = entity.String()
}
return result, nil
return entities, nil
}

// AddRelation adds given relations (tuples).
Expand All @@ -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) ([]Tag, error) {
return o.listObjects(ctx, user, relation, objType, contextualTuples)
}

Expand Down
22 changes: 14 additions & 8 deletions internal/openfga/openfga_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,12 @@ func (s *openFGATestSuite) TestListObjectsWithContextualTuples(c *gc.C) {
"30000000-0000-0000-0000-000000000000",
}

expected := make([]string, len(modelUUIDs))
expected := make([]openfga.Tag, len(modelUUIDs))
for i, v := range modelUUIDs {
expected[i] = "model:" + v
expected[i] = openfga.Tag{
Kind: "model",
ID: v,
}
}

ids, err := s.ofgaClient.ListObjects(ctx, "user:alice", "reader", "model", []openfga.Tuple{
Expand Down Expand Up @@ -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 openfga.Tag, expected openfga.Tag) bool {
return want.ID < expected.ID
}),
), gc.Equals, true)
}
Expand All @@ -489,9 +492,12 @@ func (s *openFGATestSuite) TestListObjectsWithPeristedTuples(c *gc.C) {
"30000000-0000-0000-0000-000000000000",
}

expected := make([]string, len(modelUUIDs))
expected := make([]openfga.Tag, len(modelUUIDs))
for i, v := range modelUUIDs {
expected[i] = "model:" + v
expected[i] = openfga.Tag{
Kind: "model",
ID: v,
}
}

c.Assert(s.ofgaClient.AddRelation(ctx,
Expand Down Expand Up @@ -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 openfga.Tag, expected openfga.Tag) bool {
return want.ID < expected.ID
}),
), gc.Equals, true)
}
Expand Down
10 changes: 9 additions & 1 deletion internal/openfga/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@babakks That should already be removed, are you still seeing it?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, sorry.

return u.client.ListObjects(ctx, ofganames.ConvertTag(u.ResourceTag()).String(), ofganames.ReaderRelation.String(), "model", nil)
entities, err := u.client.ListObjects(ctx, ofganames.ConvertTag(u.ResourceTag()).String(), ofganames.ReaderRelation.String(), "model", nil)
if err != nil {
return nil, err
}
modelUUIDs := make([]string, len(entities))
for i, model := range entities {
modelUUIDs[i] = model.ID
}
return modelUUIDs, err
}

type administratorT interface {
Expand Down