bosh-director 1.2852.0 → 1.2855.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/api/route_configuration.rb +25 -14
  3. data/lib/bosh/director/version.rb +1 -1
  4. metadata +21 -21
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 86bc089c44d0d0e6201618431ff094a315d78962
4
- data.tar.gz: 289373e4cfb90cf3d807f7dd20fbcc16aef13de3
3
+ metadata.gz: 5e32aa16e47e5d9c804c009adfbb04857303b5eb
4
+ data.tar.gz: b96a35ffba844fe294252cc3d015091d36c556d3
5
5
  SHA512:
6
- metadata.gz: b22c8b1e8e3de1c7a036bcfc09fe3a88016942c84a23b47e9918cff0d5f66961ba810e65217c754379a5e8777301698bee689ba3eace316c845d23c9de6f93bf
7
- data.tar.gz: 8ea28532cacae44e70583d9e6f885aa85fd97fa63533f33d5d27d41071d29f102fb198bc87d33e5390b638940156df5c466d2d0d9b456ac14c7ce1fc8621dc6d
6
+ metadata.gz: 53bce4a6bf3987047d01be8cfc1ecd1cada8214b94cb57d897a250f182366f5675b113f745b9a7691dc9b8c9cc9adb1dd9e39dbf15eb9451c2cf74d66ab2a23d
7
+ data.tar.gz: bc636cdc087127916563b5d4b877d4769647a4882876ccb8225f9c5ee916b5d0508a3ec4bb110f86e7c46f3a11ac16f23a02070f09367ae91bcdcd830eb0fd1f
data/lib/bosh/director/api/route_configuration.rb CHANGED
@@ -2,6 +2,9 @@ module Bosh
2
2
  module Director
3
3
  module Api
4
4
  class RouteConfiguration
5
+
6
+ USER_MANAGEMENT_PROVIDERS = %w[uaa local]
7
+
5
8
  def initialize(config)
6
9
  @config = config
7
10
  end
@@ -9,25 +12,25 @@ module Bosh
9
12
  def controllers
10
13
  director_app = Bosh::Director::App.new(@config)
11
14
  controllers = {}
12
- controllers['/info'] = Bosh::Director::Api::Controllers::InfoController.new identity_provider
13
- controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new identity_provider
14
- controllers['/backups'] = Bosh::Director::Api::Controllers::BackupsController.new identity_provider
15
- controllers['/deployments'] = Bosh::Director::Api::Controllers::DeploymentsController.new identity_provider
16
- controllers['/packages'] = Bosh::Director::Api::Controllers::PackagesController.new identity_provider
17
- controllers['/releases'] = Bosh::Director::Api::Controllers::ReleasesController.new identity_provider
15
+ controllers['/info'] = Bosh::Director::Api::Controllers::InfoController.new(identity_provider)
16
+ controllers['/tasks'] = Bosh::Director::Api::Controllers::TasksController.new(identity_provider)
17
+ controllers['/backups'] = Bosh::Director::Api::Controllers::BackupsController.new(identity_provider)
18
+ controllers['/deployments'] = Bosh::Director::Api::Controllers::DeploymentsController.new(identity_provider)
19
+ controllers['/packages'] = Bosh::Director::Api::Controllers::PackagesController.new(identity_provider)
20
+ controllers['/releases'] = Bosh::Director::Api::Controllers::ReleasesController.new(identity_provider)
18
21
  controllers['/resources'] = Bosh::Director::Api::Controllers::ResourcesController.new(
19
22
  identity_provider,
20
23
  Bosh::Director::Api::ResourceManager.new(director_app.blobstores.blobstore)
21
24
  )
22
- controllers['/resurrection'] = Bosh::Director::Api::Controllers::ResurrectionController.new identity_provider
23
- controllers['/stemcells'] = Bosh::Director::Api::Controllers::StemcellsController.new identity_provider
24
- controllers['/task'] = Bosh::Director::Api::Controllers::TaskController.new identity_provider
25
- controllers['/users'] = Bosh::Director::Api::Controllers::UsersController.new identity_provider
25
+ controllers['/resurrection'] = Bosh::Director::Api::Controllers::ResurrectionController.new(identity_provider)
26
+ controllers['/stemcells'] = Bosh::Director::Api::Controllers::StemcellsController.new(identity_provider)
27
+ controllers['/task'] = Bosh::Director::Api::Controllers::TaskController.new(identity_provider)
28
+ controllers['/users'] = Bosh::Director::Api::Controllers::UsersController.new(identity_provider)
26
29
  controllers['/compiled_package_groups'] = Bosh::Director::Api::Controllers::CompiledPackagesController.new(
27
30
  identity_provider,
28
31
  Bosh::Director::Api::CompiledPackageGroupManager.new
29
32
  )
30
- controllers['/locks'] = Bosh::Director::Api::Controllers::LocksController.new identity_provider
33
+ controllers['/locks'] = Bosh::Director::Api::Controllers::LocksController.new(identity_provider)
31
34
  controllers
32
35
  end
33
36
 
@@ -35,12 +38,20 @@ module Bosh
35
38
 
36
39
  def identity_provider
37
40
  @identity_provider ||= begin
38
- user_management = @config.hash['user_management']
41
+ # no fetching w defaults?
42
+ user_management_provider = @config.hash.fetch('user_management', {}).fetch('provider', 'local')
39
43
 
40
- if user_management && user_management['provider'] == 'uaa'
44
+ unless USER_MANAGEMENT_PROVIDERS.include?(user_management_provider)
45
+ raise ArgumentError,
46
+ "Unknown user management provider '#{user_management_provider}', " +
47
+ "available providers are: #{USER_MANAGEMENT_PROVIDERS}"
48
+ end
49
+ if user_management_provider == 'uaa'
50
+ Config.logger.debug("Director configured with 'uaa' user management provider")
41
51
  Bosh::Director::Api::UAAIdentityProvider.new
42
52
  else
43
- Bosh::Director::Api::LocalIdentityProvider.new Bosh::Director::Api::UserManager.new
53
+ Config.logger.debug("Director configured with 'local' user management provider")
54
+ Bosh::Director::Api::LocalIdentityProvider.new(Bosh::Director::Api::UserManager.new)
44
55
  end
45
56
  end
46
57
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2852.0'
3
+ VERSION = '1.2855.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.2852.0
4
+ version: 1.2855.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-02-19 00:00:00.000000000 Z
11
+ date: 2015-02-23 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.2852.0
33
+ version: 1.2855.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.2852.0
40
+ version: 1.2855.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.2852.0
47
+ version: 1.2855.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.2852.0
54
+ version: 1.2855.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.2852.0
61
+ version: 1.2855.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.2852.0
68
+ version: 1.2855.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.2852.0
75
+ version: 1.2855.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.2852.0
82
+ version: 1.2855.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.2852.0
89
+ version: 1.2855.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.2852.0
96
+ version: 1.2855.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.2852.0
103
+ version: 1.2855.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.2852.0
110
+ version: 1.2855.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.2852.0
117
+ version: 1.2855.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.2852.0
124
+ version: 1.2855.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.2852.0
131
+ version: 1.2855.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.2852.0
138
+ version: 1.2855.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.2852.0
145
+ version: 1.2855.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.2852.0
152
+ version: 1.2855.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_vcloud_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -446,7 +446,7 @@ dependencies:
446
446
  version: '0'
447
447
  description: |-
448
448
  BOSH Director
449
- d8b022
449
+ 697a97
450
450
  email: support@cloudfoundry.com
451
451
  executables:
452
452
  - bosh-director