backport of commit fb9324c (#20514)

Co-authored-by: Hamid Ghaf <83242695+hghaf099@users.noreply.github.com>
hashicorp · May 4, 2023 · 17e127d · 17e127d
1 parent da7618a
commit 17e127d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/changelog/20477.txt b/changelog/20477.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+cli: CLI should take days as a unit of time for ttl like flags
+```
diff --git a/command/base_flags.go b/command/base_flags.go
@@ -591,7 +591,7 @@ type DurationVar struct {
 func (f *FlagSet) DurationVar(i *DurationVar) {
 	initial := i.Default
 	if v, exist := os.LookupEnv(i.EnvVar); exist {
-		if d, err := time.ParseDuration(appendDurationSuffix(v)); err == nil {
+		if d, err := parseutil.ParseDurationSecond(v); err == nil {
 			initial = d
 		}
 	}
@@ -631,7 +631,7 @@ func (d *durationValue) Set(s string) error {
 		s = "-1"
 	}
 
-	v, err := time.ParseDuration(appendDurationSuffix(s))
+	v, err := parseutil.ParseDurationSecond(s)
 	if err != nil {
 		return err
 	}

diff --git a/command/token_create_test.go b/command/token_create_test.go
@@ -68,6 +68,12 @@ func TestTokenCreateCommand_Run(t *testing.T) {
 			"not present in secret",
 			1,
 		},
+		{
+			"ttl",
+			[]string{"-ttl", "1d", "-explicit-max-ttl", "2d"},
+			"token",
+			0,
+		},
 	}
 
 	t.Run("validations", func(t *testing.T) {