From 2717bd2831f058e557cec06e47e129085370cb6e Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 22 Jun 2026 11:42:20 +0200 Subject: [PATCH] Fix conflict Signed-off-by: Bryan Frimin --- pkg/probod/probod.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/probod/probod.go b/pkg/probod/probod.go index 758675c90..451f1b7a3 100644 --- a/pkg/probod/probod.go +++ b/pkg/probod/probod.go @@ -459,7 +459,8 @@ func (impl *Implm) Run( Register(iam.IAMOAuth2ScopeMappings). Register(probo.OAuth2ScopeMappings). Register(agentrun.OAuth2ScopeMappings). - Register(accessreview.OAuth2ScopeMappings) + Register(accessreview.OAuth2ScopeMappings). + Register(resourcealias.OAuth2ScopeMappings) iamService, err := iam.NewService( ctx, @@ -614,10 +615,6 @@ func (impl *Implm) Run( iamService.Authorizer.RegisterPolicySet(agentrun.PolicySet()) iamService.Authorizer.RegisterPolicySet(accessreview.PolicySet()) iamService.Authorizer.RegisterPolicySet(resourcealias.PolicySet()) - iamService.OAuth2ScopeRegistry.Register(agentrun.OAuth2ScopeMappings) - iamService.OAuth2ScopeRegistry.Register(accessreview.OAuth2ScopeMappings) - iamService.OAuth2ScopeRegistry.Register(iam.IAMOAuth2ScopeMappings) - iamService.OAuth2ScopeRegistry.Register(resourcealias.OAuth2ScopeMappings) thirdPartyService := thirdparty.NewService(pgClient, fileManagerService, thirdPartyVetter) riskManagementService := riskmanagement.NewService(pgClient)