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

Use require.NoError where appropriate in provisioner tests

Browse source
This commit is contained in:
Herman Slatman 2023-05-04 11:44:22 +02:00
parent 0153ff4377
commit 8c53dc9029
No known key found for this signature in database
GPG key ID: F4D8A44EA0A75A4F
1 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
authority/provisioners_test.go
View file

@ -13,6 +13,8 @@ import (
"go.step.sm/crypto/keyutil" "go.step.sm/crypto/keyutil"
"go.step.sm/linkedca" "go.step.sm/linkedca"
"github.com/stretchr/testify/require"
"github.com/smallstep/assert" "github.com/smallstep/assert"
"github.com/smallstep/certificates/api/render" "github.com/smallstep/certificates/api/render"
"github.com/smallstep/certificates/authority/admin" "github.com/smallstep/certificates/authority/admin"
@ -30,9 +32,9 @@ func TestGetEncryptedKey(t *testing.T) {
tests := map[string]func(t *testing.T) *ek{ tests := map[string]func(t *testing.T) *ek{
"ok": func(t *testing.T) *ek { "ok": func(t *testing.T) *ek {
c, err := LoadConfiguration("../ca/testdata/ca.json") c, err := LoadConfiguration("../ca/testdata/ca.json")
assert.FatalError(t, err) require.NoError(t, err)
a, err := New(c) a, err := New(c)
assert.FatalError(t, err) require.NoError(t, err)
return &ek{ return &ek{
a: a, a: a,
kid: c.AuthorityConfig.Provisioners[1].(*provisioner.JWK).Key.KeyID, kid: c.AuthorityConfig.Provisioners[1].(*provisioner.JWK).Key.KeyID,
@ -40,9 +42,9 @@ func TestGetEncryptedKey(t *testing.T) {
}, },
"fail-not-found": func(t *testing.T) *ek { "fail-not-found": func(t *testing.T) *ek {
c, err := LoadConfiguration("../ca/testdata/ca.json") c, err := LoadConfiguration("../ca/testdata/ca.json")
assert.FatalError(t, err) require.NoError(t, err)
a, err := New(c) a, err := New(c)
assert.FatalError(t, err) require.NoError(t, err)
return &ek{ return &ek{
a: a, a: a,
kid: "foo", kid: "foo",
@ -96,16 +98,16 @@ func TestGetProvisioners(t *testing.T) {
tests := map[string]func(t *testing.T) *gp{ tests := map[string]func(t *testing.T) *gp{
"ok": func(t *testing.T) *gp { "ok": func(t *testing.T) *gp {
c, err := LoadConfiguration("../ca/testdata/ca.json") c, err := LoadConfiguration("../ca/testdata/ca.json")
assert.FatalError(t, err) require.NoError(t, err)
a, err := New(c) a, err := New(c)
assert.FatalError(t, err) require.NoError(t, err)
return &gp{a: a} return &gp{a: a}
}, },
"ok/rsa": func(t *testing.T) *gp { "ok/rsa": func(t *testing.T) *gp {
c, err := LoadConfiguration("../ca/testdata/rsaca.json") c, err := LoadConfiguration("../ca/testdata/rsaca.json")
assert.FatalError(t, err) require.NoError(t, err)
a, err := New(c) a, err := New(c)
assert.FatalError(t, err) require.NoError(t, err)
return &gp{a: a} return &gp{a: a}
}, },
} }
@ -135,20 +137,20 @@ func TestGetProvisioners(t *testing.T) {
func TestAuthority_LoadProvisionerByCertificate(t *testing.T) { func TestAuthority_LoadProvisionerByCertificate(t *testing.T) {
_, priv, err := keyutil.GenerateDefaultKeyPair() _, priv, err := keyutil.GenerateDefaultKeyPair()
assert.FatalError(t, err) require.NoError(t, err)
csr := getCSR(t, priv) csr := getCSR(t, priv)
sign := func(a *Authority, extraOpts ...provisioner.SignOption) *x509.Certificate { sign := func(a *Authority, extraOpts ...provisioner.SignOption) *x509.Certificate {
key, err := jose.ReadKey("testdata/secrets/step_cli_key_priv.jwk", jose.WithPassword([]byte("pass"))) key, err := jose.ReadKey("testdata/secrets/step_cli_key_priv.jwk", jose.WithPassword([]byte("pass")))
assert.FatalError(t, err) require.NoError(t, err)
token, err := generateToken("smallstep test", "step-cli", testAudiences.Sign[0], []string{"test.smallstep.com"}, time.Now(), key) token, err := generateToken("smallstep test", "step-cli", testAudiences.Sign[0], []string{"test.smallstep.com"}, time.Now(), key)
assert.FatalError(t, err) require.NoError(t, err)
ctx := provisioner.NewContextWithMethod(context.Background(), provisioner.SignMethod) ctx := provisioner.NewContextWithMethod(context.Background(), provisioner.SignMethod)
opts, err := a.Authorize(ctx, token) opts, err := a.Authorize(ctx, token)
assert.FatalError(t, err) require.NoError(t, err)
opts = append(opts, extraOpts...) opts = append(opts, extraOpts...)
certs, err := a.Sign(csr, provisioner.SignOptions{}, opts...) certs, err := a.Sign(csr, provisioner.SignOptions{}, opts...)
assert.FatalError(t, err) require.NoError(t, err)
return certs[0] return certs[0]
} }
getProvisioner := func(a *Authority, name string) provisioner.Interface { getProvisioner := func(a *Authority, name string) provisioner.Interface {
@ -177,9 +179,7 @@ func TestAuthority_LoadProvisionerByCertificate(t *testing.T) {
}, },
MGetCertificateData: func(serialNumber string) (*db.CertificateData, error) { MGetCertificateData: func(serialNumber string) (*db.CertificateData, error) {
p, err := a1.LoadProvisionerByName("dev") p, err := a1.LoadProvisionerByName("dev")
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
return &db.CertificateData{ return &db.CertificateData{
Provisioner: &db.ProvisionerData{ Provisioner: &db.ProvisionerData{
ID: p.GetID(), ID: p.GetID(),
@ -194,9 +194,7 @@ func TestAuthority_LoadProvisionerByCertificate(t *testing.T) {
a2.adminDB = &mockAdminDB{ a2.adminDB = &mockAdminDB{
MGetCertificateData: (func(s string) (*db.CertificateData, error) { MGetCertificateData: (func(s string) (*db.CertificateData, error) {
p, err := a2.LoadProvisionerByName("dev") p, err := a2.LoadProvisionerByName("dev")
if err != nil { require.NoError(t, err)
t.Fatal(err)
}
return &db.CertificateData{ return &db.CertificateData{
Provisioner: &db.ProvisionerData{ Provisioner: &db.ProvisionerData{
ID: p.GetID(), ID: p.GetID(),