From f75880038cba6bfccfd237c19484750b264129d2 Mon Sep 17 00:00:00 2001 From: Vlastimil Holer Date: Mon, 3 Aug 2020 17:42:25 +0200 Subject: [PATCH] B #5003: Fix missing S3.rb change, fix versions (#145) --- share/install_gems/CentOS7/Gemfile.lock | 8 ++++---- share/install_gems/CentOS8/Gemfile.lock | 8 ++++---- share/install_gems/Debian10/Gemfile.lock | 8 ++++---- share/install_gems/Debian9/Gemfile.lock | 8 ++++---- share/install_gems/Fedora31/Gemfile.lock | 8 ++++---- share/install_gems/Fedora32/Gemfile.lock | 8 ++++---- share/install_gems/Ubuntu1604/Gemfile.lock | 8 ++++---- share/install_gems/Ubuntu1804/Gemfile.lock | 8 ++++---- share/install_gems/Ubuntu1910/Gemfile.lock | 8 ++++---- share/install_gems/Ubuntu2004/Gemfile.lock | 8 ++++---- src/market_mad/remotes/s3/S3.rb | 3 +-- 11 files changed, 41 insertions(+), 42 deletions(-) diff --git a/share/install_gems/CentOS7/Gemfile.lock b/share/install_gems/CentOS7/Gemfile.lock index 7eaa2a9c40..0a3bef245a 100644 --- a/share/install_gems/CentOS7/Gemfile.lock +++ b/share/install_gems/CentOS7/Gemfile.lock @@ -24,11 +24,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/CentOS8/Gemfile.lock b/share/install_gems/CentOS8/Gemfile.lock index e266019c69..5e34687e62 100644 --- a/share/install_gems/CentOS8/Gemfile.lock +++ b/share/install_gems/CentOS8/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Debian10/Gemfile.lock b/share/install_gems/Debian10/Gemfile.lock index e266019c69..5e34687e62 100644 --- a/share/install_gems/Debian10/Gemfile.lock +++ b/share/install_gems/Debian10/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Debian9/Gemfile.lock b/share/install_gems/Debian9/Gemfile.lock index 2cb27e3903..b12ef016ea 100644 --- a/share/install_gems/Debian9/Gemfile.lock +++ b/share/install_gems/Debian9/Gemfile.lock @@ -24,11 +24,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Fedora31/Gemfile.lock b/share/install_gems/Fedora31/Gemfile.lock index 0e65d85d68..5226edd591 100644 --- a/share/install_gems/Fedora31/Gemfile.lock +++ b/share/install_gems/Fedora31/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Fedora32/Gemfile.lock b/share/install_gems/Fedora32/Gemfile.lock index 0e65d85d68..5226edd591 100644 --- a/share/install_gems/Fedora32/Gemfile.lock +++ b/share/install_gems/Fedora32/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Ubuntu1604/Gemfile.lock b/share/install_gems/Ubuntu1604/Gemfile.lock index 5dd20e37f6..234540eeec 100644 --- a/share/install_gems/Ubuntu1604/Gemfile.lock +++ b/share/install_gems/Ubuntu1604/Gemfile.lock @@ -24,11 +24,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Ubuntu1804/Gemfile.lock b/share/install_gems/Ubuntu1804/Gemfile.lock index e266019c69..5e34687e62 100644 --- a/share/install_gems/Ubuntu1804/Gemfile.lock +++ b/share/install_gems/Ubuntu1804/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Ubuntu1910/Gemfile.lock b/share/install_gems/Ubuntu1910/Gemfile.lock index e266019c69..5e34687e62 100644 --- a/share/install_gems/Ubuntu1910/Gemfile.lock +++ b/share/install_gems/Ubuntu1910/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/share/install_gems/Ubuntu2004/Gemfile.lock b/share/install_gems/Ubuntu2004/Gemfile.lock index 0e65d85d68..5226edd591 100644 --- a/share/install_gems/Ubuntu2004/Gemfile.lock +++ b/share/install_gems/Ubuntu2004/Gemfile.lock @@ -26,11 +26,11 @@ GEM aws-sdk-ec2 (1.154.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-kms (1.30.0) + aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.94.0) + aws-sdk-s3 (1.63.0) + aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.3) diff --git a/src/market_mad/remotes/s3/S3.rb b/src/market_mad/remotes/s3/S3.rb index b24f2c4a78..4697b67f9b 100644 --- a/src/market_mad/remotes/s3/S3.rb +++ b/src/market_mad/remotes/s3/S3.rb @@ -14,8 +14,7 @@ # limitations under the License. # # -------------------------------------------------------------------------- # -gem 'aws-sdk', '>=2' -require 'aws-sdk' +require 'aws-sdk-s3' # This class is a generic wrapper to the s3 gem. # It can either handle simple or multipart uploads, but the logic to decide