Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: tokenserver/appengine/impl/services/admin/adminsrv/service.go

Issue 2993023002: tokenserver: Boilerplate for loading and serving service_accounts.cfg. (Closed)
Patch Set: add test Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tokenserver/appengine/impl/services/admin/adminsrv/service.go
diff --git a/tokenserver/appengine/impl/services/admin/adminsrv/service.go b/tokenserver/appengine/impl/services/admin/adminsrv/service.go
index e84f0d3fa37dfbe61a6d41cc333e1d1435de4cac..f8ceef5bbe29af477deac49ab491705b2cbfbae2 100644
--- a/tokenserver/appengine/impl/services/admin/adminsrv/service.go
+++ b/tokenserver/appengine/impl/services/admin/adminsrv/service.go
@@ -33,9 +33,9 @@ import (
type serverImpl struct {
certconfig.ImportCAConfigsRPC
delegation.ImportDelegationConfigsRPC
- serviceaccounts.ImportServiceAccountsConfigsRPC
- machinetoken.InspectMachineTokenRPC
delegation.InspectDelegationTokenRPC
+ machinetoken.InspectMachineTokenRPC
+ serviceaccounts.ImportServiceAccountsConfigsRPC
serviceaccounts.InspectOAuthTokenGrantRPC
}
@@ -48,11 +48,14 @@ func NewServer() admin.AdminServer {
ImportDelegationConfigsRPC: delegation.ImportDelegationConfigsRPC{
RulesCache: delegation.GlobalRulesCache,
},
- InspectMachineTokenRPC: machinetoken.InspectMachineTokenRPC{
+ InspectDelegationTokenRPC: delegation.InspectDelegationTokenRPC{
Signer: signer,
},
- InspectDelegationTokenRPC: delegation.InspectDelegationTokenRPC{
+ InspectMachineTokenRPC: machinetoken.InspectMachineTokenRPC{
Signer: signer,
},
+ ImportServiceAccountsConfigsRPC: serviceaccounts.ImportServiceAccountsConfigsRPC{
+ RulesCache: serviceaccounts.GlobalRulesCache,
+ },
}
}

Powered by Google App Engine
This is Rietveld 408576698