Skip to content

Commit 1e2bebf

Browse files
gildubgildub
committed
Auth: Propagate connections options
1 parent 008637a commit 1e2bebf

File tree

3 files changed

+34
-35
lines changed

3 files changed

+34
-35
lines changed

‎lib/fog/openstack/auth/token.rb

+8-9
Original file line numberDiff line numberDiff line change
@@ -13,35 +13,34 @@ class ExpiryError < RuntimeError; end
1313
class StandardError < RuntimeError; end
1414
class URLError < RuntimeError; end
1515

16-
def self.build(auth)
16+
def self.build(auth, options)
1717
if auth[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i ||
1818
auth[:openstack_tenant_id] || auth[:openstack_tenant]
19-
Fog::OpenStack::Auth::Token::V2.new(auth)
19+
Fog::OpenStack::Auth::Token::V2.new(auth, options)
2020
else
21-
Fog::OpenStack::Auth::Token::V3.new(auth)
21+
Fog::OpenStack::Auth::Token::V3.new(auth, options)
2222
end
2323
end
2424

25-
def initialize(auth)
25+
def initialize(auth, options)
2626
raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty?
2727
@creds = {
2828
:data => build_credentials(auth),
2929
:uri => URI.parse(auth[:openstack_auth_url])
3030
}
31-
response = authenticate(@creds)
31+
response = authenticate(@creds, options)
3232
set(response)
3333
end
3434

3535
def get
36-
set(authenticate(@creds)) if expired?
36+
set(authenticate(@creds, {})) if expired?
3737
@token
3838
end
3939

4040
private
4141

42-
def authenticate(creds)
43-
connection_options = {}
44-
connection = Fog::Core::Connection.new(creds[:uri].to_s, false, connection_options)
42+
def authenticate(creds, options)
43+
connection = Fog::Core::Connection.new(creds[:uri].to_s, false, options)
4544

4645
request = {
4746
:expects => [200, 201],

‎lib/fog/openstack/core.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ def authenticate
206206
if !@openstack_management_url || @openstack_must_reauthenticate
207207
@openstack_auth_token = nil if @openstack_must_reauthenticate
208208

209-
token = Fog::OpenStack::Auth::Token.build(openstack_options)
209+
token = Fog::OpenStack::Auth::Token.build(openstack_options, @connection_options)
210210

211211
@openstack_management_url = if token.catalog
212212
token.catalog.get_endpoint_url(

‎unit/auth/token_test.rb

+25-25
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
)
1414

1515
proc do
16-
Fog::OpenStack::Auth::Token.build({})
16+
Fog::OpenStack::Auth::Token.build({}, {})
1717
end.must_raise Fog::OpenStack::Auth::Token::URLError
1818
end
1919

@@ -36,7 +36,7 @@
3636
:headers => {'x-subject-token'=>'token_data_v3'}
3737
)
3838

39-
token = Fog::OpenStack::Auth::Token.build(auth)
39+
token = Fog::OpenStack::Auth::Token.build(auth, {})
4040
token.get.must_equal 'token_data_v3'
4141
end
4242

@@ -59,7 +59,7 @@
5959
:headers => {'x-subject-token'=>'token_data'}
6060
)
6161

62-
token = Fog::OpenStack::Auth::Token.build(auth)
62+
token = Fog::OpenStack::Auth::Token.build(auth, {})
6363
token.get.must_equal 'token_data'
6464
end
6565

@@ -83,7 +83,7 @@
8383
:headers => {'x-subject-token'=>'token_data'}
8484
)
8585

86-
token = Fog::OpenStack::Auth::Token.build(auth)
86+
token = Fog::OpenStack::Auth::Token.build(auth, {})
8787
token.get.must_equal 'token_data'
8888
end
8989
end
@@ -106,7 +106,7 @@
106106
:headers => {'x-subject-token'=>'token_data'}
107107
)
108108

109-
token = Fog::OpenStack::Auth::Token.build(auth)
109+
token = Fog::OpenStack::Auth::Token.build(auth, {})
110110
token.get.must_equal 'token_data'
111111
end
112112

@@ -127,7 +127,7 @@
127127
:headers => {'x-subject-token'=>'token_data'}
128128
)
129129

130-
token = Fog::OpenStack::Auth::Token.build(auth)
130+
token = Fog::OpenStack::Auth::Token.build(auth, {})
131131
token.get.must_equal 'token_data'
132132
end
133133
end
@@ -149,7 +149,7 @@
149149
:headers => {'x-subject-token'=>'token_data'}
150150
)
151151

152-
token = Fog::OpenStack::Auth::Token.build(auth)
152+
token = Fog::OpenStack::Auth::Token.build(auth, {})
153153
token.get.must_equal 'token_data'
154154
end
155155
end
@@ -171,7 +171,7 @@
171171
:headers => {'x-subject-token'=>'token_data'}
172172
)
173173

174-
token = Fog::OpenStack::Auth::Token.build(auth)
174+
token = Fog::OpenStack::Auth::Token.build(auth, {})
175175
token.get.must_equal 'token_data'
176176
end
177177
end
@@ -193,7 +193,7 @@
193193
:headers => {'x-subject-token'=>'token_data'}
194194
)
195195

196-
token = Fog::OpenStack::Auth::Token.build(auth)
196+
token = Fog::OpenStack::Auth::Token.build(auth, {})
197197
token.get.must_equal 'token_data'
198198
end
199199

@@ -214,7 +214,7 @@
214214
:headers => {'x-subject-token'=>'token_data'}
215215
)
216216

217-
token = Fog::OpenStack::Auth::Token.build(auth)
217+
token = Fog::OpenStack::Auth::Token.build(auth, {})
218218
token.get.must_equal 'token_data'
219219
end
220220
end
@@ -236,7 +236,7 @@
236236
:headers => {'x-subject-token'=>'token_data'}
237237
)
238238

239-
token = Fog::OpenStack::Auth::Token.build(auth)
239+
token = Fog::OpenStack::Auth::Token.build(auth, {})
240240
token.get.must_equal 'token_data'
241241
end
242242

@@ -256,7 +256,7 @@
256256
:headers => {'x-subject-token'=>'token_data'}
257257
)
258258

259-
token = Fog::OpenStack::Auth::Token.build(auth)
259+
token = Fog::OpenStack::Auth::Token.build(auth, {})
260260
token.get.must_equal 'token_data'
261261
end
262262
end
@@ -283,7 +283,7 @@
283283
:headers => {'x-subject-token'=>'token_data'}
284284
)
285285

286-
token = Fog::OpenStack::Auth::Token.build(authv3_creds)
286+
token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
287287
token.stub :expired?, false do
288288
token.get.must_equal 'token_data'
289289
end
@@ -297,7 +297,7 @@
297297
:headers => {'x-subject-token'=>'token_data'}
298298
)
299299

300-
token = Fog::OpenStack::Auth::Token.build(authv3_creds)
300+
token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
301301
token.stub :expired?, true do
302302
token.get.must_equal 'token_data'
303303
end
@@ -312,7 +312,7 @@
312312
:headers => {'x-subject-token'=>'token_data'}
313313
)
314314

315-
token = Fog::OpenStack::Auth::Token.build(authv3_creds)
315+
token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
316316
token.catalog.payload.must_equal ['catalog_data']
317317
end
318318

@@ -324,7 +324,7 @@
324324
:headers => {'x-subject-token'=>'token_data'}
325325
)
326326

327-
token = Fog::OpenStack::Auth::Token.build(authv3_creds)
327+
token = Fog::OpenStack::Auth::Token.build(authv3_creds, {})
328328
token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost'
329329
end
330330
end
@@ -337,7 +337,7 @@
337337
to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
338338

339339
proc do
340-
Fog::OpenStack::Auth::Token.build({})
340+
Fog::OpenStack::Auth::Token.build({}, {})
341341
end.must_raise Fog::OpenStack::Auth::Token::URLError
342342
end
343343

@@ -355,7 +355,7 @@
355355
\"tenantName\":\"tenant\"}}").
356356
to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
357357

358-
token = Fog::OpenStack::Auth::Token.build(auth)
358+
token = Fog::OpenStack::Auth::Token.build(auth, {})
359359
token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
360360
end
361361

@@ -372,7 +372,7 @@
372372
\"tenantId\":\"tenant_id\"}}").
373373
to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
374374

375-
token = Fog::OpenStack::Auth::Token.build(auth)
375+
token = Fog::OpenStack::Auth::Token.build(auth, {})
376376
token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
377377
end
378378
end
@@ -389,7 +389,7 @@
389389
with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}").
390390
to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
391391

392-
token = Fog::OpenStack::Auth::Token.build(auth)
392+
token = Fog::OpenStack::Auth::Token.build(auth, {})
393393
token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26'
394394
end
395395

@@ -404,7 +404,7 @@
404404
with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}").
405405
to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
406406

407-
Fog::OpenStack::Auth::Token.build(auth)
407+
Fog::OpenStack::Auth::Token.build(auth, {})
408408
end
409409
end
410410
end
@@ -429,7 +429,7 @@
429429
:headers => {}
430430
)
431431

432-
token = Fog::OpenStack::Auth::Token.build(authv2_creds)
432+
token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
433433
token.stub :expired?, false do
434434
token.get.must_equal 'token_not_expired'
435435
end
@@ -443,7 +443,7 @@
443443
:headers => {}
444444
)
445445

446-
token = Fog::OpenStack::Auth::Token.build(authv2_creds)
446+
token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
447447
token.stub :expired?, true do
448448
token.get.must_equal 'token_expired'
449449
end
@@ -458,7 +458,7 @@
458458
:headers => {}
459459
)
460460

461-
token = Fog::OpenStack::Auth::Token.build(authv2_creds)
461+
token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
462462
token.catalog.payload.must_equal ['catalog_data']
463463
end
464464

@@ -470,7 +470,7 @@
470470
:headers => {'x-subject-token'=>'token_data'}
471471
)
472472

473-
token = Fog::OpenStack::Auth::Token.build(authv2_creds)
473+
token = Fog::OpenStack::Auth::Token.build(authv2_creds, {})
474474
token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost'
475475
end
476476
end

0 commit comments

Comments
 (0)