misty 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51db43f31654ff73aa9fe58100552299f4e2052f
-  data.tar.gz: f7f72291b25f45d202e7b1a7c440ce7ead73d9c3
+  metadata.gz: ebb0138e4483e4547e364d1480868752341806a7
+  data.tar.gz: 19add58cab7f876d51311685c5e65a6f77a1df9f
 SHA512:
-  metadata.gz: 850fbb0608e2393355ae186e383dd8271011c028bc839fc7169692df82390001e69784232ce99227536aa455787a1275225a89b03e57a9509ef80fc0061be86d
-  data.tar.gz: f0f8ef9da041ae92042cefc55b6b44d853b71f289a19f2dee1fccc2bb81626abff5021956007f40954290b9021ec52bef5ba5c79f3b23e965f6b3931d56d55a4
+  metadata.gz: b67157bcb2a71b6c068e3b27c010e7d524f80d81bd3f394355e21210cd5f9b260e90aa0273a4fc84d96e1a238144db73d3165e8a73991e6ffcd0cbd25da12954
+  data.tar.gz: 7d49599fd1913126a95239e55058511fa70e33a261bbe6c9ace0ef4d1a2e873a9edce7c3bc1065211f334fe23883117b179f0a5cbc792c1f553b40c4cca910d8

data/README.md

@@ -212,11 +212,10 @@ defaults are applied if not specified.
 * `:auth` - Authentication credentials hash containing 'auth_url' and user context. See `Misty::Auth`.
 * `:content_type` - HTTP responses body format. :json or :hash structures. Default is `Misty::Config::CONTENT_TYPE` (`:hash`).
 * `:headers` - Hash of extra HTTP headers to be applied to all services
-* `:interface` - Endpoint interface, allowed values are: "public", "internal", "admin".
+* `:interface` - Endpoint interface, allowed values are: "public", "internal", "admin". Default is `Misty::Config::INTERFACE` (`'public'`).
 * `:log_file` - Log destination, Value is either file path (./misty.log) or IO object (SDOUT). Default is '/dev/null'
 * `:log_level` - Value is Fixnum - Default is 1 (Logger::INFO) - See Logger from Ruby standard Library
 * `:region` - Alternative Region name. Default is `Misty::Config::REGION` (`'regionOne'`)
-   Default is `Misty::Config::INTERFACE` (`'public'`)
 * `:ssl_verify_mode` - Boolean flag for SSL client verification. Applies when URI scheme is SSL ("https://").
    Default is `Misty::Config::SSL_VERIFY_MODE` (`true`)
    See `Misty::Config` for more details

data/lib/misty/auth/token.rb

@@ -3,7 +3,7 @@ module Misty
   module Auth
     module Token
       include Misty::HTTP::NetHTTP
-      attr_reader :catalog, :expires, :token, :user
+      attr_reader :catalog, :expires, :token, :user, :data
 
       def self.build(auth)
         if auth[:tenant_id] || auth[:tenant]
@@ -43,7 +43,8 @@ module Misty
         Misty::HTTP::NetHTTP.http_request(
           creds[:uri], ssl_verify_mode: creds[:ssl_verify_mode], log: @log
         ) do |connection|
-          response = connection.post(path, creds[:data].to_json,
+          connect_path = creds[:uri].path + path
+          response = connection.post(connect_path, creds[:data].to_json,
             { 'Content-Type' => 'application/json', 'Accept' => 'application/json' })
           unless response.code =~ /200|201/
             raise AuthenticationError, "Response code=#{response.code}, Msg=#{response.msg}"

data/lib/misty/auth/token/v2.rb

@@ -40,10 +40,10 @@ module Misty
         end
 
         def set(response)
-          payload = JSON.load(response.body)
-          @token   = payload['access']['token']['id']
-          @expires = payload['access']['token']['expires']
-          catalog = payload['access']['serviceCatalog']
+          @data = JSON.load(response.body)
+          @token   = @data['access']['token']['id']
+          @expires = @data['access']['token']['expires']
+          catalog = @data['access']['serviceCatalog']
           @catalog = Misty::Auth::Catalog::V2.new(catalog)
         end
 

data/lib/misty/auth/token/v3.rb

@@ -42,10 +42,10 @@ module Misty
         end
 
         def set(response)
-          payload = JSON.load(response.body)
+          @data = JSON.load(response.body)
           @token = response['x-subject-token']
-          @expires = payload['token']['expires_at']
-          catalog = payload['token']['catalog']
+          @expires = @data['token']['expires_at']
+          catalog = @data['token']['catalog']
           @catalog = Misty::Auth::Catalog::V3.new(catalog)
         end
 

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 end

data/test/unit/auth/token_test.rb

@@ -5,7 +5,7 @@ describe Misty::Auth::Token do
   describe 'V3' do
     describe '#new' do
       it 'fails when missing credentials' do
-        stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {'x-subject-token'=>'token_data'})
         proc do
           token = Misty::Auth::Token.build({})
@@ -16,31 +16,30 @@ describe Misty::Auth::Token do
         describe 'with a project scope' do
           it 'authenticates using a project id' do
             auth = {
-              :url             => 'http://localhost:5000',
+              :url             => 'http://localhost/identity',
               :user_id         => 'user_id',
               :password        => 'secret',
               :project_id      => 'project_id',
               :ssl_verify_mode => false
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data_v3'})
-
             token = Misty::Auth::Token.build(auth)
             token.get.must_equal 'token_data_v3'
           end
 
           it 'authenticates using a project name and a project domain id' do
             auth = {
-              :url               => 'http://localhost:5000',
+              :url               => 'http://localhost/identity',
               :user_id           => 'user_id',
               :password          => 'secret',
               :project           => 'project',
               :project_domain_id => 'project_domain_id'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"project_domain_id\"}}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
             token = Misty::Auth::Token.build(auth)
@@ -49,7 +48,7 @@ describe Misty::Auth::Token do
 
           it 'authenticates using a project name and a project domain name' do
             auth = {
-              :url               => 'http://localhost:5000',
+              :url               => 'http://localhost/identity',
               :user              => 'user',
               :user_domain       => 'user_domain',
               :password          => 'secret',
@@ -57,7 +56,7 @@ describe Misty::Auth::Token do
               :project_domain    => 'project_domain'
             }
 
-            stub_request(:post, "http://localhost:5000/v3/auth/tokens").
+            stub_request(:post, "http://localhost/identity/v3/auth/tokens").
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"name\":\"project_domain\"}}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -69,13 +68,13 @@ describe Misty::Auth::Token do
         describe 'with a domain scope' do
           it 'authenticates using a domain id' do
             auth = {
-              :url       => 'http://localhost:5000',
+              :url       => 'http://localhost/identity',
               :user_id   => 'user_id',
               :password  => 'secret',
               :domain_id => 'domain_id'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -85,13 +84,13 @@ describe Misty::Auth::Token do
 
           it 'authenticates using a domain name' do
             auth = {
-              :url      => 'http://localhost:5000',
+              :url      => 'http://localhost/identity',
               :user_id  => 'user_id',
               :password => 'secret',
               :domain   => 'domain'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -105,12 +104,12 @@ describe Misty::Auth::Token do
         describe 'with a project scope' do
           it 'authenticates using a project id' do
             auth = {
-              :url        => 'http://localhost:5000',
+              :url        => 'http://localhost/identity',
               :token      => 'token',
               :project_id => 'project_id'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -120,13 +119,13 @@ describe Misty::Auth::Token do
 
           it 'authenticates using a project name and a project domain id' do
             auth = {
-              :url               => 'http://localhost:5000',
+              :url               => 'http://localhost/identity',
               :token             => 'token',
               :project           => 'project',
               :project_domain_id => 'domain_id'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -138,12 +137,12 @@ describe Misty::Auth::Token do
         describe 'with a domain scope' do
           it 'authenticates using a domain id' do
             auth = {
-              :url       => 'http://localhost:5000',
+              :url       => 'http://localhost/identity',
               :token     => 'token',
               :domain_id => 'domain_id'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -153,12 +152,12 @@ describe Misty::Auth::Token do
 
           it 'authenticates using a domain name' do
             auth = {
-              :url    => 'http://localhost:5000',
+              :url    => 'http://localhost/identity',
               :token  => 'token',
               :domain => 'domain'
             }
 
-            stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+            stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
               with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}").
               to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
@@ -172,7 +171,7 @@ describe Misty::Auth::Token do
     describe 'when authenticated' do
       let(:authv3_creds) do
         {
-          :url              => 'http://localhost:5000',
+          :url              => 'http://localhost/identity',
           :user             => 'admin',
           :password         => 'secret',
           :project          => 'admin',
@@ -182,7 +181,7 @@ describe Misty::Auth::Token do
 
       describe '#get' do
         it 'when token has not expired' do
-          stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+          stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
           to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
 
           token = Misty::Auth::Token.build(authv3_creds)
@@ -192,7 +191,7 @@ describe Misty::Auth::Token do
         end
 
         it 'when token has expired' do
-          stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+          stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
           to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
 
           token = Misty::Auth::Token.build(authv3_creds)
@@ -203,7 +202,7 @@ describe Misty::Auth::Token do
       end
 
       it '#catalog' do
-        stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
         to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'})
 
         token = Misty::Auth::Token.build(authv3_creds)
@@ -211,7 +210,7 @@ describe Misty::Auth::Token do
       end
 
       it '#get_endpoint_url' do
-        stub_request(:post, 'http://localhost:5000/v3/auth/tokens').
+        stub_request(:post, 'http://localhost/identity/v3/auth/tokens').
         to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {'x-subject-token'=>'token_data'})
 
         token = Misty::Auth::Token.build(authv3_creds)
@@ -223,7 +222,7 @@ describe Misty::Auth::Token do
   describe 'V2' do
     describe '#new' do
       it 'fails when missing credentials' do
-        stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+        stub_request(:post, 'http://localhost/identity/v2.0/tokens').
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {})
 
         proc do
@@ -234,13 +233,13 @@ describe Misty::Auth::Token do
       describe 'using the password method' do
         it 'authenticates using the tenant name' do
           auth = {
-            :url      => 'http://localhost:5000',
+            :url      => 'http://localhost/identity',
             :user     => 'user',
             :password => 'secret',
             :tenant   => 'tenant',
           }
 
-          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
             with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantName\":\"tenant\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
@@ -250,13 +249,13 @@ describe Misty::Auth::Token do
 
         it 'authenticates using the tenant id' do
           auth = {
-            :url       => 'http://localhost:5000',
+            :url       => 'http://localhost/identity',
             :user      => 'user',
             :password  => 'secret',
             :tenant_id => 'tenant_id',
           }
 
-          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
             with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantId\":\"tenant_id\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
@@ -268,12 +267,12 @@ describe Misty::Auth::Token do
       describe 'using the token method' do
         it 'authenticates using the tenant name' do
           auth = {
-            :url    => 'http://localhost:5000',
+            :url    => 'http://localhost/identity',
             :token  => 'token_id',
             :tenant => 'tenant',
           }
 
-          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
             with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
@@ -283,12 +282,12 @@ describe Misty::Auth::Token do
 
         it 'authenticates using the tenant id' do
           auth = {
-            :url       => 'http://localhost:5000',
+            :url       => 'http://localhost/identity',
             :token     => 'token_id',
             :tenant_id => 'tenant_id',
           }
 
-          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
             with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}").
             to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {})
 
@@ -300,7 +299,7 @@ describe Misty::Auth::Token do
     describe 'when authenticated' do
       let(:authv2_creds) do
         {
-          :url      => 'http://localhost:5000',
+          :url      => 'http://localhost/identity',
           :user     => 'admin',
           :password => 'secret',
           :tenant   => 'admin'
@@ -309,7 +308,7 @@ describe Misty::Auth::Token do
 
       describe '#get' do
         it 'when token has not expired' do
-          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
             to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
           token = Misty::Auth::Token.build(authv2_creds)
@@ -319,7 +318,7 @@ describe Misty::Auth::Token do
         end
 
         it 'when token has expired' do
-          stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+          stub_request(:post, 'http://localhost/identity/v2.0/tokens').
             to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
           token = Misty::Auth::Token.build(authv2_creds)
@@ -330,7 +329,7 @@ describe Misty::Auth::Token do
       end
 
       it '#catalog' do
-        stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+        stub_request(:post, 'http://localhost/identity/v2.0/tokens').
           to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {})
 
         token = Misty::Auth::Token.build(authv2_creds)
@@ -338,7 +337,7 @@ describe Misty::Auth::Token do
       end
 
       it '#get_endpoint_url' do
-        stub_request(:post, 'http://localhost:5000/v2.0/tokens').
+        stub_request(:post, 'http://localhost/identity/v2.0/tokens').
           to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'})
 
         token = Misty::Auth::Token.build(authv2_creds)

data/test/unit/cloud_test.rb

@@ -119,7 +119,7 @@ describe Misty::Cloud do
         it 'uses Misty::Auth::Token::V3' do
           authv2 = Minitest::Mock.new
 
-            Misty::Auth::Token::V2.stub :new, authv2 do
+          Misty::Auth::Token::V2.stub :new, authv2 do
             cloud = Misty::Cloud.new(:auth => authv2_data)
             assert_mock authv2
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json