debian-mirror-gitlab/debian/patches/0791-aws-sdk-v3.patch
2020-08-20 17:31:46 +05:30

85 lines
2.5 KiB
Diff

--- a/Gemfile
+++ b/Gemfile
@@ -129,8 +129,10 @@
gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
gem 'elasticsearch-api', '~> 6.8'
-gem 'aws-sdk'
-gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'
+gem 'aws-sdk-core', '~> 3'
+gem 'aws-sdk-cloudformation', '~> 1'
+gem 'aws-sdk-s3', '~> 1'
+gem 'faraday_middleware-aws-sigv4', '~> 0.3.0'
# Markdown and HTML processing
gem 'html-pipeline', '~> 2.12'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,16 +93,25 @@
encryptor (~> 3.0.0)
attr_required (1.0.1)
awesome_print (1.8.0)
- aws-eventstream (1.0.3)
- aws-sdk (2.11.374)
- aws-sdk-resources (= 2.11.374)
- aws-sdk-core (2.11.374)
- aws-sigv4 (~> 1.0)
+ aws-eventstream (1.1.0)
+ aws-partitions (1.345.0)
+ aws-sdk-cloudformation (1.41.0)
+ aws-sdk-core (~> 3, >= 3.99.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-core (3.104.3)
+ aws-eventstream (~> 1, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.239.0)
+ aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.374)
- aws-sdk-core (= 2.11.374)
- aws-sigv4 (1.1.0)
- aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-sdk-kms (1.36.0)
+ aws-sdk-core (~> 3, >= 3.99.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.75.0)
+ aws-sdk-core (~> 3, >= 3.104.1)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.2.1)
+ aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.2)
base32 (0.3.2)
batch-loader (1.4.0)
@@ -306,9 +315,9 @@
faraday (~> 0.8)
faraday_middleware (0.14.0)
faraday (>= 0.7.4, < 1.0)
- faraday_middleware-aws-signers-v4 (0.1.7)
- aws-sdk-resources (~> 2)
- faraday (~> 0.9)
+ faraday_middleware-aws-sigv4 (0.3.0)
+ aws-sigv4 (~> 1.0)
+ faraday (>= 0.15)
faraday_middleware-multi_json (0.0.6)
faraday_middleware
multi_json
@@ -1183,7 +1192,9 @@
atlassian-jwt (~> 0.2.0)
attr_encrypted (~> 3.1.0)
awesome_print
- aws-sdk
+ aws-sdk-cloudformation (~> 1)
+ aws-sdk-core (~> 3)
+ aws-sdk-s3 (~> 1)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
batch-loader (~> 1.4.0)
@@ -1230,7 +1241,7 @@
escape_utils (~> 1.1)
factory_bot_rails (~> 5.1.0)
faraday (~> 0.12)
- faraday_middleware-aws-signers-v4
+ faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
ffaker (~> 2.10)
flipper (~> 0.17.1)