bosh-director 1.3001.0 → 1.3003.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/api/controllers/tasks_controller.rb +1 -1
  3. data/lib/bosh/director/api/extensions/scoping.rb +2 -2
  4. data/lib/bosh/director/api/stemcell_manager.rb +10 -0
  5. data/lib/bosh/director/jobs/export_release.rb +10 -9
  6. data/lib/bosh/director/version.rb +1 -1
  7. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 91ee041025021bd6951468bb3b7ddade9cfbd156
4
- data.tar.gz: 88e4bbd9f8d8ace47039dc90ca417f993973b9e9
3
+ metadata.gz: 32f027f1f8d631eb130f1c6dc875834755e89a08
4
+ data.tar.gz: f0d1e59b0a6ef12b22aeda4d8732506cd4518c41
5
5
  SHA512:
6
- metadata.gz: 7c1c17476af49745d5ec1f2b2ca1753c2af6fac762ffe8e7e4fa089e36e9f957a503f381a4fea17c42d8d8d4cffe27a7f48975e73c85eba124f159c217b1843d
7
- data.tar.gz: 43f25613d07eb8adacc947eb4f9073fcf3727b0636582bf00942ab918ef7013674103c1245477fc72c3dd09679d479ddd94d84fff0578b2691588ae35b5da354
6
+ metadata.gz: 5cce871b2945fa776aaf59c394efd89c7730df3748ccd97d86f5155bf914439debe6c890c0e596e84ebbecbd206c630d939157e5cbd1a5e396c49a1bda458afe
7
+ data.tar.gz: 3b2abec7b2d6e2917797fc1949532279b6753ea438703144e2a49682e2f3f39b8509b06b2d4ec9ca8ea87d69238784fbe21438b398775913925946d244e3ee19
data/lib/bosh/director/api/controllers/tasks_controller.rb CHANGED
@@ -59,7 +59,7 @@ module Bosh::Director
59
59
  # Sends back output of given task id and params[:type]
60
60
  # Example: `get /tasks/5/output?type=event` will send back the file
61
61
  # at /var/vcap/store/director/tasks/5/event
62
- get '/:id/output', scope: Api::Extensions::Scoping::ParamsScope.new(:type, {event: :read}) do
62
+ get '/:id/output', scope: Api::Extensions::Scoping::ParamsScope.new(:type, {event: :read, result: :read}) do
63
63
  log_type = params[:type] || 'debug'
64
64
  task = @task_manager.find_task(params[:id])
65
65
 
data/lib/bosh/director/api/extensions/scoping.rb CHANGED
@@ -37,9 +37,9 @@ module Bosh::Director
37
37
  if requires_authentication? && (@user.nil? || !identity_provider.valid_access?(@user, scope))
38
38
  response['WWW-Authenticate'] = 'Basic realm="BOSH Director"'
39
39
  if @user.nil?
40
- message = "Not authorized\n"
40
+ message = "Not authorized: '#{request.path}'\n"
41
41
  else
42
- message = "Not authorized: #{request.path} requires one of the scopes: #{identity_provider.required_scopes(scope).join(", ")}\n"
42
+ message = "Not authorized: '#{request.path}' requires one of the scopes: #{identity_provider.required_scopes(scope).join(", ")}\n"
43
43
  end
44
44
  throw(:halt, [401, message])
45
45
  end
data/lib/bosh/director/api/stemcell_manager.rb CHANGED
@@ -14,6 +14,16 @@ module Bosh::Director
14
14
  stemcell
15
15
  end
16
16
 
17
+ def find_by_os_and_version(os, version)
18
+ stemcell = Bosh::Director::Models::Stemcell.
19
+ dataset.order(:name)[:operating_system => os, :version => version]
20
+ if stemcell.nil?
21
+ raise StemcellNotFound,
22
+ "Stemcell version `#{version}' for OS `#{os}' doesn't exist"
23
+ end
24
+ stemcell
25
+ end
26
+
17
27
  def stemcell_exists?(name, version)
18
28
  find_by_name_and_version(name, version)
19
29
  true
data/lib/bosh/director/jobs/export_release.rb CHANGED
@@ -25,17 +25,18 @@ module Bosh::Director
25
25
  def perform
26
26
  logger.info("Exporting release: #{@release_name}/#{@release_version} for #{@stemcell_os}/#{@stemcell_version}")
27
27
 
28
- release = Bosh::Director::Models::Release.find(:name => @release_name)
29
- if release.nil?
30
- raise ReleaseNotFound
31
- end
28
+ deployment_manager = Bosh::Director::Api::DeploymentManager.new()
29
+ deployment_manager.find_by_name(@deployment_name)
32
30
 
33
- matching_versions = release.versions_dataset.where(:version => @release_version).all
34
- if matching_versions.empty?
35
- raise ReleaseVersionNotFound
36
- end
31
+ release_manager = Bosh::Director::Api::ReleaseManager.new
32
+ release = release_manager.find_by_name(@release_name)
33
+ release_manager.find_version(release, @release_version)
34
+
35
+ stemcell_manager = Bosh::Director::Api::StemcellManager.new
36
+ stemcell = stemcell_manager.find_by_os_and_version(@stemcell_os, @stemcell_version)
37
+
38
+ logger.info "Will compile with stemcell: #{stemcell.desc}"
37
39
 
38
- logger.info "!!!RELEASE: #{release.pretty_inspect}"
39
40
  end
40
41
  end
41
42
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.3001.0'
3
+ VERSION = '1.3003.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3001.0
4
+ version: 1.3003.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-25 00:00:00.000000000 Z
11
+ date: 2015-06-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3001.0
33
+ version: 1.3003.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.3001.0
40
+ version: 1.3003.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3001.0
47
+ version: 1.3003.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.3001.0
54
+ version: 1.3003.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-director-core
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3001.0
61
+ version: 1.3003.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.3001.0
68
+ version: 1.3003.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh_common
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.3001.0
75
+ version: 1.3003.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.3001.0
82
+ version: 1.3003.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-template
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.3001.0
89
+ version: 1.3003.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.3001.0
96
+ version: 1.3003.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh_cpi
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3001.0
103
+ version: 1.3003.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.3001.0
110
+ version: 1.3003.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.3001.0
117
+ version: 1.3003.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.3001.0
124
+ version: 1.3003.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: bosh_aws_cpi
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.3001.0
131
+ version: 1.3003.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.3001.0
138
+ version: 1.3003.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: bosh_vsphere_cpi
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 1.3001.0
145
+ version: 1.3003.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 1.3001.0
152
+ version: 1.3003.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_vcloud_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
572
572
  version: '0'
573
573
  description: |-
574
574
  BOSH Director
575
- 7cc77f
575
+ 44f0b8
576
576
  email: support@cloudfoundry.com
577
577
  executables:
578
578
  - bosh-director