vagrant-bosh 0.0.6 → 0.0.7

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

@@ -1,120 +0,0 @@
-// Package manifest represents internal structure of a release.
-package manifest
-
-import (
-	bosherr "bosh/errors"
-	boshsys "bosh/system"
-	"github.com/cloudfoundry-incubator/candiedyaml"
-)
-
-type Manifest struct {
-	Release Release
-}
-
-type Release struct {
-	Name    string `yaml:"name"`
-	Version string `yaml:"version"`
-
-	Jobs     []Job     `yaml:"jobs"`
-	Packages []Package `yaml:"packages"`
-
-	CommitHash         string `yaml:"commit_hash"`
-	UncommittedChanges bool   `yaml:"uncommitted_changes"`
-}
-
-type Job struct {
-	Name string `yaml:"name"`
-
-	// bosh_cli uses fingerprint as job version
-	VersionRaw string `yaml:"version"`
-	Version    string
-
-	FingerprintRaw string `yaml:"fingerprint"`
-	Fingerprint    string
-
-	SHA1Raw string `yaml:"sha1"`
-	SHA1    string
-}
-
-type Package struct {
-	Name string `yaml:"name"`
-
-	// bosh_cli uses fingerprint as package version
-	VersionRaw string `yaml:"version"`
-	Version    string
-
-	FingerprintRaw string `yaml:"fingerprint"`
-	Fingerprint    string
-
-	SHA1Raw string `yaml:"sha1"`
-	SHA1    string
-
-	DependencyNames []DependencyName `yaml:"dependencies"`
-}
-
-func (p Package) DependencyName() DependencyName {
-	return DependencyName(p.Name)
-}
-
-type DependencyName string
-
-// NewManifestFromPath returns manifest read from the file system.
-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)
-}
-
-// NewManifestFromBytes returns manifest built from given bytes.
-func NewManifestFromBytes(bytes []byte) (Manifest, error) {
-	var manifest Manifest
-	var release Release
-
-	err := candiedyaml.Unmarshal(bytes, &release)
-	if err != nil {
-		return manifest, bosherr.WrapError(err, "Parsing release")
-	}
-
-	manifest.Release = release
-
-	err = NewSyntaxValidator(&manifest).Validate()
-	if err != nil {
-		return manifest, bosherr.WrapError(err, "Validating manifest syntactically")
-	}
-
-	return manifest, nil
-}
-
-/*
-# Example for release.MF
-name: bosh
-version: 77
-
-commit_hash: bbe5476c
-uncommitted_changes: true
-
-packages:
-- name: registry
-  version: !binary |-
-    ZGQxYmEzMzBiYzQ0YjMxODFiMjYzMzgzYjhlNDI1MmQ3MDUxZGVjYQ==
-  fingerprint: !binary |-
-    ZGQxYmEzMzBiYzQ0YjMxODFiMjYzMzgzYjhlNDI1MmQ3MDUxZGVjYQ==
-  sha1: !binary |-
-    NmVhYTZjOTYxZWFjN2JkOTk0ZDE2NDRhZDQwNWIzMzk1NDIwZWNhZg==
-  dependencies:
-  - libpq
-  - mysql
-  - ruby
-
-jobs:
-- name: powerdns
-  version: !binary |-
-    MGI4MGIzYzE5OGJmN2FiYzZjODEyNjIwMTNkZTQ5NDM2OWZkMjViNg==
-  fingerprint: !binary |-
-    MGI4MGIzYzE5OGJmN2FiYzZjODEyNjIwMTNkZTQ5NDM2OWZkMjViNg==
-  sha1: !binary |-
-    YWI5NzA5YmVhYjViZTBmYjYyYTJkMWYzYzg4ZDA2YzliNGJkZWM2NQ==
-*/

data/go/src/boshprovisioner/release/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/manifest/manifest_test.go

@@ -1,126 +0,0 @@
-package manifest_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	. "boshprovisioner/release/manifest"
-)
-
-var _ = Describe("Manifest", func() {
-	Describe("NewManifestFromBytes", func() {
-		It("returns manifest with decoded version/fingerprint/sha1 for jobs and packages", func() {
-			manifestBytes := []byte(`
-name: bosh
-version: 77
-
-commit_hash: bbe5476c
-uncommitted_changes: true
-
-packages:
-- name: registry
-  version: !binary |-
-    ZGQxYmEzMzBiYzQ0YjMxODFiMjYzMzgzYjhlNDI1MmQ3MDUxZGVjYQ==
-  fingerprint: !binary |-
-    ZGQxYmEzMzBiYzQ0YjMxODFiMjYzMzgzYjhlNDI1MmQ3MDUxZGVjYQ==
-  sha1: !binary |-
-    NmVhYTZjOTYxZWFjN2JkOTk0ZDE2NDRhZDQwNWIzMzk1NDIwZWNhZg==
-  dependencies: []
-
-jobs:
-- name: powerdns
-  version: !binary |-
-    MGI4MGIzYzE5OGJmN2FiYzZjODEyNjIwMTNkZTQ5NDM2OWZkMjViNg==
-  fingerprint: !binary |-
-    MGI4MGIzYzE5OGJmN2FiYzZjODEyNjIwMTNkZTQ5NDM2OWZkMjViNg==
-  sha1: !binary |-
-    YWI5NzA5YmVhYjViZTBmYjYyYTJkMWYzYzg4ZDA2YzliNGJkZWM2NQ==
-`)
-
-			manifest, err := NewManifestFromBytes(manifestBytes)
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(manifest.Release.Packages[0]).To(Equal(Package{
-				Name: "registry",
-
-				VersionRaw: "ZGQxYmEzMzBiYzQ0YjMxODFiMjYzMzgzYjhlNDI1MmQ3MDUxZGVjYQ==",
-				Version:    "dd1ba330bc44b3181b263383b8e4252d7051deca",
-
-				FingerprintRaw: "ZGQxYmEzMzBiYzQ0YjMxODFiMjYzMzgzYjhlNDI1MmQ3MDUxZGVjYQ==",
-				Fingerprint:    "dd1ba330bc44b3181b263383b8e4252d7051deca",
-
-				SHA1Raw: "NmVhYTZjOTYxZWFjN2JkOTk0ZDE2NDRhZDQwNWIzMzk1NDIwZWNhZg==",
-				SHA1:    "6eaa6c961eac7bd994d1644ad405b3395420ecaf",
-
-				DependencyNames: []DependencyName{},
-			}))
-
-			Expect(manifest.Release.Jobs[0]).To(Equal(Job{
-				Name: "powerdns",
-
-				VersionRaw: "MGI4MGIzYzE5OGJmN2FiYzZjODEyNjIwMTNkZTQ5NDM2OWZkMjViNg==",
-				Version:    "0b80b3c198bf7abc6c81262013de494369fd25b6",
-
-				FingerprintRaw: "MGI4MGIzYzE5OGJmN2FiYzZjODEyNjIwMTNkZTQ5NDM2OWZkMjViNg==",
-				Fingerprint:    "0b80b3c198bf7abc6c81262013de494369fd25b6",
-
-				SHA1Raw: "YWI5NzA5YmVhYjViZTBmYjYyYTJkMWYzYzg4ZDA2YzliNGJkZWM2NQ==",
-				SHA1:    "ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65",
-			}))
-		})
-
-		It("returns manifest with given version/fingerprint/sha1 for jobs and packages if they were not base64 binary encoded", func() {
-			manifestBytes := []byte(`
-name: bosh
-version: 77
-
-commit_hash: bbe5476c
-uncommitted_changes: true
-
-packages:
-- name: registry
-  version: dd1ba330bc44b3181b263383b8e4252d7051deca
-  fingerprint: dd1ba330bc44b3181b263383b8e4252d7051deca
-  sha1: 6eaa6c961eac7bd994d1644ad405b3395420ecaf
-  dependencies: []
-
-jobs:
-- name: powerdns
-  version: 0b80b3c198bf7abc6c81262013de494369fd25b6
-  fingerprint: 0b80b3c198bf7abc6c81262013de494369fd25b6
-  sha1: ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65
-`)
-
-			manifest, err := NewManifestFromBytes(manifestBytes)
-			Expect(err).ToNot(HaveOccurred())
-
-			Expect(manifest.Release.Packages[0]).To(Equal(Package{
-				Name: "registry",
-
-				VersionRaw: "dd1ba330bc44b3181b263383b8e4252d7051deca",
-				Version:    "dd1ba330bc44b3181b263383b8e4252d7051deca",
-
-				FingerprintRaw: "dd1ba330bc44b3181b263383b8e4252d7051deca",
-				Fingerprint:    "dd1ba330bc44b3181b263383b8e4252d7051deca",
-
-				SHA1Raw: "6eaa6c961eac7bd994d1644ad405b3395420ecaf",
-				SHA1:    "6eaa6c961eac7bd994d1644ad405b3395420ecaf",
-
-				DependencyNames: []DependencyName{},
-			}))
-
-			Expect(manifest.Release.Jobs[0]).To(Equal(Job{
-				Name: "powerdns",
-
-				VersionRaw: "0b80b3c198bf7abc6c81262013de494369fd25b6",
-				Version:    "0b80b3c198bf7abc6c81262013de494369fd25b6",
-
-				FingerprintRaw: "0b80b3c198bf7abc6c81262013de494369fd25b6",
-				Fingerprint:    "0b80b3c198bf7abc6c81262013de494369fd25b6",
-
-				SHA1Raw: "ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65",
-				SHA1:    "ab9709beab5be0fb62a2d1f3c88d06c9b4bdec65",
-			}))
-		})
-	})
-})

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

@@ -1,134 +0,0 @@
-package manifest
-
-import (
-	bosherr "bosh/errors"
-
-	bputil "boshprovisioner/util"
-)
-
-// SyntaxValidator parses and saves all manifest values to determine
-// their syntactic validity. Determining if individual values make sense
-// in a greater context (within a full release) is outside of scope.
-type SyntaxValidator struct {
-	release *Release
-}
-
-func NewSyntaxValidator(manifest *Manifest) SyntaxValidator {
-	if manifest == nil {
-		panic("Expected manifest to not be nil")
-	}
-
-	return SyntaxValidator{release: &manifest.Release}
-}
-
-func (v SyntaxValidator) Validate() error {
-	if v.release.Name == "" {
-		return bosherr.New("Missing release name")
-	}
-
-	if v.release.Version == "" {
-		return bosherr.New("Missing release version")
-	}
-
-	if v.release.CommitHash == "" {
-		return bosherr.New("Missing release commit_hash")
-	}
-
-	for i, job := range v.release.Jobs {
-		err := v.validateJob(&v.release.Jobs[i])
-		if err != nil {
-			return bosherr.WrapError(err, "Job %s (%d)", job.Name, i)
-		}
-	}
-
-	for i, pkg := range v.release.Packages {
-		err := v.validatePkg(&v.release.Packages[i])
-		if err != nil {
-			return bosherr.WrapError(err, "Package %s (%d)", pkg.Name, i)
-		}
-	}
-
-	return nil
-}
-
-func (v SyntaxValidator) validateJob(job *Job) error {
-	if job.Name == "" {
-		return bosherr.New("Missing name")
-	}
-
-	if job.VersionRaw == "" {
-		return bosherr.New("Missing version")
-	}
-
-	str, err := bputil.DecodePossibleBase64Str(job.VersionRaw)
-	if err != nil {
-		return bosherr.WrapError(err, "Decoding base64 encoded version")
-	}
-
-	job.Version = str
-
-	if job.FingerprintRaw == "" {
-		return bosherr.New("Missing fingerprint")
-	}
-
-	str, err = bputil.DecodePossibleBase64Str(job.FingerprintRaw)
-	if err != nil {
-		return bosherr.WrapError(err, "Decoding base64 encoded fingerprint")
-	}
-
-	job.Fingerprint = str
-
-	if job.SHA1Raw == "" {
-		return bosherr.New("Missing sha1")
-	}
-
-	str, err = bputil.DecodePossibleBase64Str(job.SHA1Raw)
-	if err != nil {
-		return bosherr.WrapError(err, "Decoding base64 encoded sha1")
-	}
-
-	job.SHA1 = str
-
-	return nil
-}
-
-func (v SyntaxValidator) validatePkg(pkg *Package) error {
-	if pkg.Name == "" {
-		return bosherr.New("Missing name")
-	}
-
-	if pkg.VersionRaw == "" {
-		return bosherr.New("Missing version")
-	}
-
-	str, err := bputil.DecodePossibleBase64Str(pkg.VersionRaw)
-	if err != nil {
-		return bosherr.WrapError(err, "Decoding base64 encoded version")
-	}
-
-	pkg.Version = str
-
-	if pkg.FingerprintRaw == "" {
-		return bosherr.New("Missing fingerprint")
-	}
-
-	str, err = bputil.DecodePossibleBase64Str(pkg.FingerprintRaw)
-	if err != nil {
-		return bosherr.WrapError(err, "Decoding base64 encoded fingerprint")
-	}
-
-	pkg.Fingerprint = str
-
-	if pkg.SHA1Raw == "" {
-		return bosherr.New("Missing sha1")
-	}
-
-	str, err = bputil.DecodePossibleBase64Str(pkg.SHA1Raw)
-	if err != nil {
-		return bosherr.WrapError(err, "Decoding base64 encoded sha1")
-	}
-
-	pkg.SHA1 = str
-
-	return nil
-}

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

@@ -1,45 +0,0 @@
-package release
-
-import (
-	"strings"
-
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-
-	bpdload "boshprovisioner/downloader"
-	bptar "boshprovisioner/tar"
-)
-
-const (
-	readerFactoryDirPrefix = "dir://"
-)
-
-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) NewReader(name, version, url string) Reader {
-	if strings.HasPrefix(url, readerFactoryDirPrefix) {
-		path := url[len(readerFactoryDirPrefix):]
-		return NewDirReader(name, version, path, rf.fs, rf.logger)
-	}
-
-	return NewTarReader(url, rf.downloader, rf.extractor, rf.fs, rf.logger)
-}

data/go/src/boshprovisioner/release/reader_interface.go

@@ -1,6 +0,0 @@
-package release
-
-type Reader interface {
-	Read() (Release, error)
-	Close() error
-}