bug(vault): Fix token len check (#2291)
This commit is contained in:
1 parent
67d789cb6d
commit
47739566bc
2 files changed
+48
-8
No files matched your search
@@ -26,7 +26,7 @@ type clientConfig struct {
|
||||
}
|
||||
|
||||
func (c *clientConfig) isValid() bool {
|
||||
if c == nil || c.Addr == "" || len(c.Token) < 0 {
|
||||
if c == nil || c.Addr == "" || len(c.Token) == 0 {
|
||||
return false
|
||||
}
|
||||
return true
|
||||
|
||||
@@ -15,13 +15,53 @@ import (
|
||||
|
||||
func Test_newClient(t *testing.T) {
|
||||
t.Parallel()
|
||||
t.Run("nilConfig", func(t *testing.T) {
|
||||
assert := assert.New(t)
|
||||
var c *clientConfig
|
||||
client, err := newClient(c)
|
||||
assert.Error(err)
|
||||
assert.Nil(client)
|
||||
})
|
||||
v := NewTestVaultServer(t)
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
wantErr bool
|
||||
clientConfig *clientConfig
|
||||
}{
|
||||
{
|
||||
name: "nil-config",
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "empty-addr",
|
||||
clientConfig: &clientConfig{
|
||||
Token: TokenSecret(v.RootToken),
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "empty-token",
|
||||
clientConfig: &clientConfig{
|
||||
Addr: v.Addr,
|
||||
},
|
||||
wantErr: true,
|
||||
},
|
||||
{
|
||||
name: "valid-config",
|
||||
clientConfig: &clientConfig{
|
||||
Addr: v.Addr,
|
||||
Token: TokenSecret(v.RootToken),
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
tt := tt
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assert, require := assert.New(t), require.New(t)
|
||||
client, err := newClient(tt.clientConfig)
|
||||
if tt.wantErr {
|
||||
require.Error(err)
|
||||
assert.Nil(client)
|
||||
return
|
||||
}
|
||||
require.NoError(err)
|
||||
assert.NotNil(client)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestClient_RenewToken(t *testing.T) {
|
||||
|
||||
Reference in new issue
Block a user