Merge branch 'v3' into add-controller-with-cloud-with-no-regions

canonical · Jan 9, 2025 · a1883a9 · a1883a9
2 parents 9fd582d + 212fb31
commit a1883a9
Show file tree

Hide file tree

Showing 47 changed files with 3,835 additions and 3,609 deletions.
diff --git a/cmd/jimmsrv/service/service.go b/cmd/jimmsrv/service/service.go
@@ -254,7 +254,7 @@ func (s *Service) OpenFGACleanup(ctx context.Context, trigger <-chan time.Time)
 	for {
 		select {
 		case <-trigger:
-			err := s.jimm.OpenFGACleanup(ctx)
+			err := s.jimm.PermissionManager().OpenFGACleanup(ctx)
 			if err != nil {
 				zapctx.Error(ctx, "openfga cleanup", zap.Error(err))
 				continue