feat: Hiding not needed revoked column.

Author: lukasz-lobocki

cmd/columns_sshcerts.go

@@ -120,8 +120,8 @@ func getSshColumns() []tSshColumn {
 		},
 
 		tSshColumn{
-			isShown:    func(_ tConfig) bool { return true },  // Always shown.
-			title:      func() string { return "Revoked at" }, // Static title.
+			isShown:    func(tc tConfig) bool { return tc.showRevoked }, // Always shown.
+			title:      func() string { return "Revoked at" },           // Static title.
 			titleColor: color.Bold,
 
 			contentSource: func(x tSshCertificateWithRevocation, tc tConfig) string {

cmd/columns_x509certs.go

@@ -183,8 +183,8 @@ func getX509Columns() []tX509Column {
 		},
 
 		tX509Column{
-			isShown:    func(_ tConfig) bool { return true },  // Always shown.
-			title:      func() string { return "Revoked at" }, // Static title.
+			isShown:    func(tc tConfig) bool { return tc.showRevoked }, // Always shown.
+			title:      func() string { return "Revoked at" },           // Static title.
 			titleColor: color.Bold,
 
 			contentSource: func(x tX509CertificateProvisionerRevocation, tc tConfig) string {

cmd/command_sshcerts.go

@@ -40,18 +40,18 @@ func init() {
 	//Do not sort flags.
 	sshCertsCmd.Flags().SortFlags = false
 
+	// 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")
+
 	// 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")
+	sshCertsCmd.Flags().BoolVarP(&config.showKeyId, "keyid", "", false, "key id column shown")
 }
 
 /*

cmd/command_x509certs.go

@@ -42,23 +42,23 @@ func init() {
 	//Do not sort flags.
 	x509certsCmd.Flags().SortFlags = false
 
+	// Records selection criteria.
+	x509certsCmd.Flags().BoolVarP(&config.showValid, "valid", "v", true, "valid certificates shown")
+	x509certsCmd.Flags().BoolVarP(&config.showRevoked, "revoked", "r", true, "revoked certificates shown")
+	x509certsCmd.Flags().BoolVarP(&config.showExpired, "expired", "x", false, "expired certificates shown")
+
 	// 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, "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")
-
-	// Records selection criteria.
-	x509certsCmd.Flags().BoolVarP(&config.showValid, "valid", "v", true, "valid certificates shown")
-	x509certsCmd.Flags().BoolVarP(&config.showRevoked, "revoked", "r", true, "revoked certificates shown")
-	x509certsCmd.Flags().BoolVarP(&config.showExpired, "expired", "x", false, "expired certificates shown")
+	x509certsCmd.Flags().BoolVarP(&config.showDNSNames, "dnsnames", "", false, "dns names column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showEmailAddresses, "emailaddresses", "", false, "email addresses column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showIPAddresses, "ipaddresses", "", false, "ip addresses column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showURIs, "uris", "", false, "uris column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showCrl, "crl", "", false, "crl column shown")
+	x509certsCmd.Flags().BoolVarP(&config.showProvisioner, "provisioner", "", false, "provisioner column shown")
 }
 
 /*