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,17 +0,0 @@
|
|
1
|
-
package compiledpackagesrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bprel "boshprovisioner/release"
|
5
|
-
)
|
6
|
-
|
7
|
-
type CompiledPackageRecord struct {
|
8
|
-
BlobID string
|
9
|
-
SHA1 string
|
10
|
-
}
|
11
|
-
|
12
|
-
// CompiledPackagesRepository maintains list of compiled packages as blobs
|
13
|
-
// todo account for stemcell
|
14
|
-
type CompiledPackagesRepository interface {
|
15
|
-
Find(bprel.Package) (CompiledPackageRecord, bool, error)
|
16
|
-
Save(bprel.Package, CompiledPackageRecord) error
|
17
|
-
}
|
@@ -1,61 +0,0 @@
|
|
1
|
-
package compiledpackagesrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpindex "boshprovisioner/index"
|
8
|
-
bprel "boshprovisioner/release"
|
9
|
-
)
|
10
|
-
|
11
|
-
type CCPRepository struct {
|
12
|
-
index bpindex.Index
|
13
|
-
logger boshlog.Logger
|
14
|
-
}
|
15
|
-
|
16
|
-
type packageToCompiledPackageKey struct {
|
17
|
-
PackageName string
|
18
|
-
PackageVersion string
|
19
|
-
|
20
|
-
// Fingerprint of a package captures its dependenices
|
21
|
-
PackageFingerprint string
|
22
|
-
}
|
23
|
-
|
24
|
-
func NewConcreteCompiledPackagesRepository(
|
25
|
-
index bpindex.Index,
|
26
|
-
logger boshlog.Logger,
|
27
|
-
) CCPRepository {
|
28
|
-
return CCPRepository{index: index, logger: logger}
|
29
|
-
}
|
30
|
-
|
31
|
-
func (r CCPRepository) Find(pkg bprel.Package) (CompiledPackageRecord, bool, error) {
|
32
|
-
var record CompiledPackageRecord
|
33
|
-
|
34
|
-
err := r.index.Find(r.pkgKey(pkg), &record)
|
35
|
-
if err != nil {
|
36
|
-
if err == bpindex.ErrNotFound {
|
37
|
-
return record, false, nil
|
38
|
-
}
|
39
|
-
|
40
|
-
return record, false, bosherr.WrapError(err, "Finding compiled package")
|
41
|
-
}
|
42
|
-
|
43
|
-
return record, true, nil
|
44
|
-
}
|
45
|
-
|
46
|
-
func (r CCPRepository) Save(pkg bprel.Package, record CompiledPackageRecord) error {
|
47
|
-
err := r.index.Save(r.pkgKey(pkg), record)
|
48
|
-
if err != nil {
|
49
|
-
return bosherr.WrapError(err, "Saving compiled package")
|
50
|
-
}
|
51
|
-
|
52
|
-
return nil
|
53
|
-
}
|
54
|
-
|
55
|
-
func (r CCPRepository) pkgKey(pkg bprel.Package) packageToCompiledPackageKey {
|
56
|
-
return packageToCompiledPackageKey{
|
57
|
-
PackageName: pkg.Name,
|
58
|
-
PackageVersion: pkg.Version,
|
59
|
-
PackageFingerprint: pkg.Fingerprint,
|
60
|
-
}
|
61
|
-
}
|
@@ -1,179 +0,0 @@
|
|
1
|
-
package packagescompiler
|
2
|
-
|
3
|
-
import (
|
4
|
-
"fmt"
|
5
|
-
|
6
|
-
boshcomp "bosh/agent/compiler"
|
7
|
-
boshblob "bosh/blobstore"
|
8
|
-
bosherr "bosh/errors"
|
9
|
-
boshlog "bosh/logger"
|
10
|
-
|
11
|
-
bpagentclient "boshprovisioner/agent/client"
|
12
|
-
bpeventlog "boshprovisioner/eventlog"
|
13
|
-
bpcpkgsrepo "boshprovisioner/packagescompiler/compiledpackagesrepo"
|
14
|
-
bppkgsrepo "boshprovisioner/packagescompiler/packagesrepo"
|
15
|
-
bprel "boshprovisioner/release"
|
16
|
-
)
|
17
|
-
|
18
|
-
const concretePackagesCompilerLogTag = "ConcretePackagesCompiler"
|
19
|
-
|
20
|
-
type ConcretePackagesCompiler struct {
|
21
|
-
agentClient bpagentclient.Client
|
22
|
-
packagesRepo bppkgsrepo.PackagesRepository
|
23
|
-
compiledPackagesRepo bpcpkgsrepo.CompiledPackagesRepository
|
24
|
-
blobstore boshblob.Blobstore
|
25
|
-
|
26
|
-
eventLog bpeventlog.Log
|
27
|
-
logger boshlog.Logger
|
28
|
-
}
|
29
|
-
|
30
|
-
func NewConcretePackagesCompiler(
|
31
|
-
agentClient bpagentclient.Client,
|
32
|
-
packagesRepo bppkgsrepo.PackagesRepository,
|
33
|
-
compiledPackagesRepo bpcpkgsrepo.CompiledPackagesRepository,
|
34
|
-
blobstore boshblob.Blobstore,
|
35
|
-
eventLog bpeventlog.Log,
|
36
|
-
logger boshlog.Logger,
|
37
|
-
) ConcretePackagesCompiler {
|
38
|
-
return ConcretePackagesCompiler{
|
39
|
-
agentClient: agentClient,
|
40
|
-
packagesRepo: packagesRepo,
|
41
|
-
compiledPackagesRepo: compiledPackagesRepo,
|
42
|
-
blobstore: blobstore,
|
43
|
-
|
44
|
-
eventLog: eventLog,
|
45
|
-
logger: logger,
|
46
|
-
}
|
47
|
-
}
|
48
|
-
|
49
|
-
// Compile populates blobstore with compiled packages for a given release packages.
|
50
|
-
// All packages are compiled regardless if they will be later used or not.
|
51
|
-
// Currently Compile does not account for stemcell differences.
|
52
|
-
func (pc ConcretePackagesCompiler) Compile(release bprel.Release) error {
|
53
|
-
packages := release.ResolvedPackageDependencies()
|
54
|
-
|
55
|
-
releaseDesc := fmt.Sprintf("Compiling release %s/%s", release.Name, release.Version)
|
56
|
-
|
57
|
-
stage := pc.eventLog.BeginStage(releaseDesc, len(packages))
|
58
|
-
|
59
|
-
for _, pkg := range packages {
|
60
|
-
pkgDesc := fmt.Sprintf("%s/%s", pkg.Name, pkg.Version)
|
61
|
-
|
62
|
-
task := stage.BeginTask(fmt.Sprintf("Package %s", pkgDesc))
|
63
|
-
|
64
|
-
_, found, err := pc.compiledPackagesRepo.Find(*pkg)
|
65
|
-
if err != nil {
|
66
|
-
return task.End(bosherr.WrapError(err, "Finding compiled package %s", pkg.Name))
|
67
|
-
} else if found {
|
68
|
-
task.End(nil)
|
69
|
-
continue
|
70
|
-
}
|
71
|
-
|
72
|
-
err = task.End(pc.compilePkg(*pkg))
|
73
|
-
if err != nil {
|
74
|
-
return err
|
75
|
-
}
|
76
|
-
}
|
77
|
-
|
78
|
-
return nil
|
79
|
-
}
|
80
|
-
|
81
|
-
// FindCompiledPackage returns previously compiled package for a given template.
|
82
|
-
// If such compiled package is not found, error is returned.
|
83
|
-
func (pc ConcretePackagesCompiler) FindCompiledPackage(pkg bprel.Package) (CompiledPackageRecord, error) {
|
84
|
-
var compiledPkgRec CompiledPackageRecord
|
85
|
-
|
86
|
-
rec, found, err := pc.compiledPackagesRepo.Find(pkg)
|
87
|
-
if err != nil {
|
88
|
-
return compiledPkgRec, bosherr.WrapError(err, "Finding compiled package %s", pkg.Name)
|
89
|
-
} else if !found {
|
90
|
-
return compiledPkgRec, bosherr.New("Expected to find compiled package %s", pkg.Name)
|
91
|
-
}
|
92
|
-
|
93
|
-
compiledPkgRec.SHA1 = rec.SHA1
|
94
|
-
compiledPkgRec.BlobID = rec.BlobID
|
95
|
-
|
96
|
-
return compiledPkgRec, nil
|
97
|
-
}
|
98
|
-
|
99
|
-
// compilePackage populates blobstore with a compiled package for a
|
100
|
-
// given package. Assumes that dependencies of given package have
|
101
|
-
// already been compiled and are in the blobstore.
|
102
|
-
func (pc ConcretePackagesCompiler) compilePkg(pkg bprel.Package) error {
|
103
|
-
pc.logger.Debug(concretePackagesCompilerLogTag,
|
104
|
-
"Preparing to compile package %v", pkg)
|
105
|
-
|
106
|
-
pkgRec, found, err := pc.packagesRepo.Find(pkg)
|
107
|
-
if err != nil {
|
108
|
-
return bosherr.WrapError(err, "Finding package source blob %s", pkg.Name)
|
109
|
-
}
|
110
|
-
|
111
|
-
if !found {
|
112
|
-
blobID, fingerprint, err := pc.blobstore.Create(pkg.TarPath)
|
113
|
-
if err != nil {
|
114
|
-
return bosherr.WrapError(err, "Creating package source blob %s", pkg.Name)
|
115
|
-
}
|
116
|
-
|
117
|
-
pkgRec = bppkgsrepo.PackageRecord{
|
118
|
-
BlobID: blobID,
|
119
|
-
SHA1: fingerprint,
|
120
|
-
}
|
121
|
-
|
122
|
-
err = pc.packagesRepo.Save(pkg, pkgRec)
|
123
|
-
if err != nil {
|
124
|
-
return bosherr.WrapError(err, "Saving package record %s", pkg.Name)
|
125
|
-
}
|
126
|
-
}
|
127
|
-
|
128
|
-
deps, err := pc.buildPkgDeps(pkg)
|
129
|
-
if err != nil {
|
130
|
-
return err
|
131
|
-
}
|
132
|
-
|
133
|
-
compiledPkgRes, err := pc.agentClient.CompilePackage(
|
134
|
-
pkgRec.BlobID, // source tar
|
135
|
-
pkgRec.SHA1, // source tar
|
136
|
-
pkg.Name,
|
137
|
-
pkg.Version,
|
138
|
-
deps,
|
139
|
-
)
|
140
|
-
if err != nil {
|
141
|
-
return bosherr.WrapError(err, "Compiling package %s", pkg.Name)
|
142
|
-
}
|
143
|
-
|
144
|
-
compiledPkgRec := bpcpkgsrepo.CompiledPackageRecord{
|
145
|
-
BlobID: compiledPkgRes.BlobID,
|
146
|
-
SHA1: compiledPkgRes.SHA1,
|
147
|
-
}
|
148
|
-
|
149
|
-
err = pc.compiledPackagesRepo.Save(pkg, compiledPkgRec)
|
150
|
-
if err != nil {
|
151
|
-
return bosherr.WrapError(err, "Saving compiled package %s", pkg.Name)
|
152
|
-
}
|
153
|
-
|
154
|
-
return nil
|
155
|
-
}
|
156
|
-
|
157
|
-
// buildPkgDeps prepares dependencies for agent's compile_package.
|
158
|
-
// Assumes that all package dependencies were already compiled.
|
159
|
-
func (pc ConcretePackagesCompiler) buildPkgDeps(pkg bprel.Package) (boshcomp.Dependencies, error) {
|
160
|
-
deps := boshcomp.Dependencies{}
|
161
|
-
|
162
|
-
for _, depPkg := range pkg.Dependencies {
|
163
|
-
compiledPkgRec, found, err := pc.compiledPackagesRepo.Find(*depPkg)
|
164
|
-
if err != nil {
|
165
|
-
return deps, bosherr.WrapError(err, "Finding compiled package %s", depPkg.Name)
|
166
|
-
} else if !found {
|
167
|
-
return deps, bosherr.New("Expected to find compiled package %s", depPkg.Name)
|
168
|
-
}
|
169
|
-
|
170
|
-
deps[depPkg.Name] = boshcomp.Package{
|
171
|
-
Name: depPkg.Name,
|
172
|
-
Version: depPkg.Version,
|
173
|
-
BlobstoreID: compiledPkgRec.BlobID, // compiled tar
|
174
|
-
Sha1: compiledPkgRec.SHA1, // compiled tar
|
175
|
-
}
|
176
|
-
}
|
177
|
-
|
178
|
-
return deps, nil
|
179
|
-
}
|
@@ -1,48 +0,0 @@
|
|
1
|
-
package packagescompiler
|
2
|
-
|
3
|
-
import (
|
4
|
-
boshblob "bosh/blobstore"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpagclient "boshprovisioner/agent/client"
|
8
|
-
bpeventlog "boshprovisioner/eventlog"
|
9
|
-
bpcpkgsrepo "boshprovisioner/packagescompiler/compiledpackagesrepo"
|
10
|
-
bppkgsrepo "boshprovisioner/packagescompiler/packagesrepo"
|
11
|
-
)
|
12
|
-
|
13
|
-
type ConcretePackagesCompilerFactory struct {
|
14
|
-
packagesRepo bppkgsrepo.PackagesRepository
|
15
|
-
compiledPackagesRepo bpcpkgsrepo.CompiledPackagesRepository
|
16
|
-
blobstore boshblob.Blobstore
|
17
|
-
|
18
|
-
eventLog bpeventlog.Log
|
19
|
-
logger boshlog.Logger
|
20
|
-
}
|
21
|
-
|
22
|
-
func NewConcretePackagesCompilerFactory(
|
23
|
-
packagesRepo bppkgsrepo.PackagesRepository,
|
24
|
-
compiledPackagesRepo bpcpkgsrepo.CompiledPackagesRepository,
|
25
|
-
blobstore boshblob.Blobstore,
|
26
|
-
eventLog bpeventlog.Log,
|
27
|
-
logger boshlog.Logger,
|
28
|
-
) ConcretePackagesCompilerFactory {
|
29
|
-
return ConcretePackagesCompilerFactory{
|
30
|
-
packagesRepo: packagesRepo,
|
31
|
-
compiledPackagesRepo: compiledPackagesRepo,
|
32
|
-
blobstore: blobstore,
|
33
|
-
|
34
|
-
eventLog: eventLog,
|
35
|
-
logger: logger,
|
36
|
-
}
|
37
|
-
}
|
38
|
-
|
39
|
-
func (f ConcretePackagesCompilerFactory) NewCompiler(agentClient bpagclient.Client) PackagesCompiler {
|
40
|
-
return NewConcretePackagesCompiler(
|
41
|
-
agentClient,
|
42
|
-
f.packagesRepo,
|
43
|
-
f.compiledPackagesRepo,
|
44
|
-
f.blobstore,
|
45
|
-
f.eventLog,
|
46
|
-
f.logger,
|
47
|
-
)
|
48
|
-
}
|
@@ -1,20 +0,0 @@
|
|
1
|
-
package packagescompiler
|
2
|
-
|
3
|
-
import (
|
4
|
-
bprel "boshprovisioner/release"
|
5
|
-
)
|
6
|
-
|
7
|
-
type CompiledPackageRecord struct {
|
8
|
-
SHA1 string
|
9
|
-
BlobID string
|
10
|
-
}
|
11
|
-
|
12
|
-
// PackagesCompiler takes each release package and compiles it.
|
13
|
-
// Compiled packages are used as:
|
14
|
-
// (1) compile dependencies for other packages
|
15
|
-
// (2) runtime dependencies for jobs
|
16
|
-
// todo account for stemcells
|
17
|
-
type PackagesCompiler interface {
|
18
|
-
Compile(bprel.Release) error
|
19
|
-
FindCompiledPackage(bprel.Package) (CompiledPackageRecord, error)
|
20
|
-
}
|
@@ -1,65 +0,0 @@
|
|
1
|
-
package packagesrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpindex "boshprovisioner/index"
|
8
|
-
bprel "boshprovisioner/release"
|
9
|
-
)
|
10
|
-
|
11
|
-
type CPRepository struct {
|
12
|
-
index bpindex.Index
|
13
|
-
logger boshlog.Logger
|
14
|
-
}
|
15
|
-
|
16
|
-
type pkgToPkgRecKey struct {
|
17
|
-
// Mostly for ease of debugging
|
18
|
-
PackageName string
|
19
|
-
PackageVersion string
|
20
|
-
|
21
|
-
// Fingerprint of a package captures its dependenices
|
22
|
-
PackageFingerprint string
|
23
|
-
}
|
24
|
-
|
25
|
-
func NewConcretePackagesRepository(
|
26
|
-
index bpindex.Index,
|
27
|
-
logger boshlog.Logger,
|
28
|
-
) CPRepository {
|
29
|
-
return CPRepository{
|
30
|
-
index: index,
|
31
|
-
logger: logger,
|
32
|
-
}
|
33
|
-
}
|
34
|
-
|
35
|
-
func (r CPRepository) Find(pkg bprel.Package) (PackageRecord, bool, error) {
|
36
|
-
var record PackageRecord
|
37
|
-
|
38
|
-
err := r.index.Find(r.pkgKey(pkg), &record)
|
39
|
-
if err != nil {
|
40
|
-
if err == bpindex.ErrNotFound {
|
41
|
-
return record, false, nil
|
42
|
-
}
|
43
|
-
|
44
|
-
return record, false, bosherr.WrapError(err, "Finding package record")
|
45
|
-
}
|
46
|
-
|
47
|
-
return record, true, nil
|
48
|
-
}
|
49
|
-
|
50
|
-
func (r CPRepository) Save(pkg bprel.Package, record PackageRecord) error {
|
51
|
-
err := r.index.Save(r.pkgKey(pkg), record)
|
52
|
-
if err != nil {
|
53
|
-
return bosherr.WrapError(err, "Saving package record")
|
54
|
-
}
|
55
|
-
|
56
|
-
return nil
|
57
|
-
}
|
58
|
-
|
59
|
-
func (r CPRepository) pkgKey(pkg bprel.Package) pkgToPkgRecKey {
|
60
|
-
return pkgToPkgRecKey{
|
61
|
-
PackageName: pkg.Name,
|
62
|
-
PackageVersion: pkg.Version,
|
63
|
-
PackageFingerprint: pkg.Fingerprint,
|
64
|
-
}
|
65
|
-
}
|
@@ -1,16 +0,0 @@
|
|
1
|
-
package packagesrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bprel "boshprovisioner/release"
|
5
|
-
)
|
6
|
-
|
7
|
-
type PackageRecord struct {
|
8
|
-
BlobID string
|
9
|
-
SHA1 string
|
10
|
-
}
|
11
|
-
|
12
|
-
// PackagesRepository maintains list of package source code as blobs.
|
13
|
-
type PackagesRepository interface {
|
14
|
-
Find(bprel.Package) (PackageRecord, bool, error)
|
15
|
-
Save(bprel.Package, PackageRecord) error
|
16
|
-
}
|
@@ -1,65 +0,0 @@
|
|
1
|
-
package provisioner
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
)
|
6
|
-
|
7
|
-
const (
|
8
|
-
BlobstoreConfigTypeLocal = "local"
|
9
|
-
)
|
10
|
-
|
11
|
-
type BlobstoreConfig struct {
|
12
|
-
Type string `json:"provider"`
|
13
|
-
Options map[string]interface{} `json:"options"`
|
14
|
-
}
|
15
|
-
|
16
|
-
func (c BlobstoreConfig) Validate() error {
|
17
|
-
// Only local blobstore provides options[blobstore_path]
|
18
|
-
if c.Type == BlobstoreConfigTypeLocal {
|
19
|
-
_, err := c.extractLocalPath()
|
20
|
-
if err != nil {
|
21
|
-
return err
|
22
|
-
}
|
23
|
-
}
|
24
|
-
|
25
|
-
return nil
|
26
|
-
}
|
27
|
-
|
28
|
-
func (c BlobstoreConfig) LocalPath() string {
|
29
|
-
if c.Type != BlobstoreConfigTypeLocal {
|
30
|
-
return ""
|
31
|
-
}
|
32
|
-
|
33
|
-
path, err := c.extractLocalPath()
|
34
|
-
if err != nil {
|
35
|
-
return ""
|
36
|
-
}
|
37
|
-
|
38
|
-
return path
|
39
|
-
}
|
40
|
-
|
41
|
-
func (c BlobstoreConfig) extractLocalPath() (string, error) {
|
42
|
-
path, ok := c.Options["blobstore_path"]
|
43
|
-
if !ok {
|
44
|
-
return "", bosherr.New("Missing blobstore_path in options")
|
45
|
-
}
|
46
|
-
|
47
|
-
pathStr, ok := path.(string)
|
48
|
-
if !ok {
|
49
|
-
return "", bosherr.New("Must provide blobstore_path as a string")
|
50
|
-
}
|
51
|
-
|
52
|
-
if pathStr == "" {
|
53
|
-
return "", bosherr.New("Must provide non-empty blobstore_path in options")
|
54
|
-
}
|
55
|
-
|
56
|
-
return pathStr, nil
|
57
|
-
}
|
58
|
-
|
59
|
-
// AsMap is used to populate agent infrastructure configuration
|
60
|
-
func (c BlobstoreConfig) AsMap() map[string]interface{} {
|
61
|
-
return map[string]interface{}{
|
62
|
-
"provider": c.Type,
|
63
|
-
"options": c.Options,
|
64
|
-
}
|
65
|
-
}
|