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,144 +0,0 @@
|
|
1
|
-
package release
|
2
|
-
|
3
|
-
import (
|
4
|
-
bprelman "boshprovisioner/release/manifest"
|
5
|
-
)
|
6
|
-
|
7
|
-
type Release struct {
|
8
|
-
Manifest bprelman.Manifest
|
9
|
-
|
10
|
-
Name string
|
11
|
-
Version string
|
12
|
-
|
13
|
-
Jobs []Job
|
14
|
-
|
15
|
-
Packages []*Package
|
16
|
-
}
|
17
|
-
|
18
|
-
type Job struct {
|
19
|
-
Name string
|
20
|
-
Version string
|
21
|
-
|
22
|
-
Fingerprint string
|
23
|
-
SHA1 string
|
24
|
-
|
25
|
-
TarPath string
|
26
|
-
}
|
27
|
-
|
28
|
-
type Package struct {
|
29
|
-
Name string
|
30
|
-
Version string
|
31
|
-
|
32
|
-
Fingerprint string
|
33
|
-
SHA1 string
|
34
|
-
|
35
|
-
TarPath string
|
36
|
-
|
37
|
-
// Package dependencies used at compilation of this package
|
38
|
-
Dependencies []*Package
|
39
|
-
}
|
40
|
-
|
41
|
-
// ResolvedPackageDependencies returns list of packages
|
42
|
-
// in order such that each package at a higher index
|
43
|
-
// only depends on packages at lower indecies.
|
44
|
-
func (r Release) ResolvedPackageDependencies() []*Package {
|
45
|
-
var resolvedPkgs []*Package
|
46
|
-
var pendingPkgs []*Package
|
47
|
-
|
48
|
-
for _, pkg := range r.Packages {
|
49
|
-
pkgRef := pkg
|
50
|
-
pendingPkgs = append(pendingPkgs, pkgRef)
|
51
|
-
}
|
52
|
-
|
53
|
-
iterations := 0
|
54
|
-
|
55
|
-
for len(pendingPkgs) > 0 {
|
56
|
-
pkg := pendingPkgs[0]
|
57
|
-
|
58
|
-
depsSatisfied := true
|
59
|
-
|
60
|
-
for _, depPkg := range pkg.Dependencies {
|
61
|
-
depSatisfied := false
|
62
|
-
|
63
|
-
for _, resPkg := range resolvedPkgs {
|
64
|
-
if depPkg.Name == resPkg.Name {
|
65
|
-
depSatisfied = true
|
66
|
-
break
|
67
|
-
}
|
68
|
-
}
|
69
|
-
|
70
|
-
if !depSatisfied {
|
71
|
-
depsSatisfied = false
|
72
|
-
break
|
73
|
-
}
|
74
|
-
}
|
75
|
-
|
76
|
-
pendingPkgs = pendingPkgs[1:]
|
77
|
-
if depsSatisfied {
|
78
|
-
resolvedPkgs = append(resolvedPkgs, pkg)
|
79
|
-
} else {
|
80
|
-
pendingPkgs = append(pendingPkgs, pkg)
|
81
|
-
}
|
82
|
-
|
83
|
-
if iterations > 100 {
|
84
|
-
panic("Failed to resolve package dependenices witin 100 iterations")
|
85
|
-
} else {
|
86
|
-
iterations++
|
87
|
-
}
|
88
|
-
}
|
89
|
-
|
90
|
-
return resolvedPkgs
|
91
|
-
}
|
92
|
-
|
93
|
-
// populateFromManifest populates release information
|
94
|
-
// interpreted from release manifest.
|
95
|
-
func (r *Release) populateFromManifest(manifest bprelman.Manifest) {
|
96
|
-
r.populateRelease(manifest.Release)
|
97
|
-
r.populatePackages(manifest.Release.Packages)
|
98
|
-
r.populateJobs(manifest.Release.Jobs)
|
99
|
-
r.Manifest = manifest
|
100
|
-
}
|
101
|
-
|
102
|
-
func (r *Release) populateRelease(manRelease bprelman.Release) {
|
103
|
-
r.Name = manRelease.Name
|
104
|
-
r.Version = manRelease.Version
|
105
|
-
}
|
106
|
-
|
107
|
-
func (r *Release) populatePackages(manPkgs []bprelman.Package) {
|
108
|
-
nameToPkg := map[bprelman.DependencyName]*Package{}
|
109
|
-
|
110
|
-
for _, manPkg := range manPkgs {
|
111
|
-
pkg := Package{
|
112
|
-
Name: manPkg.Name,
|
113
|
-
Version: manPkg.Version,
|
114
|
-
|
115
|
-
Fingerprint: manPkg.Fingerprint,
|
116
|
-
SHA1: manPkg.SHA1,
|
117
|
-
}
|
118
|
-
|
119
|
-
r.Packages = append(r.Packages, &pkg)
|
120
|
-
|
121
|
-
nameToPkg[bprelman.DependencyName(pkg.Name)] = &pkg
|
122
|
-
}
|
123
|
-
|
124
|
-
// Connect compile time dependencies for packages
|
125
|
-
for i, manPkg := range manPkgs {
|
126
|
-
for _, depName := range manPkg.DependencyNames {
|
127
|
-
r.Packages[i].Dependencies = append(r.Packages[i].Dependencies, nameToPkg[depName])
|
128
|
-
}
|
129
|
-
}
|
130
|
-
}
|
131
|
-
|
132
|
-
func (r *Release) populateJobs(manJobs []bprelman.Job) {
|
133
|
-
for _, manJob := range manJobs {
|
134
|
-
job := Job{
|
135
|
-
Name: manJob.Name,
|
136
|
-
Version: manJob.Version,
|
137
|
-
|
138
|
-
Fingerprint: manJob.Fingerprint,
|
139
|
-
SHA1: manJob.SHA1,
|
140
|
-
}
|
141
|
-
|
142
|
-
r.Jobs = append(r.Jobs, job)
|
143
|
-
}
|
144
|
-
}
|
@@ -1,129 +0,0 @@
|
|
1
|
-
package release_test
|
2
|
-
|
3
|
-
import (
|
4
|
-
. "github.com/onsi/ginkgo"
|
5
|
-
. "github.com/onsi/gomega"
|
6
|
-
|
7
|
-
. "boshprovisioner/release"
|
8
|
-
)
|
9
|
-
|
10
|
-
var _ = Describe("Release", func() {
|
11
|
-
var (
|
12
|
-
release Release
|
13
|
-
)
|
14
|
-
|
15
|
-
BeforeEach(func() {
|
16
|
-
release = Release{}
|
17
|
-
})
|
18
|
-
|
19
|
-
Describe("ResolvedPackageDependencies", func() {
|
20
|
-
It("returns packages in correct order with transitive deps", func() {
|
21
|
-
pkg1 := Package{Name: "fake-package-name-1"}
|
22
|
-
|
23
|
-
pkg2 := Package{
|
24
|
-
Name: "fake-package-name-2",
|
25
|
-
Dependencies: []*Package{&pkg1},
|
26
|
-
}
|
27
|
-
|
28
|
-
pkg3 := Package{
|
29
|
-
Name: "fake-package-name-3",
|
30
|
-
Dependencies: []*Package{&pkg2},
|
31
|
-
}
|
32
|
-
|
33
|
-
release.Packages = []*Package{&pkg3, &pkg2, &pkg1}
|
34
|
-
|
35
|
-
pkgs := release.ResolvedPackageDependencies()
|
36
|
-
Expect(pkgs).To(Equal([]*Package{&pkg1, &pkg2, &pkg3}))
|
37
|
-
})
|
38
|
-
|
39
|
-
It("returns packages in resolved order with multiple deps", func() {
|
40
|
-
pkg1 := Package{Name: "fake-package-name-1"}
|
41
|
-
pkg2 := Package{Name: "fake-package-name-2"}
|
42
|
-
|
43
|
-
pkg3 := Package{
|
44
|
-
Name: "fake-package-name-3",
|
45
|
-
Dependencies: []*Package{&pkg1, &pkg2},
|
46
|
-
}
|
47
|
-
|
48
|
-
release.Packages = []*Package{&pkg3, &pkg2, &pkg1}
|
49
|
-
|
50
|
-
pkgs := release.ResolvedPackageDependencies()
|
51
|
-
Expect(pkgs).To(Equal([]*Package{&pkg2, &pkg1, &pkg3})) // or pkg1, pkg2, pkg3
|
52
|
-
})
|
53
|
-
|
54
|
-
It("compiles BOSH release packages (example)", func() {
|
55
|
-
nginx := Package{Name: "nginx"}
|
56
|
-
genisoimage := Package{Name: "genisoimage"}
|
57
|
-
powerdns := Package{Name: "powerdns"}
|
58
|
-
ruby := Package{Name: "ruby"}
|
59
|
-
|
60
|
-
blobstore := Package{
|
61
|
-
Name: "blobstore",
|
62
|
-
Dependencies: []*Package{&ruby},
|
63
|
-
}
|
64
|
-
|
65
|
-
mysql := Package{Name: "mysql"}
|
66
|
-
|
67
|
-
nats := Package{
|
68
|
-
Name: "nats",
|
69
|
-
Dependencies: []*Package{&ruby},
|
70
|
-
}
|
71
|
-
|
72
|
-
common := Package{Name: "common"}
|
73
|
-
redis := Package{Name: "redis"}
|
74
|
-
libpq := Package{Name: "libpq"}
|
75
|
-
postgres := Package{Name: "postgres"}
|
76
|
-
|
77
|
-
registry := Package{
|
78
|
-
Name: "registry",
|
79
|
-
Dependencies: []*Package{&libpq, &mysql, &ruby},
|
80
|
-
}
|
81
|
-
|
82
|
-
director := Package{
|
83
|
-
Name: "director",
|
84
|
-
Dependencies: []*Package{&libpq, &mysql, &ruby},
|
85
|
-
}
|
86
|
-
|
87
|
-
healthMonitor := Package{
|
88
|
-
Name: "health_monitor",
|
89
|
-
Dependencies: []*Package{&ruby},
|
90
|
-
}
|
91
|
-
|
92
|
-
release.Packages = []*Package{
|
93
|
-
&nginx,
|
94
|
-
&genisoimage,
|
95
|
-
&powerdns,
|
96
|
-
&blobstore, // before ruby
|
97
|
-
&ruby,
|
98
|
-
&mysql,
|
99
|
-
&nats,
|
100
|
-
&common,
|
101
|
-
&director, // before libpq, postgres; after ruby
|
102
|
-
&redis,
|
103
|
-
®istry, // before libpq, postgres; after ruby
|
104
|
-
&libpq,
|
105
|
-
&postgres,
|
106
|
-
&healthMonitor, // after ruby, libpq, postgres
|
107
|
-
}
|
108
|
-
|
109
|
-
pkgs := release.ResolvedPackageDependencies()
|
110
|
-
|
111
|
-
Expect(pkgs).To(Equal([]*Package{
|
112
|
-
&nginx,
|
113
|
-
&genisoimage,
|
114
|
-
&powerdns,
|
115
|
-
&ruby,
|
116
|
-
&mysql,
|
117
|
-
&nats,
|
118
|
-
&common,
|
119
|
-
&redis,
|
120
|
-
&libpq,
|
121
|
-
&postgres,
|
122
|
-
&healthMonitor, // currently always appended to the end
|
123
|
-
&blobstore,
|
124
|
-
&director,
|
125
|
-
®istry,
|
126
|
-
}))
|
127
|
-
})
|
128
|
-
})
|
129
|
-
})
|
@@ -1,141 +0,0 @@
|
|
1
|
-
package release
|
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
|
-
bprelman "boshprovisioner/release/manifest"
|
12
|
-
bptar "boshprovisioner/tar"
|
13
|
-
)
|
14
|
-
|
15
|
-
const tarReaderLogTag = "TarReader"
|
16
|
-
|
17
|
-
// TarReader reads .tgz release file and returns a Release.
|
18
|
-
// See unpacked release directory layout at the end of the file.
|
19
|
-
type TarReader struct {
|
20
|
-
url string
|
21
|
-
|
22
|
-
downloader bpdload.Downloader
|
23
|
-
extractor bptar.Extractor
|
24
|
-
fs boshsys.FileSystem
|
25
|
-
logger boshlog.Logger
|
26
|
-
|
27
|
-
// location to clean if successfully downloaded/extracted
|
28
|
-
downloadPath string
|
29
|
-
extractPath string
|
30
|
-
}
|
31
|
-
|
32
|
-
func NewTarReader(
|
33
|
-
url string,
|
34
|
-
downloader bpdload.Downloader,
|
35
|
-
extractor bptar.Extractor,
|
36
|
-
fs boshsys.FileSystem,
|
37
|
-
logger boshlog.Logger,
|
38
|
-
) *TarReader {
|
39
|
-
return &TarReader{
|
40
|
-
url: url,
|
41
|
-
|
42
|
-
downloader: downloader,
|
43
|
-
extractor: extractor,
|
44
|
-
fs: fs,
|
45
|
-
logger: logger,
|
46
|
-
}
|
47
|
-
}
|
48
|
-
|
49
|
-
func (r *TarReader) Read() (Release, error) {
|
50
|
-
var release Release
|
51
|
-
|
52
|
-
downloadPath, err := r.downloader.Download(r.url)
|
53
|
-
if err != nil {
|
54
|
-
return release, bosherr.WrapError(err, "Downloading release")
|
55
|
-
}
|
56
|
-
|
57
|
-
r.downloadPath = downloadPath
|
58
|
-
|
59
|
-
extractPath, err := r.extractor.Extract(r.downloadPath)
|
60
|
-
if err != nil {
|
61
|
-
cleanUpErr := r.downloader.CleanUp(r.downloadPath)
|
62
|
-
if cleanUpErr != nil {
|
63
|
-
r.logger.Debug(tarReaderLogTag,
|
64
|
-
"Failed to clean up downloaded release %v", cleanUpErr)
|
65
|
-
}
|
66
|
-
|
67
|
-
return release, bosherr.WrapError(err, "Extracting release")
|
68
|
-
}
|
69
|
-
|
70
|
-
r.extractPath = extractPath
|
71
|
-
|
72
|
-
manifestPath := filepath.Join(r.extractPath, "release.MF")
|
73
|
-
|
74
|
-
manifest, err := bprelman.NewManifestFromPath(manifestPath, r.fs)
|
75
|
-
if err != nil {
|
76
|
-
closeErr := r.Close()
|
77
|
-
if closeErr != nil {
|
78
|
-
r.logger.Debug(tarReaderLogTag,
|
79
|
-
"Failed to close release %v", closeErr)
|
80
|
-
}
|
81
|
-
|
82
|
-
return release, bosherr.WrapError(err, "Building manifest")
|
83
|
-
}
|
84
|
-
|
85
|
-
r.logger.Debug(tarReaderLogTag, "Done building manifest %#v", manifest)
|
86
|
-
|
87
|
-
release.populateFromManifest(manifest)
|
88
|
-
|
89
|
-
r.populateReleaseTarPaths(&release)
|
90
|
-
|
91
|
-
return release, nil
|
92
|
-
}
|
93
|
-
|
94
|
-
func (r TarReader) Close() error {
|
95
|
-
dlErr := r.downloader.CleanUp(r.downloadPath)
|
96
|
-
if dlErr != nil {
|
97
|
-
r.logger.Debug(tarReaderLogTag,
|
98
|
-
"Failed to clean up downloaded release %v", dlErr)
|
99
|
-
}
|
100
|
-
|
101
|
-
exErr := r.extractor.CleanUp(r.extractPath)
|
102
|
-
if exErr != nil {
|
103
|
-
r.logger.Debug(tarReaderLogTag,
|
104
|
-
"Failed to clean up extracted release %v", exErr)
|
105
|
-
}
|
106
|
-
|
107
|
-
if dlErr != nil {
|
108
|
-
return dlErr
|
109
|
-
}
|
110
|
-
|
111
|
-
return exErr
|
112
|
-
}
|
113
|
-
|
114
|
-
// populateReleaseTarPaths sets TarPath for each job/package in the release.
|
115
|
-
func (r TarReader) populateReleaseTarPaths(release *Release) {
|
116
|
-
for i, job := range release.Jobs {
|
117
|
-
fileName := job.Name + ".tgz"
|
118
|
-
release.Jobs[i].TarPath = filepath.Join(r.extractPath, "jobs", fileName)
|
119
|
-
}
|
120
|
-
|
121
|
-
for _, pkg := range release.Packages {
|
122
|
-
fileName := pkg.Name + ".tgz"
|
123
|
-
pkg.TarPath = filepath.Join(r.extractPath, "packages", fileName)
|
124
|
-
}
|
125
|
-
}
|
126
|
-
|
127
|
-
/*
|
128
|
-
Example layout of an unpackaged release tar:
|
129
|
-
|
130
|
-
$ tree ~/Downloads/dummy-release
|
131
|
-
~/Downloads/dummy-release
|
132
|
-
├── jobs
|
133
|
-
│ ├── dummy.tgz
|
134
|
-
│ ├── dummy_with_bad_package.tgz
|
135
|
-
│ ├── dummy_with_package.tgz
|
136
|
-
│ └── dummy_with_properties.tgz
|
137
|
-
├── packages
|
138
|
-
│ ├── bad_package.tgz
|
139
|
-
│ └── dummy_package.tgz
|
140
|
-
└── release.MF
|
141
|
-
*/
|
@@ -1,68 +0,0 @@
|
|
1
|
-
package tar
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
boshsys "bosh/system"
|
7
|
-
)
|
8
|
-
|
9
|
-
const cmdCompressorLogTag = "CmdCompressor"
|
10
|
-
|
11
|
-
type CmdCompressor struct {
|
12
|
-
runner boshsys.CmdRunner
|
13
|
-
fs boshsys.FileSystem
|
14
|
-
logger boshlog.Logger
|
15
|
-
}
|
16
|
-
|
17
|
-
func NewCmdCompressor(
|
18
|
-
runner boshsys.CmdRunner,
|
19
|
-
fs boshsys.FileSystem,
|
20
|
-
logger boshlog.Logger,
|
21
|
-
) CmdCompressor {
|
22
|
-
return CmdCompressor{
|
23
|
-
runner: runner,
|
24
|
-
fs: fs,
|
25
|
-
logger: logger,
|
26
|
-
}
|
27
|
-
}
|
28
|
-
|
29
|
-
func (c CmdCompressor) Compress(path string) (string, error) {
|
30
|
-
compressPath, err := c.tmpPath()
|
31
|
-
if err != nil {
|
32
|
-
return "", err
|
33
|
-
}
|
34
|
-
|
35
|
-
c.logger.Debug(cmdCompressorLogTag, "Compressing %s to %s", path, compressPath)
|
36
|
-
|
37
|
-
_, _, _, err = c.runner.RunCommand("tar", "-C", path, "-czf", compressPath, ".")
|
38
|
-
if err != nil {
|
39
|
-
return "", bosherr.WrapError(err, "Running tar")
|
40
|
-
}
|
41
|
-
|
42
|
-
return compressPath, nil
|
43
|
-
}
|
44
|
-
|
45
|
-
func (c CmdCompressor) CleanUp(path string) error {
|
46
|
-
return c.fs.RemoveAll(path)
|
47
|
-
}
|
48
|
-
|
49
|
-
func (c CmdCompressor) tmpPath() (string, error) {
|
50
|
-
file, err := c.fs.TempFile("tar-CmdCompressor")
|
51
|
-
if err != nil {
|
52
|
-
return "", bosherr.WrapError(err, "Creating extract destination")
|
53
|
-
}
|
54
|
-
|
55
|
-
compressPath := file.Name()
|
56
|
-
|
57
|
-
err = file.Close()
|
58
|
-
if err != nil {
|
59
|
-
return "", bosherr.WrapError(err, "Closing temp file")
|
60
|
-
}
|
61
|
-
|
62
|
-
err = c.fs.RemoveAll(compressPath)
|
63
|
-
if err != nil {
|
64
|
-
return "", bosherr.WrapError(err, "Remove temp file")
|
65
|
-
}
|
66
|
-
|
67
|
-
return compressPath, nil
|
68
|
-
}
|