luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

e2e/vault: updated e2e vault tests to use version-specific policy creation endpoint (old servers are not compatible with new client)

Browse source
This commit is contained in:
Chris Baker 2019-04-05 04:21:13 +00:00 committed by Preetha Appan
parent a26d4fe1e5
commit b290d774bc
No known key found for this signature in database
GPG key ID: 9F7C19990A50EAFC
2 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
e2e/vault/matrix_test.go
View file

@ -3,6 +3,10 @@ package vault
var (
// versions is the set of Vault versions we test for backwards compatibility
versions = []string{
"1.1.0",
"1.0.3",
"1.0.2",
"1.0.1",
"1.0.0",
"0.11.5",
"0.11.4",

31
e2e/vault/vault_test.go
View file

@ -12,9 +12,12 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
"testing"
"time"
"github.com/hashicorp/go-version"
"github.com/hashicorp/nomad/command/agent"
"github.com/hashicorp/nomad/helper"
"github.com/hashicorp/nomad/nomad/structs/config"
@ -254,8 +257,32 @@ func testVaultCompatibility(t *testing.T, vault string) {
func setupVault(t *testing.T, client *vapi.Client) string {
// Write the policy
sys := client.Sys()
if err := sys.PutPolicy("nomad-server", policy); err != nil {
t.Fatalf("failed to create policy: %v", err)
// pre-0.9.0 vault servers do not work with our new vault client for the policy endpoint
// perform this using a raw HTTP request
newApi, err := version.NewVersion("0.9.0")
if err != nil {
t.Fatalf("failed to parse comparison version: %v", err)
}
testVersion, err := version.NewVersion(strings.TrimPrefix(t.Name(), "TestVaultCompatibility/"))
if err != nil {
t.Fatalf("failed to parse test version from '%v': %v", t.Name(), err)
}
if testVersion.LessThan(newApi) {
body := map[string]string{
"rules": policy,
}
request := client.NewRequest("PUT", fmt.Sprintf("/v1/sys/policy/%s", "nomad-server"))
if err := request.SetJSONBody(body); err != nil {
t.Fatalf("failed to set JSON body on legacy policy creation: %v", err)
}
if _, err := client.RawRequest(request); err != nil {
t.Fatalf("failed to create legacy policy: %v", err)
}
} else {
if err := sys.PutPolicy("nomad-server", policy); err != nil {
t.Fatalf("failed to create policy: %v", err)
}
}
// Build the role