make method not exported

canonical · Aug 28, 2024 · 1645376 · 1645376
1 parent 7cb33ed
commit 1645376
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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)
 }