kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 10:25:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

cli: output none when a token has no expiration.

Browse Source
This commit is contained in:
James Rasell
2022-08-24 15:14:49 +01:00
parent f4db3b64a2
commit 34a1591a90
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/acl_bootstrap.go
View File

@@ -198,7 +198,7 @@ func outputACLToken(ui cli.Ui, token *api.ACLToken) {
func expiryTimeString(t *time.Time) string {
if t == nil || t.IsZero() {
return "<never>"
return "<none>"
}
return t.String()
}

4
command/acl_bootstrap_test.go
View File

@@ -36,7 +36,7 @@ func TestACLBootstrapCommand(t *testing.T) {
out := ui.OutputWriter.String()
assert.Contains(out, "Secret ID")
require.Contains(t, out, "Expiry Time = <never>")
require.Contains(t, out, "Expiry Time = <none>")
}
// If a bootstrap token has already been created, attempts to create more should
@@ -117,7 +117,7 @@ func TestACLBootstrapCommand_WithOperatorFileBootstrapToken(t *testing.T) {
out := ui.OutputWriter.String()
assert.Contains(t, out, mockToken.SecretID)
require.Contains(t, out, "Expiry Time = <never>")
require.Contains(t, out, "Expiry Time = <none>")
}
// Attempting to bootstrap the server with an invalid operator provided token in a file should

4
command/acl_token_create_test.go
View File

@@ -39,7 +39,7 @@ func TestACLTokenCreateCommand(t *testing.T) {
// Check the output
out := ui.OutputWriter.String()
require.Contains(t, out, "[foo]")
require.Contains(t, out, "Expiry Time = <never>")
require.Contains(t, out, "Expiry Time = <none>")
ui.OutputWriter.Reset()
ui.ErrorWriter.Reset()
@@ -49,7 +49,7 @@ func TestACLTokenCreateCommand(t *testing.T) {
require.Equal(t, 0, code)
out = ui.OutputWriter.String()
require.NotContains(t, out, "Expiry Time = <never>")
require.NotContains(t, out, "Expiry Time = <none>")
}
func Test_generateACLTokenRoleLinks(t *testing.T) {