Skip to content

Commit 60d8b22

Browse files
hslatmanhslatman
committed
Change context retrievers to MustTFromContext
1 parent 723c4c1 commit 60d8b22

File tree

7 files changed

+63
-39
lines changed

7 files changed

+63
-39
lines changed

‎authority/admin/api/acme.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type GetExternalAccountKeysResponse struct {
3636
func (h *Handler) requireEABEnabled(next http.HandlerFunc) http.HandlerFunc {
3737
return func(w http.ResponseWriter, r *http.Request) {
3838
ctx := r.Context()
39-
prov := linkedca.ProvisionerFromContext(ctx)
39+
prov := linkedca.MustProvisionerFromContext(ctx)
4040

4141
acmeProvisioner := prov.GetDetails().GetACME()
4242
if acmeProvisioner == nil {

‎authority/admin/api/middleware.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (h *Handler) checkAction(next http.HandlerFunc, supportedInStandalone bool)
107107
func (h *Handler) loadExternalAccountKey(next http.HandlerFunc) http.HandlerFunc {
108108
return func(w http.ResponseWriter, r *http.Request) {
109109
ctx := r.Context()
110-
prov := linkedca.ProvisionerFromContext(ctx)
110+
prov := linkedca.MustProvisionerFromContext(ctx)
111111

112112
reference := chi.URLParam(r, "reference")
113113
keyID := chi.URLParam(r, "keyID")

‎authority/admin/api/middleware_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ func TestHandler_extractAuthorizeTokenAdmin(t *testing.T) {
176176
}
177177
next := func(w http.ResponseWriter, r *http.Request) {
178178
ctx := r.Context()
179-
adm := linkedca.AdminFromContext(ctx) // verifying that the context now has a linkedca.Admin
179+
adm := linkedca.MustAdminFromContext(ctx) // verifying that the context now has a linkedca.Admin
180180
opts := []cmp.Option{cmpopts.IgnoreUnexported(linkedca.Admin{}, timestamppb.Timestamp{})}
181181
if !cmp.Equal(adm, adm, opts...) {
182182
t.Errorf("linkedca.Admin diff =\n%s", cmp.Diff(adm, adm, opts...))
@@ -314,7 +314,7 @@ func TestHandler_loadProvisionerByName(t *testing.T) {
314314
adminDB: db,
315315
statusCode: 200,
316316
next: func(w http.ResponseWriter, r *http.Request) {
317-
prov := linkedca.ProvisionerFromContext(r.Context())
317+
prov := linkedca.MustProvisionerFromContext(r.Context())
318318
assert.NotNil(t, prov)
319319
assert.Equals(t, "provID", prov.GetId())
320320
assert.Equals(t, "provName", prov.GetName())
@@ -588,7 +588,7 @@ func TestHandler_loadExternalAccountKey(t *testing.T) {
588588
},
589589
},
590590
next: func(w http.ResponseWriter, r *http.Request) {
591-
contextEAK := linkedca.ExternalAccountKeyFromContext(r.Context())
591+
contextEAK := linkedca.MustExternalAccountKeyFromContext(r.Context())
592592
assert.NotNil(t, eak)
593593
exp := &linkedca.EABKey{
594594
Id: "eakID",
@@ -632,7 +632,7 @@ func TestHandler_loadExternalAccountKey(t *testing.T) {
632632
},
633633
},
634634
next: func(w http.ResponseWriter, r *http.Request) {
635-
contextEAK := linkedca.ExternalAccountKeyFromContext(r.Context())
635+
contextEAK := linkedca.MustExternalAccountKeyFromContext(r.Context())
636636
assert.NotNil(t, eak)
637637
exp := &linkedca.EABKey{
638638
Id: "eakID",

‎authority/admin/api/policy.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (par *PolicyAdminResponder) CreateAuthorityPolicy(w http.ResponseWriter, r
104104

105105
newPolicy.Deduplicate()
106106

107-
adm := linkedca.AdminFromContext(ctx)
107+
adm := linkedca.MustAdminFromContext(ctx)
108108

109109
var createdPolicy *linkedca.Policy
110110
if createdPolicy, err = par.auth.CreateAuthorityPolicy(ctx, adm, newPolicy); err != nil {
@@ -149,7 +149,7 @@ func (par *PolicyAdminResponder) UpdateAuthorityPolicy(w http.ResponseWriter, r
149149

150150
newPolicy.Deduplicate()
151151

152-
adm := linkedca.AdminFromContext(ctx)
152+
adm := linkedca.MustAdminFromContext(ctx)
153153

154154
var updatedPolicy *linkedca.Policy
155155
if updatedPolicy, err = par.auth.UpdateAuthorityPolicy(ctx, adm, newPolicy); err != nil {
@@ -202,7 +202,7 @@ func (par *PolicyAdminResponder) GetProvisionerPolicy(w http.ResponseWriter, r *
202202
return
203203
}
204204

205-
prov := linkedca.ProvisionerFromContext(r.Context())
205+
prov := linkedca.MustProvisionerFromContext(r.Context())
206206

207207
policy := prov.GetPolicy()
208208
if policy == nil {
@@ -222,7 +222,7 @@ func (par *PolicyAdminResponder) CreateProvisionerPolicy(w http.ResponseWriter,
222222
}
223223

224224
ctx := r.Context()
225-
prov := linkedca.ProvisionerFromContext(ctx)
225+
prov := linkedca.MustProvisionerFromContext(ctx)
226226

227227
policy := prov.GetPolicy()
228228
if policy != nil {
@@ -263,7 +263,7 @@ func (par *PolicyAdminResponder) UpdateProvisionerPolicy(w http.ResponseWriter,
263263
}
264264

265265
ctx := r.Context()
266-
prov := linkedca.ProvisionerFromContext(ctx)
266+
prov := linkedca.MustProvisionerFromContext(ctx)
267267

268268
if prov.Policy == nil {
269269
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "provisioner policy does not exist"))
@@ -301,7 +301,7 @@ func (par *PolicyAdminResponder) DeleteProvisionerPolicy(w http.ResponseWriter,
301301
}
302302

303303
ctx := r.Context()
304-
prov := linkedca.ProvisionerFromContext(ctx)
304+
prov := linkedca.MustProvisionerFromContext(ctx)
305305

306306
if prov.Policy == nil {
307307
render.Error(w, admin.NewError(admin.ErrorNotFoundType, "provisioner policy does not exist"))
@@ -327,7 +327,7 @@ func (par *PolicyAdminResponder) GetACMEAccountPolicy(w http.ResponseWriter, r *
327327
}
328328

329329
ctx := r.Context()
330-
eak := linkedca.ExternalAccountKeyFromContext(ctx)
330+
eak := linkedca.MustExternalAccountKeyFromContext(ctx)
331331

332332
policy := eak.GetPolicy()
333333
if policy == nil {
@@ -346,8 +346,8 @@ func (par *PolicyAdminResponder) CreateACMEAccountPolicy(w http.ResponseWriter,
346346
}
347347

348348
ctx := r.Context()
349-
prov := linkedca.ProvisionerFromContext(ctx)
350-
eak := linkedca.ExternalAccountKeyFromContext(ctx)
349+
prov := linkedca.MustProvisionerFromContext(ctx)
350+
eak := linkedca.MustExternalAccountKeyFromContext(ctx)
351351

352352
policy := eak.GetPolicy()
353353
if policy != nil {
@@ -383,8 +383,8 @@ func (par *PolicyAdminResponder) UpdateACMEAccountPolicy(w http.ResponseWriter,
383383
}
384384

385385
ctx := r.Context()
386-
prov := linkedca.ProvisionerFromContext(ctx)
387-
eak := linkedca.ExternalAccountKeyFromContext(ctx)
386+
prov := linkedca.MustProvisionerFromContext(ctx)
387+
eak := linkedca.MustExternalAccountKeyFromContext(ctx)
388388

389389
policy := eak.GetPolicy()
390390
if policy == nil {
@@ -418,8 +418,8 @@ func (par *PolicyAdminResponder) DeleteACMEAccountPolicy(w http.ResponseWriter,
418418
}
419419

420420
ctx := r.Context()
421-
prov := linkedca.ProvisionerFromContext(ctx)
422-
eak := linkedca.ExternalAccountKeyFromContext(ctx)
421+
prov := linkedca.MustProvisionerFromContext(ctx)
422+
eak := linkedca.MustExternalAccountKeyFromContext(ctx)
423423

424424
policy := eak.GetPolicy()
425425
if policy == nil {

‎authority/provisioners.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ func (a *Authority) StoreProvisioner(ctx context.Context, prov *linkedca.Provisi
173173
return admin.WrapErrorISE(err, "error generating provisioner config")
174174
}
175175

176-
adm := linkedca.AdminFromContext(ctx)
176+
adm := linkedca.MustAdminFromContext(ctx)
177177

178178
if err := a.checkProvisionerPolicy(ctx, adm, prov.Name, prov.Policy); err != nil {
179179
return err
@@ -224,7 +224,7 @@ func (a *Authority) UpdateProvisioner(ctx context.Context, nu *linkedca.Provisio
224224
return admin.WrapErrorISE(err, "error generating provisioner config")
225225
}
226226

227-
adm := linkedca.AdminFromContext(ctx)
227+
adm := linkedca.MustAdminFromContext(ctx)
228228

229229
if err := a.checkProvisionerPolicy(ctx, adm, nu.Name, nu.Policy); err != nil {
230230
return err

‎go.mod

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,26 @@ require (
1414
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
1515
github.com/Masterminds/sprig/v3 v3.2.2
1616
github.com/ThalesIgnite/crypto11 v1.2.4
17-
github.com/aws/aws-sdk-go v1.30.29
17+
github.com/aws/aws-sdk-go v1.37.0
1818
github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd // indirect
19+
github.com/fatih/color v1.9.0 // indirect
20+
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
1921
github.com/go-chi/chi v4.0.2+incompatible
2022
github.com/go-kit/kit v0.10.0 // indirect
2123
github.com/go-piv/piv-go v1.7.0
24+
github.com/go-sql-driver/mysql v1.6.0 // indirect
25+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2226
github.com/golang/mock v1.6.0
23-
github.com/golang/protobuf v1.5.2 // indirect
2427
github.com/google/go-cmp v0.5.7
2528
github.com/google/uuid v1.3.0
2629
github.com/googleapis/gax-go/v2 v2.1.1
2730
github.com/hashicorp/vault/api v1.3.1
2831
github.com/hashicorp/vault/api/auth/approle v0.1.1
32+
github.com/jhump/protoreflect v1.9.0 // indirect
2933
github.com/mattn/go-colorable v0.1.8 // indirect
3034
github.com/mattn/go-isatty v0.0.13 // indirect
3135
github.com/micromdm/scep/v2 v2.1.0
36+
github.com/miekg/pkcs11 v1.0.3 // indirect
3237
github.com/newrelic/go-agent v2.15.0+incompatible
3338
github.com/pkg/errors v0.9.1
3439
github.com/rs/xid v1.2.1
@@ -38,18 +43,21 @@ require (
3843
github.com/smallstep/nosql v0.4.0
3944
github.com/stretchr/testify v1.7.1
4045
github.com/urfave/cli v1.22.4
46+
go.etcd.io/bbolt v1.3.6 // indirect
4147
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352
4248
go.step.sm/cli-utils v0.7.0
4349
go.step.sm/crypto v0.16.1
44-
go.step.sm/linkedca v0.15.0
50+
go.step.sm/linkedca v0.16.0
4551
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
4652
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b
4753
golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect
54+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
4855
google.golang.org/api v0.70.0
4956
google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de
5057
google.golang.org/grpc v1.45.0
5158
google.golang.org/protobuf v1.28.0
5259
gopkg.in/square/go-jose.v2 v2.6.0
60+
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
5361
)
5462

5563
// replace github.com/smallstep/nosql => ../nosql

0 commit comments

Comments
 (0)