bfs-s3 0.8.3 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fde16d5ecd59f0ba7892b75083f66886361e5b7dc5efea15f5c28c2cdd7f0b44
-  data.tar.gz: e5fc5fb205274be7c10071dbc2a8c9c6bbe7c12cc30c90cb0768b1758692183c
+  metadata.gz: 62b340a5f520e74eb90e955dbb60567e917f4cbb3c6541efd9e8bdda8dc26f9b
+  data.tar.gz: 52029ed05c542f450daa1de63a2bd7bd04962fe05d382123856f5db35238c451
 SHA512:
-  metadata.gz: 720120b887769f077a4a5f2ac1874cb71f6c2bc9f11825be5aa41096787d226e50ba18008409a0fad45dbe608f61ac7a1ae0314fb811261e7bd2d09bdbfb2a5b
-  data.tar.gz: 3c45d88593ebf385de8cc81c292cd86219ea13d8a6d962cf40b96ff06d34bd5188ab97af85b642beb5be39fffb9503cdf41f2fffe03ae23a9574145047c550bb
+  metadata.gz: 20f43fa100f573afd1b62bc2639e13f2488ff32cb82d0d98da9d8e5f3fc711128ab23c1bfdf3bbd0c9934c127f0df16aab604abbe12c337a0690f0fa052a63d7
+  data.tar.gz: bd6218d46b3cbe9608fda26ae57d20e34857249e6c115b091cb9ce6b1de13e37c00de4ee1cf67cf18e78bcfa5ea33179c0d44a0a8d4356c1089a52cd27cf7f32

data/bfs-s3.gemspec

@@ -15,8 +15,9 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7'
 
   s.add_dependency 'aws-sdk-s3', '~> 1.38'
   s.add_dependency 'bfs', s.version
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/bfs/bucket/s3.rb

@@ -141,15 +141,20 @@ module BFS
         config[:credentials] = opts[:credentials] if opts[:credentials]
         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: config[:credentials] ? Aws::STS::Client.new(credentials: config[:credentials]) : nil,
-          role_arn: opts[:assume_role],
-          role_session_name: SecureRandom.urlsafe_base64(12),
-        ) if opts[:assume_role]
+        config[:credentials] = assume_role_credentials(opts[:assume_role], config[:credentials]) if opts[:assume_role]
 
         Aws::S3::Client.new(config)
       end
 
+      def assume_role_credentials(role_arn, credentials = nil)
+        opts = {
+          role_arn: role_arn,
+          role_session_name: SecureRandom.urlsafe_base64(12),
+        }
+        opts[:client] = Aws::STS::Client.new(credentials: credentials) if credentials
+        Aws::AssumeRoleCredentials.new(**opts)
+      end
+
       def walk(pattern, **opts)
         prefix = pattern[%r{^[^*?\{\}\[\]]+/}]
         prefix = File.join(*[@prefix, prefix].compact) if @prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bfs-s3
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.1
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2022-03-17 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.3
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.1
 description: https://github.com/bsm/bfs.rb
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -51,7 +51,8 @@ files:
 homepage: https://github.com/bsm/bfs.rb
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -60,14 +61,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: S3 bucket adapter for bfs