From 428661f4720db1d6c65b875f39fc82aff34cea23 Mon Sep 17 00:00:00 2001 From: Mariano Cano Date: Tue, 30 Oct 2018 15:25:52 -0700 Subject: [PATCH] Use name instead of issuer in error message. --- authority/provisioner.go | 2 +- authority/provisioner_test.go | 4 ++-- authority/provisioners_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/authority/provisioner.go b/authority/provisioner.go index 34a6e492..bfaf8d7c 100644 --- a/authority/provisioner.go +++ b/authority/provisioner.go @@ -96,7 +96,7 @@ type Provisioner struct { func (p *Provisioner) Init(global *ProvisionerClaims) error { switch { case p.Name == "": - return errors.New("provisioner issuer cannot be empty") + return errors.New("provisioner name cannot be empty") case p.Type == "": return errors.New("provisioner type cannot be empty") diff --git a/authority/provisioner_test.go b/authority/provisioner_test.go index 0d33d679..5135636e 100644 --- a/authority/provisioner_test.go +++ b/authority/provisioner_test.go @@ -14,10 +14,10 @@ func TestProvisionerInit(t *testing.T) { err error } tests := map[string]func(*testing.T) ProvisionerValidateTest{ - "fail-empty-issuer": func(t *testing.T) ProvisionerValidateTest { + "fail-empty-name": func(t *testing.T) ProvisionerValidateTest { return ProvisionerValidateTest{ p: &Provisioner{}, - err: errors.New("provisioner issuer cannot be empty"), + err: errors.New("provisioner name cannot be empty"), } }, "fail-empty-type": func(t *testing.T) ProvisionerValidateTest { diff --git a/authority/provisioners_test.go b/authority/provisioners_test.go index 07046d76..b982a366 100644 --- a/authority/provisioners_test.go +++ b/authority/provisioners_test.go @@ -128,7 +128,7 @@ func TestGetProvisioners(t *testing.T) { } func generateProvisioner(t *testing.T) *Provisioner { - issuer, err := randutil.Alphanumeric(10) + name, err := randutil.Alphanumeric(10) assert.FatalError(t, err) // Create a new JWK jwk, err := jose.GenerateJWK("EC", "P-256", "ES256", "sig", "", 0) @@ -155,7 +155,7 @@ func generateProvisioner(t *testing.T) *Provisioner { encrypted, err := jwe.CompactSerialize() assert.FatalError(t, err) return &Provisioner{ - Name: issuer, + Name: name, Type: "JWT", Key: &public, EncryptedKey: encrypted,