fix: Column and parameter names

BREAKING CHANGE:

Author: lukasz-lobocki

README.md

@@ -19,10 +19,10 @@ Flags:
   -e, --emit {t|j|m|o}   emit format: table|json|markdown|openssl (default t)
   -t, --time {i|s}       time format: iso|short (default i)
   -s, --sort {s|f}       sort order: start|finish (default f)
-  -d, --dnsnames         DNSNames column shown
-  -m, --emailaddresses   EmailAddresses column shown
-  -i, --ipaddresses      IPAddresses column shown
-  -u, --uris             URIs column shown
+  -d, --dnsnames         dns names column shown
+  -m, --emailaddresses   email addresses column shown
+  -i, --ipaddresses      ip addresses column shown
+  -u, --uris             uris column shown
   -c, --crl              crl column shown
   -p, --provisioner      provisioner column shown
   -v, --valid            valid certificates shown (default true)
@@ -47,7 +47,7 @@ Flags:
   -e, --emit {t|j|m}   emit format: table|json|markdown (default t)
   -t, --time {i|s}     time format: iso|short (default i)
   -s, --sort {s|f}     sort order: start|finish (default f)
-  -k, --kid            Key ID column shown
+  -k, --kid            key id column shown
   -v, --valid          valid certificates shown (default true)
   -r, --revoked        revoked certificates shown (default true)
   -x, --expired        expired certificates shown

cmd/columns_x509certs.go

@@ -56,7 +56,7 @@ func getX509Columns() []tX509Column {
 
 		tX509Column{
 			isShown:    func(tc tConfig) bool { return tc.showDNSNames },
-			title:      func() string { return "DNSNames" }, // Static title.
+			title:      func() string { return "DNS names" }, // Static title.
 			titleColor: color.Bold,
 
 			contentSource: func(x tX509CertificateProvisionerRevocation, _ tConfig) string {
@@ -70,7 +70,7 @@ func getX509Columns() []tX509Column {
 
 		tX509Column{
 			isShown:    func(tc tConfig) bool { return tc.showEmailAddresses },
-			title:      func() string { return "EmailAddresses" }, // Static title.
+			title:      func() string { return "Email addresses" }, // Static title.
 			titleColor: color.Bold,
 
 			contentSource: func(x tX509CertificateProvisionerRevocation, _ tConfig) string {
@@ -84,7 +84,7 @@ func getX509Columns() []tX509Column {
 
 		tX509Column{
 			isShown:    func(tc tConfig) bool { return tc.showIPAddresses },
-			title:      func() string { return "IPAddresses" }, // Static title.
+			title:      func() string { return "IP addresses" }, // Static title.
 			titleColor: color.Bold,
 
 			contentSource: func(x tX509CertificateProvisionerRevocation, _ tConfig) string {
@@ -120,7 +120,7 @@ func getX509Columns() []tX509Column {
 
 		tX509Column{
 			isShown:    func(tc tConfig) bool { return tc.showCrl },
-			title:      func() string { return "CRLDistributionPoints" }, // Static title.
+			title:      func() string { return "CRL distribution points" }, // Static title.
 			titleColor: color.Bold,
 
 			contentSource: func(x tX509CertificateProvisionerRevocation, _ tConfig) string {

cmd/command_sshcerts.go

@@ -40,10 +40,15 @@ func init() {
 	//Do not sort flags.
 	sshCertsCmd.Flags().SortFlags = false
 
-	sshCertsCmd.Flags().VarP(config.emitSshFormat, "emit", "e", "emit format: table|json|markdown") // Choice
-	sshCertsCmd.Flags().VarP(config.timeFormat, "time", "t", "time format: iso|short")              // Choice
-	sshCertsCmd.Flags().VarP(config.sortOrder, "sort", "s", "sort order: start|finish")             // Choice
-	sshCertsCmd.Flags().BoolVarP(&config.showKeyId, "kid", "k", false, "Key ID column shown")
+	// Format choice
+	sshCertsCmd.Flags().VarP(config.emitSshFormat, "emit", "e", "emit format: table|json|markdown")
+	sshCertsCmd.Flags().VarP(config.timeFormat, "time", "t", "time format: iso|short")
+	sshCertsCmd.Flags().VarP(config.sortOrder, "sort", "s", "sort order: start|finish")
+
+	// Columns selection criteria.
+	sshCertsCmd.Flags().BoolVarP(&config.showKeyId, "kid", "k", false, "key id column shown")
+
+	// Records selection criteria.
 	sshCertsCmd.Flags().BoolVarP(&config.showValid, "valid", "v", true, "valid certificates shown")
 	sshCertsCmd.Flags().BoolVarP(&config.showRevoked, "revoked", "r", true, "revoked certificates shown")
 	sshCertsCmd.Flags().BoolVarP(&config.showExpired, "expired", "x", false, "expired certificates shown")

cmd/command_x509certs.go

@@ -42,15 +42,16 @@ func init() {
 	//Do not sort flags.
 	x509certsCmd.Flags().SortFlags = false
 
-	x509certsCmd.Flags().VarP(config.emitX509Format, "emit", "e", "emit format: table|json|markdown|openssl") // Choice
-	x509certsCmd.Flags().VarP(config.timeFormat, "time", "t", "time format: iso|short")                       // Choice
-	x509certsCmd.Flags().VarP(config.sortOrder, "sort", "s", "sort order: start|finish")                      // Choice
+	// Format choice
+	x509certsCmd.Flags().VarP(config.emitX509Format, "emit", "e", "emit format: table|json|markdown|openssl")
+	x509certsCmd.Flags().VarP(config.timeFormat, "time", "t", "time format: iso|short")
+	x509certsCmd.Flags().VarP(config.sortOrder, "sort", "s", "sort order: start|finish")
 
 	// Columns selection criteria.
-	x509certsCmd.Flags().BoolVarP(&config.showDNSNames, "dnsnames", "d", false, "DNSNames column shown")
-	x509certsCmd.Flags().BoolVarP(&config.showEmailAddresses, "emailaddresses", "m", false, "EmailAddresses column shown")
-	x509certsCmd.Flags().BoolVarP(&config.showIPAddresses, "ipaddresses", "i", false, "IPAddresses column shown")
-	x509certsCmd.Flags().BoolVarP(&config.showURIs, "uris", "u", false, "URIs column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showDNSNames, "dnsnames", "d", false, "dns names column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showEmailAddresses, "emailaddresses", "m", false, "email addresses column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showIPAddresses, "ipaddresses", "i", false, "ip addresses column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showURIs, "uris", "u", false, "uris column shown")
 	x509certsCmd.Flags().BoolVarP(&config.showCrl, "crl", "c", false, "crl column shown")
 	x509certsCmd.Flags().BoolVarP(&config.showProvisioner, "provisioner", "p", false, "provisioner column shown")