From c4bd37413d9ec34c59e6b60381d7503d1f6ffea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20de=20Ara=C3=BAjo=20Martinez=20Camarinha?=
 <diegoamc@protonmail.ch>
Date: Wed, 8 Jun 2022 05:28:41 -0300
Subject: [PATCH 1/2] Remove old aws-sdk dependency

It is on version 1.67.0 and has an old json dependency that makes
bundler unable to solve conflicts. That means it's not possible to
install other gems because of it
---
 Gemfile      | 1 -
 Gemfile.lock | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1725e5e0d1..b257f78dec 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,7 +69,6 @@ gem 'rswag-api'
 gem 'rswag-ui'
 
 gem 'angularjs-rails', '1.8.0'
-gem 'aws-sdk', '1.67.0'
 gem 'bugsnag'
 gem 'haml'
 gem 'redcarpet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9001b74101..7437781889 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,8 +165,6 @@ GEM
     awesome_print (1.9.2)
     aws-eventstream (1.2.0)
     aws-partitions (1.570.0)
-    aws-sdk (1.67.0)
-      aws-sdk-v1 (= 1.67.0)
     aws-sdk-core (3.130.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -179,9 +177,6 @@ GEM
       aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-v1 (1.67.0)
-      json (~> 1.4)
-      nokogiri (~> 1)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     axlsx_styler (1.1.0)
@@ -713,7 +708,6 @@ DEPENDENCIES
   arel-helpers (~> 2.12)
   awesome_nested_set
   awesome_print
-  aws-sdk (= 1.67.0)
   aws-sdk-s3
   bigdecimal (= 3.0.2)
   bootsnap

From a4fa4a4803587a978921d9f4953bd74584d89ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20de=20Ara=C3=BAjo=20Martinez=20Camarinha?=
 <diegoamc@protonmail.ch>
Date: Wed, 8 Jun 2022 05:43:06 -0300
Subject: [PATCH 2/2] Remove aws sdk patch

This was introduced because an old version of the aws sdk was used. Now
with a newer version installed, this should not be need anymore
---
 config/initializers/aws_sdk.rb | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 config/initializers/aws_sdk.rb

diff --git a/config/initializers/aws_sdk.rb b/config/initializers/aws_sdk.rb
deleted file mode 100644
index cf49dc9bb5..0000000000
--- a/config/initializers/aws_sdk.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# frozen_string_literal: false
-
-if AWS::VERSION == "1.67.0"
-  module AWS
-    module Core
-      module Signers
-        # @api private
-        class S3
-          module URI
-            def self.escape(string)
-              ::URI::RFC2396_Parser.new.escape(string)
-            end
-          end
-        end
-      end
-    end
-  end
-else
-  Rails.logger.warn "The aws-sdk patch needs updating or removing."
-end