Merge pull request #31 from inteon/bugfix_26

Bugfix typos: Organizational(Unit)
cert-manager · Mar 5, 2024 · e752497 · e752497
2 parents a77727e + f715b54
commit e752497
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/pkg/inspect/secret/secret.go b/pkg/inspect/secret/secret.go
@@ -57,13 +57,13 @@ const validityPeriodTemplate = `Validity period:
 
 const issuedByTemplate = `Issued By:
 	Common Name:	{{ .CommonName }}
-	Organization:	{{ .CommonName }}
+	Organization:	{{ .Organization }}
 	OrganizationalUnit:	{{ .OrganizationalUnit }}
 	Country:	{{ .Country }}`
 
 const issuedForTemplate = `Issued For:
 	Common Name:	{{ .CommonName }}
-	Organization:	{{ .CommonName }}
+	Organization:	{{ .Organization }}
 	OrganizationalUnit:	{{ .OrganizationalUnit }}
 	Country:	{{ .Country }}`
 
@@ -219,7 +219,7 @@ func describeIssuedBy(cert *x509.Certificate) string {
 	}{
 		CommonName:         printOrNone(cert.Issuer.CommonName),
 		Organization:       printSliceOrOne(cert.Issuer.Organization),
-		OrganizationalUnit: printSliceOrOne(cert.Issuer.Organization),
+		OrganizationalUnit: printSliceOrOne(cert.Issuer.OrganizationalUnit),
 		Country:            printSliceOrOne(cert.Issuer.Country),
 	})
 
@@ -236,7 +236,7 @@ func describeIssuedFor(cert *x509.Certificate) string {
 	}{
 		CommonName:         printOrNone(cert.Subject.CommonName),
 		Organization:       printSliceOrOne(cert.Subject.Organization),
-		OrganizationalUnit: printSliceOrOne(cert.Subject.Organization),
+		OrganizationalUnit: printSliceOrOne(cert.Subject.OrganizationalUnit),
 		Country:            printSliceOrOne(cert.Subject.Country),
 	})
 

diff --git a/pkg/inspect/secret/secret_test.go b/pkg/inspect/secret/secret_test.go
@@ -83,7 +83,6 @@ func init() {
 		gen.SetCertificateIPs("10.0.0.1"),
 		gen.SetCertificateURIs("spiffe://cert-manager.test"),
 		gen.SetCertificateEmails("test@cert-manager.io"),
-		gen.SetCertificateIsCA(true),
 		gen.SetCertificateKeyAlgorithm(v1.ECDSAKeyAlgorithm),
 		gen.SetCertificateIsCA(false),
 		gen.SetCertificateKeySize(256),
@@ -221,8 +220,8 @@ func Test_describeIssuedBy(t *testing.T) {
 			cert: MustParseCertificate(t, testCert),
 			want: `Issued By:
 	Common Name:	testing-ca
-	Organization:	testing-ca
-	OrganizationalUnit:	Internet Widgets, Inc.
+	Organization:	Internet Widgets, Inc.
+	OrganizationalUnit:	WWW
 	Country:	US`,
 		},
 	}
@@ -246,8 +245,8 @@ func Test_describeIssuedFor(t *testing.T) {
 			cert: MustParseCertificate(t, testCert),
 			want: `Issued For:
 	Common Name:	<none>
-	Organization:	<none>
-	OrganizationalUnit:	cncf
+	Organization:	cncf
+	OrganizationalUnit:	cert-manager
 	Country:	GB`,
 		},
 	}