vagrant-bosh 0.0.6 → 0.0.7

data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erb_renderer.go

@@ -1,117 +0,0 @@
-package erbrenderer
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-)
-
-const erbRendererLogTag = "ERBRenderer"
-
-type ERBRenderer struct {
-	fs      boshsys.FileSystem
-	runner  boshsys.CmdRunner
-	context TemplateEvaluationContext
-	logger  boshlog.Logger
-
-	rendererScript string
-}
-
-func NewERBRenderer(
-	fs boshsys.FileSystem,
-	runner boshsys.CmdRunner,
-	context TemplateEvaluationContext,
-	logger boshlog.Logger,
-) ERBRenderer {
-	return ERBRenderer{
-		fs:      fs,
-		runner:  runner,
-		context: context,
-		logger:  logger,
-
-		rendererScript: templateEvaluationContextRb,
-	}
-}
-
-func (r ERBRenderer) Render(srcPath, dstPath string) error {
-	r.logger.Debug(erbRendererLogTag, "Rendering template %s", dstPath)
-
-	dirPath := filepath.Dir(dstPath)
-
-	err := r.fs.MkdirAll(dirPath, os.FileMode(0755))
-	if err != nil {
-		return bosherr.WrapError(err, "Creating directory %s", dirPath)
-	}
-
-	rendererScriptPath, err := r.writeRendererScript()
-	if err != nil {
-		return err
-	}
-
-	contextPath, err := r.writeContext()
-	if err != nil {
-		return err
-	}
-
-	// Use ruby to compile job templates
-	command := boshsys.Command{
-		Name: r.determineRubyExePath(),
-		Args: []string{rendererScriptPath, contextPath, srcPath, dstPath},
-	}
-
-	_, _, _, err = r.runner.RunComplexCommand(command)
-	if err != nil {
-		return bosherr.WrapError(err, "Running ruby")
-	}
-
-	return nil
-}
-
-func (r ERBRenderer) writeRendererScript() (string, error) {
-	// todo use temp path; it's same everytime?
-	path := "/tmp/erb-render.rb"
-
-	err := r.fs.WriteFileString(path, r.rendererScript)
-	if err != nil {
-		return "", bosherr.WrapError(err, "Writing renderer script")
-	}
-
-	return path, nil
-}
-
-func (r ERBRenderer) writeContext() (string, error) {
-	contextBytes, err := json.Marshal(r.context)
-	if err != nil {
-		return "", bosherr.WrapError(err, "Marshalling context")
-	}
-
-	// todo use temp path?
-	path := "/tmp/erb-context.json"
-
-	err = r.fs.WriteFileString(path, string(contextBytes))
-	if err != nil {
-		return "", bosherr.WrapError(err, "Writing context")
-	}
-
-	return path, nil
-}
-
-func (r ERBRenderer) determineRubyExePath() string {
-	// Prefer ruby executable on the PATH
-	if r.runner.CommandExists("ruby") {
-		return "ruby"
-	}
-
-	// Fallback to chef-solo ruby usually found in vagrant boxes
-	vagrantRuby := "/opt/vagrant_ruby/bin/ruby"
-
-	if r.fs.FileExists(vagrantRuby) {
-		return vagrantRuby
-	}
-
-	return "ruby"
-}

data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erbrenderer_suite_test.go

@@ -1,13 +0,0 @@
-package erbrenderer_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"testing"
-)
-
-func TestErbrenderer(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "Erbrenderer Suite")
-}

data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties.go

@@ -1,77 +0,0 @@
-package erbrenderer
-
-import (
-	"encoding/json"
-	"strings"
-
-	bosherr "bosh/errors"
-
-	bpdep "boshprovisioner/deployment"
-	bpreljob "boshprovisioner/release/job"
-)
-
-type RenderProperties struct {
-	relJob   bpreljob.Job
-	instance bpdep.Instance
-}
-
-func NewRenderProperties(relJob bpreljob.Job, instance bpdep.Instance) RenderProperties {
-	return RenderProperties{relJob: relJob, instance: instance}
-}
-
-// AsMap returns job and instance properties merged together.
-func (p RenderProperties) AsMap() (map[string]interface{}, error) {
-	result, err := p.deepCopyInstanceProperties()
-	if err != nil {
-		return result, err
-	}
-
-	for _, prop := range p.relJob.Properties {
-		p.copyProperty(prop.Name, prop.Default, result)
-	}
-
-	return result, nil
-}
-
-// copyProperty fills in property in dst with value if it's not already set.
-func (p RenderProperties) copyProperty(path string, value interface{}, dst map[string]interface{}) {
-	pathParts := strings.Split(path, ".")
-
-	for i, part := range pathParts {
-		if dstNested, ok := dst[part]; ok { // Found section; check if modified
-			if dstNestedMap, ok := dstNested.(map[string]interface{}); ok {
-				dst = dstNestedMap
-			} else {
-				break // Not a section; cannot modify
-			}
-		} else if len(pathParts)-1 == i { // Last property path part
-			dst[part] = value
-		} else {
-			m := map[string]interface{}{}
-			dst[part] = m
-			dst = m
-		}
-	}
-}
-
-// deepCopyInstanceProperties makes a deep copy of instance properties.
-// Always returns an initialized map even if instance properties are nil.
-func (p RenderProperties) deepCopyInstanceProperties() (map[string]interface{}, error) {
-	result := map[string]interface{}{}
-
-	if p.instance.Properties == nil {
-		return result, nil
-	}
-
-	bytes, err := json.Marshal(p.instance.Properties)
-	if err != nil {
-		return result, bosherr.WrapError(err, "Marshalling instance properties")
-	}
-
-	err = json.Unmarshal(bytes, &result)
-	if err != nil {
-		return result, bosherr.WrapError(err, "Unmarshalling instance properties")
-	}
-
-	return result, nil
-}

data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties_test.go

@@ -1,193 +0,0 @@
-package erbrenderer_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	bpdep "boshprovisioner/deployment"
-	. "boshprovisioner/instance/templatescompiler/erbrenderer"
-	bpreljob "boshprovisioner/release/job"
-)
-
-var _ = Describe("RenderProperties", func() {
-	var (
-		job      bpreljob.Job
-		instance bpdep.Instance
-		props    RenderProperties
-	)
-
-	JustBeforeEach(func() {
-		props = NewRenderProperties(job, instance)
-	})
-
-	Describe("AsMap", func() {
-		Context("when job specifies a default for a nested property", func() {
-			BeforeEach(func() {
-				job = bpreljob.Job{
-					Properties: []bpreljob.Property{
-						bpreljob.Property{
-							Name:    "prop.nest-prop",
-							Default: "job-val",
-						},
-					},
-				}
-			})
-
-			Context("when instance specifies nested property", func() {
-				BeforeEach(func() {
-					instance = bpdep.Instance{
-						Properties: map[string]interface{}{
-							"prop": map[string]interface{}{
-								"nest-prop": "instance-val",
-							},
-						},
-					}
-				})
-
-				It("returns map with property value from job", func() {
-					Expect(props.AsMap()).To(Equal(map[string]interface{}{
-						"prop": map[string]interface{}{
-							"nest-prop": "instance-val",
-						},
-					}))
-				})
-			})
-
-			Context("when instance does not specify nested property", func() {
-				Context("when first nesting level is specified", func() {
-					BeforeEach(func() {
-						instance = bpdep.Instance{
-							Properties: map[string]interface{}{
-								"prop": map[string]interface{}{},
-							},
-						}
-					})
-
-					It("returns map with default property from job", func() {
-						Expect(props.AsMap()).To(Equal(map[string]interface{}{
-							"prop": map[string]interface{}{
-								"nest-prop": "job-val",
-							},
-						}))
-					})
-				})
-
-				Context("when first nesting level is not specified", func() {
-					BeforeEach(func() {
-						instance = bpdep.Instance{}
-					})
-
-					It("returns map with default property from job", func() {
-						Expect(props.AsMap()).To(Equal(map[string]interface{}{
-							"prop": map[string]interface{}{
-								"nest-prop": "job-val",
-							},
-						}))
-					})
-				})
-			})
-		})
-
-		Context("when job specifies an empty string default for a nested property", func() {
-			BeforeEach(func() {
-				job = bpreljob.Job{
-					Properties: []bpreljob.Property{
-						bpreljob.Property{
-							Name:    "prop.nest-prop",
-							Default: "",
-						},
-					},
-				}
-			})
-
-			Context("when instance specifies nested property", func() {
-				BeforeEach(func() {
-					instance = bpdep.Instance{
-						Properties: map[string]interface{}{
-							"prop": map[string]interface{}{
-								"nest-prop": "instance-val",
-							},
-						},
-					}
-				})
-
-				It("returns map with property value from instance", func() {
-					Expect(props.AsMap()).To(Equal(map[string]interface{}{
-						"prop": map[string]interface{}{
-							"nest-prop": "instance-val",
-						},
-					}))
-				})
-			})
-
-			Context("when instance does not specify nested property", func() {
-				BeforeEach(func() {
-					instance = bpdep.Instance{
-						Properties: map[string]interface{}{
-							"prop": map[string]interface{}{},
-						},
-					}
-				})
-
-				It("returns map with default property from job", func() {
-					Expect(props.AsMap()).To(Equal(map[string]interface{}{
-						"prop": map[string]interface{}{
-							"nest-prop": "",
-						},
-					}))
-				})
-			})
-		})
-
-		Context("when job does not specify a default (nil) for a nested property", func() {
-			BeforeEach(func() {
-				job = bpreljob.Job{
-					Properties: []bpreljob.Property{
-						bpreljob.Property{
-							Name:    "prop.nest-prop",
-							Default: nil,
-						},
-					},
-				}
-			})
-
-			Context("when instance specifies nested property", func() {
-				BeforeEach(func() {
-					instance = bpdep.Instance{
-						Properties: map[string]interface{}{
-							"prop": map[string]interface{}{
-								"nest-prop": "instance-val",
-							},
-						},
-					}
-				})
-
-				It("returns map with property value from instance", func() {
-					Expect(props.AsMap()).To(Equal(map[string]interface{}{
-						"prop": map[string]interface{}{
-							"nest-prop": "instance-val",
-						},
-					}))
-				})
-			})
-
-			Context("when instance does not specify nested property", func() {
-				BeforeEach(func() {
-					instance = bpdep.Instance{
-						Properties: map[string]interface{}{
-							"prop": map[string]interface{}{},
-						},
-					}
-				})
-
-				It("returns map with default property from job", func() {
-					Expect(props.AsMap()).To(Equal(map[string]interface{}{
-						"prop": map[string]interface{}{
-							"nest-prop": nil,
-						},
-					}))
-				})
-			})
-		}) //~
-	})
-})

data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context.go

@@ -1,85 +0,0 @@
-package erbrenderer
-
-import (
-	"encoding/json"
-
-	bosherr "bosh/errors"
-
-	bpdep "boshprovisioner/deployment"
-	bpreljob "boshprovisioner/release/job"
-)
-
-type TemplateEvaluationContext struct {
-	relJob   bpreljob.Job
-	instance bpdep.Instance
-}
-
-// rootContext is exposed as an open struct in ERB templates.
-// It must stay same to provide backwards compatible API.
-type rootContext struct {
-	Index int `json:"index"`
-
-	JobContext jobContext `json:"job"`
-
-	Deployment string `json:"deployment"`
-
-	// Usually is accessed with <%= spec.networks.default.ip %>
-	NetworkContexts map[string]networkContext `json:"networks"`
-
-	Properties map[string]interface{} `json:"properties"`
-}
-
-type jobContext struct {
-	Name string `json:"name"`
-}
-
-// networkContext is not fully backwards compatible.
-type networkContext struct {
-	IP      string `json:"ip"`
-	Netmask string `json:"netmask"`
-	Gateway string `json:"gateway"`
-}
-
-func NewTemplateEvaluationContext(
-	relJob bpreljob.Job,
-	instance bpdep.Instance,
-) TemplateEvaluationContext {
-	return TemplateEvaluationContext{
-		relJob:   relJob,
-		instance: instance,
-	}
-}
-
-func (c TemplateEvaluationContext) MarshalJSON() ([]byte, error) {
-	properties, err := NewRenderProperties(c.relJob, c.instance).AsMap()
-	if err != nil {
-		return nil, bosherr.WrapError(err, "Rendering properties")
-	}
-
-	context := rootContext{
-		Index:      c.instance.Index,
-		JobContext: jobContext{Name: c.instance.JobName},
-		Deployment: c.instance.DeploymentName,
-
-		NetworkContexts: c.buildNetworkContexts(),
-		Properties:      properties,
-	}
-
-	return json.Marshal(context)
-}
-
-func (c TemplateEvaluationContext) buildNetworkContexts() map[string]networkContext {
-	networkContexts := map[string]networkContext{}
-
-	for _, na := range c.instance.NetworkAssociations {
-		netConfig := c.instance.NetworkConfigurationForNetworkAssociation(na)
-
-		networkContexts[na.Network.Name] = networkContext{
-			IP:      netConfig.IP,
-			Netmask: netConfig.Netmask,
-			Gateway: netConfig.Gateway,
-		}
-	}
-
-	return networkContexts
-}