ab7eb5de6e
Move some common Vault API data struct decoding out of the Vault client so it can be reused in other situations. Make Vault job validation its own function so it's easier to expand it. Rename the `Job.VaultPolicies` method to just `Job.Vault` since it returns the full Vault block, not just their policies. Set `ChangeMode` on `Vault.Canonicalize`. Add some missing tests. Allows specifying an entity alias that will be used by Nomad when deriving the task Vault token. An entity alias assigns an indentity to a token, allowing better control and management of Vault clients since all tokens with the same indentity alias will now be considered the same client. This helps track Nomad activity in Vault's audit logs and better control over Vault billing. Add support for a new Nomad server configuration to define a default entity alias to be used when deriving Vault tokens. This default value will be used if the task doesn't have an entity alias defined.
142 lines
3.4 KiB
Go
142 lines
3.4 KiB
Go
package config
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/hashicorp/nomad/ci"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestVaultConfig_Merge(t *testing.T) {
|
|
ci.Parallel(t)
|
|
|
|
trueValue, falseValue := true, false
|
|
c1 := &VaultConfig{
|
|
Enabled: &falseValue,
|
|
Token: "1",
|
|
Role: "1",
|
|
EntityAlias: "1",
|
|
AllowUnauthenticated: &trueValue,
|
|
TaskTokenTTL: "1",
|
|
Addr: "1",
|
|
TLSCaFile: "1",
|
|
TLSCaPath: "1",
|
|
TLSCertFile: "1",
|
|
TLSKeyFile: "1",
|
|
TLSSkipVerify: &trueValue,
|
|
TLSServerName: "1",
|
|
}
|
|
|
|
c2 := &VaultConfig{
|
|
Enabled: &trueValue,
|
|
Token: "2",
|
|
Role: "2",
|
|
EntityAlias: "2",
|
|
AllowUnauthenticated: &falseValue,
|
|
TaskTokenTTL: "2",
|
|
Addr: "2",
|
|
TLSCaFile: "2",
|
|
TLSCaPath: "2",
|
|
TLSCertFile: "2",
|
|
TLSKeyFile: "2",
|
|
TLSSkipVerify: nil,
|
|
TLSServerName: "2",
|
|
}
|
|
|
|
e := &VaultConfig{
|
|
Enabled: &trueValue,
|
|
Token: "2",
|
|
Role: "2",
|
|
EntityAlias: "2",
|
|
AllowUnauthenticated: &falseValue,
|
|
TaskTokenTTL: "2",
|
|
Addr: "2",
|
|
TLSCaFile: "2",
|
|
TLSCaPath: "2",
|
|
TLSCertFile: "2",
|
|
TLSKeyFile: "2",
|
|
TLSSkipVerify: &trueValue,
|
|
TLSServerName: "2",
|
|
}
|
|
|
|
result := c1.Merge(c2)
|
|
if !reflect.DeepEqual(result, e) {
|
|
t.Fatalf("bad:\n%#v\n%#v", result, e)
|
|
}
|
|
}
|
|
|
|
func TestVaultConfig_IsEqual(t *testing.T) {
|
|
ci.Parallel(t)
|
|
|
|
require := require.New(t)
|
|
|
|
trueValue, falseValue := true, false
|
|
c1 := &VaultConfig{
|
|
Enabled: &falseValue,
|
|
Token: "1",
|
|
Role: "1",
|
|
EntityAlias: "1",
|
|
AllowUnauthenticated: &trueValue,
|
|
TaskTokenTTL: "1",
|
|
Addr: "1",
|
|
TLSCaFile: "1",
|
|
TLSCaPath: "1",
|
|
TLSCertFile: "1",
|
|
TLSKeyFile: "1",
|
|
TLSSkipVerify: &trueValue,
|
|
TLSServerName: "1",
|
|
}
|
|
|
|
c2 := &VaultConfig{
|
|
Enabled: &falseValue,
|
|
Token: "1",
|
|
Role: "1",
|
|
EntityAlias: "1",
|
|
AllowUnauthenticated: &trueValue,
|
|
TaskTokenTTL: "1",
|
|
Addr: "1",
|
|
TLSCaFile: "1",
|
|
TLSCaPath: "1",
|
|
TLSCertFile: "1",
|
|
TLSKeyFile: "1",
|
|
TLSSkipVerify: &trueValue,
|
|
TLSServerName: "1",
|
|
}
|
|
|
|
require.True(c1.IsEqual(c2))
|
|
|
|
c3 := &VaultConfig{
|
|
Enabled: &trueValue,
|
|
Token: "1",
|
|
Role: "1",
|
|
EntityAlias: "1",
|
|
AllowUnauthenticated: &trueValue,
|
|
TaskTokenTTL: "1",
|
|
Addr: "1",
|
|
TLSCaFile: "1",
|
|
TLSCaPath: "1",
|
|
TLSCertFile: "1",
|
|
TLSKeyFile: "1",
|
|
TLSSkipVerify: &trueValue,
|
|
TLSServerName: "1",
|
|
}
|
|
|
|
c4 := &VaultConfig{
|
|
Enabled: &falseValue,
|
|
Token: "1",
|
|
Role: "1",
|
|
EntityAlias: "1",
|
|
AllowUnauthenticated: &trueValue,
|
|
TaskTokenTTL: "1",
|
|
Addr: "1",
|
|
TLSCaFile: "1",
|
|
TLSCaPath: "1",
|
|
TLSCertFile: "1",
|
|
TLSKeyFile: "1",
|
|
TLSSkipVerify: &trueValue,
|
|
TLSServerName: "1",
|
|
}
|
|
require.False(c3.IsEqual(c4))
|
|
}
|