From 1de8eb4bfa7379c8c09f3000dbf32b75fcd260b5 Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano@smallstep.com>
Date: Thu, 25 Oct 2018 17:27:40 -0700
Subject: [PATCH] Fix provisioner package move.

---
 authority/authority.go         |  1 -
 authority/provisioners.go      | 10 +++++-----
 authority/provisioners_test.go | 11 +++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/authority/authority.go b/authority/authority.go
index 790ab6ad..232a9e4d 100644
--- a/authority/authority.go
+++ b/authority/authority.go
@@ -58,7 +58,6 @@ func New(config *Config) (*Authority, error) {
 			audiences = append(audiences, fmt.Sprintf("https://%s/sign", name), fmt.Sprintf("https://%s/1.0/sign", name))
 		}
 		audiences = append(audiences, fmt.Sprintf("https://%s:%s/sign", name, port), fmt.Sprintf("https://%s:%s/1.0/sign", name, port))
-
 	}
 
 	var a = &Authority{
diff --git a/authority/provisioners.go b/authority/provisioners.go
index 098cba4c..9f3b246e 100644
--- a/authority/provisioners.go
+++ b/authority/provisioners.go
@@ -43,11 +43,11 @@ func (a *Authority) GetProvisioners() ([]*Provisioner, error) {
 }
 
 type uidProvisioner struct {
-	provisioner *provisioner.Provisioner
+	provisioner *Provisioner
 	uid         string
 }
 
-func newSortedProvisioners(provisioners []*provisioner.Provisioner) (provisionerSlice, error) {
+func newSortedProvisioners(provisioners []*Provisioner) (provisionerSlice, error) {
 	if len(provisioners) > math.MaxUint32 {
 		return nil, errors.New("too many provisioners")
 	}
@@ -80,7 +80,7 @@ func (p provisionerSlice) Len() int           { return len(p) }
 func (p provisionerSlice) Less(i, j int) bool { return p[i].uid < p[j].uid }
 func (p provisionerSlice) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
 
-func (p provisionerSlice) Find(cursor string, limit int) ([]*provisioner.Provisioner, string) {
+func (p provisionerSlice) Find(cursor string, limit int) ([]*Provisioner, string) {
 	switch {
 	case limit <= 0:
 		limit = DefaultProvisionersLimit
@@ -92,7 +92,7 @@ func (p provisionerSlice) Find(cursor string, limit int) ([]*provisioner.Provisi
 	cursor = fmt.Sprintf("%040s", cursor)
 	i := sort.Search(n, func(i int) bool { return p[i].uid >= cursor })
 
-	var slice []*provisioner.Provisioner
+	var slice []*Provisioner
 	for ; i < n && len(slice) < limit; i++ {
 		slice = append(slice, p[i].provisioner)
 	}
@@ -104,7 +104,7 @@ func (p provisionerSlice) Find(cursor string, limit int) ([]*provisioner.Provisi
 
 // provisionerSum returns the SHA1 of the json representation of the
 // provisioner. From this we will create the unique and sorted id.
-func provisionerSum(p *provisioner.Provisioner) ([]byte, error) {
+func provisionerSum(p *Provisioner) ([]byte, error) {
 	b, err := json.Marshal(p.Key)
 	if err != nil {
 		return nil, errors.Wrap(err, "error marshalling provisioner")
diff --git a/authority/provisioners_test.go b/authority/provisioners_test.go
index 688e48e6..50f0e268 100644
--- a/authority/provisioners_test.go
+++ b/authority/provisioners_test.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/smallstep/assert"
-	"github.com/smallstep/ca-component/provisioner"
 	"github.com/smallstep/cli/crypto/randutil"
 	"github.com/smallstep/cli/jose"
 )
@@ -127,7 +126,7 @@ func TestGetProvisioners(t *testing.T) {
 	}
 }
 
-func generateProvisioner(t *testing.T) *provisioner.Provisioner {
+func generateProvisioner(t *testing.T) *Provisioner {
 	issuer, err := randutil.Alphanumeric(10)
 	assert.FatalError(t, err)
 	// Create a new JWK
@@ -154,7 +153,7 @@ func generateProvisioner(t *testing.T) *provisioner.Provisioner {
 	public := jwk.Public()
 	encrypted, err := jwe.CompactSerialize()
 	assert.FatalError(t, err)
-	return &provisioner.Provisioner{
+	return &Provisioner{
 		Issuer:       issuer,
 		Type:         "JWT",
 		Key:          &public,
@@ -163,7 +162,7 @@ func generateProvisioner(t *testing.T) *provisioner.Provisioner {
 }
 
 func Test_newSortedProvisioners(t *testing.T) {
-	provisioners := make([]*provisioner.Provisioner, 20)
+	provisioners := make([]*Provisioner, 20)
 	for i := range provisioners {
 		provisioners[i] = generateProvisioner(t)
 	}
@@ -186,7 +185,7 @@ func Test_provisionerSlice_Find(t *testing.T) {
 	trim := func(s string) string {
 		return strings.TrimLeft(s, "0")
 	}
-	provisioners := make([]*provisioner.Provisioner, 20)
+	provisioners := make([]*Provisioner, 20)
 	for i := range provisioners {
 		provisioners[i] = generateProvisioner(t)
 	}
@@ -201,7 +200,7 @@ func Test_provisionerSlice_Find(t *testing.T) {
 		name  string
 		p     provisionerSlice
 		args  args
-		want  []*provisioner.Provisioner
+		want  []*Provisioner
 		want1 string
 	}{
 		{"all", ps, args{"", DefaultProvisionersMax}, provisioners[0:20], ""},