Simplify field names for ProvisionerInfo

authority/tls.go

@@ -100,9 +100,9 @@ func (a *Authority) Sign(csr *x509.CertificateRequest, signOpts provisioner.Sign
 		case provisioner.Interface:
 			prov = k
 			pInfo = &casapi.ProvisionerInfo{
-				ProvisionerID:   prov.GetID(),
+				ID:   prov.GetID(),
-				ProvisionerType: prov.GetType().String(),
+				Type: prov.GetType().String(),
-				ProvisionerName: prov.GetName(),
+				Name: prov.GetName(),
 			}
 		// Adds new options to NewCertificate
 		case provisioner.CertificateOptions:

cas/apiv1/requests.go

@@ -63,9 +63,9 @@ type CreateCertificateRequest struct {
 // ProvisionerInfo contains information of the provisioner used to authorize a
 // certificate.
 type ProvisionerInfo struct {
-	ProvisionerID   string
+	ID   string
-	ProvisionerType string
+	Type string
-	ProvisionerName string
+	Name string
 }
 
 // CreateCertificateResponse is the response to a create certificate request.

cas/stepcas/stepcas.go

@@ -79,9 +79,9 @@ func (s *StepCAS) CreateCertificate(req *apiv1.CreateCertificateRequest) (*apiv1
 	if p := req.Provisioner; p != nil {
 		info = &raInfo{
 			AuthorityID:     s.authorityID,
-			ProvisionerID:   p.ProvisionerID,
+			ProvisionerID:   p.ID,
-			ProvisionerType: p.ProvisionerType,
+			ProvisionerType: p.Type,
-			ProvisionerName: p.ProvisionerName,
+			ProvisionerName: p.Name,
 		}
 	}
 

cas/stepcas/stepcas_test.go

@@ -667,7 +667,7 @@ func TestStepCAS_CreateCertificate(t *testing.T) {
 		{"ok with provisioner", fields{jwk, client, testRootFingerprint}, args{&apiv1.CreateCertificateRequest{
 			CSR:         testCR,
 			Lifetime:    time.Hour,
-			Provisioner: &apiv1.ProvisionerInfo{ProvisionerID: "provisioner-id", ProvisionerType: "ACME"},
+			Provisioner: &apiv1.ProvisionerInfo{ID: "provisioner-id", Type: "ACME"},
 		}}, &apiv1.CreateCertificateResponse{
 			Certificate:      testCrt,
 			CertificateChain: []*x509.Certificate{testIssCrt},