bfs-s3 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa1ea1fe4992c8906df21de648b99f938a9c214be07566dbc6163c15b94cbf2
-  data.tar.gz: e8703b5f3a586124995f81de0fbca1cd1d19abbe5c2f37623f19d1b40d67667c
+  metadata.gz: fde16d5ecd59f0ba7892b75083f66886361e5b7dc5efea15f5c28c2cdd7f0b44
+  data.tar.gz: e5fc5fb205274be7c10071dbc2a8c9c6bbe7c12cc30c90cb0768b1758692183c
 SHA512:
-  metadata.gz: 74a9b4b41efc8d9123e620fcf350539f8662b4d0bd58cff6cf441744c264a879e03f1b2fde6993c85f0c11363d52509a70a5e2ed5075ca5a48297bdb8e32cff1
-  data.tar.gz: 01f28fc9cd26b31dd239511e22e9fef436df1fd8fed467780cb50d6f2870f1bd9740f05ebcaca396c9766b73d084762ad9015eea9022ab04eb4fe2a38380f0ce
+  metadata.gz: 720120b887769f077a4a5f2ac1874cb71f6c2bc9f11825be5aa41096787d226e50ba18008409a0fad45dbe608f61ac7a1ae0314fb811261e7bd2d09bdbfb2a5b
+  data.tar.gz: 3c45d88593ebf385de8cc81c292cd86219ea13d8a6d962cf40b96ff06d34bd5188ab97af85b642beb5be39fffb9503cdf41f2fffe03ae23a9574145047c550bb

data/lib/bfs/bucket/s3.rb

@@ -33,22 +33,19 @@ module BFS
 
       # Lists the contents of a bucket using a glob pattern
       def ls(pattern = '**/*', **opts)
-        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
-        prefix = File.join(*[@prefix, prefix].compact) if @prefix
-
-        opts = opts.merge(bucket: name, prefix: @prefix)
-        opts[:prefix] = prefix if prefix
+        Enumerator.new do |acc|
+          walk(pattern, **opts) do |path, _|
+            acc << path
+          end
+        end
+      end
 
-        next_token = nil
-        Enumerator.new do |y|
-          loop do
-            resp = @client.list_objects_v2 opts.merge(continuation_token: next_token)
-            resp.contents.each do |obj|
-              name = trim_prefix(obj.key)
-              y << name if File.fnmatch?(pattern, name, File::FNM_PATHNAME)
-            end
-            next_token = resp.next_continuation_token.to_s
-            break if next_token.empty?
+      # Iterates over the contents of a bucket using a glob pattern
+      def glob(pattern = '**/*', **opts)
+        Enumerator.new do |acc|
+          walk(pattern, **opts) do |path, obj|
+            info = BFS::FileInfo.new(path: path, size: obj.size, mtime: obj.last_modified)
+            acc << info
           end
         end
       end
@@ -60,7 +57,7 @@ module BFS
         info = @client.head_object(**opts)
         raise BFS::FileNotFound, path unless info
 
-        BFS::FileInfo.new(path: path, size: info.content_length, mtime: info.last_modified, content_type: info.content_type, metadata: norm_meta(info.metadata))
+        BFS::FileInfo.new path: path, size: info.content_length, mtime: info.last_modified, content_type: info.content_type, metadata: norm_meta(info.metadata)
       rescue Aws::S3::Errors::NoSuchKey, Aws::S3::Errors::NoSuchBucket, Aws::S3::Errors::NotFound
         raise BFS::FileNotFound, path
       end
@@ -145,13 +142,32 @@ module BFS
         config[:credentials] ||= Aws::Credentials.new(opts[:access_key_id].to_s, opts[:secret_access_key].to_s) if opts[:access_key_id]
         config[:credentials] ||= Aws::SharedCredentials.new(profile_name: opts[:profile_name]) if opts[:profile_name]
         config[:credentials] = Aws::AssumeRoleCredentials.new(
-          client: Aws::STS::Client.new(credentials: config[:credentials]),
+          client: config[:credentials] ? Aws::STS::Client.new(credentials: config[:credentials]) : nil,
           role_arn: opts[:assume_role],
-          role_session_name: "#{opts[:assume_role]}_#{SecureRandom.urlsafe_base64(12)}",
+          role_session_name: SecureRandom.urlsafe_base64(12),
         ) if opts[:assume_role]
 
         Aws::S3::Client.new(config)
       end
+
+      def walk(pattern, **opts)
+        prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
+        prefix = File.join(*[@prefix, prefix].compact) if @prefix
+
+        opts = opts.merge(bucket: name, prefix: @prefix)
+        opts[:prefix] = prefix if prefix
+
+        next_token = nil
+        loop do
+          resp = @client.list_objects_v2 opts.merge(continuation_token: next_token)
+          resp.contents.each do |obj|
+            path = trim_prefix(obj.key)
+            yield(path, obj) if File.fnmatch?(pattern, path, File::FNM_PATHNAME)
+          end
+          next_token = resp.next_continuation_token.to_s
+          break if next_token.empty?
+        end
+      end
     end
   end
 end
@@ -159,7 +175,7 @@ end
 BFS.register('s3') do |url, opts, block|
   prefix = BFS.norm_path(opts[:prefix] || url.path)
   opts[:prefix] = prefix.empty? ? nil : prefix
-  opts = opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding)
+  opts = opts.slice(:prefix, :region, :sse, :access_key_id, :secret_access_key, :acl, :storage_class, :encoding, :assume_role)
 
   BFS::Bucket::S3.open url.host, **opts, &block
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: S3 bucket adapter for bfs