vagrant-bosh 0.0.6 → 0.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitmodules +3 -6
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent-log +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent-run +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent.cert +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent.json +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/agent.key +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/bosh-agent +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/bosh-agent-rc +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/agent/bosh-blobstore-dav +0 -0
- data/bosh-provisioner/assets/bosh-provisioner +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monit +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monit-log +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monit-run +0 -0
- data/{lib/vagrant-bosh → bosh-provisioner}/assets/monit/monitrc +0 -0
- data/dev/Vagrantfile +1 -1
- data/dev/example-bosh-manifest.yml +12 -12
- data/lib/vagrant-bosh/bootstrapper.rb +6 -2
- data/lib/vagrant-bosh/config.rb +1 -1
- data/lib/vagrant-bosh/provisioner.rb +1 -1
- data/lib/vagrant-bosh/version.rb +1 -1
- data/vagrant-bosh.gemspec +3 -1
- metadata +20 -139
- data/go/.gitignore +0 -11
- data/go/bin/build +0 -10
- data/go/bin/build-linux-amd64 +0 -9
- data/go/bin/env +0 -13
- data/go/bin/go +0 -5
- data/go/bin/golint +0 -19
- data/go/bin/test +0 -37
- data/go/src/boshprovisioner/agent/client/client_interface.go +0 -73
- data/go/src/boshprovisioner/agent/client/fakes/fake_client.go +0 -81
- data/go/src/boshprovisioner/agent/client/http_client.go +0 -299
- data/go/src/boshprovisioner/agent/client/http_client_envelope.go +0 -107
- data/go/src/boshprovisioner/deployment/deployment.go +0 -221
- data/go/src/boshprovisioner/deployment/instance.go +0 -54
- data/go/src/boshprovisioner/deployment/manifest/deployment.go +0 -84
- data/go/src/boshprovisioner/deployment/manifest/ips.go +0 -23
- data/go/src/boshprovisioner/deployment/manifest/manifest.go +0 -143
- data/go/src/boshprovisioner/deployment/manifest/manifest_suite_test.go +0 -13
- data/go/src/boshprovisioner/deployment/manifest/manifest_test.go +0 -86
- data/go/src/boshprovisioner/deployment/manifest/syntax_validator.go +0 -186
- data/go/src/boshprovisioner/deployment/manifest/watch_time.go +0 -43
- data/go/src/boshprovisioner/deployment/manifest_reader.go +0 -46
- data/go/src/boshprovisioner/deployment/reader_factory.go +0 -25
- data/go/src/boshprovisioner/deployment/semantic_validator.go +0 -111
- data/go/src/boshprovisioner/downloader/blobstore_downloader.go +0 -55
- data/go/src/boshprovisioner/downloader/default_mux_downloader.go +0 -22
- data/go/src/boshprovisioner/downloader/downloader_interface.go +0 -6
- data/go/src/boshprovisioner/downloader/http_downloader.go +0 -53
- data/go/src/boshprovisioner/downloader/local_fs_downloader.go +0 -48
- data/go/src/boshprovisioner/downloader/mux_downloader.go +0 -69
- data/go/src/boshprovisioner/eventlog/log.go +0 -72
- data/go/src/boshprovisioner/eventlog/stage.go +0 -39
- data/go/src/boshprovisioner/eventlog/task.go +0 -58
- data/go/src/boshprovisioner/index/file_index.go +0 -289
- data/go/src/boshprovisioner/index/file_index_test.go +0 -296
- data/go/src/boshprovisioner/index/index_interface.go +0 -18
- data/go/src/boshprovisioner/index/index_suite_test.go +0 -13
- data/go/src/boshprovisioner/instance/instance.go +0 -43
- data/go/src/boshprovisioner/instance/instance_provisioner.go +0 -48
- data/go/src/boshprovisioner/instance/templatescompiler/concrete_templates_compiler.go +0 -284
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erb_renderer.go +0 -117
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/erbrenderer_suite_test.go +0 -13
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties.go +0 -77
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/render_properties_test.go +0 -193
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context.go +0 -85
- data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context_rb.go +0 -155
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_jobs_repository.go +0 -86
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_runtime_packages_repository.go +0 -113
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/concrete_template_to_job_repository.go +0 -86
- data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/jobs_repository_interface.go +0 -49
- data/go/src/boshprovisioner/instance/templatescompiler/rendered_archives_compiler.go +0 -81
- data/go/src/boshprovisioner/instance/templatescompiler/templates_compiler_interface.go +0 -20
- data/go/src/boshprovisioner/instance/templatescompiler/templatesrepo/ct_repository.go +0 -54
- data/go/src/boshprovisioner/instance/templatescompiler/templatesrepo/templates_repository_interface.go +0 -16
- data/go/src/boshprovisioner/instance/updater/applier/applier.go +0 -93
- data/go/src/boshprovisioner/instance/updater/applier/empty_state.go +0 -66
- data/go/src/boshprovisioner/instance/updater/applier/job_state.go +0 -178
- data/go/src/boshprovisioner/instance/updater/drainer.go +0 -72
- data/go/src/boshprovisioner/instance/updater/starter.go +0 -36
- data/go/src/boshprovisioner/instance/updater/stopper.go +0 -36
- data/go/src/boshprovisioner/instance/updater/updater.go +0 -97
- data/go/src/boshprovisioner/instance/updater/updater_factory.go +0 -80
- data/go/src/boshprovisioner/instance/updater/updater_suite_test.go +0 -13
- data/go/src/boshprovisioner/instance/updater/waiter.go +0 -77
- data/go/src/boshprovisioner/instance/updater/waiter_test.go +0 -147
- data/go/src/boshprovisioner/main/config.go +0 -95
- data/go/src/boshprovisioner/main/config_test.go +0 -67
- data/go/src/boshprovisioner/main/main.go +0 -185
- data/go/src/boshprovisioner/main/main_suite_test.go +0 -13
- data/go/src/boshprovisioner/main/repos_factory.go +0 -86
- data/go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/compiled_packages_repository_interface.go +0 -17
- data/go/src/boshprovisioner/packagescompiler/compiledpackagesrepo/concrete_compiled_packages_repository.go +0 -61
- data/go/src/boshprovisioner/packagescompiler/concrete_packages_compiler.go +0 -179
- data/go/src/boshprovisioner/packagescompiler/concrete_packages_compiler_factory.go +0 -48
- data/go/src/boshprovisioner/packagescompiler/packages_compiler_interface.go +0 -20
- data/go/src/boshprovisioner/packagescompiler/packagesrepo/concrete_packages_repository.go +0 -65
- data/go/src/boshprovisioner/packagescompiler/packagesrepo/packages_repository_interface.go +0 -16
- data/go/src/boshprovisioner/provisioner/blobstore_config.go +0 -65
- data/go/src/boshprovisioner/provisioner/blobstore_provisioner.go +0 -38
- data/go/src/boshprovisioner/provisioner/deployment_provisioner_interface.go +0 -10
- data/go/src/boshprovisioner/provisioner/release_compiler.go +0 -95
- data/go/src/boshprovisioner/provisioner/single_configured_vm_provisioner.go +0 -124
- data/go/src/boshprovisioner/provisioner/single_non_configured_vm_provisioner.go +0 -40
- data/go/src/boshprovisioner/provisioner/single_vm_provisioner_factory.go +0 -68
- data/go/src/boshprovisioner/release/dir_reader.go +0 -146
- data/go/src/boshprovisioner/release/job/job.go +0 -86
- data/go/src/boshprovisioner/release/job/manifest/manifest.go +0 -79
- data/go/src/boshprovisioner/release/job/manifest/manifest_suite_test.go +0 -13
- data/go/src/boshprovisioner/release/job/manifest/manifest_test.go +0 -59
- data/go/src/boshprovisioner/release/job/manifest/syntax_validator.go +0 -43
- data/go/src/boshprovisioner/release/job/reader_factory.go +0 -34
- data/go/src/boshprovisioner/release/job/tar_reader.go +0 -133
- data/go/src/boshprovisioner/release/manifest/manifest.go +0 -120
- data/go/src/boshprovisioner/release/manifest/manifest_suite_test.go +0 -13
- data/go/src/boshprovisioner/release/manifest/manifest_test.go +0 -126
- data/go/src/boshprovisioner/release/manifest/syntax_validator.go +0 -134
- data/go/src/boshprovisioner/release/reader_factory.go +0 -45
- data/go/src/boshprovisioner/release/reader_interface.go +0 -6
- data/go/src/boshprovisioner/release/release.go +0 -144
- data/go/src/boshprovisioner/release/release_suite_test.go +0 -13
- data/go/src/boshprovisioner/release/release_test.go +0 -129
- data/go/src/boshprovisioner/release/tar_reader.go +0 -141
- data/go/src/boshprovisioner/tar/cmd_compressor.go +0 -68
- data/go/src/boshprovisioner/tar/cmd_extractor.go +0 -47
- data/go/src/boshprovisioner/tar/compressor_interface.go +0 -6
- data/go/src/boshprovisioner/tar/extractor_interface.go +0 -6
- data/go/src/boshprovisioner/util/possible_base64.go +0 -21
- data/go/src/boshprovisioner/util/string_keyed.go +0 -70
- data/go/src/boshprovisioner/vm/vagrant/agent_provisioner.go +0 -296
- data/go/src/boshprovisioner/vm/vagrant/asset_manager.go +0 -61
- data/go/src/boshprovisioner/vm/vagrant/configured_vm.go +0 -29
- data/go/src/boshprovisioner/vm/vagrant/deps_provisioner.go +0 -214
- data/go/src/boshprovisioner/vm/vagrant/monit_provisioner.go +0 -85
- data/go/src/boshprovisioner/vm/vagrant/non_configured_vm.go +0 -26
- data/go/src/boshprovisioner/vm/vagrant/runit_provisioner.go +0 -229
- data/go/src/boshprovisioner/vm/vagrant/simple_cmds.go +0 -54
- data/go/src/boshprovisioner/vm/vagrant/vcap_user_provisioner.go +0 -167
- data/go/src/boshprovisioner/vm/vagrant/vm_provisioner.go +0 -119
- data/go/src/boshprovisioner/vm/vagrant/vm_provisioner_factory.go +0 -101
- data/go/src/boshprovisioner/vm/vm_interface.go +0 -45
- data/lib/vagrant-bosh/assets/provisioner +0 -0
@@ -1,86 +0,0 @@
|
|
1
|
-
package job
|
2
|
-
|
3
|
-
import (
|
4
|
-
bpreljobman "boshprovisioner/release/job/manifest"
|
5
|
-
)
|
6
|
-
|
7
|
-
type Job struct {
|
8
|
-
Manifest bpreljobman.Manifest
|
9
|
-
|
10
|
-
Name string
|
11
|
-
|
12
|
-
MonitTemplate Template
|
13
|
-
|
14
|
-
Templates []Template
|
15
|
-
|
16
|
-
// Runtime package dependencies for this job
|
17
|
-
Packages []Package
|
18
|
-
|
19
|
-
Properties []Property
|
20
|
-
}
|
21
|
-
|
22
|
-
type Template struct {
|
23
|
-
SrcPathEnd string
|
24
|
-
DstPathEnd string // End of the path on the VM
|
25
|
-
|
26
|
-
Path string
|
27
|
-
}
|
28
|
-
|
29
|
-
type Package struct {
|
30
|
-
Name string
|
31
|
-
}
|
32
|
-
|
33
|
-
type Property struct {
|
34
|
-
Name string
|
35
|
-
Description string
|
36
|
-
|
37
|
-
Default interface{}
|
38
|
-
}
|
39
|
-
|
40
|
-
// populateFromManifest populates job information interpreted from job manifest.
|
41
|
-
func (j *Job) populateFromManifest(manifest bpreljobman.Manifest) {
|
42
|
-
j.populateJob(manifest.Job)
|
43
|
-
j.populateTemplates(manifest.Job.TemplateNames)
|
44
|
-
j.populatePackages(manifest.Job.PackageNames)
|
45
|
-
j.populateProperties(manifest.Job.PropertyMappings)
|
46
|
-
j.Manifest = manifest
|
47
|
-
}
|
48
|
-
|
49
|
-
func (j *Job) populateJob(manJob bpreljobman.Job) {
|
50
|
-
j.Name = manJob.Name
|
51
|
-
}
|
52
|
-
|
53
|
-
func (j *Job) populateTemplates(manTemplateNames bpreljobman.TemplateNames) {
|
54
|
-
j.MonitTemplate = Template{
|
55
|
-
SrcPathEnd: "monit",
|
56
|
-
DstPathEnd: "monit",
|
57
|
-
}
|
58
|
-
|
59
|
-
for srcPathEnd, dstPathEnd := range manTemplateNames {
|
60
|
-
template := Template{
|
61
|
-
SrcPathEnd: srcPathEnd,
|
62
|
-
DstPathEnd: dstPathEnd,
|
63
|
-
}
|
64
|
-
|
65
|
-
j.Templates = append(j.Templates, template)
|
66
|
-
}
|
67
|
-
}
|
68
|
-
|
69
|
-
func (j *Job) populatePackages(manPackageNames []string) {
|
70
|
-
for _, name := range manPackageNames {
|
71
|
-
j.Packages = append(j.Packages, Package{Name: name})
|
72
|
-
}
|
73
|
-
}
|
74
|
-
|
75
|
-
func (j *Job) populateProperties(manPropMappings bpreljobman.PropertyMappings) {
|
76
|
-
for propName, propDef := range manPropMappings {
|
77
|
-
property := Property{
|
78
|
-
Name: propName,
|
79
|
-
Description: propDef.Description,
|
80
|
-
|
81
|
-
Default: propDef.Default,
|
82
|
-
}
|
83
|
-
|
84
|
-
j.Properties = append(j.Properties, property)
|
85
|
-
}
|
86
|
-
}
|
@@ -1,79 +0,0 @@
|
|
1
|
-
// Package manifest represents internal structure of a release job.
|
2
|
-
package manifest
|
3
|
-
|
4
|
-
import (
|
5
|
-
bosherr "bosh/errors"
|
6
|
-
boshsys "bosh/system"
|
7
|
-
"github.com/cloudfoundry-incubator/candiedyaml"
|
8
|
-
)
|
9
|
-
|
10
|
-
type Manifest struct {
|
11
|
-
Job Job
|
12
|
-
}
|
13
|
-
|
14
|
-
type Job struct {
|
15
|
-
Name string `yaml:"name"`
|
16
|
-
|
17
|
-
TemplateNames TemplateNames `yaml:"templates"`
|
18
|
-
|
19
|
-
PackageNames []string `yaml:"packages"`
|
20
|
-
|
21
|
-
PropertyMappings PropertyMappings `yaml:"properties"`
|
22
|
-
}
|
23
|
-
|
24
|
-
type TemplateNames map[string]string
|
25
|
-
|
26
|
-
type PropertyMappings map[string]PropertyDefinition
|
27
|
-
|
28
|
-
type PropertyDefinition struct {
|
29
|
-
Description string `yaml:"description"`
|
30
|
-
|
31
|
-
// Non-raw field is populated by the validator.
|
32
|
-
DefaultRaw interface{} `yaml:"default"`
|
33
|
-
Default interface{}
|
34
|
-
}
|
35
|
-
|
36
|
-
func NewManifestFromPath(path string, fs boshsys.FileSystem) (Manifest, error) {
|
37
|
-
bytes, err := fs.ReadFile(path)
|
38
|
-
if err != nil {
|
39
|
-
return Manifest{}, bosherr.WrapError(err, "Reading manifest %s", path)
|
40
|
-
}
|
41
|
-
|
42
|
-
return NewManifestFromBytes(bytes)
|
43
|
-
}
|
44
|
-
|
45
|
-
func NewManifestFromBytes(bytes []byte) (Manifest, error) {
|
46
|
-
var manifest Manifest
|
47
|
-
var job Job
|
48
|
-
|
49
|
-
err := candiedyaml.Unmarshal(bytes, &job)
|
50
|
-
if err != nil {
|
51
|
-
return manifest, bosherr.WrapError(err, "Parsing job")
|
52
|
-
}
|
53
|
-
|
54
|
-
manifest.Job = job
|
55
|
-
|
56
|
-
err = NewSyntaxValidator(&manifest).Validate()
|
57
|
-
if err != nil {
|
58
|
-
return Manifest{}, bosherr.WrapError(err, "Validating manifest syntactically")
|
59
|
-
}
|
60
|
-
|
61
|
-
return manifest, nil
|
62
|
-
}
|
63
|
-
|
64
|
-
/*
|
65
|
-
# Example for job.MF
|
66
|
-
name: dummy
|
67
|
-
|
68
|
-
templates:
|
69
|
-
dummy_ctl: bin/dummy_ctl
|
70
|
-
|
71
|
-
packages:
|
72
|
-
- dummy_package
|
73
|
-
- dummy_package2
|
74
|
-
|
75
|
-
properties:
|
76
|
-
dummy_value:
|
77
|
-
description: Some value for the dummy job
|
78
|
-
default: 300
|
79
|
-
*/
|
@@ -1,59 +0,0 @@
|
|
1
|
-
package manifest_test
|
2
|
-
|
3
|
-
import (
|
4
|
-
. "github.com/onsi/ginkgo"
|
5
|
-
. "github.com/onsi/gomega"
|
6
|
-
|
7
|
-
. "boshprovisioner/release/job/manifest"
|
8
|
-
)
|
9
|
-
|
10
|
-
var _ = Describe("Manifest", func() {
|
11
|
-
Describe("NewManifestFromBytes", func() {
|
12
|
-
It("returns manifest with property definiton default that have string keys", func() {
|
13
|
-
manifestBytes := []byte(`
|
14
|
-
properties:
|
15
|
-
key:
|
16
|
-
default:
|
17
|
-
prop:
|
18
|
-
nest-prop: instance-val
|
19
|
-
props:
|
20
|
-
- name: nest-prop
|
21
|
-
`)
|
22
|
-
|
23
|
-
manifest, err := NewManifestFromBytes(manifestBytes)
|
24
|
-
Expect(err).ToNot(HaveOccurred())
|
25
|
-
|
26
|
-
Expect(manifest.Job.PropertyMappings).To(HaveLen(1))
|
27
|
-
|
28
|
-
for _, propDef := range manifest.Job.PropertyMappings {
|
29
|
-
// candiedyaml unmarshals manifest to map[interface{}]interface{}
|
30
|
-
// (encoding/json unmarshals manifest to map[string]interface{})
|
31
|
-
Expect(propDef.Default).To(Equal(map[string]interface{}{
|
32
|
-
"prop": map[string]interface{}{
|
33
|
-
"nest-prop": "instance-val",
|
34
|
-
},
|
35
|
-
"props": []interface{}{
|
36
|
-
map[string]interface{}{"name": "nest-prop"},
|
37
|
-
},
|
38
|
-
}))
|
39
|
-
}
|
40
|
-
})
|
41
|
-
|
42
|
-
It("returns manifest with property definiton default that is an empty string", func() {
|
43
|
-
manifestBytes := []byte(`
|
44
|
-
properties:
|
45
|
-
key:
|
46
|
-
default: ""
|
47
|
-
`)
|
48
|
-
|
49
|
-
manifest, err := NewManifestFromBytes(manifestBytes)
|
50
|
-
Expect(err).ToNot(HaveOccurred())
|
51
|
-
|
52
|
-
Expect(manifest.Job.PropertyMappings).To(HaveLen(1))
|
53
|
-
|
54
|
-
for _, propDef := range manifest.Job.PropertyMappings {
|
55
|
-
Expect(propDef.Default).To(Equal(""))
|
56
|
-
}
|
57
|
-
})
|
58
|
-
})
|
59
|
-
})
|
@@ -1,43 +0,0 @@
|
|
1
|
-
package manifest
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
|
6
|
-
bputil "boshprovisioner/util"
|
7
|
-
)
|
8
|
-
|
9
|
-
type SyntaxValidator struct {
|
10
|
-
job *Job
|
11
|
-
}
|
12
|
-
|
13
|
-
func NewSyntaxValidator(manifest *Manifest) SyntaxValidator {
|
14
|
-
if manifest == nil {
|
15
|
-
panic("Expected manifest to not be nil")
|
16
|
-
}
|
17
|
-
|
18
|
-
return SyntaxValidator{job: &manifest.Job}
|
19
|
-
}
|
20
|
-
|
21
|
-
func (v SyntaxValidator) Validate() error {
|
22
|
-
for name, propDef := range v.job.PropertyMappings {
|
23
|
-
propDef, err := v.validatePropDef(propDef)
|
24
|
-
if err != nil {
|
25
|
-
return bosherr.WrapError(err, "Property %s", name)
|
26
|
-
}
|
27
|
-
|
28
|
-
v.job.PropertyMappings[name] = propDef
|
29
|
-
}
|
30
|
-
|
31
|
-
return nil
|
32
|
-
}
|
33
|
-
|
34
|
-
func (v SyntaxValidator) validatePropDef(propDef PropertyDefinition) (PropertyDefinition, error) {
|
35
|
-
def, err := bputil.NewStringKeyed().ConvertInterface(propDef.DefaultRaw)
|
36
|
-
if err != nil {
|
37
|
-
return propDef, bosherr.WrapError(err, "Default")
|
38
|
-
}
|
39
|
-
|
40
|
-
propDef.Default = def
|
41
|
-
|
42
|
-
return propDef, nil
|
43
|
-
}
|
@@ -1,34 +0,0 @@
|
|
1
|
-
package job
|
2
|
-
|
3
|
-
import (
|
4
|
-
boshlog "bosh/logger"
|
5
|
-
boshsys "bosh/system"
|
6
|
-
|
7
|
-
bpdload "boshprovisioner/downloader"
|
8
|
-
bptar "boshprovisioner/tar"
|
9
|
-
)
|
10
|
-
|
11
|
-
type ReaderFactory struct {
|
12
|
-
downloader bpdload.Downloader
|
13
|
-
extractor bptar.Extractor
|
14
|
-
fs boshsys.FileSystem
|
15
|
-
logger boshlog.Logger
|
16
|
-
}
|
17
|
-
|
18
|
-
func NewReaderFactory(
|
19
|
-
downloader bpdload.Downloader,
|
20
|
-
extractor bptar.Extractor,
|
21
|
-
fs boshsys.FileSystem,
|
22
|
-
logger boshlog.Logger,
|
23
|
-
) ReaderFactory {
|
24
|
-
return ReaderFactory{
|
25
|
-
downloader: downloader,
|
26
|
-
extractor: extractor,
|
27
|
-
fs: fs,
|
28
|
-
logger: logger,
|
29
|
-
}
|
30
|
-
}
|
31
|
-
|
32
|
-
func (rf ReaderFactory) NewTarReader(path string) *TarReader {
|
33
|
-
return NewTarReader(path, rf.downloader, rf.extractor, rf.fs, rf.logger)
|
34
|
-
}
|
@@ -1,133 +0,0 @@
|
|
1
|
-
package job
|
2
|
-
|
3
|
-
import (
|
4
|
-
"path/filepath"
|
5
|
-
|
6
|
-
bosherr "bosh/errors"
|
7
|
-
boshlog "bosh/logger"
|
8
|
-
boshsys "bosh/system"
|
9
|
-
|
10
|
-
bpdload "boshprovisioner/downloader"
|
11
|
-
bpreljobman "boshprovisioner/release/job/manifest"
|
12
|
-
bptar "boshprovisioner/tar"
|
13
|
-
)
|
14
|
-
|
15
|
-
const tarReaderLogTag = "TarReader"
|
16
|
-
|
17
|
-
// TarReader reads .tgz job file and returns a Job.
|
18
|
-
// See unpacked job directory layout at the end of the file.
|
19
|
-
type TarReader struct {
|
20
|
-
path string
|
21
|
-
downloader bpdload.Downloader
|
22
|
-
extractor bptar.Extractor
|
23
|
-
fs boshsys.FileSystem
|
24
|
-
logger boshlog.Logger
|
25
|
-
|
26
|
-
// location to clean if successfully downloaded/extracted
|
27
|
-
downloadPath string
|
28
|
-
extractPath string
|
29
|
-
}
|
30
|
-
|
31
|
-
func NewTarReader(
|
32
|
-
path string,
|
33
|
-
downloader bpdload.Downloader,
|
34
|
-
extractor bptar.Extractor,
|
35
|
-
fs boshsys.FileSystem,
|
36
|
-
logger boshlog.Logger,
|
37
|
-
) *TarReader {
|
38
|
-
return &TarReader{
|
39
|
-
path: path,
|
40
|
-
downloader: downloader,
|
41
|
-
extractor: extractor,
|
42
|
-
fs: fs,
|
43
|
-
logger: logger,
|
44
|
-
}
|
45
|
-
}
|
46
|
-
|
47
|
-
func (tr *TarReader) Read() (Job, error) {
|
48
|
-
var job Job
|
49
|
-
|
50
|
-
downloadPath, err := tr.downloader.Download(tr.path)
|
51
|
-
if err != nil {
|
52
|
-
return job, bosherr.WrapError(err, "Downloading job")
|
53
|
-
}
|
54
|
-
|
55
|
-
tr.downloadPath = downloadPath
|
56
|
-
|
57
|
-
extractPath, err := tr.extractor.Extract(tr.downloadPath)
|
58
|
-
if err != nil {
|
59
|
-
cleanUpErr := tr.downloader.CleanUp(tr.downloadPath)
|
60
|
-
if cleanUpErr != nil {
|
61
|
-
tr.logger.Debug(tarReaderLogTag,
|
62
|
-
"Failed to clean up downloaded job %v", cleanUpErr)
|
63
|
-
}
|
64
|
-
|
65
|
-
return job, bosherr.WrapError(err, "Extracting job")
|
66
|
-
}
|
67
|
-
|
68
|
-
tr.extractPath = extractPath
|
69
|
-
|
70
|
-
manifestPath := filepath.Join(tr.extractPath, "job.MF")
|
71
|
-
|
72
|
-
manifest, err := bpreljobman.NewManifestFromPath(manifestPath, tr.fs)
|
73
|
-
if err != nil {
|
74
|
-
closeErr := tr.Close()
|
75
|
-
if closeErr != nil {
|
76
|
-
tr.logger.Debug(tarReaderLogTag,
|
77
|
-
"Failed to close job %v", closeErr)
|
78
|
-
}
|
79
|
-
|
80
|
-
return job, bosherr.WrapError(err, "Building manifest")
|
81
|
-
}
|
82
|
-
|
83
|
-
tr.logger.Debug(tarReaderLogTag, "Done building manifest %#v", manifest)
|
84
|
-
|
85
|
-
job.populateFromManifest(manifest)
|
86
|
-
|
87
|
-
tr.populateJobPaths(&job)
|
88
|
-
|
89
|
-
return job, nil
|
90
|
-
}
|
91
|
-
|
92
|
-
func (tr TarReader) Close() error {
|
93
|
-
dlErr := tr.downloader.CleanUp(tr.downloadPath)
|
94
|
-
if dlErr != nil {
|
95
|
-
tr.logger.Debug(tarReaderLogTag,
|
96
|
-
"Failed to clean up downloaded job %v", dlErr)
|
97
|
-
}
|
98
|
-
|
99
|
-
exErr := tr.extractor.CleanUp(tr.extractPath)
|
100
|
-
if exErr != nil {
|
101
|
-
tr.logger.Debug(tarReaderLogTag,
|
102
|
-
"Failed to clean up extracted job %v", exErr)
|
103
|
-
}
|
104
|
-
|
105
|
-
if dlErr != nil {
|
106
|
-
return dlErr
|
107
|
-
}
|
108
|
-
|
109
|
-
return exErr
|
110
|
-
}
|
111
|
-
|
112
|
-
// populateJobPaths sets Path for each template and monit in the job.
|
113
|
-
func (tr TarReader) populateJobPaths(job *Job) {
|
114
|
-
// monit file is outside of templates/ directory
|
115
|
-
job.MonitTemplate.Path = filepath.Join(
|
116
|
-
tr.extractPath, job.MonitTemplate.SrcPathEnd)
|
117
|
-
|
118
|
-
for i, template := range job.Templates {
|
119
|
-
job.Templates[i].Path = filepath.Join(
|
120
|
-
tr.extractPath, "templates", template.SrcPathEnd)
|
121
|
-
}
|
122
|
-
}
|
123
|
-
|
124
|
-
/*
|
125
|
-
Example layout of an unpackaged job tar:
|
126
|
-
|
127
|
-
$ tree ~/Downloads/dummy-job
|
128
|
-
~/Downloads/dummy-job
|
129
|
-
├── job.MF
|
130
|
-
├── monit
|
131
|
-
└── templates
|
132
|
-
└── dummy_ctl
|
133
|
-
*/
|