From 6b5d3dca951452286138b4c9ebede76c73dc7aa4 Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano.cano@gmail.com>
Date: Wed, 3 Aug 2022 18:44:04 -0700
Subject: [PATCH] Add provisioner name to RA info

---
 authority/provisioner/provisioner.go | 1 +
 authority/tls.go                     | 1 +
 cas/stepcas/issuer.go                | 1 +
 cas/stepcas/stepcas.go               | 1 +
 4 files changed, 4 insertions(+)

diff --git a/authority/provisioner/provisioner.go b/authority/provisioner/provisioner.go
index ba3153a3..bdfc7da7 100644
--- a/authority/provisioner/provisioner.go
+++ b/authority/provisioner/provisioner.go
@@ -346,6 +346,7 @@ type RAInfo struct {
 	AuthorityID     string `json:"authorityId"`
 	ProvisionerID   string `json:"provisionerId"`
 	ProvisionerType string `json:"provisionerType"`
+	ProvisionerName string `json:"provisionerName"`
 }
 
 // raProvisioner wraps a provisioner with RA data.
diff --git a/authority/tls.go b/authority/tls.go
index d7be04fc..24cd86c5 100644
--- a/authority/tls.go
+++ b/authority/tls.go
@@ -102,6 +102,7 @@ func (a *Authority) Sign(csr *x509.CertificateRequest, signOpts provisioner.Sign
 			pInfo = &casapi.ProvisionerInfo{
 				ProvisionerID:   prov.GetID(),
 				ProvisionerType: prov.GetType().String(),
+				ProvisionerName: prov.GetName(),
 			}
 		// Adds new options to NewCertificate
 		case provisioner.CertificateOptions:
diff --git a/cas/stepcas/issuer.go b/cas/stepcas/issuer.go
index 394489bc..57421ffe 100644
--- a/cas/stepcas/issuer.go
+++ b/cas/stepcas/issuer.go
@@ -14,6 +14,7 @@ type raInfo struct {
 	AuthorityID     string `json:"authorityId,omitempty"`
 	ProvisionerID   string `json:"provisionerId"`
 	ProvisionerType string `json:"provisionerType"`
+	ProvisionerName string `json:"provisionerName"`
 }
 
 type stepIssuer interface {
diff --git a/cas/stepcas/stepcas.go b/cas/stepcas/stepcas.go
index 03166c5f..ffcbeab9 100644
--- a/cas/stepcas/stepcas.go
+++ b/cas/stepcas/stepcas.go
@@ -81,6 +81,7 @@ func (s *StepCAS) CreateCertificate(req *apiv1.CreateCertificateRequest) (*apiv1
 			AuthorityID:     s.authorityID,
 			ProvisionerID:   p.ProvisionerID,
 			ProvisionerType: p.ProvisionerType,
+			ProvisionerName: p.ProvisionerName,
 		}
 	}