vagrant-bosh 0.0.6 → 0.0.7

data/go/src/boshprovisioner/instance/templatescompiler/rendered_archives_compiler.go

@@ -1,81 +0,0 @@
-package templatescompiler
-
-import (
-	"path/filepath"
-
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-	boshsys "bosh/system"
-
-	bpdep "boshprovisioner/deployment"
-	bperb "boshprovisioner/instance/templatescompiler/erbrenderer"
-	bpreljob "boshprovisioner/release/job"
-	bptar "boshprovisioner/tar"
-)
-
-type RenderedArchivesCompiler struct {
-	fs         boshsys.FileSystem
-	runner     boshsys.CmdRunner
-	compressor bptar.Compressor
-	logger     boshlog.Logger
-}
-
-func NewRenderedArchivesCompiler(
-	fs boshsys.FileSystem,
-	runner boshsys.CmdRunner,
-	compressor bptar.Compressor,
-	logger boshlog.Logger,
-) RenderedArchivesCompiler {
-	return RenderedArchivesCompiler{
-		fs:         fs,
-		runner:     runner,
-		compressor: compressor,
-		logger:     logger,
-	}
-}
-
-// Compile takes release jobs and instance and produces rendered templates archive.
-// Rendered templates archive contains rendered job templates
-// that can be unpacked by a GoAgent to populate a VM.
-func (rac RenderedArchivesCompiler) Compile(relJobs []bpreljob.Job, instance bpdep.Instance) (string, error) {
-	path, err := rac.fs.TempDir("instance-templatescompiler-RenderedArchivesCompiler")
-	if err != nil {
-		return "", bosherr.WrapError(err, "Creating compiled templates directory")
-	}
-
-	defer rac.fs.RemoveAll(path)
-
-	for _, relJob := range relJobs {
-		context := bperb.NewTemplateEvaluationContext(relJob, instance)
-
-		renderer := bperb.NewERBRenderer(rac.fs, rac.runner, context, rac.logger)
-
-		dstPath := filepath.Join(path, relJob.Name, "monit")
-
-		err := renderer.Render(relJob.MonitTemplate.Path, dstPath)
-		if err != nil {
-			return "", bosherr.WrapError(err, "Rendering monit ERB")
-		}
-
-		for _, template := range relJob.Templates {
-			dstPath := filepath.Join(path, relJob.Name, template.DstPathEnd)
-
-			err := renderer.Render(template.Path, dstPath)
-			if err != nil {
-				return "", bosherr.WrapError(err, "Rendering %s ERB", template.DstPathEnd)
-			}
-		}
-	}
-
-	renderedArchivePath, err := rac.compressor.Compress(path)
-	if err != nil {
-		return "", bosherr.WrapError(err, "Compressing templates")
-	}
-
-	return renderedArchivePath, nil
-}
-
-// CleanUp deletes previously produced rendered templates archive.
-func (rac RenderedArchivesCompiler) CleanUp(path string) error {
-	return rac.fs.RemoveAll(path)
-}

data/go/src/boshprovisioner/instance/templatescompiler/templates_compiler_interface.go

@@ -1,20 +0,0 @@
-package templatescompiler
-
-import (
-	bpdep "boshprovisioner/deployment"
-	bprel "boshprovisioner/release"
-)
-
-type RenderedArchiveRecord struct {
-	SHA1   string
-	BlobID string
-}
-
-type TemplatesCompiler interface {
-	Precompile(bprel.Release) error
-	Compile(bpdep.Job, bpdep.Instance) error
-	FindRenderedArchive(bpdep.Job, bpdep.Instance) (RenderedArchiveRecord, error)
-
-	// todo does it belong here?
-	FindPackages(template bpdep.Template) ([]bprel.Package, error)
-}

data/go/src/boshprovisioner/instance/templatescompiler/templatesrepo/ct_repository.go

@@ -1,54 +0,0 @@
-package templatesrepo
-
-import (
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-
-	bpdep "boshprovisioner/deployment"
-	bpindex "boshprovisioner/index"
-)
-
-type CTRepository struct {
-	index  bpindex.Index
-	logger boshlog.Logger
-}
-
-// todo fingerprint property changes
-type jobToTemplateKey struct {
-	JobName string
-}
-
-func NewConcreteTemplatesRepository(
-	index bpindex.Index,
-	logger boshlog.Logger,
-) CTRepository {
-	return CTRepository{index: index, logger: logger}
-}
-
-func (tr CTRepository) Find(job bpdep.Job, instance bpdep.Instance) (TemplateRecord, bool, error) {
-	var record TemplateRecord
-
-	err := tr.index.Find(tr.templateKey(job), &record)
-	if err != nil {
-		if err == bpindex.ErrNotFound {
-			return record, false, nil
-		}
-
-		return record, false, bosherr.WrapError(err, "Finding tempate")
-	}
-
-	return record, true, nil
-}
-
-func (tr CTRepository) Save(job bpdep.Job, instance bpdep.Instance, record TemplateRecord) error {
-	err := tr.index.Save(tr.templateKey(job), record)
-	if err != nil {
-		return bosherr.WrapError(err, "Saving template")
-	}
-
-	return nil
-}
-
-func (tr CTRepository) templateKey(job bpdep.Job) jobToTemplateKey {
-	return jobToTemplateKey{JobName: job.Name}
-}

data/go/src/boshprovisioner/instance/templatescompiler/templatesrepo/templates_repository_interface.go

@@ -1,16 +0,0 @@
-package templatesrepo
-
-import (
-	bpdep "boshprovisioner/deployment"
-)
-
-type TemplateRecord struct {
-	BlobID string
-	SHA1   string
-}
-
-// TemplatesRepository maintains list of rendered templates as blobs
-type TemplatesRepository interface {
-	Find(bpdep.Job, bpdep.Instance) (TemplateRecord, bool, error)
-	Save(bpdep.Job, bpdep.Instance, TemplateRecord) error
-}

data/go/src/boshprovisioner/instance/updater/applier/applier.go

@@ -1,93 +0,0 @@
-package applier
-
-import (
-	bosherr "bosh/errors"
-	boshlog "bosh/logger"
-
-	bpagclient "boshprovisioner/agent/client"
-	bpdep "boshprovisioner/deployment"
-	bptplcomp "boshprovisioner/instance/templatescompiler"
-	bppkgscomp "boshprovisioner/packagescompiler"
-)
-
-const applierLogTag = "Applier"
-
-type Applier struct {
-	depJob   bpdep.Job
-	instance bpdep.Instance
-
-	templatesCompiler bptplcomp.TemplatesCompiler
-	packagesCompiler  bppkgscomp.PackagesCompiler
-
-	agentClient bpagclient.Client
-	logger      boshlog.Logger
-}
-
-func NewApplier(
-	depJob bpdep.Job,
-	instance bpdep.Instance,
-	templatesCompiler bptplcomp.TemplatesCompiler,
-	packagesCompiler bppkgscomp.PackagesCompiler,
-	agentClient bpagclient.Client,
-	logger boshlog.Logger,
-) Applier {
-	return Applier{
-		depJob:   depJob,
-		instance: instance,
-
-		templatesCompiler: templatesCompiler,
-		packagesCompiler:  packagesCompiler,
-
-		agentClient: agentClient,
-		logger:      logger,
-	}
-}
-
-func (a Applier) Apply() error {
-	a.logger.Debug(applierLogTag, "Applying empty state")
-
-	emptyState := NewEmptyState(a.instance)
-
-	_, err := a.agentClient.Apply(emptyState.AsApplySpec())
-	if err != nil {
-		return bosherr.WrapError(err, "Applying empty spec")
-	}
-
-	// Changes local copy of an instance
-	a.instance.CurrentState, err = a.agentClient.GetState()
-	if err != nil {
-		return bosherr.WrapError(err, "Getting state")
-	}
-
-	a.logger.Debug(applierLogTag, "Finished applying empty state")
-
-	// Recompile job templates since current instance state might have changed.
-	// e.g. dynamic IP could now be set
-	err = a.templatesCompiler.Compile(a.depJob, a.instance)
-	if err != nil {
-		return bosherr.WrapError(err, "Compiling templates %s", a.depJob.Name)
-	}
-
-	a.logger.Debug(applierLogTag, "Applying job state")
-
-	jobState := NewJobState(
-		a.depJob,
-		a.instance,
-		a.templatesCompiler,
-		a.packagesCompiler,
-	)
-
-	jobApplySpec, err := jobState.AsApplySpec()
-	if err != nil {
-		return err
-	}
-
-	_, err = a.agentClient.Apply(jobApplySpec)
-	if err != nil {
-		return bosherr.WrapError(err, "Applying job spec")
-	}
-
-	a.logger.Debug(applierLogTag, "Finished applying job state")
-
-	return nil
-}

data/go/src/boshprovisioner/instance/updater/applier/empty_state.go

@@ -1,66 +0,0 @@
-package applier
-
-import (
-	boshas "bosh/agent/applier/applyspec"
-
-	bpdep "boshprovisioner/deployment"
-)
-
-// EmptyState represents state for a VM
-// that should not be running any job templates.
-type EmptyState struct {
-	instance bpdep.Instance
-}
-
-func NewEmptyState(instance bpdep.Instance) EmptyState {
-	return EmptyState{instance: instance}
-}
-
-func (s EmptyState) AsApplySpec() boshas.V1ApplySpec {
-	var spec boshas.V1ApplySpec
-
-	jobName := s.instance.JobName
-	jobIndex := s.instance.Index
-
-	spec = boshas.V1ApplySpec{
-		ConfigurationHash: "fake-configuration-hash", // todo
-
-		Deployment: s.instance.DeploymentName,
-
-		JobSpec: boshas.JobSpec{
-			Name: &jobName,
-		},
-
-		Index: &jobIndex,
-
-		NetworkSpecs: s.buildNetworkSpecs(),
-
-		// todo find out whats here
-		ResourcePoolSpecs: s.buildResourcePoolSpecs(),
-	}
-
-	return spec
-}
-
-func (s EmptyState) buildNetworkSpecs() map[string]boshas.NetworkSpec {
-	specs := map[string]boshas.NetworkSpec{}
-
-	for _, netAssoc := range s.instance.NetworkAssociations {
-		netConfig := s.instance.NetworkConfigurationForNetworkAssociation(netAssoc)
-
-		specs[netAssoc.Network.Name] = boshas.NetworkSpec{
-			Fields: map[string]interface{}{
-				"type":    netAssoc.Network.Type,
-				"ip":      netConfig.IP,
-				"netmask": netConfig.Netmask,
-				"gateway": netConfig.Gateway,
-			},
-		}
-	}
-
-	return specs
-}
-
-func (s EmptyState) buildResourcePoolSpecs() map[string]interface{} {
-	return map[string]interface{}{}
-}

data/go/src/boshprovisioner/instance/updater/applier/job_state.go

@@ -1,178 +0,0 @@
-package applier
-
-import (
-	boshas "bosh/agent/applier/applyspec"
-	bosherr "bosh/errors"
-
-	bpdep "boshprovisioner/deployment"
-	bptplcomp "boshprovisioner/instance/templatescompiler"
-	bppkgscomp "boshprovisioner/packagescompiler"
-)
-
-// JobState represents state for a VM
-// that should be running 1+ job templates.
-type JobState struct {
-	depJob   bpdep.Job
-	instance bpdep.Instance
-
-	templatesCompiler bptplcomp.TemplatesCompiler
-	packagesCompiler  bppkgscomp.PackagesCompiler
-
-	emptyState EmptyState
-}
-
-func NewJobState(
-	depJob bpdep.Job,
-	instance bpdep.Instance,
-	templatesCompiler bptplcomp.TemplatesCompiler,
-	packagesCompiler bppkgscomp.PackagesCompiler,
-) JobState {
-	return JobState{
-		depJob:   depJob,
-		instance: instance,
-
-		templatesCompiler: templatesCompiler,
-		packagesCompiler:  packagesCompiler,
-
-		emptyState: NewEmptyState(instance),
-	}
-}
-
-func (s JobState) AsApplySpec() (boshas.V1ApplySpec, error) {
-	var err error
-
-	spec := s.emptyState.AsApplySpec()
-
-	// JobTemplateSpecs list templates names; however,
-	// actual template content would come from RenderedTemplatesArchiveSpec
-	spec.JobSpec.JobTemplateSpecs = s.buildJobTemplateSpecs()
-
-	// Package dependencies for all job templates
-	spec.PackageSpecs, err = s.buildPackageSpecs()
-	if err != nil {
-		return spec, err
-	}
-
-	// Provides content for JobTemplateSpecs
-	spec.RenderedTemplatesArchiveSpec, err = s.buildRenderedTemplatesArchive()
-	if err != nil {
-		return spec, err
-	}
-
-	return spec, nil
-}
-
-func (s JobState) buildJobTemplateSpecs() []boshas.JobTemplateSpec {
-	var specs []boshas.JobTemplateSpec
-
-	for _, template := range s.depJob.Templates {
-		spec := boshas.JobTemplateSpec{
-			Name:    template.Name,
-			Version: "fake-job-template-version", // todo
-
-			Sha1:        "", // deprecated
-			BlobstoreID: "", // deprecated
-		}
-
-		specs = append(specs, spec)
-	}
-
-	return specs
-}
-
-func (s JobState) buildPackageSpecs() (map[string]boshas.PackageSpec, error) {
-	specs := map[string]boshas.PackageSpec{}
-
-	for _, template := range s.depJob.Templates {
-		pkgs, err := s.templatesCompiler.FindPackages(template)
-		if err != nil {
-			return specs, bosherr.WrapError(err, "Finding packages for template %s", template.Name)
-		}
-
-		for _, pkg := range pkgs {
-			rec, err := s.packagesCompiler.FindCompiledPackage(pkg)
-			if err != nil {
-				return specs, bosherr.WrapError(err, "Finding compiled package %s", pkg.Name)
-			}
-
-			specs[pkg.Name] = boshas.PackageSpec{
-				Name:    pkg.Name,
-				Version: pkg.Version,
-
-				Sha1:        rec.SHA1,
-				BlobstoreID: rec.BlobID,
-			}
-		}
-	}
-
-	return specs, nil
-}
-
-func (s JobState) buildRenderedTemplatesArchive() (boshas.RenderedTemplatesArchiveSpec, error) {
-	var archive boshas.RenderedTemplatesArchiveSpec
-
-	rec, err := s.templatesCompiler.FindRenderedArchive(s.depJob, s.instance)
-	if err != nil {
-		return archive, bosherr.WrapError(
-			err, "Finding rendered archive %s", s.depJob.Name)
-	}
-
-	// todo uppercase Sha1
-	archive.Sha1 = rec.SHA1
-	archive.BlobstoreID = rec.BlobID
-
-	return archive, nil
-}
-
-/*
-// Example apply spec
-{
-  "job": {
-    "name": "router",
-    "template": "router template",
-    "version": "1.0",
-    "sha1": "router sha1",
-    "blobstore_id": "router-blob-id-1",
-    "templates": [{
-      "name": "template 1",
-      "version": "0.1",
-      "sha1": "template 1 sha1",
-      "blobstore_id": "template-blob-id-1"
-    }]
-  },
-
-  "index": 1,
-
-  "packages": {
-    "package 1": {
-      "name": "package 1",
-      "version": "0.1",
-      "sha1": "package 1 sha1",
-      "blobstore_id": "package-blob-id-1"
-    }
-  },
-
-  "networks": {
-    "manual-net": {
-      "ip": "xx.xx.xx.xx",
-      "gateway": "xx.xx.xx.xx",
-      "netmask": "xx.xx.xx.xx",
-      "dns": ["xx.xx.xx.xx"],
-      "default": ["dns", "gateway"],
-      "cloud_properties": {"subnet": "subnet-xxxxxx"},
-      "dns_record_name": "job-index.job-name.manual-net.deployment-name.bosh"
-    },
-    "vip-net": {
-      "type": "vip",
-      "ip": "xx.xx.xx.xx",
-      "cloud_properties": {"security_groups": ["bosh"]},
-      "dns_record_name": "job-index.job-name.vip-net.deployment-name.bosh"
-    }
-  },
-
-  "rendered_templates_archive": {
-    "sha1": "archive sha 1",
-    "blobstore_id": "archive-blob-id-1"
-  }
-}
-*/