misty 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199084962ac01539f791b1d9c2f825250dac494d
-  data.tar.gz: b83a3c147b00475928747f9ad234667cb93f92fe
+  metadata.gz: 0b46444639b793223b76621ff379c0bf749ba3a1
+  data.tar.gz: 6866fbf4eb5b156f9e630b4b4a812a485f0645a9
 SHA512:
-  metadata.gz: a46ae9b346bf59365903f900602ffda726ea82f7d699621a2009909287306398f09a6577d0413e48449510aa50a8ef437088747110eda7b4d7aca5c57e0d22a6
-  data.tar.gz: 5d344630bc6c7fb6a857cf0c0aa429a610345c3deb633ac41dc7c73315c5bcae566b1296d34f25a7fc9ec42ee0c3e8001bc5da178145fc640141ab25612bcc85
+  metadata.gz: e720372b9ea867e4dc8a5ad1a4b71fc2a9bbdbb93180c96a1c08a406ad4e41142afd076e43af7beafeb7fb6155e293205573abaa5bf5aae90932432c47cb2acc
+  data.tar.gz: cb9cbf61569180b18c59593f6732406492e16f6d4b2c61be05d00e78a4f67df12cc2cf86d97a4687d7ccc0f6b51f6a29d7ab44fc469e56fced081f2c4227d708

data/README.md

@@ -15,11 +15,12 @@ APIs experience.
 * Direct HTTP Methods for custom needs
 
 ## A solid KISS
-For REST transactions, Misty uses only Net/HTTP from the Ruby Standard Library.  So besides 'json', no other gem are
-required.  
-Because OpenStack authentication and Service Catalog management are very specific and shared by all the APIs, once taken
-care of, there is no need for a complex HTTP framework.  
-This offers a solid foundation with reduced dependencies.
+For REST transactions, Misty relies on Net/HTTP, from the Standard Library, therefore no other gem is required
+besides 'json'.  
+
+The choice to not use the help of a more complex HTTP framework reduces dependencies.
+Effectively, once taken care of, the authentication process provides a Service Catalog which allow to serve all
+available APIs.
 
 ## APIs Definitions
 The rich variety of OpenStack projects requires lots of Application Program Interfaces to handle.  
@@ -152,10 +153,14 @@ The following parameters can be used:
   User domain id
 * `:user_domain`  
   User domain name  
-* `:password`
+* `:password`  
   Password for user. Cannot be used together with `:token`.
-* `:token`
-  Previous Keystone v3 token for user. Can only be used with Keystone v3. Overrides all user and password parameters.
+* `:token`  
+  User provided token, overrides all user and password parameters.
+* `:context`  
+  I you have a proper context with `token id`, `service catalog` and `expire date` you can bypass the authentication to save the api call
+  Overrides all user and password parameters
+  Example: ``{:context => { :token => token_id, :catalog => service_catalog, :expires => expire_date }}``
 
 #### Keystone v3
 Keystone v3 is default recommended version:

data/lib/misty/auth.rb

@@ -17,8 +17,11 @@ module Misty
     attr_reader :catalog
 
     def self.factory(auth, config)
-      raise URLError, "No URL provided" unless auth[:url] && !auth[:url].empty?
-      http = Misty::HTTP::NetHTTP.net_http(URI.parse(auth[:url]), config.ssl_verify_mode, config.log)
+      http = nil
+      unless auth[:context]
+        raise URLError, "No URL provided" unless auth[:url] && !auth[:url].empty?
+        http = Misty::HTTP::NetHTTP.net_http(URI.parse(auth[:url]), config.ssl_verify_mode, config.log)
+      end
 
       if auth[:tenant_id] || auth[:tenant]
         return Misty::AuthV2.new(auth, http)
@@ -28,9 +31,17 @@ module Misty
     end
 
     def initialize(auth, http)
-      @http = http
-      @credentials = set_credentials(auth)
-      @token, @catalog, @expires = set(authenticate)
+      if auth[:context]
+        # bypass the authentication by given token catalog and expire date
+        @token   = auth[:context][:token]
+        @catalog = auth[:context][:catalog]
+        @expires = auth[:context][:expires]
+      else
+        @http = http
+        # autheticate
+        @credentials = set_credentials(auth)
+        @token, @catalog, @expires = set(authenticate)
+      end
     end
 
     def authenticate

data/lib/misty/auth/auth_v3.rb

@@ -57,9 +57,13 @@ module Misty
     def set_credentials(auth)
       if auth[:project_id] || auth[:project]
         # scope: project
-        project_domain_id = auth[:project_domain_id] ? auth[:project_domain_id] : Misty::DOMAIN_ID
+        project_domain_id = auth[:project_domain_id]
+        if project_domain_id.nil? && auth[:project_domain].nil?
+          project_domain_id = Misty::DOMAIN_ID
+        end
+
         @project = Misty::Auth::ProjectScope.new(auth[:project_id], auth[:project])
-        @project.domain = Misty::Auth::Name.new(project_domain_id, auth[:user_domain])
+        @project.domain = Misty::Auth::Name.new(project_domain_id, auth[:project_domain])
       else
         # scope: domain
         if auth[:domain_id] || auth[:domain]

data/lib/misty/version.rb

@@ -1,3 +1,3 @@
 module Misty
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/integration/test_helper.rb

@@ -10,10 +10,11 @@ end
 
 def auth
   {
-    :url      => "http://192.0.2.21:5000",
-    :user     => "admin",
-    :password => "CJk9hb2ZFR96Ypu74KFFGWuhv",
-    :project  => "admin",
-    :domain   => "default"
+    :url                => "http://192.0.2.21:5000",
+    :user               => "admin",
+    :password           => "CJk9hb2ZFR96Ypu74KFFGWuhv",
+    :project            => "admin",
+    :project_domain_id  => 'default',
+    :domain             => "default"
   }
 end

data/test/unit/auth_test.rb

@@ -152,10 +152,11 @@ describe Misty::Auth do
     describe "when authenticated" do
       let(:authv3_creds) do
         {
-          :url      => "http://localhost:5000",
-          :user     => "admin",
-          :password => "secret",
-          :project  => "admin"
+          :url              => "http://localhost:5000",
+          :user             => "admin",
+          :password         => "secret",
+          :project          => "admin",
+          :project_domain_id=> 'default'
         }
       end
 

data/test/unit/cloud/requests_test.rb

@@ -4,11 +4,12 @@ require 'auth_helper'
 describe Misty::Cloud do
   let(:cloud) do
     auth = {
-      :url      => "http://localhost:5000",
-      :user     => "admin",
-      :password => "secret",
-      :project  => "admin",
-      :domain   => "default"
+      :url                => "http://localhost:5000",
+      :user               => "admin",
+      :password           => "secret",
+      :project            => "admin",
+      :project_domain_id  => 'default',
+      :domain             => "default"
     }
 
     Misty::Cloud.new(:auth => auth)

data/test/unit/cloud/services_test.rb

@@ -7,7 +7,8 @@ describe "Misty::Cloud" do
       :url               => "http://localhost:5000",
       :user              => "admin",
       :password          => "secret",
-      :project           => "admin"
+      :project           => "admin",
+      :project_domain_id => "default"
     }
 
     Misty::Cloud.new(:auth => auth)

data/test/unit/cloud_test.rb

@@ -18,10 +18,11 @@ describe Misty::Cloud do
         to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {"x-subject-token"=>"token_data"})
 
       auth = {
-        :url      => "http://localhost:5000",
-        :user     => "admin",
-        :password => "secret",
-        :project  => "admin",
+        :url                => "http://localhost:5000",
+        :user               => "admin",
+        :password           => "secret",
+        :project            => "admin",
+        :project_domain_id  => 'default'
       }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: misty
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Gilles Dubreuil
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Misty is an OpenStack API client