Add var_file support on out

- This take into account relative path provided by user
  and prepend the resource directory.

#46

README.md

@@ -146,6 +146,8 @@ deployment manifest and then deploy.
 
 * `vars_files`: *Optional.* A collection of vars files to be interpolated into the deployment manifest.
 
+* `var_files`: *Optional.* A collection of variables to be set by the contents of the file configured.
+
 * `ops_files`: *Optional.* A collection of ops files to be applied over the deployment manifest.
 
 * `cleanup`: *Optional* An boolean that specifies if a bosh cleanup should be

bosh/director.go

@@ -19,6 +19,7 @@ import (
 
 type DeployParams struct {
 	Vars      map[string]interface{}
+	VarFiles  map[string]string
 	VarsFiles []string
 	OpsFiles  []string
 	NoRedact  bool
@@ -74,6 +75,11 @@ func (d BoshDirector) Deploy(manifestBytes []byte, deployParams DeployParams) er
 		return err
 	}
 
+	boshVarFiles, err := parsedVarFiles(deployParams.VarFiles)
+	if err != nil {
+		return err
+	}
+
 	boshOpsFiles, err := parsedOpsFiles(deployParams.OpsFiles)
 	if err != nil {
 		return err
@@ -93,6 +99,7 @@ func (d BoshDirector) Deploy(manifestBytes []byte, deployParams DeployParams) er
 		VarFlags: boshcmd.VarFlags{
 			VarKVs:    varKVsFromVars(deployParams.Vars),
 			VarsFiles: boshVarsFiles,
+			VarFiles:  boshVarFiles,
 		},
 		OpsFlags: boshcmd.OpsFlags{
 			OpsFiles: boshOpsFiles,
@@ -331,6 +338,18 @@ func parsedVarsFiles(varsFiles []string) ([]boshtpl.VarsFileArg, error) {
 	return varsFileArgs, nil
 }
 
+func parsedVarFiles(varFiles map[string]string) ([]boshtpl.VarFileArg, error) {
+	varFileArgs := []boshtpl.VarFileArg{}
+	for varKey, varFile := range varFiles {
+		varFileArg := boshtpl.VarFileArg{FS: boshFileSystem()}
+		if err := varFileArg.UnmarshalFlag(fmt.Sprintf("%s=%s", varKey, varFile)); err != nil {
+			return nil, err
+		}
+		varFileArgs = append(varFileArgs, varFileArg)
+	}
+	return varFileArgs, nil
+}
+
 func parsedOpsFiles(opsFiles []string) ([]boshcmd.OpsFileArg, error) {
 	nullLogger := boshlog.NewWriterLogger(boshlog.LevelInfo, ioutil.Discard)
 	boshFS := boshsys.NewOsFileSystemWithStrictTempRoot(nullLogger)

bosh/director_test.go

@@ -51,11 +51,14 @@ var _ = Describe("BoshDirector", func() {
 					Value: "bar",
 				},
 			}
-			varFileContents := properYaml(`
+			varsFileContents := properYaml(`
 				baz: "best-bar"
 			`)
-			varFile, _ := ioutil.TempFile("", "var-file-1")
-			varFile.Write(varFileContents)
+			varsFile, _ := ioutil.TempFile("", "var-file-1")
+			varsFile.Write(varsFileContents)
+
+			varFile, _ := ioutil.TempFile("", "var-file-key2")
+			varFile.Write([]byte("val2"))
 
 			opsFileContents := properYaml(`
 				- type: replace
@@ -71,7 +74,8 @@ var _ = Describe("BoshDirector", func() {
 				NoRedact:  noRedact,
 				DryRun:    dryRun,
 				Vars:      vars,
-				VarsFiles: []string{varFile.Name()},
+				VarFiles:  map[string]string{"key2": varFile.Name()},
+				VarsFiles: []string{varsFile.Name()},
 				OpsFiles:  []string{opsFile.Name()},
 			})
 			Expect(err).ToNot(HaveOccurred())
@@ -87,6 +91,11 @@ var _ = Describe("BoshDirector", func() {
 			Expect(deployOpts.VarsFiles[0].Vars).To(Equal(boshtpl.StaticVariables{
 				"baz": "best-bar",
 			}))
+
+			Expect(len(deployOpts.VarFiles)).To(Equal(1))
+			Expect(deployOpts.VarFiles[0].Vars).To(Equal(boshtpl.StaticVariables{
+				"key2": "val2",
+			}))
 			Expect(len(deployOpts.OpsFiles)).To(Equal(1))
 
 			pathPointer, _ := patch.NewPointerFromString("/my?/new_key")

ci/pipeline.yml

@@ -127,6 +127,25 @@ jobs:
       passed: [rc]
     - get: bosh-deployment-resource-image
       passed: [rc]
+  - task: write-var-file
+    config:
+      platform: linux
+      image_resource:
+        type: docker-image
+        source:
+          repository: ubuntu
+          tag: "14.04"
+      run:
+        path: /bin/sh
+        args:
+        - -c
+        - |
+          set -e
+          echo "less-interesting-value" > var-file/file
+        dir: ""
+      outputs:
+      - name: var-file
+        path: ""
   - task: write-vars-files
     config:
       platform: linux
@@ -174,6 +193,8 @@ jobs:
       - ops-files/*
       vars_files:
       - vars-files/*
+      var_files:
+        interesting_var: var-file/file
       vars:
         max_in_flight: 10
       releases:

ci/test-deployment.yml

@@ -7,6 +7,7 @@ update:
   serial: false
   update_watch_time: 5000-1200000
   really: ((cool))
+  var_file_interpolation: ((interesting_var))
 instance_groups:
 - name: dummy
   azs: [z1]

concourse/out_params.go

@@ -11,6 +11,7 @@ type OutParams struct {
 	Stemcells []string               `json:"stemcells,omitempty"`
 	Vars      map[string]interface{} `json:"vars,omitempty"`
 	VarsFiles []string               `json:"vars_files,omitempty"`
+	VarFiles  map[string]string      `json:"var_files,omitempty"`
 	OpsFiles  []string               `json:"ops_files,omitempty"`
 	Delete    DeleteParams           `json:"delete,omitempty"`
 }

concourse/out_request_test.go

@@ -23,6 +23,10 @@ var _ = Describe("NewOutRequest", func() {
 					"path/to/file",
 					"second/path/to/file"
 				],
+				"var_files": {
+					"var_from_file": "/path/to/file/with/var/content",
+					"another_var_from_file": "/more/path/to/content"
+				},
 				"ops_files": [
 					"ops-file1",
 					"path/to/ops-file2"
@@ -70,6 +74,10 @@ var _ = Describe("NewOutRequest", func() {
 					"path/to/file",
 					"second/path/to/file",
 				},
+				VarFiles: map[string]string{
+					"var_from_file":         "/path/to/file/with/var/content",
+					"another_var_from_file": "/more/path/to/content",
+				},
 				OpsFiles: []string{
 					"ops-file1",
 					"path/to/ops-file2",

out/out_command.go

@@ -5,6 +5,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"path/filepath"
 
 	"github.com/cloudfoundry/bosh-deployment-resource/bosh"
 	"github.com/cloudfoundry/bosh-deployment-resource/concourse"
@@ -51,7 +52,7 @@ func (c OutCommand) deploy(outRequest concourse.OutRequest) (OutResponse, error)
 
 	varsFilePaths, err := tools.UnfurlGlobs(c.resourcesDirectory, outRequest.Params.VarsFiles)
 	if err != nil {
-		return OutResponse{}, fmt.Errorf("Invalid var_file name: %s", err)
+		return OutResponse{}, fmt.Errorf("Invalid vars_file name: %s", err)
 	}
 
 	opsFilePaths, err := tools.UnfurlGlobs(c.resourcesDirectory, outRequest.Params.OpsFiles)
@@ -91,6 +92,7 @@ func (c OutCommand) deploy(outRequest concourse.OutRequest) (OutResponse, error)
 		Recreate:  outRequest.Params.Recreate,
 		SkipDrain: outRequest.Params.SkipDrain,
 		Cleanup:   outRequest.Params.Cleanup,
+		VarFiles:  c.prependResourcesDir(outRequest.Params.VarFiles),
 	}
 
 	var varsStoreFile *os.File
@@ -182,3 +184,11 @@ func (c OutCommand) consumeStemcells(manifest bosh.DeploymentManifest, stemcellG
 
 	return metadata, nil
 }
+
+func (c OutCommand) prependResourcesDir(varsFiles map[string]string) map[string]string {
+	varsWithAbsPath := map[string]string{}
+	for varName, varFilePath := range varsFiles {
+		varsWithAbsPath[varName] = filepath.Join(c.resourcesDirectory, varFilePath)
+	}
+	return varsWithAbsPath
+}