From 547742a86094ee5487cdb62e05e85adf12ad5a9e Mon Sep 17 00:00:00 2001
From: Artem Prigoda <artem.prigoda@elastic.co>
Date: Wed, 17 Aug 2022 00:43:06 +0200
Subject: [PATCH 1/2] [discovery-ec2] Update the AWS SDK to 1.12.270

---
 gradle/verification-metadata.xml   | 10 ++++++++++
 plugins/discovery-ec2/build.gradle |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e6eae1a422579..0be85f4fbf322 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -84,11 +84,21 @@
             <sha256 value="06d4035a0b2373f0fef529de0e6f81ff43ef7a36ecf476e5d5f1aecba8ee4fad" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.amazonaws" name="aws-java-sdk-core" version="1.12.270">
+         <artifact name="aws-java-sdk-core-1.12.270.jar">
+            <sha256 value="4e41d9f54606151674fc550e5e6291b0ddf917d55a2a3465a45a4e6ac98c9f8f" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.11.749">
          <artifact name="aws-java-sdk-ec2-1.11.749.jar">
             <sha256 value="293cc44d21aac78f5d974992606e7c4bbff20e8d0b897d0f13476424c59df843" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.12.270">
+         <artifact name="aws-java-sdk-ec2-1.12.270.jar">
+            <sha256 value="faadf443751822e205338e80d2cea5eabd6373c1c3cef6348c24809ca82a9dd0" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.amazonaws" name="aws-java-sdk-s3" version="1.11.749">
          <artifact name="aws-java-sdk-s3-1.11.749.jar">
             <sha256 value="fc17c0e186c36ac153e9f871a510e485527c911edeb9f736160b37609f51e7c2" origin="Generated by Gradle"/>
diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
index 6ffa429c03cb9..1e48fa537e432 100644
--- a/plugins/discovery-ec2/build.gradle
+++ b/plugins/discovery-ec2/build.gradle
@@ -16,7 +16,7 @@ esplugin {
 }
 
 versions << [
-  'aws': '1.11.749'
+  'aws': '1.12.270'
 ]
 
 dependencies {

From 910734f1008e22780cf2f0500a7bb2beda4fb1cf Mon Sep 17 00:00:00 2001
From: Artem Prigoda <artem.prigoda@elastic.co>
Date: Mon, 5 Sep 2022 11:14:36 +0200
Subject: [PATCH 2/2] Manually remove checksums for older AWS versions

---
 gradle/verification-metadata.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index a7b1b507e2a9b..7a66cb3848211 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -79,51 +79,26 @@
             <sha256 value="395eebdbfaae281244b2da7f369654d6ca79c4be70acfff87e6638c07f89a0be" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.amazonaws" name="aws-java-sdk-core" version="1.11.749">
-         <artifact name="aws-java-sdk-core-1.11.749.jar">
-            <sha256 value="06d4035a0b2373f0fef529de0e6f81ff43ef7a36ecf476e5d5f1aecba8ee4fad" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.amazonaws" name="aws-java-sdk-core" version="1.12.270">
          <artifact name="aws-java-sdk-core-1.12.270.jar">
             <sha256 value="4e41d9f54606151674fc550e5e6291b0ddf917d55a2a3465a45a4e6ac98c9f8f" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.11.749">
-         <artifact name="aws-java-sdk-ec2-1.11.749.jar">
-            <sha256 value="293cc44d21aac78f5d974992606e7c4bbff20e8d0b897d0f13476424c59df843" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.amazonaws" name="aws-java-sdk-ec2" version="1.12.270">
          <artifact name="aws-java-sdk-ec2-1.12.270.jar">
             <sha256 value="faadf443751822e205338e80d2cea5eabd6373c1c3cef6348c24809ca82a9dd0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.amazonaws" name="aws-java-sdk-s3" version="1.11.749">
-         <artifact name="aws-java-sdk-s3-1.11.749.jar">
-            <sha256 value="fc17c0e186c36ac153e9f871a510e485527c911edeb9f736160b37609f51e7c2" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.amazonaws" name="aws-java-sdk-s3" version="1.12.270">
          <artifact name="aws-java-sdk-s3-1.12.270.jar">
             <sha256 value="41bbea44bac7cfce3898e2e598a17526984337e265f6b16814839c17168a570e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.amazonaws" name="aws-java-sdk-sts" version="1.11.749">
-         <artifact name="aws-java-sdk-sts-1.11.749.jar">
-            <sha256 value="ad753f2b17690010a2dde4b1a84e8f67916c79301a8d44b6224d8132febdc152" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.amazonaws" name="aws-java-sdk-sts" version="1.12.270">
          <artifact name="aws-java-sdk-sts-1.12.270.jar">
             <sha256 value="8cf2d3705381b81808c2e75a5e25a7097385b121ef15c001b18fde3d79657571" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.amazonaws" name="jmespath-java" version="1.11.749">
-         <artifact name="jmespath-java-1.11.749.jar">
-            <sha256 value="0a73428ee8e19b0a1cb4a39f5b4a7af8f5c2d736bd6b171d7054d517cd528c3e" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.amazonaws" name="jmespath-java" version="1.12.270">
          <artifact name="jmespath-java-1.12.270.jar">
             <sha256 value="515d1afb0cd0176630c0707acabd4a3e48424ea938b89359774f61a24b6450f1" origin="Generated by Gradle"/>