fog-openstack 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abb817399bc80ba516784a9a377b5deaec69a7c3
-  data.tar.gz: a56c91075e1400e259cb38841e3eed0246469718
+  metadata.gz: ea0e7a81cd4d076ed16a5cab127a5ab730881d3e
+  data.tar.gz: 5128d367de9376015965157fbc610040b11be008
 SHA512:
-  metadata.gz: d1f94ba6d952af85df598963158c16e2623ff8ad081e7d4198198f58e0496fa13583603b189683f7ec1ff6480b24ac4197ee38dca044ae0dee6e0fee8bc77f24
-  data.tar.gz: a581bdc68d1785c65f10139839688fad5b69e1d352a84df8e8836a2e50525278bf034531ad2854d111fcdd1a55693e1b01bef46d58e80e1c6c1cb2955b1fab0a
+  metadata.gz: 25784e5390b52943bfb2af9b0e99dc4f53a5fc1d443d7fa82b4677a4a8bb0c321078cb5c9e184d6033fc7e1737bd5b9c61cbf7d9ad2914d4e34b06a0636bf276
+  data.tar.gz: 222a1f8668c1b81c5be08e5264cc956e61f9a46efecf96635efa5258ee325971fc46647a695acfc04132991b5af1813f70bd769b67b3cbed2b9436fb3a02df5b

data/lib/fog/openstack/identity/identity.rb

@@ -5,26 +5,7 @@ module Fog
       autoload :V3, 'fog/openstack/identity/v3'
 
       def self.new(args = {})
-        version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i
-                    '2.0'
-                  elsif args[:openstack_auth_url] =~ /v3|v2(\.0)*/
-                    # Deprecated from fog-openstack 0.2.0
-                    # Will be removed in future after hard deprecation is enforced for a couple of releases
-                    Fog::Logger.deprecation("An authentication URL including a version is deprecated")
-                    case args[:openstack_auth_url]
-                    when /\/v3(\/)*.*$/
-                      args[:openstack_auth_url].gsub!(/\/v3(\/)*.*$/, '')
-                      args[:no_path_prefix] = true
-                      '3'
-                    when /\/v2(\.0)*(\/)*.*$/
-                      args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*$/, '')
-                      args[:no_path_prefix] = true
-                      '2.0'
-                    end
-                  end
-
-        case version
-        when '2.0'
+        if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i
           Fog::OpenStack::Identity::V2.new(args)
         else
           Fog::OpenStack::Identity::V3.new(args)

data/lib/fog/openstack/identity/v2.rb

@@ -169,12 +169,8 @@ module Fog
         end
 
         class Real < Fog::OpenStack::Identity::Real
-          def initialize(args)
-            @path_prefix = if args[:no_path_prefix]
-                             ''
-                           else
-                             'v2.0'
-                           end
+          def api_path_prefix
+            @path_prefix = version_in_path?(@openstack_management_uri.path) ? '' : 'v2.0'
             super
           end
 
@@ -185,6 +181,10 @@ module Fog
           def default_service_type
             %w[identity_v2 identityv2 identity]
           end
+
+          def version_in_path?(url)
+            true if url =~ /\/v2(\.0)*(\/)*.*$/
+          end
         end
       end
     end

data/lib/fog/openstack/identity/v3.rb

@@ -13,7 +13,7 @@ module Fog
                    :openstack_user_domain_id, :openstack_project_domain_id,
                    :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username,
                    :current_user, :current_user_id, :current_tenant,
-                   :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix
+                   :provider, :openstack_identity_api_version, :openstack_cache_ttl
 
         model_path 'fog/openstack/identity/v3/models'
         model :domain
@@ -142,12 +142,8 @@ module Fog
         end
 
         class Real < Fog::OpenStack::Identity::Real
-          def initialize(args)
-            @path_prefix = if args[:no_path_prefix]
-                             ''
-                           else
-                             'v3'
-                           end
+          def api_path_prefix
+            @path_prefix = version_in_path?(@openstack_management_uri.path) ? '' : 'v3'
             super
           end
 
@@ -158,6 +154,10 @@ module Fog
           def default_service_type
             %w[identity_v3 identityv3 identity]
           end
+
+          def version_in_path?(url)
+            true if url =~ /\/v3(\/)*.*$/
+          end
         end
       end
     end

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '1.0.1'.freeze
+    VERSION = '1.0.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matt Darby