rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflict

Browse Source 
Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
Bryan Frimin
2026-06-22 11:42:20 +02:00
parent 87f769a816
commit 2717bd2831
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/probod/probod.go
View File

@@ -459,7 +459,8 @@ func (impl *Implm) Run(
Register(iam.IAMOAuth2ScopeMappings). Register(iam.IAMOAuth2ScopeMappings).
Register(probo.OAuth2ScopeMappings). Register(probo.OAuth2ScopeMappings).
Register(agentrun.OAuth2ScopeMappings). Register(agentrun.OAuth2ScopeMappings).
Register(accessreview.OAuth2ScopeMappings) Register(accessreview.OAuth2ScopeMappings).
Register(resourcealias.OAuth2ScopeMappings)
iamService, err := iam.NewService( iamService, err := iam.NewService(
ctx, ctx,
@@ -614,10 +615,6 @@ func (impl *Implm) Run(
iamService.Authorizer.RegisterPolicySet(agentrun.PolicySet()) iamService.Authorizer.RegisterPolicySet(agentrun.PolicySet())
iamService.Authorizer.RegisterPolicySet(accessreview.PolicySet()) iamService.Authorizer.RegisterPolicySet(accessreview.PolicySet())
iamService.Authorizer.RegisterPolicySet(resourcealias.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) thirdPartyService := thirdparty.NewService(pgClient, fileManagerService, thirdPartyVetter)
riskManagementService := riskmanagement.NewService(pgClient) riskManagementService := riskmanagement.NewService(pgClient)