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
data/go/src/boshprovisioner/instance/templatescompiler/erbrenderer/template_evaluation_context_rb.go
DELETED
@@ -1,155 +0,0 @@
|
|
1
|
-
package erbrenderer
|
2
|
-
|
3
|
-
const templateEvaluationContextRb = `
|
4
|
-
# Based on common/properties/template_evaluation_context.rb
|
5
|
-
require "rubygems"
|
6
|
-
require "ostruct"
|
7
|
-
require "json"
|
8
|
-
require "erb"
|
9
|
-
|
10
|
-
class TemplateEvaluationContext
|
11
|
-
attr_reader :name, :index
|
12
|
-
attr_reader :properties, :raw_properties
|
13
|
-
attr_reader :spec
|
14
|
-
|
15
|
-
def initialize(spec)
|
16
|
-
@name = spec["job"]["name"] if spec["job"].is_a?(Hash)
|
17
|
-
@index = spec["index"]
|
18
|
-
@properties = openstruct(spec["properties"] || {})
|
19
|
-
@raw_properties = spec["properties"] || {}
|
20
|
-
@spec = openstruct(spec)
|
21
|
-
end
|
22
|
-
|
23
|
-
def get_binding
|
24
|
-
binding.taint
|
25
|
-
end
|
26
|
-
|
27
|
-
def p(*args)
|
28
|
-
names = Array(args[0])
|
29
|
-
|
30
|
-
names.each do |name|
|
31
|
-
result = lookup_property(@raw_properties, name)
|
32
|
-
return result unless result.nil?
|
33
|
-
end
|
34
|
-
|
35
|
-
return args[1] if args.length == 2
|
36
|
-
raise UnknownProperty.new(names)
|
37
|
-
end
|
38
|
-
|
39
|
-
def if_p(*names)
|
40
|
-
values = names.map do |name|
|
41
|
-
value = lookup_property(@raw_properties, name)
|
42
|
-
return ActiveElseBlock.new(self) if value.nil?
|
43
|
-
value
|
44
|
-
end
|
45
|
-
|
46
|
-
yield *values
|
47
|
-
InactiveElseBlock.new
|
48
|
-
end
|
49
|
-
|
50
|
-
private
|
51
|
-
|
52
|
-
def openstruct(object)
|
53
|
-
case object
|
54
|
-
when Hash
|
55
|
-
mapped = object.inject({}) { |h, (k,v)| h[k] = openstruct(v); h }
|
56
|
-
OpenStruct.new(mapped)
|
57
|
-
when Array
|
58
|
-
object.map { |item| openstruct(item) }
|
59
|
-
else
|
60
|
-
object
|
61
|
-
end
|
62
|
-
end
|
63
|
-
|
64
|
-
def lookup_property(collection, name)
|
65
|
-
keys = name.split(".")
|
66
|
-
ref = collection
|
67
|
-
|
68
|
-
keys.each do |key|
|
69
|
-
ref = ref[key]
|
70
|
-
return nil if ref.nil?
|
71
|
-
end
|
72
|
-
|
73
|
-
ref
|
74
|
-
end
|
75
|
-
|
76
|
-
class UnknownProperty < StandardError
|
77
|
-
attr_reader :name
|
78
|
-
|
79
|
-
def initialize(name)
|
80
|
-
@name = name
|
81
|
-
super("Can't find property '#{name}'")
|
82
|
-
end
|
83
|
-
end
|
84
|
-
|
85
|
-
class ActiveElseBlock
|
86
|
-
def initialize(template)
|
87
|
-
@context = template
|
88
|
-
end
|
89
|
-
|
90
|
-
def else
|
91
|
-
yield
|
92
|
-
end
|
93
|
-
|
94
|
-
def else_if_p(*names, &block)
|
95
|
-
@context.if_p(*names, &block)
|
96
|
-
end
|
97
|
-
end
|
98
|
-
|
99
|
-
class InactiveElseBlock
|
100
|
-
def else; end
|
101
|
-
|
102
|
-
def else_if_p(*names)
|
103
|
-
InactiveElseBlock.new
|
104
|
-
end
|
105
|
-
end
|
106
|
-
end
|
107
|
-
|
108
|
-
# todo do not use JSON in releases
|
109
|
-
class << JSON
|
110
|
-
alias dump_array_or_hash dump
|
111
|
-
|
112
|
-
def dump(*args)
|
113
|
-
arg = args[0]
|
114
|
-
if arg.is_a?(String) || arg.is_a?(Numeric)
|
115
|
-
arg.inspect
|
116
|
-
else
|
117
|
-
dump_array_or_hash(*args)
|
118
|
-
end
|
119
|
-
end
|
120
|
-
end
|
121
|
-
|
122
|
-
class ERBRenderer
|
123
|
-
def initialize(context)
|
124
|
-
@context = context
|
125
|
-
end
|
126
|
-
|
127
|
-
def render(src_path, dst_path)
|
128
|
-
erb = ERB.new(File.read(src_path))
|
129
|
-
erb.filename = src_path
|
130
|
-
|
131
|
-
File.open(dst_path, "w") do |f|
|
132
|
-
f.write(erb.result(@context.get_binding))
|
133
|
-
end
|
134
|
-
|
135
|
-
rescue Exception => e
|
136
|
-
name = "#{@context.name}/#{@context.index}"
|
137
|
-
|
138
|
-
line_i = e.backtrace.index { |l| l.include?(erb.filename) }
|
139
|
-
line_num = line_i ? e.backtrace[line_i].split(':')[1] : "unknown"
|
140
|
-
location = "(line #{line_num}: #{e.inspect})"
|
141
|
-
|
142
|
-
raise("Error filling in template '#{src_path}' for #{name} #{location}")
|
143
|
-
end
|
144
|
-
end
|
145
|
-
|
146
|
-
if $0 == __FILE__
|
147
|
-
context_path, src_path, dst_path = *ARGV
|
148
|
-
|
149
|
-
context_hash = JSON.load(File.read(context_path))
|
150
|
-
context = TemplateEvaluationContext.new(context_hash)
|
151
|
-
|
152
|
-
renderer = ERBRenderer.new(context)
|
153
|
-
renderer.render(src_path, dst_path)
|
154
|
-
end
|
155
|
-
`
|
@@ -1,86 +0,0 @@
|
|
1
|
-
package jobsrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpindex "boshprovisioner/index"
|
8
|
-
bprel "boshprovisioner/release"
|
9
|
-
)
|
10
|
-
|
11
|
-
type CJRepository struct {
|
12
|
-
index bpindex.Index
|
13
|
-
logger boshlog.Logger
|
14
|
-
}
|
15
|
-
|
16
|
-
type jobToJobKey struct {
|
17
|
-
JobName string
|
18
|
-
JobVersion string
|
19
|
-
|
20
|
-
// Fingerprint of a job captures its dependenices; however,
|
21
|
-
// that does not capture package changes in an associated release.
|
22
|
-
JobFingerprint string
|
23
|
-
}
|
24
|
-
|
25
|
-
func NewConcreteJobsRepository(
|
26
|
-
index bpindex.Index,
|
27
|
-
logger boshlog.Logger,
|
28
|
-
) CJRepository {
|
29
|
-
return CJRepository{
|
30
|
-
index: index,
|
31
|
-
logger: logger,
|
32
|
-
}
|
33
|
-
}
|
34
|
-
|
35
|
-
func (r CJRepository) Find(job bprel.Job) (JobRecord, bool, error) {
|
36
|
-
var record JobRecord
|
37
|
-
|
38
|
-
err := r.index.Find(r.key(job), &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 job record")
|
45
|
-
}
|
46
|
-
|
47
|
-
return record, true, nil
|
48
|
-
}
|
49
|
-
|
50
|
-
func (r CJRepository) FindByReleaseJob(rec ReleaseJobRecord) (JobRecord, bool, error) {
|
51
|
-
var record JobRecord
|
52
|
-
|
53
|
-
key := jobToJobKey{
|
54
|
-
JobName: rec.JobName,
|
55
|
-
JobVersion: rec.JobVersion,
|
56
|
-
JobFingerprint: rec.JobFingerprint,
|
57
|
-
}
|
58
|
-
|
59
|
-
err := r.index.Find(key, &record)
|
60
|
-
if err != nil {
|
61
|
-
if err == bpindex.ErrNotFound {
|
62
|
-
return record, false, nil
|
63
|
-
}
|
64
|
-
|
65
|
-
return record, false, bosherr.WrapError(err, "Finding job record")
|
66
|
-
}
|
67
|
-
|
68
|
-
return record, true, nil
|
69
|
-
}
|
70
|
-
|
71
|
-
func (r CJRepository) Save(job bprel.Job, record JobRecord) error {
|
72
|
-
err := r.index.Save(r.key(job), record)
|
73
|
-
if err != nil {
|
74
|
-
return bosherr.WrapError(err, "Saving job record")
|
75
|
-
}
|
76
|
-
|
77
|
-
return nil
|
78
|
-
}
|
79
|
-
|
80
|
-
func (r CJRepository) key(job bprel.Job) jobToJobKey {
|
81
|
-
return jobToJobKey{
|
82
|
-
JobName: job.Name,
|
83
|
-
JobVersion: job.Version,
|
84
|
-
JobFingerprint: job.Fingerprint,
|
85
|
-
}
|
86
|
-
}
|
@@ -1,113 +0,0 @@
|
|
1
|
-
package jobsrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpindex "boshprovisioner/index"
|
8
|
-
bprel "boshprovisioner/release"
|
9
|
-
)
|
10
|
-
|
11
|
-
type CRPRepository struct {
|
12
|
-
index bpindex.Index
|
13
|
-
logger boshlog.Logger
|
14
|
-
}
|
15
|
-
|
16
|
-
func NewConcreteRuntimePackagesRepository(
|
17
|
-
index bpindex.Index,
|
18
|
-
logger boshlog.Logger,
|
19
|
-
) CRPRepository {
|
20
|
-
return CRPRepository{
|
21
|
-
index: index,
|
22
|
-
logger: logger,
|
23
|
-
}
|
24
|
-
}
|
25
|
-
|
26
|
-
type jobToPkgsKey struct {
|
27
|
-
ReleaseName string
|
28
|
-
ReleaseVersion string
|
29
|
-
|
30
|
-
// Mostly for ease of debugging
|
31
|
-
JobName string
|
32
|
-
JobVersion string
|
33
|
-
|
34
|
-
// Fingerprint of a job captures its dependenices
|
35
|
-
JobFingerprint string
|
36
|
-
|
37
|
-
// Indicates if contains all packages in a job's release
|
38
|
-
ContainsAllPackages bool
|
39
|
-
}
|
40
|
-
|
41
|
-
func (r CRPRepository) Find(rec ReleaseJobRecord) ([]bprel.Package, bool, error) {
|
42
|
-
var pkgs []bprel.Package
|
43
|
-
|
44
|
-
err := r.index.Find(r.jobSpecificKey(rec), &pkgs)
|
45
|
-
if err != nil {
|
46
|
-
if err == bpindex.ErrNotFound {
|
47
|
-
return pkgs, false, nil
|
48
|
-
}
|
49
|
-
|
50
|
-
return pkgs, false, bosherr.WrapError(err, "Finding rel-job record -> specific rel-pkgs record")
|
51
|
-
}
|
52
|
-
|
53
|
-
return pkgs, true, nil
|
54
|
-
}
|
55
|
-
|
56
|
-
func (r CRPRepository) Save(rec ReleaseJobRecord, pkgs []bprel.Package) error {
|
57
|
-
err := r.index.Save(r.jobSpecificKey(rec), pkgs)
|
58
|
-
if err != nil {
|
59
|
-
return bosherr.WrapError(err, "Saving rel-job record -> specific rel-pkgs record")
|
60
|
-
}
|
61
|
-
|
62
|
-
return nil
|
63
|
-
}
|
64
|
-
|
65
|
-
func (r CRPRepository) FindAll(rec ReleaseJobRecord) ([]bprel.Package, bool, error) {
|
66
|
-
var pkgs []bprel.Package
|
67
|
-
|
68
|
-
err := r.index.Find(r.jobAllKey(rec), &pkgs)
|
69
|
-
if err != nil {
|
70
|
-
if err == bpindex.ErrNotFound {
|
71
|
-
return pkgs, false, nil
|
72
|
-
}
|
73
|
-
|
74
|
-
return pkgs, false, bosherr.WrapError(err, "Finding rel-job record -> all rel-pkgs record")
|
75
|
-
}
|
76
|
-
|
77
|
-
return pkgs, true, nil
|
78
|
-
}
|
79
|
-
|
80
|
-
func (r CRPRepository) SaveAll(rec ReleaseJobRecord, pkgs []bprel.Package) error {
|
81
|
-
err := r.index.Save(r.jobAllKey(rec), pkgs)
|
82
|
-
if err != nil {
|
83
|
-
return bosherr.WrapError(err, "Saving rel-job record -> all rel-pkgs record")
|
84
|
-
}
|
85
|
-
|
86
|
-
return nil
|
87
|
-
}
|
88
|
-
|
89
|
-
func (r CRPRepository) jobSpecificKey(rec ReleaseJobRecord) jobToPkgsKey {
|
90
|
-
return jobToPkgsKey{
|
91
|
-
ReleaseName: rec.ReleaseName,
|
92
|
-
ReleaseVersion: rec.ReleaseVersion,
|
93
|
-
|
94
|
-
JobName: rec.JobName,
|
95
|
-
JobVersion: rec.JobVersion,
|
96
|
-
JobFingerprint: rec.JobFingerprint,
|
97
|
-
|
98
|
-
ContainsAllPackages: false,
|
99
|
-
}
|
100
|
-
}
|
101
|
-
|
102
|
-
func (r CRPRepository) jobAllKey(rec ReleaseJobRecord) jobToPkgsKey {
|
103
|
-
return jobToPkgsKey{
|
104
|
-
ReleaseName: rec.ReleaseName,
|
105
|
-
ReleaseVersion: rec.ReleaseVersion,
|
106
|
-
|
107
|
-
JobName: rec.JobName,
|
108
|
-
JobVersion: rec.JobVersion,
|
109
|
-
JobFingerprint: rec.JobFingerprint,
|
110
|
-
|
111
|
-
ContainsAllPackages: true,
|
112
|
-
}
|
113
|
-
}
|
@@ -1,86 +0,0 @@
|
|
1
|
-
package jobsrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
bosherr "bosh/errors"
|
5
|
-
boshlog "bosh/logger"
|
6
|
-
|
7
|
-
bpdep "boshprovisioner/deployment"
|
8
|
-
bpindex "boshprovisioner/index"
|
9
|
-
bprel "boshprovisioner/release"
|
10
|
-
)
|
11
|
-
|
12
|
-
type CTTJRepository struct {
|
13
|
-
index bpindex.Index
|
14
|
-
logger boshlog.Logger
|
15
|
-
}
|
16
|
-
|
17
|
-
type templateToJobKey struct {
|
18
|
-
JobName string
|
19
|
-
ReleaseName string
|
20
|
-
ReleaseVersion string
|
21
|
-
}
|
22
|
-
|
23
|
-
func NewConcreteTemplateToJobRepository(
|
24
|
-
index bpindex.Index,
|
25
|
-
logger boshlog.Logger,
|
26
|
-
) CTTJRepository {
|
27
|
-
return CTTJRepository{
|
28
|
-
index: index,
|
29
|
-
logger: logger,
|
30
|
-
}
|
31
|
-
}
|
32
|
-
|
33
|
-
func (r CTTJRepository) FindByTemplate(template bpdep.Template) (ReleaseJobRecord, bool, error) {
|
34
|
-
var rec ReleaseJobRecord
|
35
|
-
|
36
|
-
err := r.index.Find(r.templateKey(template), &rec)
|
37
|
-
if err != nil {
|
38
|
-
if err == bpindex.ErrNotFound {
|
39
|
-
return rec, false, nil
|
40
|
-
}
|
41
|
-
|
42
|
-
return rec, false, bosherr.WrapError(err, "Finding dep-template -> release-job record")
|
43
|
-
}
|
44
|
-
|
45
|
-
return rec, true, nil
|
46
|
-
}
|
47
|
-
|
48
|
-
func (r CTTJRepository) SaveForJob(release bprel.Release, job bprel.Job) (ReleaseJobRecord, error) {
|
49
|
-
// todo redundant info stored in value
|
50
|
-
rec := ReleaseJobRecord{
|
51
|
-
ReleaseName: release.Name,
|
52
|
-
ReleaseVersion: release.Version,
|
53
|
-
|
54
|
-
JobName: job.Name,
|
55
|
-
JobVersion: job.Version,
|
56
|
-
JobFingerprint: job.Fingerprint,
|
57
|
-
}
|
58
|
-
|
59
|
-
err := r.index.Save(r.jobKey(release, job), rec)
|
60
|
-
if err != nil {
|
61
|
-
return rec, bosherr.WrapError(err, "Saving dep-template -> release-job record")
|
62
|
-
}
|
63
|
-
|
64
|
-
return rec, nil
|
65
|
-
}
|
66
|
-
|
67
|
-
func (r CTTJRepository) templateKey(template bpdep.Template) templateToJobKey {
|
68
|
-
if template.Release == nil {
|
69
|
-
panic("Expected template.Release to not be nil")
|
70
|
-
}
|
71
|
-
|
72
|
-
return templateToJobKey{
|
73
|
-
JobName: template.Name,
|
74
|
-
ReleaseName: template.Release.Name,
|
75
|
-
ReleaseVersion: template.Release.Version,
|
76
|
-
}
|
77
|
-
}
|
78
|
-
|
79
|
-
// todo should job point back to release
|
80
|
-
func (r CTTJRepository) jobKey(release bprel.Release, job bprel.Job) templateToJobKey {
|
81
|
-
return templateToJobKey{
|
82
|
-
JobName: job.Name,
|
83
|
-
ReleaseName: release.Name,
|
84
|
-
ReleaseVersion: release.Version,
|
85
|
-
}
|
86
|
-
}
|
data/go/src/boshprovisioner/instance/templatescompiler/jobsrepo/jobs_repository_interface.go
DELETED
@@ -1,49 +0,0 @@
|
|
1
|
-
package jobsrepo
|
2
|
-
|
3
|
-
import (
|
4
|
-
"fmt"
|
5
|
-
|
6
|
-
bpdep "boshprovisioner/deployment"
|
7
|
-
bprel "boshprovisioner/release"
|
8
|
-
)
|
9
|
-
|
10
|
-
type JobRecord struct {
|
11
|
-
BlobID string
|
12
|
-
SHA1 string
|
13
|
-
}
|
14
|
-
|
15
|
-
type ReleaseJobRecord struct {
|
16
|
-
ReleaseName string
|
17
|
-
ReleaseVersion string
|
18
|
-
|
19
|
-
JobName string
|
20
|
-
JobVersion string
|
21
|
-
JobFingerprint string
|
22
|
-
}
|
23
|
-
|
24
|
-
func (r ReleaseJobRecord) String() string {
|
25
|
-
return fmt.Sprintf("job %s in release %s/%s", r.JobName, r.ReleaseName, r.ReleaseVersion)
|
26
|
-
}
|
27
|
-
|
28
|
-
// JobsRepository maintains list of job source code as blobs
|
29
|
-
type JobsRepository interface {
|
30
|
-
Find(bprel.Job) (JobRecord, bool, error)
|
31
|
-
Save(bprel.Job, JobRecord) error
|
32
|
-
|
33
|
-
FindByReleaseJob(ReleaseJobRecord) (JobRecord, bool, error)
|
34
|
-
}
|
35
|
-
|
36
|
-
type TemplateToJobRepository interface {
|
37
|
-
FindByTemplate(bpdep.Template) (ReleaseJobRecord, bool, error)
|
38
|
-
SaveForJob(bprel.Release, bprel.Job) (ReleaseJobRecord, error)
|
39
|
-
}
|
40
|
-
|
41
|
-
// RuntimePackagesRepository maintains list of releases' packages
|
42
|
-
type RuntimePackagesRepository interface {
|
43
|
-
Find(ReleaseJobRecord) ([]bprel.Package, bool, error)
|
44
|
-
Save(ReleaseJobRecord, []bprel.Package) error
|
45
|
-
|
46
|
-
// Keeps association between all possible packages for a job
|
47
|
-
FindAll(ReleaseJobRecord) ([]bprel.Package, bool, error)
|
48
|
-
SaveAll(ReleaseJobRecord, []bprel.Package) error
|
49
|
-
}
|