From 96ad359b7d113b0441e117b2a935b3c35edd7649 Mon Sep 17 00:00:00 2001
From: Alex Woods <alexwoo@amazon.com>
Date: Mon, 12 Feb 2024 10:31:52 -0800
Subject: [PATCH] Revert "Prepare for Ruby 3.4 release - add dependencies on
 previously default gems (base64/bigdecimal) (#2986)"

This reverts commit 21f8d232ad9132298ecb5f6bf4170f498d6b2ec9.
---
 .../aws-sdk-code-generator/views/gemspec.rb   |  6 +----
 .../templates/gemspec.mustache                |  2 +-
 gems/aws-sdk-core/CHANGELOG.md                |  2 --
 gems/aws-sdk-core/aws-sdk-core.gemspec        |  1 -
 services.json                                 | 23 +++++++++++--------
 5 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/gemspec.rb b/build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/gemspec.rb
index 45200464db1..7979f184116 100644
--- a/build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/gemspec.rb
+++ b/build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/gemspec.rb
@@ -78,11 +78,7 @@ def deprecated?
         @service.deprecated?
       end
 
-      Dependency = Struct.new(:gem, :version) do
-        def gem_version
-          [gem, version].compact.map { |s| "'#{s}'"}.join(', ')
-        end
-      end
+      Dependency = Struct.new(:gem, :version)
 
     end
   end
diff --git a/build_tools/aws-sdk-code-generator/templates/gemspec.mustache b/build_tools/aws-sdk-code-generator/templates/gemspec.mustache
index 1813f1ba34a..0c230025ce7 100644
--- a/build_tools/aws-sdk-code-generator/templates/gemspec.mustache
+++ b/build_tools/aws-sdk-code-generator/templates/gemspec.mustache
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   {{/metadata}}
   {{#dependencies}}
-  spec.add_dependency({{{gem_version}}})
+  spec.add_dependency('{{gem}}', '{{&version}}')
   {{/dependencies}}
 
   spec.required_ruby_version = '>= 2.5'
diff --git a/gems/aws-sdk-core/CHANGELOG.md b/gems/aws-sdk-core/CHANGELOG.md
index 4c4e2b42f48..9a988b5fce2 100644
--- a/gems/aws-sdk-core/CHANGELOG.md
+++ b/gems/aws-sdk-core/CHANGELOG.md
@@ -1,8 +1,6 @@
 Unreleased Changes
 ------------------
 
-* Issue - Add base64 as dependency to prepare for Ruby 3.4 release (#2984).
-
 3.191.1 (2024-02-07)
 ------------------
 
diff --git a/gems/aws-sdk-core/aws-sdk-core.gemspec b/gems/aws-sdk-core/aws-sdk-core.gemspec
index 64b99af8a1f..12f78a41c66 100644
--- a/gems/aws-sdk-core/aws-sdk-core.gemspec
+++ b/gems/aws-sdk-core/aws-sdk-core.gemspec
@@ -16,7 +16,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency('aws-partitions', '~> 1', '>= 1.651.0') # necessary for new endpoint resolution
   spec.add_dependency('aws-sigv4', '~> 1.8') # necessary for s3 express auth
   spec.add_dependency('aws-eventstream', '~> 1', '>= 1.3.0') # necessary for binary eventstream
-  spec.add_dependency('base64') # necessary for base64 encoding/decoding
 
   spec.metadata = {
     'source_code_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-core',
diff --git a/services.json b/services.json
index cf951c2fe60..1b8fdeb9d05 100644
--- a/services.json
+++ b/services.json
@@ -365,19 +365,13 @@
       "Aws::DynamoDB::Plugins::ExtendedRetries",
       "Aws::DynamoDB::Plugins::SimpleAttributes",
       "Aws::DynamoDB::Plugins::CRC32Validation"
-    ],
-    "dependencies": {
-      "bigdecimal": null
-    }
+    ]
   },
   "DynamoDBStreams": {
     "models": "streams.dynamodb/2012-08-10",
     "addPlugins": [
       "Aws::DynamoDBStreams::Plugins::SimpleAttributes"
-    ],
-    "dependencies": {
-      "bigdecimal": null
-    }
+    ]
   },
   "EBS": {
     "models": "ebs/2019-11-02"
@@ -387,7 +381,10 @@
     "addPlugins": [
       "Aws::EC2::Plugins::CopyEncryptedSnapshot",
       "Aws::EC2::Plugins::RegionValidation"
-    ]
+    ],
+    "dependencies": {
+      "aws-sigv4": "~> 1.0"
+    }
   },
   "EC2InstanceConnect": {
     "models": "ec2-instance-connect/2018-04-02"
@@ -927,7 +924,10 @@
     "models": "rds/2014-10-31",
     "addPlugins": [
       "Aws::RDS::Plugins::CrossRegionCopying"
-    ]
+    ],
+    "dependencies": {
+      "aws-sigv4": "~> 1.0"
+    }
   },
   "RDSDataService": {
     "models": "rds-data/2018-08-01"
@@ -1019,6 +1019,9 @@
   },
   "S3Control": {
     "models": "s3control/2018-08-20",
+    "dependencies": {
+      "aws-sigv4": "~> 1.1"
+    },
     "addPlugins": [
       "Aws::S3Control::Plugins::ARN",
       "Aws::S3Control::Plugins::Dualstack",