vagrant-bosh 0.0.6 → 0.0.7

data/go/src/boshprovisioner/release/job/job.go

@@ -1,86 +0,0 @@
-package job
-
-import (
-	bpreljobman "boshprovisioner/release/job/manifest"
-)
-
-type Job struct {
-	Manifest bpreljobman.Manifest
-
-	Name string
-
-	MonitTemplate Template
-
-	Templates []Template
-
-	// Runtime package dependencies for this job
-	Packages []Package
-
-	Properties []Property
-}
-
-type Template struct {
-	SrcPathEnd string
-	DstPathEnd string // End of the path on the VM
-
-	Path string
-}
-
-type Package struct {
-	Name string
-}
-
-type Property struct {
-	Name        string
-	Description string
-
-	Default interface{}
-}
-
-// populateFromManifest populates job information interpreted from job manifest.
-func (j *Job) populateFromManifest(manifest bpreljobman.Manifest) {
-	j.populateJob(manifest.Job)
-	j.populateTemplates(manifest.Job.TemplateNames)
-	j.populatePackages(manifest.Job.PackageNames)
-	j.populateProperties(manifest.Job.PropertyMappings)
-	j.Manifest = manifest
-}
-
-func (j *Job) populateJob(manJob bpreljobman.Job) {
-	j.Name = manJob.Name
-}
-
-func (j *Job) populateTemplates(manTemplateNames bpreljobman.TemplateNames) {
-	j.MonitTemplate = Template{
-		SrcPathEnd: "monit",
-		DstPathEnd: "monit",
-	}
-
-	for srcPathEnd, dstPathEnd := range manTemplateNames {
-		template := Template{
-			SrcPathEnd: srcPathEnd,
-			DstPathEnd: dstPathEnd,
-		}
-
-		j.Templates = append(j.Templates, template)
-	}
-}
-
-func (j *Job) populatePackages(manPackageNames []string) {
-	for _, name := range manPackageNames {
-		j.Packages = append(j.Packages, Package{Name: name})
-	}
-}
-
-func (j *Job) populateProperties(manPropMappings bpreljobman.PropertyMappings) {
-	for propName, propDef := range manPropMappings {
-		property := Property{
-			Name:        propName,
-			Description: propDef.Description,
-
-			Default: propDef.Default,
-		}
-
-		j.Properties = append(j.Properties, property)
-	}
-}

data/go/src/boshprovisioner/release/job/manifest/manifest.go

@@ -1,79 +0,0 @@
-// Package manifest represents internal structure of a release job.
-package manifest
-
-import (
-	bosherr "bosh/errors"
-	boshsys "bosh/system"
-	"github.com/cloudfoundry-incubator/candiedyaml"
-)
-
-type Manifest struct {
-	Job Job
-}
-
-type Job struct {
-	Name string `yaml:"name"`
-
-	TemplateNames TemplateNames `yaml:"templates"`
-
-	PackageNames []string `yaml:"packages"`
-
-	PropertyMappings PropertyMappings `yaml:"properties"`
-}
-
-type TemplateNames map[string]string
-
-type PropertyMappings map[string]PropertyDefinition
-
-type PropertyDefinition struct {
-	Description string `yaml:"description"`
-
-	// Non-raw field is populated by the validator.
-	DefaultRaw interface{} `yaml:"default"`
-	Default    interface{}
-}
-
-func NewManifestFromPath(path string, fs boshsys.FileSystem) (Manifest, error) {
-	bytes, err := fs.ReadFile(path)
-	if err != nil {
-		return Manifest{}, bosherr.WrapError(err, "Reading manifest %s", path)
-	}
-
-	return NewManifestFromBytes(bytes)
-}
-
-func NewManifestFromBytes(bytes []byte) (Manifest, error) {
-	var manifest Manifest
-	var job Job
-
-	err := candiedyaml.Unmarshal(bytes, &job)
-	if err != nil {
-		return manifest, bosherr.WrapError(err, "Parsing job")
-	}
-
-	manifest.Job = job
-
-	err = NewSyntaxValidator(&manifest).Validate()
-	if err != nil {
-		return Manifest{}, bosherr.WrapError(err, "Validating manifest syntactically")
-	}
-
-	return manifest, nil
-}
-
-/*
-# Example for job.MF
-name: dummy
-
-templates:
-  dummy_ctl: bin/dummy_ctl
-
-packages:
-- dummy_package
-- dummy_package2
-
-properties:
-  dummy_value:
-    description: Some value for the dummy job
-    default: 300
-*/

data/go/src/boshprovisioner/release/job/manifest/manifest_suite_test.go

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

data/go/src/boshprovisioner/release/job/manifest/manifest_test.go

@@ -1,59 +0,0 @@
-package manifest_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	. "boshprovisioner/release/job/manifest"
-)
-
-var _ = Describe("Manifest", func() {
-	Describe("NewManifestFromBytes", func() {
-		It("returns manifest with property definiton default that have string keys", func() {
-			manifestBytes := []byte(`
-properties:
-  key:
-    default:
-      prop:
-        nest-prop: instance-val
-      props:
-      - name: nest-prop
-`)
-
-			manifest, err := NewManifestFromBytes(manifestBytes)
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(manifest.Job.PropertyMappings).To(HaveLen(1))
-
-			for _, propDef := range manifest.Job.PropertyMappings {
-				// candiedyaml unmarshals manifest to map[interface{}]interface{}
-				// (encoding/json unmarshals manifest to map[string]interface{})
-				Expect(propDef.Default).To(Equal(map[string]interface{}{
-					"prop": map[string]interface{}{
-						"nest-prop": "instance-val",
-					},
-					"props": []interface{}{
-						map[string]interface{}{"name": "nest-prop"},
-					},
-				}))
-			}
-		})
-
-		It("returns manifest with property definiton default that is an empty string", func() {
-			manifestBytes := []byte(`
-properties:
-  key:
-    default: ""
-`)
-
-			manifest, err := NewManifestFromBytes(manifestBytes)
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(manifest.Job.PropertyMappings).To(HaveLen(1))
-
-			for _, propDef := range manifest.Job.PropertyMappings {
-				Expect(propDef.Default).To(Equal(""))
-			}
-		})
-	})
-})

data/go/src/boshprovisioner/release/job/manifest/syntax_validator.go

@@ -1,43 +0,0 @@
-package manifest
-
-import (
-	bosherr "bosh/errors"
-
-	bputil "boshprovisioner/util"
-)
-
-type SyntaxValidator struct {
-	job *Job
-}
-
-func NewSyntaxValidator(manifest *Manifest) SyntaxValidator {
-	if manifest == nil {
-		panic("Expected manifest to not be nil")
-	}
-
-	return SyntaxValidator{job: &manifest.Job}
-}
-
-func (v SyntaxValidator) Validate() error {
-	for name, propDef := range v.job.PropertyMappings {
-		propDef, err := v.validatePropDef(propDef)
-		if err != nil {
-			return bosherr.WrapError(err, "Property %s", name)
-		}
-
-		v.job.PropertyMappings[name] = propDef
-	}
-
-	return nil
-}
-
-func (v SyntaxValidator) validatePropDef(propDef PropertyDefinition) (PropertyDefinition, error) {
-	def, err := bputil.NewStringKeyed().ConvertInterface(propDef.DefaultRaw)
-	if err != nil {
-		return propDef, bosherr.WrapError(err, "Default")
-	}
-
-	propDef.Default = def
-
-	return propDef, nil
-}

data/go/src/boshprovisioner/release/job/reader_factory.go

@@ -1,34 +0,0 @@
-package job
-
-import (
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-
-	bpdload "boshprovisioner/downloader"
-	bptar "boshprovisioner/tar"
-)
-
-type ReaderFactory struct {
-	downloader bpdload.Downloader
-	extractor  bptar.Extractor
-	fs         boshsys.FileSystem
-	logger     boshlog.Logger
-}
-
-func NewReaderFactory(
-	downloader bpdload.Downloader,
-	extractor bptar.Extractor,
-	fs boshsys.FileSystem,
-	logger boshlog.Logger,
-) ReaderFactory {
-	return ReaderFactory{
-		downloader: downloader,
-		extractor:  extractor,
-		fs:         fs,
-		logger:     logger,
-	}
-}
-
-func (rf ReaderFactory) NewTarReader(path string) *TarReader {
-	return NewTarReader(path, rf.downloader, rf.extractor, rf.fs, rf.logger)
-}

data/go/src/boshprovisioner/release/job/tar_reader.go

@@ -1,133 +0,0 @@
-package job
-
-import (
-	"path/filepath"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-
-	bpdload "boshprovisioner/downloader"
-	bpreljobman "boshprovisioner/release/job/manifest"
-	bptar "boshprovisioner/tar"
-)
-
-const tarReaderLogTag = "TarReader"
-
-// TarReader reads .tgz job file and returns a Job.
-// See unpacked job directory layout at the end of the file.
-type TarReader struct {
-	path       string
-	downloader bpdload.Downloader
-	extractor  bptar.Extractor
-	fs         boshsys.FileSystem
-	logger     boshlog.Logger
-
-	// location to clean if successfully downloaded/extracted
-	downloadPath string
-	extractPath  string
-}
-
-func NewTarReader(
-	path string,
-	downloader bpdload.Downloader,
-	extractor bptar.Extractor,
-	fs boshsys.FileSystem,
-	logger boshlog.Logger,
-) *TarReader {
-	return &TarReader{
-		path:       path,
-		downloader: downloader,
-		extractor:  extractor,
-		fs:         fs,
-		logger:     logger,
-	}
-}
-
-func (tr *TarReader) Read() (Job, error) {
-	var job Job
-
-	downloadPath, err := tr.downloader.Download(tr.path)
-	if err != nil {
-		return job, bosherr.WrapError(err, "Downloading job")
-	}
-
-	tr.downloadPath = downloadPath
-
-	extractPath, err := tr.extractor.Extract(tr.downloadPath)
-	if err != nil {
-		cleanUpErr := tr.downloader.CleanUp(tr.downloadPath)
-		if cleanUpErr != nil {
-			tr.logger.Debug(tarReaderLogTag,
-				"Failed to clean up downloaded job %v", cleanUpErr)
-		}
-
-		return job, bosherr.WrapError(err, "Extracting job")
-	}
-
-	tr.extractPath = extractPath
-
-	manifestPath := filepath.Join(tr.extractPath, "job.MF")
-
-	manifest, err := bpreljobman.NewManifestFromPath(manifestPath, tr.fs)
-	if err != nil {
-		closeErr := tr.Close()
-		if closeErr != nil {
-			tr.logger.Debug(tarReaderLogTag,
-				"Failed to close job %v", closeErr)
-		}
-
-		return job, bosherr.WrapError(err, "Building manifest")
-	}
-
-	tr.logger.Debug(tarReaderLogTag, "Done building manifest %#v", manifest)
-
-	job.populateFromManifest(manifest)
-
-	tr.populateJobPaths(&job)
-
-	return job, nil
-}
-
-func (tr TarReader) Close() error {
-	dlErr := tr.downloader.CleanUp(tr.downloadPath)
-	if dlErr != nil {
-		tr.logger.Debug(tarReaderLogTag,
-			"Failed to clean up downloaded job %v", dlErr)
-	}
-
-	exErr := tr.extractor.CleanUp(tr.extractPath)
-	if exErr != nil {
-		tr.logger.Debug(tarReaderLogTag,
-			"Failed to clean up extracted job %v", exErr)
-	}
-
-	if dlErr != nil {
-		return dlErr
-	}
-
-	return exErr
-}
-
-// populateJobPaths sets Path for each template and monit in the job.
-func (tr TarReader) populateJobPaths(job *Job) {
-	// monit file is outside of templates/ directory
-	job.MonitTemplate.Path = filepath.Join(
-		tr.extractPath, job.MonitTemplate.SrcPathEnd)
-
-	for i, template := range job.Templates {
-		job.Templates[i].Path = filepath.Join(
-			tr.extractPath, "templates", template.SrcPathEnd)
-	}
-}
-
-/*
-Example layout of an unpackaged job tar:
-
-$ tree ~/Downloads/dummy-job
-~/Downloads/dummy-job
-├── job.MF
-├── monit
-└── templates
-    └── dummy_ctl
-*/