mbiryukova/certificates
1
0
Fork 0
forked from TrueCloudLab/certificates
Code Pull requests Activity

change return value of generateProvisionerConfig to value

Browse source 
- always used as value (rather than pointer)
This commit is contained in:
max furman 2022-02-28 11:04:40 -08:00
parent 6030f8bc2e
commit a79d4af19b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
authority/authority.go
View file

@ -175,7 +175,7 @@ func (a *Authority) reloadAdminResources(ctx context.Context) error {
// Create provisioner collection. // Create provisioner collection.
provClxn := provisioner.NewCollection(provisionerConfig.Audiences) provClxn := provisioner.NewCollection(provisionerConfig.Audiences)
for _, p := range provList { for _, p := range provList {
if err := p.Init(*provisionerConfig); err != nil { if err := p.Init(provisionerConfig); err != nil {
return err return err
} }
if err := provClxn.Store(p); err != nil { if err := provClxn.Store(p); err != nil {

14
authority/provisioners.go
View file

@ -87,20 +87,20 @@ func (a *Authority) LoadProvisionerByName(name string) (provisioner.Interface, e
return p, nil return p, nil
} }
func (a *Authority) generateProvisionerConfig(ctx context.Context) (*provisioner.Config, error) { func (a *Authority) generateProvisionerConfig(ctx context.Context) (provisioner.Config, error) {
// Merge global and configuration claims // Merge global and configuration claims
claimer, err := provisioner.NewClaimer(a.config.AuthorityConfig.Claims, config.GlobalProvisionerClaims) claimer, err := provisioner.NewClaimer(a.config.AuthorityConfig.Claims, config.GlobalProvisionerClaims)
if err != nil { if err != nil {
return nil, err return provisioner.Config{}, err
} }
// TODO: should we also be combining the ssh federated roots here? // TODO: should we also be combining the ssh federated roots here?
// If we rotate ssh roots keys, sshpop provisioner will lose ability to // If we rotate ssh roots keys, sshpop provisioner will lose ability to
// validate old SSH certificates, unless they are added as federated certs. // validate old SSH certificates, unless they are added as federated certs.
sshKeys, err := a.GetSSHRoots(ctx) sshKeys, err := a.GetSSHRoots(ctx)
if err != nil { if err != nil {
return nil, err return provisioner.Config{}, err
} }
return &provisioner.Config{ return provisioner.Config{
Claims: claimer.Claims(), Claims: claimer.Claims(),
Audiences: a.config.GetAudiences(), Audiences: a.config.GetAudiences(),
DB: a.db, DB: a.db,
@ -138,7 +138,7 @@ func (a *Authority) StoreProvisioner(ctx context.Context, prov *linkedca.Provisi
return admin.WrapErrorISE(err, "error generating provisioner config") return admin.WrapErrorISE(err, "error generating provisioner config")
} }
if err := certProv.Init(*provisionerConfig); err != nil { if err := certProv.Init(provisionerConfig); err != nil {
return admin.WrapError(admin.ErrorBadRequestType, err, "error validating configuration for provisioner %s", prov.Name) return admin.WrapError(admin.ErrorBadRequestType, err, "error validating configuration for provisioner %s", prov.Name)
} }
@ -154,7 +154,7 @@ func (a *Authority) StoreProvisioner(ctx context.Context, prov *linkedca.Provisi
"error converting to certificates provisioner from linkedca provisioner") "error converting to certificates provisioner from linkedca provisioner")
} }
if err := certProv.Init(*provisionerConfig); err != nil { if err := certProv.Init(provisionerConfig); err != nil {
return admin.WrapErrorISE(err, "error initializing provisioner %s", prov.Name) return admin.WrapErrorISE(err, "error initializing provisioner %s", prov.Name)
} }
@ -183,7 +183,7 @@ func (a *Authority) UpdateProvisioner(ctx context.Context, nu *linkedca.Provisio
return admin.WrapErrorISE(err, "error generating provisioner config") return admin.WrapErrorISE(err, "error generating provisioner config")
} }
if err := certProv.Init(*provisionerConfig); err != nil { if err := certProv.Init(provisionerConfig); err != nil {
return admin.WrapErrorISE(err, "error initializing provisioner %s", nu.Name) return admin.WrapErrorISE(err, "error initializing provisioner %s", nu.Name)
} }