occi-api 4.3.8 → 4.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989ed6f8ff03bdac576ec5721b77c402d221e60b
-  data.tar.gz: 3e85abd587efea9b5713fe815de349e5c7d9cd89
+  metadata.gz: c8b69c9ddc70b5ac8a38d674e34b53683f64809d
+  data.tar.gz: 24573d898d0169235a498050c7699ef37c543782
 SHA512:
-  metadata.gz: 8adf03257f511aabb53d61b4883bb44eeb980cba5147df713165bbac81605ad523fbb6ce7f9bd41ed1a4c97ff5e99b0ac211c8da7182fdad2ac30448ed60ed81
-  data.tar.gz: 88c1a17c2d8880d928e75de38683ed42980d6df3a98f9d1d0c5c93c6fe91a5781f3e8a64dc7161f079c4d833e96d28ca40f95097b116d1eefb792142f035f748
+  metadata.gz: 2ad5bb6636c11da1e4f2c31d06f3ad813d381c836c8ce3d7fff437af048385083fc9afd3b87b9641610ab76e2074b54d3e2bb24a19ac09db260225045f760a92
+  data.tar.gz: 0f13a8097e9f77c965bddbd3bbc4e5fe46250a4a3c99a8f6294b66a1c74a73083c244dc0e4af028b4e0167e938b53f169b5918be420116b19e9258e92d7a0670

data/lib/occi/api/client/http/authn_plugins/keystone.rb

@@ -4,7 +4,7 @@ module Occi::Api::Client
 
       class Keystone < Base
 
-        KEYSTONE_URI_REGEXP = /^(Keystone|snf-auth) uri='(.+)'$/
+        KEYSTONE_URI_REGEXP = /^(Keystone|snf-auth) uri=("|')(.+)("|')$/
         KEYSTONE_VERSION_REGEXP = /^v([0-9]).*$/
 
         def setup(options = {})
@@ -12,6 +12,7 @@ module Occi::Api::Client
           set_keystone_base_url
 
           # discover Keystone API version
+          @env_ref.class.headers.delete 'X-Auth-Token'
           set_auth_token ENV['ROCCI_CLIENT_KEYSTONE_TENANT']
 
           raise ::Occi::Api::Client::Errors::AuthnError,
@@ -48,9 +49,9 @@ module Occi::Api::Client
 
           match = KEYSTONE_URI_REGEXP.match(authN_header)
           raise ::Occi::Api::Client::Errors::AuthnError,
-                "Unable to get Keystone's URL from the response, fallback failed!" unless match && match[2]
+                "Unable to get Keystone's URL from the response, fallback failed!" unless match && match[3]
 
-          @keystone_url = match[2]
+          @keystone_url = match[3]
         end
 
         def set_auth_token(tenant = nil)
@@ -220,8 +221,8 @@ module Occi::Api::Client
 
         def set_voms_unscoped_token
           response = @env_ref.class.post(
-            # egi.eu and voms below should be configurable
-            "#{@base_url}/OS-FEDERATION/identity_providers/egi.eu/protocols/mapped/voms",
+            # egi.eu and mapped below should be configurable
+            "#{@base_url}/OS-FEDERATION/identity_providers/egi.eu/protocols/mapped/auth",
           )
           Occi::Api::Log.debug response.inspect
 
@@ -235,7 +236,7 @@ module Occi::Api::Client
 
         def get_first_working_project
           response = @env_ref.class.get(
-            "#{@base_url}/projects",
+            "#{@base_url}/auth/projects",
             :headers => get_req_headers
           )
           Occi::Api::Log.debug response.inspect
@@ -270,7 +271,7 @@ module Occi::Api::Client
           }
           response = @env_ref.class.post(
             "#{@base_url}/auth/tokens",
-            :body => body,
+            :body => body.to_json,
             :headers => get_req_headers
           )
 

data/lib/occi/api/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Api
-    VERSION = "4.3.8" unless defined?(::Occi::Api::VERSION)
+    VERSION = "4.3.9" unless defined?(::Occi::Api::VERSION)
   end
 end

data/occi-api.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'occi-core', '>= 4.3.2', '< 5'
+  gem.add_dependency 'occi-core', '>= 4.3.5', '< 5'
   gem.add_dependency 'httparty', '>= 0.13.1', '< 1'
   gem.add_dependency 'json', '>= 1.8.1', '< 3'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-api
 version: !ruby/object:Gem::Version
-  version: 4.3.8
+  version: 4.3.9
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: 4.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.2
+        version: 4.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -459,7 +459,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: OCCI development library providing a high-level client API