fog-aws 3.31.0 → 3.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7794f67756d283af6606ff87f6b2b6599c3ed3b17cc6db10c536ae768640313
-  data.tar.gz: 122cff38a7493c120d605514afabcd410de9e6d1be041e50ff4ff1c3f6c8fcc1
+  metadata.gz: e082ebe8e5a7cc585e85b6d2415306da6a2c0fec952ea3a62754dddfa82087d3
+  data.tar.gz: ac57b359e23b43ac11189ae93ee9f7eee31ac16b16d69ecc00f885b41f357105
 SHA512:
-  metadata.gz: 28ce47b3633913750148f26382218dd1ff7f168cead3972427efcf034597bf57bd029dc6c1ac132b718699ae7f1eaeb34d7b405256df5785027dd2acffdf3301
-  data.tar.gz: ff37460e9621a6f86141c9770e6f1c56ca8fd0d7abb5e4d5d67b621663d46bdabd3fbee384e15f6b32ff518a0127b14cfb45a780adeb296a3f365c5674e1bc66
+  metadata.gz: b4e819ca80fc191bfd1a28888924a121f96e94e90315f2f62cc5b3c7702b810b9358ab6812c67c3d1dcf184ef673717030f3218a32f7c0e49a78c0cb4e89ebc8
+  data.tar.gz: 2959e61875371b8e0e06575855fa571669b477390c02c77515a1cba7c9f351b5ddd84865116d890b7a1be76ab91c5abf806aac5687345f167e1da2d9a396700f

data/CHANGELOG.md

@@ -1,5 +1,44 @@
 # Changelog
 
+## v3.33.0 (2025-08-27)
+
+Closed issues:
+
+- Add support for ListObjectsV2 [\#741](https://github.com/fog/fog-aws/issues/741)
+
+
+Merged pull requests:
+
+- Update base64 requirement from ~\> 0.2.0 to \>= 0.2, \< 0.4 [\#743](https://github.com/fog/fog-aws/pull/743) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Fix #741 Added list objects v2 api support [\#744](https://github.com/fog/fog-aws/pull/744)
+- Update rubyzip requirement from ~\> 2.4.1 to ~\> 3.0.0 [\#746](https://github.com/fog/fog-aws/pull/746) ([dependabot[bot]](https://github.com/apps/dependabot))
+- storage headers should be rejected in a case-insensitive way [\#747](https://github.com/fog/fog-aws/pull/747)
+
+## [v3.32.0](https://github.com/fog/fog-aws/tree/v3.32.0) (2025-05-27)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.31.0...v3.32.0)
+
+**Closed issues:**
+
+- Add ability to specify s3 restore object tier in post\_object\_restore [\#740](https://github.com/fog/fog-aws/issues/740)
+
+**Merged pull requests:**
+
+- Add ability to specify s3 restore object tier in post\_object\_restore [\#742](https://github.com/fog/fog-aws/pull/742) ([Ankk98](https://github.com/Ankk98))
+
+## [v3.31.0](https://github.com/fog/fog-aws/tree/v3.31.0) (2025-04-21)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.30.0...v3.31.0)
+
+**Closed issues:**
+
+- Compute.describe\_instance\_status\(\) fails [\#734](https://github.com/fog/fog-aws/issues/734)
+
+**Merged pull requests:**
+
+- Fix Compute.describe\_instance\_status parser [\#735](https://github.com/fog/fog-aws/pull/735) ([kitherill](https://github.com/kitherill))
+- Update rubyzip requirement from ~\> 2.3.0 to ~\> 2.4.1 [\#733](https://github.com/fog/fog-aws/pull/733) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v3.30.0](https://github.com/fog/fog-aws/tree/v3.30.0) (2024-12-17)
 
 [Full Changelog](https://github.com/fog/fog-aws/compare/v3.29.0...v3.30.0)
@@ -22,18 +61,6 @@
 
 - fallback to excon 1.0+ error retry error settings [\#728](https://github.com/fog/fog-aws/pull/728) ([geemus](https://github.com/geemus))
 
-## [v3.28.0](https://github.com/fog/fog-aws/tree/v3.28.0) (2024-10-14)
-
-[Full Changelog](https://github.com/fog/fog-aws/compare/v3.27.0...v3.28.0)
-
-**Closed issues:**
-
-- SES needs to support AWS SigV4 [\#726](https://github.com/fog/fog-aws/issues/726)
-
-**Merged pull requests:**
-
-- Update SES to use AWS SigV4 [\#727](https://github.com/fog/fog-aws/pull/727) ([ohookins](https://github.com/ohookins))
-
 
 
 \* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/fog-aws.gemspec

@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'github_changelog_generator', '~> 1.16'
   spec.add_development_dependency 'rake',    '>= 12.3.3'
-  spec.add_development_dependency 'rubyzip', '~> 2.4.1'
+  spec.add_development_dependency 'rubyzip', '~> 3.0.0'
   spec.add_development_dependency 'shindo',  '~> 0.3'
 
-  spec.add_dependency 'base64', '~> 0.2.0'
+  spec.add_dependency 'base64', '>= 0.2', '< 0.4'
   spec.add_dependency 'fog-core', '~> 2.6'
   spec.add_dependency 'fog-json', '~> 1.1'
   spec.add_dependency 'fog-xml', '~> 0.1'

data/lib/fog/aws/models/storage/file.rb

@@ -281,7 +281,7 @@ module Fog
             merge_attributes(data.body)
           else
             data = service.put_object(directory.key, key, body, options)
-            merge_attributes(data.headers.reject {|key, value| ['Connection', 'Content-Length', 'Content-Type'].include?(key)})
+            merge_attributes(data.headers.reject {|key, value| ['connection', 'content-length', 'content-type'].include?(key.downcase)})
           end
           self.etag = self.etag.gsub('"','') if self.etag
           self.content_length = Fog::Storage.get_body_size(body)

data/lib/fog/aws/parsers/storage/list_objects_v2.rb

@@ -0,0 +1,66 @@
+module Fog
+  module Parsers
+    module AWS
+      module Storage
+        class ListObjectsV2 < Fog::Parsers::Base
+          # Initialize parser state
+          def initialize
+            super
+            @common_prefix = {}
+            @object = { 'Owner' => {} }
+            reset
+          end
+
+          def reset
+            @object = { 'Owner' => {} }
+            @response = { 'Contents' => [], 'CommonPrefixes' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'CommonPrefixes'
+              @in_common_prefixes = true
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'CommonPrefixes'
+              @in_common_prefixes = false
+            when 'Contents'
+              @response['Contents'] << @object
+              @object = { 'Owner' => {} }
+            when 'DisplayName', 'ID'
+              @object['Owner'][name] = value
+            when 'ETag'
+              @object[name] = value.gsub('"', '') if value != nil
+            when 'IsTruncated'
+              if value == 'true'
+                @response['IsTruncated'] = true
+              else
+                @response['IsTruncated'] = false
+              end
+            when 'LastModified'
+              @object['LastModified'] = Time.parse(value)
+            when 'ContinuationToken', 'NextContinuationToken', 'Name', 'StartAfter'
+              @response[name] = value
+            when 'MaxKeys', 'KeyCount'
+              @response[name] = value.to_i
+            when 'Prefix'
+              if @in_common_prefixes
+                @response['CommonPrefixes'] << value
+              else
+                @response[name] = value
+              end
+            when 'Size'
+              @object['Size'] = value.to_i
+            when 'Delimiter', 'Key', 'StorageClass'
+              @object[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end 

data/lib/fog/aws/requests/storage/list_objects_v2.rb

@@ -0,0 +1,129 @@
+module Fog
+  module AWS
+    class Storage
+      class Real
+        require 'fog/aws/parsers/storage/list_objects_v2'
+
+        # List information about objects in an S3 bucket using ListObjectsV2
+        #
+        # @param bucket_name [String] name of bucket to list object keys from
+        # @param options [Hash] config arguments for list.  Defaults to {}.
+        # @option options delimiter [String] causes keys with the same string between the prefix
+        #     value and the first occurrence of delimiter to be rolled up
+        # @option options continuation-token [String] continuation token from a previous request
+        # @option options fetch-owner [Boolean] specifies whether to return owner information
+        # @option options max-keys [Integer] limits number of object keys returned
+        # @option options prefix [String] limits object keys to those beginning with its value
+        # @option options start-after [String] starts listing after this specified key
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * Delimiter [String] - Delimiter specified for query
+        #     * IsTruncated [Boolean] - Whether or not the listing is truncated
+        #     * ContinuationToken [String] - Token specified in the request
+        #     * NextContinuationToken [String] - Token to use in subsequent requests
+        #     * KeyCount [Integer] - Number of keys returned
+        #     * MaxKeys [Integer] - Maximum number of keys specified for query
+        #     * Name [String] - Name of the bucket
+        #     * Prefix [String] - Prefix specified for query
+        #     * StartAfter [String] - StartAfter specified in the request
+        #     * CommonPrefixes [Array] - Array of strings for common prefixes
+        #     * Contents [Array]:
+        #       * ETag [String] - Etag of object
+        #       * Key [String] - Name of object
+        #       * LastModified [String] - Timestamp of last modification of object
+        #       * Owner [Hash]:
+        #         * DisplayName [String] - Display name of object owner
+        #         * ID [String] - Id of object owner
+        #       * Size [Integer] - Size of object
+        #       * StorageClass [String] - Storage class of object
+        #
+        # @see https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
+
+        def list_objects_v2(bucket_name, options = {})
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          
+          # Add list-type=2 to indicate ListObjectsV2
+          options = options.merge('list-type' => '2')
+          
+          request({
+            :expects  => 200,
+            :headers  => {},
+            :bucket_name => bucket_name,
+            :idempotent => true,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::Storage::ListObjectsV2.new,
+            :query    => options
+          })
+        end
+      end
+
+      class Mock # :nodoc:all
+        def list_objects_v2(bucket_name, options = {})
+          prefix = options['prefix']
+          continuation_token = options['continuation-token']
+          delimiter = options['delimiter']
+          max_keys = options['max-keys']
+          start_after = options['start-after']
+          fetch_owner = options['fetch-owner']
+          common_prefixes = []
+
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          
+          response = Excon::Response.new
+          if bucket = self.data[:buckets][bucket_name]
+            contents = bucket[:objects].values.map(&:first).sort {|x,y| x['Key'] <=> y['Key']}.reject do |object|
+                (prefix    && object['Key'][0...prefix.length] != prefix) ||
+                (start_after && object['Key'] <= start_after) ||
+                (continuation_token && object['Key'] <= continuation_token) ||
+                (delimiter && object['Key'][(prefix ? prefix.length : 0)..-1].include?(delimiter) \
+                           && common_prefixes << object['Key'].sub(/^(#{prefix}[^#{delimiter}]+.).*/, '\1')) ||
+                object.key?(:delete_marker)
+              end.map do |object|
+                data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
+                data.merge!({
+                  'LastModified' => Time.parse(object['Last-Modified']),
+                  'Owner'        => fetch_owner ? bucket['Owner'] : nil,
+                  'Size'         => object['Content-Length'].to_i
+                })
+              data
+            end
+            
+            max_keys = max_keys || 1000
+            size = [max_keys, 1000].min
+            truncated_contents = contents[0...size]
+            next_token = truncated_contents.size != contents.size ? truncated_contents.last['Key'] : nil
+
+            response.status = 200
+            common_prefixes_uniq = common_prefixes.uniq
+            response.body = {
+              'CommonPrefixes'  => common_prefixes_uniq,
+              'Contents'        => truncated_contents,
+              'IsTruncated'     => truncated_contents.size != contents.size,
+              'ContinuationToken' => continuation_token,
+              'NextContinuationToken' => next_token,
+              'KeyCount'        => truncated_contents.size + common_prefixes_uniq.size,
+              'MaxKeys'         => max_keys,
+              'Name'            => bucket['Name'],
+              'Prefix'          => prefix,
+              'StartAfter'      => start_after
+            }
+            if max_keys && max_keys < response.body['Contents'].length
+                response.body['IsTruncated'] = true
+                response.body['Contents'] = response.body['Contents'][0...max_keys]
+                response.body['KeyCount'] = response.body['Contents'].size + response.body['CommonPrefixes'].size
+            end
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
+        end
+      end
+    end
+  end
+end 

data/lib/fog/aws/requests/storage/post_object_restore.rb

@@ -6,7 +6,9 @@ module Fog
         #
         # @param bucket_name [String] Name of bucket containing object
         # @param object_name [String] Name of object to restore
-        # @option days [Integer] Number of days to restore object for. Defaults to 100000 (a very long time)
+        # @param options [Hash] Optional parameters
+        # @option options [Integer] :days Number of days to restore object for. Defaults to 100000 (a very long time)
+        # @option options [String] :tier Glacier retrieval tier. Can be 'Standard', 'Bulk', or 'Expedited'
         #
         # @return [Excon::Response] response:
         #   * status [Integer] 200 (OK) Object is previously restored
@@ -15,11 +17,24 @@ module Fog
         #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPOSTrestore.html
         #
-        def post_object_restore(bucket_name, object_name, days = 100000)
+        def post_object_restore(bucket_name, object_name, options = {})
           raise ArgumentError.new('bucket_name is required') unless bucket_name
           raise ArgumentError.new('object_name is required') unless object_name
 
-          data = '<RestoreRequest xmlns="http://s3.amazonaws.com/doc/2006-3-01"><Days>' + days.to_s + '</Days></RestoreRequest>'
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("post_object_restore with a bare days parameter is deprecated, use post_object_restore(bucket_name, object_name, :days => days) instead [light_black](#{caller.first})[/]")
+            options = { :days => options }
+          end
+
+          days = options[:days] || 100000
+          tier = options[:tier]
+
+          data = '<RestoreRequest xmlns="http://s3.amazonaws.com/doc/2006-03-01/">'
+          data += '<Days>' + days.to_s + '</Days>'
+          if tier
+            data += '<GlacierJobParameters><Tier>' + tier + '</Tier></GlacierJobParameters>'
+          end
+          data += '</RestoreRequest>'
 
           headers = {}
           headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
@@ -39,7 +54,12 @@ module Fog
       end
 
       class Mock # :nodoc:all
-        def post_object_restore(bucket_name, object_name, days = 100000)
+        def post_object_restore(bucket_name, object_name, options = {})
+          unless options.is_a?(Hash)
+            Fog::Logger.deprecation("post_object_restore with a bare days parameter is deprecated, use post_object_restore(bucket_name, object_name, :days => days) instead [light_black](#{caller.first})[/]")
+            options = { :days => options }
+          end
+          
           response = get_object(bucket_name, object_name)
           response.body = nil
           response

data/lib/fog/aws/storage.rb

@@ -26,9 +26,12 @@ module Fog
 
       VALID_QUERY_KEYS = %w[
         acl
+        continuation-token
         cors
         delete
+        fetch-owner
         lifecycle
+        list-type
         location
         logging
         notification
@@ -42,6 +45,7 @@ module Fog
         response-content-type
         response-expires
         restore
+        start-after
         tagging
         torrent
         uploadId
@@ -102,6 +106,7 @@ module Fog
       request :head_object_url
       request :initiate_multipart_upload
       request :list_multipart_uploads
+      request :list_objects_v2
       request :list_parts
       request :post_object_hidden_fields
       request :post_object_restore

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = '3.31.0'.freeze
+    VERSION = '3.33.0'.freeze
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.31.0
+  version: 3.33.0
 platform: ruby
 authors:
 - Josh Lane
 - Wesley Beary
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: shindo
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +84,22 @@ dependencies:
   name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: fog-core
   requirement: !ruby/object:Gem::Requirement
@@ -748,6 +753,7 @@ files:
 - lib/fog/aws/parsers/storage/get_service.rb
 - lib/fog/aws/parsers/storage/initiate_multipart_upload.rb
 - lib/fog/aws/parsers/storage/list_multipart_uploads.rb
+- lib/fog/aws/parsers/storage/list_objects_v2.rb
 - lib/fog/aws/parsers/storage/list_parts.rb
 - lib/fog/aws/parsers/storage/upload_part_copy_object.rb
 - lib/fog/aws/parsers/sts/assume_role.rb
@@ -1420,6 +1426,7 @@ files:
 - lib/fog/aws/requests/storage/head_object_url.rb
 - lib/fog/aws/requests/storage/initiate_multipart_upload.rb
 - lib/fog/aws/requests/storage/list_multipart_uploads.rb
+- lib/fog/aws/requests/storage/list_objects_v2.rb
 - lib/fog/aws/requests/storage/list_parts.rb
 - lib/fog/aws/requests/storage/post_object_hidden_fields.rb
 - lib/fog/aws/requests/storage/post_object_restore.rb
@@ -1464,7 +1471,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/fog/fog-aws/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1479,8 +1485,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.
 test_files: []