fog-openstack 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e709d55ce5fa6e2513278e19a6f949053ac3d9ab
-  data.tar.gz: '0948ccd18c50d50da4fb742dbf4837cd70afb351'
+  metadata.gz: aecda82f58600858370cf9cfaf02cce488a57bc8
+  data.tar.gz: 45287b13e8061378835d5da407b491016b1aa172
 SHA512:
-  metadata.gz: c84b8d3f4a0f8ca80601595a606148e28c38729c4180b9969c23b17514699596a278dab94b5ce321586ef9a0af5cf1de963aa070fd0c2a6f27e8cfe51e5f7a98
-  data.tar.gz: cf712ed9aae98300e32b68a0c99a264d3c1dc79fb8975ef8da1c85e5228e4b629c0a14136fe08287654a7ed68c2d839131a48348ef0570bcdd3d36f0e9b69d37
+  metadata.gz: c8473feca37f5c98d830f91e4942609cc4c64664798203352e7a0f400621c507ba1f18d4c5c2ada45986771690ddd114ddb637583ab37bf3d80d8228e4096cb8
+  data.tar.gz: 69ba5d22a7f10d0864fbff96b7c56feea3456b02fb417e6bbe7d69c7620a819d5d32d4a36cdb04e95a42184e2c4c8aa14f29929706ceded413f2aa55be5ec5f8

data/lib/fog/identity/openstack.rb

@@ -5,26 +5,7 @@ module Fog
       autoload :V3, 'fog/identity/openstack/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::Identity::OpenStack::V2.new(args)
         else
           Fog::Identity::OpenStack::V3.new(args)

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

@@ -169,12 +169,8 @@ module Fog
         end
 
         class Real < Fog::Identity::OpenStack::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/identity/openstack/v3.rb

@@ -142,12 +142,8 @@ module Fog
         end
 
         class Real < Fog::Identity::OpenStack::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 = '0.3.4'.freeze
+    VERSION = '0.3.5'.freeze
   end
 end

metadata

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