d0aa3ba053
* Vault Agent Template: parse templates (#7540) * add template config parsing, but it's wrong b/c it's not using mapstructure * parsing consul templates in agent config * add additional test to configuration parsing, to cover basics * another test fixture, rework simple test into table * refactor into table test * rename test * remove flattenKeys and add other test fixture * Update command/agent/config/config.go Co-Authored-By: Jim Kalafut <jkalafut@hashicorp.com> * return the decode error instead of swallowing it * Update command/agent/config/config_test.go Co-Authored-By: Jim Kalafut <jkalafut@hashicorp.com> * go mod tidy * change error checking style * Add agent template doc * TemplateServer: render secrets with Consul Template (#7621) * add template config parsing, but it's wrong b/c it's not using mapstructure * parsing consul templates in agent config * add additional test to configuration parsing, to cover basics * another test fixture, rework simple test into table * refactor into table test * rename test * remove flattenKeys and add other test fixture * add template package * WIP: add runner * fix panic, actually copy templates, etc * rework how the config.Vault is created and enable reading from the environment * this was supposed to be a part of the prior commit * move/add methods to testhelpers for converting some values to pointers * use new methods in testhelpers * add an unblock channel to block agent until a template has been rendered * add note * unblock if there are no templates * cleanups * go mod tidy * remove dead code * simple test to starT * add simple, empty templates test * Update package doc, error logs, and add missing close() on channel * update code comment to be clear what I'm referring to * have template.NewServer return a (<- chan) type, even though it's a normal chan, as a better practice to enforce reading only * Update command/agent.go Co-Authored-By: Jim Kalafut <jkalafut@hashicorp.com> * update with test * Add README and doc.go to the command/agent directory (#7503) * Add README and doc.go to the command/agent directory * Add link to website * address feedback for agent.go * updated with feedback from Calvin * Rework template.Server to export the unblock channel, and remove it from the NewServer function * apply feedback from Nick * fix/restructure rendering test * Add pointerutil package for converting types to their pointers * Remove pointer helper methods; use sdk/helper/pointerutil instead * update newRunnerConfig to use pointerutil and empty strings * only wait for unblock if template server is initialized * update test structure * some test cleanup * follow up tests * remove debugging, fix issue in replacing runner config * need to handle first render/token * Simplify the blocking logic to support exit after auth * fix channel name * expand TestAgent_Template to include multiple scenarios * cleanup * test cleanups after feedback
200 lines
5 KiB
Go
200 lines
5 KiB
Go
package template
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"os"
|
|
"testing"
|
|
|
|
ctconfig "github.com/hashicorp/consul-template/config"
|
|
"github.com/hashicorp/go-hclog"
|
|
"github.com/hashicorp/vault/command/agent/config"
|
|
"github.com/hashicorp/vault/sdk/helper/logging"
|
|
"github.com/hashicorp/vault/sdk/helper/pointerutil"
|
|
)
|
|
|
|
// TestNewServer is a simple test to make sure NewServer returns a Server and
|
|
// channel
|
|
func TestNewServer(t *testing.T) {
|
|
server := NewServer(&ServerConfig{})
|
|
if server == nil {
|
|
t.Fatal("nil server returned")
|
|
}
|
|
}
|
|
|
|
func TestServerRun(t *testing.T) {
|
|
// create http test server
|
|
ts := httptest.NewServer(http.HandlerFunc(handleRequest))
|
|
defer ts.Close()
|
|
tmpDir, err := ioutil.TempDir("", "agent-tests")
|
|
defer os.RemoveAll(tmpDir)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// secretRender is a simple struct that represents the secret we render to
|
|
// disk. It's used to unmarshal the file contents and test against
|
|
type secretRender struct {
|
|
Username string `json:"username"`
|
|
Password string `json:"password"`
|
|
Version string `json:"version"`
|
|
}
|
|
|
|
type templateTest struct {
|
|
template *ctconfig.TemplateConfig
|
|
}
|
|
|
|
testCases := map[string]struct {
|
|
templateMap map[string]*templateTest
|
|
}{
|
|
"simple": {
|
|
templateMap: map[string]*templateTest{
|
|
"render_01": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
"multiple": {
|
|
templateMap: map[string]*templateTest{
|
|
"render_01": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
"render_02": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
"render_03": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
"render_04": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
"render_05": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
"render_06": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
"render_07": &templateTest{
|
|
template: &ctconfig.TemplateConfig{
|
|
Contents: pointerutil.StringPtr(templateContents),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
for name, tc := range testCases {
|
|
t.Run(name, func(t *testing.T) {
|
|
templateTokenCh := make(chan string, 1)
|
|
var templatesToRender []*ctconfig.TemplateConfig
|
|
for fileName, templateTest := range tc.templateMap {
|
|
dstFile := fmt.Sprintf("%s/%s", tmpDir, fileName)
|
|
templateTest.template.Destination = pointerutil.StringPtr(dstFile)
|
|
templatesToRender = append(templatesToRender, templateTest.template)
|
|
}
|
|
|
|
ctx := context.Background()
|
|
sc := ServerConfig{
|
|
Logger: logging.NewVaultLogger(hclog.Trace),
|
|
VaultConf: &config.Vault{
|
|
Address: ts.URL,
|
|
},
|
|
ExitAfterAuth: true,
|
|
}
|
|
|
|
var server *Server
|
|
server = NewServer(&sc)
|
|
if ts == nil {
|
|
t.Fatal("nil server returned")
|
|
}
|
|
|
|
go server.Run(ctx, templateTokenCh, templatesToRender)
|
|
|
|
// send a dummy value to trigger the internal Runner to query for secret
|
|
// info
|
|
templateTokenCh <- "test"
|
|
<-server.DoneCh
|
|
|
|
// verify test file exists and has the content we're looking for
|
|
var fileCount int
|
|
for _, template := range templatesToRender {
|
|
if template.Destination == nil {
|
|
t.Fatal("nil template destination")
|
|
}
|
|
content, err := ioutil.ReadFile(*template.Destination)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
fileCount++
|
|
|
|
secret := secretRender{}
|
|
if err := json.Unmarshal(content, &secret); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if secret.Username != "appuser" || secret.Password != "password" || secret.Version != "3" {
|
|
t.Fatalf("secret didn't match: %#v", secret)
|
|
}
|
|
}
|
|
if fileCount != len(templatesToRender) {
|
|
t.Fatalf("mismatch file to template: (%d) / (%d)", fileCount, len(templatesToRender))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func handleRequest(w http.ResponseWriter, r *http.Request) {
|
|
fmt.Fprintln(w, jsonResponse)
|
|
}
|
|
|
|
var jsonResponse = `
|
|
{
|
|
"request_id": "8af096e9-518c-7351-eff5-5ba20554b21f",
|
|
"lease_id": "",
|
|
"renewable": false,
|
|
"lease_duration": 0,
|
|
"data": {
|
|
"data": {
|
|
"password": "password",
|
|
"username": "appuser"
|
|
},
|
|
"metadata": {
|
|
"created_time": "2019-10-07T22:18:44.233247Z",
|
|
"deletion_time": "",
|
|
"destroyed": false,
|
|
"version": 3
|
|
}
|
|
},
|
|
"wrap_info": null,
|
|
"warnings": null,
|
|
"auth": null
|
|
}
|
|
`
|
|
|
|
var templateContents = `
|
|
{{ with secret "kv/myapp/config"}}
|
|
{
|
|
{{ if .Data.data.username}}"username":"{{ .Data.data.username}}",{{ end }}
|
|
{{ if .Data.data.password }}"password":"{{ .Data.data.password }}",{{ end }}
|
|
{{ if .Data.metadata.version}}"version":"{{ .Data.metadata.version }}"{{ end }}
|
|
}
|
|
{{ end }}
|
|
`
|