fog-openstack 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 270074b35f68ff30e1fdf308aebfc3c65c7612a0b47ef4086bc8eba90e81caef
-  data.tar.gz: cdcf2622d79d20d4d32712b57c61ae59f565fb200c9207de8e4055962cb0216b
+  metadata.gz: 530da777fdef44b8a3c8fa5a17af871552a076cffe5d02ceb62c7111398e9f96
+  data.tar.gz: 347b19093860b01a5a55bf449b132ace59f7587c273aa011a7a6b7f933c45d3f
 SHA512:
-  metadata.gz: 8f99c8410def0a380c0ca60c17972e25f276242ec17868a37807ff771178c105b79c32e7404f1a300bff19886aba9b9b0c3766120a7ebb96fad30ce2843dcbf2
-  data.tar.gz: abd0932213deea67ce5d1b7ef79f0dfd20895e9b8ee52f8931732ecd15d8ba1fe42a582829c9dc24f1b1f70e2d09cc69e443ef61c5894a7373eee3e379c218c5
+  metadata.gz: 20cf27a82b8c3cd6383a502b4ca14dbf69939a654ae70d43172203be191bb9b3d1d5f89a51bfb7a3d30055cd0cf87b1ecfd2084ed8808ce92446f76d1da722b7
+  data.tar.gz: 7206050c3ae79424adec760d7d796117784c24124d9049268b9d3ab9dd19a19529d6dc6f25f87b8d5513057086023861644c931e90bd1a5ef2ade4ef0a72ac0b

data/.rubocop.yml

@@ -21,6 +21,8 @@ CollectionMethods:
     reduce: inject
 CyclomaticComplexity:
   Severity: refactor
+Debugger:
+  Enabled: true
 FormatString:
   EnforcedStyle: percent
 HashSyntax:

data/fog-openstack.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'fog-json',  '>= 1.0'
   spec.add_dependency 'ipaddress', '>= 0.8'
 
-  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency "mime-types"
   spec.add_development_dependency "mime-types-data"

data/lib/fog/openstack/core.rb

@@ -50,17 +50,18 @@ module Fog
       def request(params, parse_json = true)
         retried = false
         begin
+          authenticate! if @expires && (@expires - Time.now.utc).to_i < 60
+
           response = @connection.request(
             params.merge(
               :headers => headers(params.delete(:headers)),
               :path    => "#{@path}/#{params[:path]}"
             )
           )
-        rescue Excon::Errors::Unauthorized => error
+        rescue Excon::Errors::Unauthorized, Excon::Error::Unauthorized => error
           # token expiration and token renewal possible
           if error.response.body != 'Bad username or password' && @openstack_can_reauthenticate && !retried
-            @openstack_must_reauthenticate = true
-            authenticate
+            authenticate!
             retried = true
             retry
           # bad credentials or token renewal not possible
@@ -171,6 +172,9 @@ module Fog
           instance_variable_set "@#{openstack_param}".to_sym, value
         end
 
+        # Ensure OpenStack User's Password is always a String
+        @openstack_api_key = @openstack_api_key.to_s if @openstack_api_key
+
         @auth_token ||= options[:openstack_auth_token]
         @openstack_must_reauthenticate = false
         @openstack_endpoint_type = options[:openstack_endpoint_type] || 'public'
@@ -197,7 +201,7 @@ module Fog
 
         @openstack_service_type = options[:openstack_service_type] || default_service_type
         @openstack_endpoint_type = options[:openstack_endpoint_type] || default_endpoint_type
-        @openstack_endpoint_type.gsub!(/URL/, '')
+        @openstack_endpoint_type = @openstack_endpoint_type.gsub(/URL/, '')
         @connection_options = options[:connection_options] || {}
         @persistent = options[:persistent] || false
       end
@@ -221,7 +225,7 @@ module Fog
           @current_user = token.user['name']
           @current_user_id          = token.user['id']
           @current_tenant           = token.tenant
-          @expires                  = token.expires
+          @expires                  = Time.parse(token.expires)
           @auth_token               = token.token
           @unscoped_token           = token.token
           @openstack_must_reauthenticate = false
@@ -237,6 +241,11 @@ module Fog
 
         true
       end
+
+      def authenticate!
+        @openstack_must_reauthenticate = true
+        authenticate
+      end
     end
   end
 end

data/lib/fog/openstack/storage/requests/get_object_https_url.rb

@@ -27,6 +27,7 @@ module Fog
         #   * 'scheme'<~String> - The scheme to use (http, https)
         #   * 'host'<~String> - The host to use
         #   * 'port'<~Integer> - The port to use
+        #   * 'filename'<~String> - Filename returned Content-Disposition response header
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -34,6 +35,7 @@ module Fog
         #
         # ==== See Also
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
+        # https://developer.openstack.org/api-ref/object-store/?expanded=get-object-content-and-metadata-detail#get-object-content-and-metadata
         def create_temp_url(container, object, expires, method, options = {})
           raise ArgumentError, "Insufficient parameters specified." unless container && object && expires && method
           raise ArgumentError, "Storage must be instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil?
@@ -54,14 +56,19 @@ module Fog
           string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}"
 
           hmac = Fog::HMAC.new('sha1', @openstack_temp_url_key.to_s)
-          sig  = sig_to_hex(hmac.sign(string_to_sign))
+
+          query = {
+            temp_url_sig: sig_to_hex(hmac.sign(string_to_sign)),
+            temp_url_expires: expires
+          }
+          query[:filename] = options[:filename] if options[:filename]
 
           temp_url_options = {
             :scheme => scheme,
             :host   => host,
             :port   => port,
             :path   => object_path_escaped,
-            :query  => "temp_url_sig=#{sig}&temp_url_expires=#{expires}"
+            :query  => query.map { |k, v| "#{k}=#{v}" }.join('&')
           }
           URI::Generic.build(temp_url_options).to_s
         end

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '1.0.8'.freeze
+    VERSION = '1.0.9'.freeze
   end
 end

data/lib/fog/openstack/volume/requests/create_volume.rb

@@ -6,7 +6,8 @@ module Fog
 
         def _create_volume(data, options = {})
           vanilla_options = [:snapshot_id, :imageRef, :volume_type,
-                             :source_volid, :availability_zone, :metadata]
+                             :source_volid, :availability_zone, :metadata,
+                             :multiattach]
           vanilla_options.select { |o| options[o] }.each do |key|
             data['volume'][key] = options[key]
           end

data/lib/fog/openstack/volume/v1.rb

@@ -84,82 +84,8 @@ module Fog
         request :set_tenant
         request :action
 
-        class Mock
-          def self.data
-            @data ||= Hash.new do |hash, key|
-              hash[key] = {
-                :users   => {},
-                :tenants => {},
-                :quota   => {
-                  'gigabytes' => 1000,
-                  'volumes'   => 10,
-                  'snapshots' => 10
-                }
-              }
-            end
-          end
-
-          def self.reset
-            @data = nil
-          end
-
-          def initialize(options = {})
-            @openstack_username = options[:openstack_username]
-            @openstack_tenant   = options[:openstack_tenant]
-            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-
-            @auth_token            = Fog::Mock.random_base64(64)
-            @auth_token_expiration = (Time.now.utc + 86400).iso8601
-
-            management_url            = URI.parse(options[:openstack_auth_url])
-            management_url.port       = 8776
-            management_url.path       = '/v1'
-            @openstack_management_url = management_url.to_s
-
-            @data ||= {:users => {}}
-            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
-              id                = Fog::Mock.random_numbers(6).to_s
-              @data[:users][id] = {
-                'id'       => id,
-                'name'     => options[:openstack_username],
-                'email'    => "#{options[:openstack_username]}@mock.com",
-                'tenantId' => Fog::Mock.random_numbers(6).to_s,
-                'enabled'  => true
-              }
-            end
-          end
-
-          def data
-            self.class.data[@openstack_username]
-          end
-
-          def reset_data
-            self.class.data.delete(@openstack_username)
-          end
-
-          def credentials
-            {:provider                 => 'openstack',
-             :openstack_auth_url       => @openstack_auth_uri.to_s,
-             :openstack_auth_token     => @auth_token,
-             :openstack_management_url => @openstack_management_url}
-          end
-        end
-
-        class Real
-          include Fog::OpenStack::Core
-
-          def self.not_found_class
-            Fog::OpenStack::Volume::NotFound
-          end
-
-          def default_endtpoint_type
-            'admin'
-          end
-
-          def default_service_type
-            %w[volume]
-          end
-        end
+        autoload :Mock, 'fog/openstack/volume/v1/mock'
+        autoload :Real, 'fog/openstack/volume/v1/real'
       end
     end
   end

data/lib/fog/openstack/volume/v1/mock.rb

@@ -0,0 +1,68 @@
+module Fog
+  module OpenStack
+    class Volume
+      class V1 < Fog::OpenStack::Volume
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                :users   => {},
+                :tenants => {},
+                :quota   => {
+                  'gigabytes' => 1000,
+                  'volumes'   => 10,
+                  'snapshots' => 10
+                }
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options = {})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token            = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url            = URI.parse(options[:openstack_auth_url])
+            management_url.port       = 8776
+            management_url.path       = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= {:users => {}}
+            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+              id                = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                'id'       => id,
+                'name'     => options[:openstack_username],
+                'email'    => "#{options[:openstack_username]}@mock.com",
+                'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_management_url => @openstack_management_url}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v1/real.rb

@@ -0,0 +1,23 @@
+module Fog
+  module OpenStack
+    class Volume
+      class V1 < Fog::OpenStack::Volume
+        class Real
+          include Fog::OpenStack::Core
+
+          def self.not_found_class
+            Fog::OpenStack::Volume::NotFound
+          end
+
+          def default_endtpoint_type
+            'admin'
+          end
+
+          def default_service_type
+            %w[volume]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -86,82 +86,8 @@ module Fog
         request :action
         request :snapshot_action
 
-        class Mock
-          def self.data
-            @data ||= Hash.new do |hash, key|
-              hash[key] = {
-                :users   => {},
-                :tenants => {},
-                :quota   => {
-                  'gigabytes' => 1000,
-                  'volumes'   => 10,
-                  'snapshots' => 10
-                }
-              }
-            end
-          end
-
-          def self.reset
-            @data = nil
-          end
-
-          def initialize(options = {})
-            @openstack_username = options[:openstack_username]
-            @openstack_tenant   = options[:openstack_tenant]
-            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
-
-            @auth_token            = Fog::Mock.random_base64(64)
-            @auth_token_expiration = (Time.now.utc + 86400).iso8601
-
-            management_url            = URI.parse(options[:openstack_auth_url])
-            management_url.port       = 8776
-            management_url.path       = '/v1'
-            @openstack_management_url = management_url.to_s
-
-            @data ||= {:users => {}}
-            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
-              id                = Fog::Mock.random_numbers(6).to_s
-              @data[:users][id] = {
-                'id'       => id,
-                'name'     => options[:openstack_username],
-                'email'    => "#{options[:openstack_username]}@mock.com",
-                'tenantId' => Fog::Mock.random_numbers(6).to_s,
-                'enabled'  => true
-              }
-            end
-          end
-
-          def data
-            self.class.data[@openstack_username]
-          end
-
-          def reset_data
-            self.class.data.delete(@openstack_username)
-          end
-
-          def credentials
-            {:provider                 => 'openstack',
-             :openstack_auth_url       => @openstack_auth_uri.to_s,
-             :openstack_auth_token     => @auth_token,
-             :openstack_management_url => @openstack_management_url}
-          end
-        end
-
-        class Real
-          include Fog::OpenStack::Core
-
-          def self.not_found_class
-            Fog::OpenStack::Volume::NotFound
-          end
-
-          def default_endtpoint_type
-            'admin'
-          end
-
-          def default_service_type
-            %w[volumev2]
-          end
-        end
+        autoload :Mock, 'fog/openstack/volume/v2/mock'
+        autoload :Real, 'fog/openstack/volume/v2/real'
       end
     end
   end

data/lib/fog/openstack/volume/v2/mock.rb

@@ -0,0 +1,68 @@
+module Fog
+  module OpenStack
+    class Volume
+      class V2 < Fog::OpenStack::Volume
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                :users   => {},
+                :tenants => {},
+                :quota   => {
+                  'gigabytes' => 1000,
+                  'volumes'   => 10,
+                  'snapshots' => 10
+                }
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options = {})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token            = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url            = URI.parse(options[:openstack_auth_url])
+            management_url.port       = 8776
+            management_url.path       = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= {:users => {}}
+            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+              id                = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                'id'       => id,
+                'name'     => options[:openstack_username],
+                'email'    => "#{options[:openstack_username]}@mock.com",
+                'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_management_url => @openstack_management_url}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume/v2/real.rb

@@ -0,0 +1,23 @@
+module Fog
+  module OpenStack
+    class Volume
+      class V2 < Fog::OpenStack::Volume
+        class Real
+          include Fog::OpenStack::Core
+
+          def self.not_found_class
+            Fog::OpenStack::Volume::NotFound
+          end
+
+          def default_endtpoint_type
+            'admin'
+          end
+
+          def default_service_type
+            %w[volumev2]
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -1214,6 +1214,7 @@ files:
 - lib/fog/openstack/volume/requests/update_volume.rb
 - lib/fog/openstack/volume/requests/update_volume_type.rb
 - lib/fog/openstack/volume/v1.rb
+- lib/fog/openstack/volume/v1/mock.rb
 - lib/fog/openstack/volume/v1/models/availability_zone.rb
 - lib/fog/openstack/volume/v1/models/availability_zones.rb
 - lib/fog/openstack/volume/v1/models/backup.rb
@@ -1226,6 +1227,7 @@ files:
 - lib/fog/openstack/volume/v1/models/volume_type.rb
 - lib/fog/openstack/volume/v1/models/volume_types.rb
 - lib/fog/openstack/volume/v1/models/volumes.rb
+- lib/fog/openstack/volume/v1/real.rb
 - lib/fog/openstack/volume/v1/requests/accept_transfer.rb
 - lib/fog/openstack/volume/v1/requests/action.rb
 - lib/fog/openstack/volume/v1/requests/create_backup.rb
@@ -1270,6 +1272,7 @@ files:
 - lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb
 - lib/fog/openstack/volume/v1/requests/update_volume.rb
 - lib/fog/openstack/volume/v2.rb
+- lib/fog/openstack/volume/v2/mock.rb
 - lib/fog/openstack/volume/v2/models/availability_zone.rb
 - lib/fog/openstack/volume/v2/models/availability_zones.rb
 - lib/fog/openstack/volume/v2/models/backup.rb
@@ -1282,6 +1285,7 @@ files:
 - lib/fog/openstack/volume/v2/models/volume_type.rb
 - lib/fog/openstack/volume/v2/models/volume_types.rb
 - lib/fog/openstack/volume/v2/models/volumes.rb
+- lib/fog/openstack/volume/v2/real.rb
 - lib/fog/openstack/volume/v2/requests/accept_transfer.rb
 - lib/fog/openstack/volume/v2/requests/action.rb
 - lib/fog/openstack/volume/v2/requests/create_backup.rb
@@ -1398,8 +1402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: OpenStack fog provider gem