matterhorn_whymper 1.0.0 → 1.0.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/matterhorn/endpoint.rb +2 -2
- data/lib/matterhorn/http_client.rb +3 -3
- data/lib/matterhorn_whymper/version.rb +1 -1
- data/lib/matterhorn_whymper.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ODQzZmIzNWVkY2EwMjRiNjJiZTMwNDQ1YTE4NTNlMDRhY2IxOTRkYw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YThkZDk3NTM0NzVkNzY0NTc5YjI0N2U3NGM5YjNjNmI3YWJmYjkxMQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
OWYxMDcyMTNiZjdmYTI2ODFiNzQ1MDI1OTZiZGQwZTBkYWIzNjExNGEwZmM4
|
10
|
+
Njk3MmJjMGQ1MGUyNjExMWU1MjhkZWE0ZTdhYTMzZGIxMzljYjQ1NTkzMDAx
|
11
|
+
NjdmZGVjZjA4Y2FkNmNkNDdjYjcwMDg5NTZjOTYxOWNlZmQ2OWI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
Mzk4YzQ0NjNjNmVkYWMxMWJhNjU4YjE5MjZjOTY4NmFmYTc2MDI3NjNjZWQw
|
14
|
+
MDI2ZjRjMjhhMGNmNTBjZTdiYmQ4MGM3YjQ1YmE2NjI5NGM0OTJmZTFiODNl
|
15
|
+
ZTUxNzNmNWFhZWI3MTY3MTJkMDJkMDMzOTM1NjgyNjJkMTdjMTA=
|
data/lib/matterhorn/endpoint.rb
CHANGED
@@ -47,7 +47,7 @@ class Matterhorn::Endpoint
|
|
47
47
|
MatterhornWhymper.configuration.endpoint(mh_instance)[:auth_mode],
|
48
48
|
MatterhornWhymper.configuration.endpoint(mh_instance)[:http_timeout],
|
49
49
|
MatterhornWhymper.configuration.endpoint(mh_instance)[:ssl_dont_verify_cert],
|
50
|
-
MatterhornWhymper.configuration.endpoint(mh_instance)[:
|
50
|
+
MatterhornWhymper.configuration.endpoint(mh_instance)[:multi_tenant]
|
51
51
|
)
|
52
52
|
@http_api_client = if !MatterhornWhymper.configuration.api(mh_instance).nil?
|
53
53
|
Matterhorn::HttpClient.new(
|
@@ -59,7 +59,7 @@ class Matterhorn::Endpoint
|
|
59
59
|
MatterhornWhymper.configuration.api(mh_instance)[:auth_mode],
|
60
60
|
MatterhornWhymper.configuration.api(mh_instance)[:http_timeout],
|
61
61
|
MatterhornWhymper.configuration.api(mh_instance)[:ssl_dont_verify_cert],
|
62
|
-
MatterhornWhymper.configuration.api(mh_instance)[:
|
62
|
+
MatterhornWhymper.configuration.api(mh_instance)[:multi_tenant]
|
63
63
|
)
|
64
64
|
else
|
65
65
|
nil
|
@@ -15,7 +15,7 @@ module Matterhorn
|
|
15
15
|
# --------------------------------------------------------------------------- initialization ---
|
16
16
|
|
17
17
|
def initialize(protocol, domain, org_domain, user, password, auth_mode,
|
18
|
-
http_timeout = nil, ssl_dont_verify_cert = false,
|
18
|
+
http_timeout = nil, ssl_dont_verify_cert = false, multi_tenant = true)
|
19
19
|
@sub_domain = org_domain.split('.').first
|
20
20
|
@uri = URI.parse("#{protocol}://#{domain}")
|
21
21
|
@uri.user = user
|
@@ -24,7 +24,7 @@ module Matterhorn
|
|
24
24
|
@ssl = @uri.port == 443 ? true : false
|
25
25
|
@timeout = http_timeout
|
26
26
|
@ssl_dont_verify_cert = ssl_dont_verify_cert
|
27
|
-
@
|
27
|
+
@multi_tenant = multi_tenant
|
28
28
|
end
|
29
29
|
|
30
30
|
|
@@ -81,7 +81,7 @@ module Matterhorn
|
|
81
81
|
|
82
82
|
|
83
83
|
def assemble_url(url)
|
84
|
-
if @
|
84
|
+
if @multi_tenant && !@sub_domain.blank?
|
85
85
|
@uri.request_uri + "#{@sub_domain}/" + url
|
86
86
|
else
|
87
87
|
@uri.request_uri + url
|
@@ -5,7 +5,7 @@ module MatterhornWhymper
|
|
5
5
|
|
6
6
|
# -------------------------------------------------------------------------- const definitions ---
|
7
7
|
|
8
|
-
VERSION = "1.0.
|
8
|
+
VERSION = "1.0.1"
|
9
9
|
|
10
10
|
|
11
11
|
end # -------------------------------------------------------------------- end MatterhornWhymper ---
|
data/lib/matterhorn_whymper.rb
CHANGED
@@ -94,7 +94,7 @@ module MatterhornWhymper
|
|
94
94
|
|
95
95
|
def validate_options(opt)
|
96
96
|
valid_keys = [:protocol, :domain, :user, :password, :auth_mode,
|
97
|
-
:http_timeout, :ssl_dont_verify_cert, :
|
97
|
+
:http_timeout, :ssl_dont_verify_cert, :multi_tenant]
|
98
98
|
options = {
|
99
99
|
:protocol => 'http',
|
100
100
|
:domain => 'example.org',
|
@@ -103,7 +103,7 @@ module MatterhornWhymper
|
|
103
103
|
:auth_mode => 'basic',
|
104
104
|
:http_timeout => nil,
|
105
105
|
:ssl_dont_verify_cert => false,
|
106
|
-
:
|
106
|
+
:multi_tenant => true
|
107
107
|
}
|
108
108
|
opt.each do |key, value|
|
109
109
|
if valid_keys.include? key.to_sym
|