command/token-lookup: better output for the key expiration left duration

Make the expiration time left more readable.
Example: the previous output "767h55m35s" is now displayed as
         "4 weeks 3 days 23 hours 55 minutes 35 seconds".

Signed-off-by: Davide Madrisan <[email protected]>

Gopkg.toml

@@ -15,6 +15,10 @@
   name = "github.com/go-test/deep"
   version = "v1.0.3"
 
+[[constraint]]
+  name = "github.com/hako/durafmt"
+  version = "1.0.0"
+
 [prune]
   go-tests = true
   unused-packages = true

README.md

@@ -194,10 +194,10 @@ As usual, add `-output=nagios` to get an output compliant with the Nagios specif
 ###### Example of output
 
     # default output message
-    The token will expire on Mon, 07 Oct 2019 14:25:06 UTC (767h55m35s left)
+    This (renewable) token will expire on Mon, 07 Oct 2019 14:25:06 UTC (4 weeks 3 days 23 hours 55 minutes 35 seconds left)
 
     # with the '-output=nagios' switch
-    vault OK - The token will expire on Mon, 07 Oct 2019 14:25:06 UTC (767h55m35s left)
+    vault OK - This (renewable) token will expire on Mon, 07 Oct 2019 14:25:06 UTC (4 weeks 3 days 23 hours 55 minutes 35 seconds left)
 
 Note that you should replace `39d2c7...` with the generated *Root token* from
 your output.

command/token-lookup.go

@@ -20,6 +20,8 @@ import (
 	"flag"
 	"fmt"
 	"time"
+
+	"github.com/hako/durafmt"
 )
 
 // Thresholds in hours for warning and critical status.
@@ -97,6 +99,7 @@ func (c *TokenLookupCommand) Run(args []string) int {
 	cmdFlags := flag.NewFlagSet("token-lookup", flag.ContinueOnError)
 	cmdFlags.Usage = func() { c.UI.Output(c.Help()) }
 	cmdFlags.StringVar(&c.Address, "address", addressDefault, addressDescr)
+	cmdFlags.StringVar(&c.Token, "token", tokenDefault, tokenDescr)
 	cmdFlags.StringVar(&c.OutputFormat, "output", "default", outputFormatDescr)
 	cmdFlags.StringVar(&c.WarningThreshold, "warning",
 		DefaultWarningTokenExpiration,
@@ -157,13 +160,22 @@ func (c *TokenLookupCommand) Run(args []string) int {
 	t, _ := time.Parse(time.RFC3339Nano, expireTimeStr)
 	delta := time.Until(t)
 
-	pluginMessage := ""
 	retCode := StateOk
 
 	if delta > 0 {
-		pluginMessage = fmt.Sprintf("The token will expire on %s (%s left)",
-			t.Format(time.RFC1123),
+		var pluginMessage, renewable string
+
+		if tokenIsRenewable, _ := s.TokenIsRenewable(); tokenIsRenewable {
+			renewable = "(renewable) "
+		}
+
+		left, _ := durafmt.ParseString(
 			delta.Truncate(time.Second).String())
+		pluginMessage = fmt.Sprintf("This %stoken will expire on %s (%s left)",
+			renewable,
+			t.Format(time.RFC1123),
+			left)
+
 		if delta < criticalThreshold {
 			out.Critical(pluginMessage)
 			retCode = StateCritical