From e397d61429ab3e9b4b89eae965c7cc9b980b4d4f Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Thu, 20 Aug 2020 17:31:46 +0530
Subject: [PATCH] Switch to aws-sdk v3 with upstream patch

---
 debian/control                       |  6 +-
 debian/gitlab.install                |  1 -
 debian/patches/0791-aws-sdk-v3.patch | 85 ++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 debian/watch                         |  3 -
 5 files changed, 90 insertions(+), 6 deletions(-)
 create mode 100644 debian/patches/0791-aws-sdk-v3.patch

diff --git a/debian/control b/debian/control
index b76665478a..46e3645ad4 100644
--- a/debian/control
+++ b/debian/control
@@ -134,8 +134,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  ruby-elasticsearch (>= 5.0.3~),
 # ruby-elasticsearch-rails (>= 0.1.9~), embedded
  ruby-elasticsearch-api (>= 6.8~),
- ruby-aws-sdk (>= 2.9.32-2~),
-# ruby-faraday-middleware-aws-signers-v4, embedded
+ ruby-aws-sdk-core (>= 3.0~),
+ ruby-aws-sdk-cloudformation (>= 1.0~),
+ ruby-aws-sdk-s3 (>= 1.0~),
+ ruby-faraday-middleware-aws-sigv4,
 # Markdown and HTML processing
  ruby-html-pipeline (>= 2.12~),
  ruby-task-list (>= 2.3.1~),
diff --git a/debian/gitlab.install b/debian/gitlab.install
index 18d384828e..1bbb2c5302 100644
--- a/debian/gitlab.install
+++ b/debian/gitlab.install
@@ -67,4 +67,3 @@ public var/lib/gitlab
 db var/lib/gitlab
 elasticsearch-model usr/share/gitlab/vendor/gems
 elasticsearch-rails usr/share/gitlab/vendor/gems
-faraday-middleware-aws-signers-v4 usr/share/gitlab/vendor/gems
diff --git a/debian/patches/0791-aws-sdk-v3.patch b/debian/patches/0791-aws-sdk-v3.patch
new file mode 100644
index 0000000000..c57f2bae0f
--- /dev/null
+++ b/debian/patches/0791-aws-sdk-v3.patch
@@ -0,0 +1,85 @@
+--- 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)
diff --git a/debian/patches/series b/debian/patches/series
index a3634aa375..60e1f35502 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,3 +27,4 @@
 0740-use-packaged-modules.patch
 0750-fix-relative-paths.patch
 0790-protobuf-compat.patch
+0791-aws-sdk-v3.patch
diff --git a/debian/watch b/debian/watch
index 7e69fab6d6..71c10789a6 100644
--- a/debian/watch
+++ b/debian/watch
@@ -10,9 +10,6 @@ https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-model-(6.1.*).t
 opts="pgpmode=none,component=elasticsearch-rails" \
 https://gemwatch.debian.net/elasticsearch-rails .*/elasticsearch-rails-(6.1.*).tar.gz ignore
 
-opts="pgpmode=none,component=faraday-middleware-aws-signers-v4" \
-https://gemwatch.debian.net/faraday_middleware-aws-signers-v4 .*/faraday_middleware-aws-signers-v4-(0.1.*).tar.gz ignore
-
 opts="pgpmode=none,component=snowplow-javascript-tracker,\
 filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/snowplow-javascript-tracker-\$1\.tar\.gz/" \
 https://github.com/snowplow/snowplow-javascript-tracker/tags?after=2.11.0-rc3 .*/v?(2.10.0)\.tar\.gz ignore