Merge pull request #455 from Venafi/cloud-local-csr-fix

fix(cloud-local-csr): Fixes issue with local generated CSR in cloud connector
Venafi · Apr 9, 2024 · 039d25d · 039d25d
2 parents 8874536 + 8364b5f
commit 039d25d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/examples/tlspc-svc-account/main.go b/examples/tlspc-svc-account/main.go
@@ -58,21 +58,25 @@ func main() {
 		log.Fatalf("error creating client: %s", err.Error())
 	}
 
-	_, err = connector.ReadZoneConfiguration()
+	zoneConfig, err := connector.ReadZoneConfiguration()
 	if err != nil {
 		log.Fatalf("error reading zone: %s", err.Error())
-
 	}
 
 	request := &certificate.Request{
 		Subject: pkix.Name{
 			CommonName: "svc-account.venafi.example.com",
 		},
-		CsrOrigin: certificate.ServiceGeneratedCSR,
+		CsrOrigin: certificate.LocalGeneratedCSR,
 		KeyType:   certificate.KeyTypeRSA,
 		KeyLength: 2048,
 	}
 
+	err = connector.GenerateRequest(zoneConfig, request)
+	if err != nil {
+		log.Fatalf("error generating request: %s", err.Error())
+	}
+
 	certID, err := connector.RequestCertificate(request)
 	if err != nil {
 		log.Fatalf("error requesting certificate: %s", err.Error())

diff --git a/pkg/venafi/cloud/connector.go b/pkg/venafi/cloud/connector.go
@@ -205,9 +205,6 @@ func (c *Connector) ReadZoneConfiguration() (config *endpoint.ZoneConfiguration,
 			if err != nil {
 				return
 			}
-		} else {
-			// an error happened, return now
-			return
 		}
 	}
 	if template == nil {