From 1645376476787de3a6c59bba789ddfd935fd3bd9 Mon Sep 17 00:00:00 2001 From: Kian Parvin Date: Wed, 28 Aug 2024 11:54:50 +0200 Subject: [PATCH] make method not exported --- internal/jimm/applicationoffer.go | 2 +- internal/jimm/controller.go | 2 +- internal/jimm/export_test.go | 4 ++++ internal/jimm/utils.go | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/internal/jimm/applicationoffer.go b/internal/jimm/applicationoffer.go index 498eaba86..004f7aaf2 100644 --- a/internal/jimm/applicationoffer.go +++ b/internal/jimm/applicationoffer.go @@ -166,7 +166,7 @@ func (j *JIMM) Offer(ctx context.Context, user *openfga.User, offer AddApplicati zap.String("application-offer", doc.UUID)) } - if err := j.EveryoneUser().SetApplicationOfferAccess(ctx, doc.ResourceTag(), ofganames.ReaderRelation); err != nil { + if err := j.everyoneUser().SetApplicationOfferAccess(ctx, doc.ResourceTag(), ofganames.ReaderRelation); err != nil { zapctx.Error( ctx, "failed relation between user and application offer", diff --git a/internal/jimm/controller.go b/internal/jimm/controller.go index b4c5aac70..32c44c7ac 100644 --- a/internal/jimm/controller.go +++ b/internal/jimm/controller.go @@ -278,7 +278,7 @@ func (j *JIMM) AddController(ctx context.Context, user *openfga.User, ctl *dbmod // If this cloud is the one used by the controller model then // it is available to all users. Other clouds require `juju grant-cloud` to add permissions. if cloud.ResourceTag().String() == modelSummary.CloudTag { - if err := j.EveryoneUser().SetCloudAccess(ctx, cloud.ResourceTag(), ofganames.CanAddModelRelation); err != nil { + if err := j.everyoneUser().SetCloudAccess(ctx, cloud.ResourceTag(), ofganames.CanAddModelRelation); err != nil { zapctx.Error(ctx, "failed to grant everyone add-model access", zap.Error(err)) } } diff --git a/internal/jimm/export_test.go b/internal/jimm/export_test.go index 671e8e35c..9fd272ff7 100644 --- a/internal/jimm/export_test.go +++ b/internal/jimm/export_test.go @@ -56,3 +56,7 @@ func (j *JIMM) GetUser(ctx context.Context, identifier string) (*openfga.User, e func (j *JIMM) UpdateUserLastLogin(ctx context.Context, identifier string) error { return j.updateUserLastLogin(ctx, identifier) } + +func (j *JIMM) EveryoneUser() *openfga.User { + return j.everyoneUser() +} diff --git a/internal/jimm/utils.go b/internal/jimm/utils.go index 2d7588f5a..c97cdf225 100644 --- a/internal/jimm/utils.go +++ b/internal/jimm/utils.go @@ -18,9 +18,9 @@ import ( * Authorisation utilities **/ -// EveryoneUser is a convenience method to retrieve the "everyone" user +// everyoneUser is a convenience method to retrieve the "everyone" user // whose permissions will translate into granting all users with access. -func (j *JIMM) EveryoneUser() *openfga.User { +func (j *JIMM) everyoneUser() *openfga.User { everyoneIdentity := &dbmodel.Identity{Name: ofganames.EveryoneUser} return openfga.NewUser(everyoneIdentity, j.OpenFGAClient) }