From aa6f782dd58aa5019bcb16009182c9fc1ec9fa0e Mon Sep 17 00:00:00 2001
From: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Date: Fri, 24 Jun 2022 18:10:26 -0700
Subject: [PATCH] Upgrading AWS SDK dependency for native plugins (#3694)

---
 buildSrc/version.properties                              | 3 +++
 plugins/discovery-ec2/build.gradle                       | 4 ----
 .../licenses/aws-java-sdk-core-1.11.749.jar.sha1         | 1 -
 .../licenses/aws-java-sdk-core-1.12.247.jar.sha1         | 1 +
 .../licenses/aws-java-sdk-ec2-1.11.749.jar.sha1          | 1 -
 .../licenses/aws-java-sdk-ec2-1.12.247.jar.sha1          | 1 +
 plugins/repository-s3/build.gradle                       | 9 +++------
 .../licenses/aws-java-sdk-core-1.11.749.jar.sha1         | 1 -
 .../licenses/aws-java-sdk-core-1.12.247.jar.sha1         | 1 +
 .../licenses/aws-java-sdk-s3-1.11.749.jar.sha1           | 1 -
 .../licenses/aws-java-sdk-s3-1.12.247.jar.sha1           | 1 +
 .../licenses/aws-java-sdk-sts-1.11.749.jar.sha1          | 1 -
 .../licenses/aws-java-sdk-sts-1.12.247.jar.sha1          | 1 +
 .../licenses/jmespath-java-1.11.749.jar.sha1             | 1 -
 .../licenses/jmespath-java-1.12.247.jar.sha1             | 1 +
 15 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1
 delete mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1
 create mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/aws-java-sdk-core-1.11.749.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.749.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/aws-java-sdk-sts-1.11.749.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/jmespath-java-1.11.749.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 87dbad73229b4..2a7f8aeaae705 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -31,6 +31,9 @@ httpasyncclient   = 4.1.4
 commonslogging    = 1.2
 commonscodec      = 1.13
 
+# plugin dependencies
+aws               = 1.12.247
+
 # when updating this version, you need to ensure compatibility with:
 #  - plugins/ingest-attachment (transitive dependency, check the upstream POM)
 #  - distribution/tools/plugin-cli
diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
index 0e096958538a4..1766aa14ea9e9 100644
--- a/plugins/discovery-ec2/build.gradle
+++ b/plugins/discovery-ec2/build.gradle
@@ -38,10 +38,6 @@ opensearchplugin {
   classname 'org.opensearch.discovery.ec2.Ec2DiscoveryPlugin'
 }
 
-versions << [
-  'aws': '1.11.749'
-]
-
 dependencies {
   api "com.amazonaws:aws-java-sdk-ec2:${versions.aws}"
   api "com.amazonaws:aws-java-sdk-core:${versions.aws}"
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1
deleted file mode 100644
index 7bc18d6d4f681..0000000000000
--- a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1da5c1549295cfeebc67fc1c7539785a9441755b
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1
new file mode 100644
index 0000000000000..5b3f4a3511769
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1
@@ -0,0 +1 @@
+70f59d940c965a899f69743ec36a8eb099f539ef
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1
deleted file mode 100644
index c7c7220005fc3..0000000000000
--- a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0865e0937c6500acf62ce9c8964eac76a8718f5f
\ No newline at end of file
diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1
new file mode 100644
index 0000000000000..03505417f3e26
--- /dev/null
+++ b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1
@@ -0,0 +1 @@
+30120ff6617fb653d525856480d7ba99528d875d
\ No newline at end of file
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
index ff6e2148fab37..e207b472ee665 100644
--- a/plugins/repository-s3/build.gradle
+++ b/plugins/repository-s3/build.gradle
@@ -44,10 +44,6 @@ opensearchplugin {
   classname 'org.opensearch.repositories.s3.S3RepositoryPlugin'
 }
 
-versions << [
-  'aws': '1.11.749'
-]
-
 dependencies {
   api "com.amazonaws:aws-java-sdk-s3:${versions.aws}"
   api "com.amazonaws:aws-java-sdk-core:${versions.aws}"
@@ -240,7 +236,7 @@ testClusters.yamlRestTest {
     setting 's3.client.integration_test_permanent.endpoint', { "${-> fixtureAddress('s3-fixture', 's3-fixture', '80')}" }, IGNORE_VALUE
     setting 's3.client.integration_test_temporary.endpoint', { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-session-token', '80')}" }, IGNORE_VALUE
     setting 's3.client.integration_test_ec2.endpoint', { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-ec2', '80')}" }, IGNORE_VALUE
-    setting 's3.client.integration_test_eks.endpoint', { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-eks', '80')}" }, IGNORE_VALUE    
+    setting 's3.client.integration_test_eks.endpoint', { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-eks', '80')}" }, IGNORE_VALUE
     setting 's3.client.integration_test_eks.region', { "us-east-2" }, IGNORE_VALUE
 
     // to redirect InstanceProfileCredentialsProvider to custom auth point
@@ -386,7 +382,8 @@ thirdPartyAudit.ignoreMissingClasses(
   'com.amazonaws.services.kms.model.EncryptRequest',
   'com.amazonaws.services.kms.model.EncryptResult',
   'com.amazonaws.services.kms.model.GenerateDataKeyRequest',
-  'com.amazonaws.services.kms.model.GenerateDataKeyResult'
+  'com.amazonaws.services.kms.model.GenerateDataKeyResult',
+  'com.amazonaws.services.kms.AWSKMSClientBuilder'
 )
 
 // jarhell with jdk (intentionally, because jaxb was removed from default modules in java 9)
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.749.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.749.jar.sha1
deleted file mode 100644
index 7bc18d6d4f681..0000000000000
--- a/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.749.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1da5c1549295cfeebc67fc1c7539785a9441755b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1
new file mode 100644
index 0000000000000..5b3f4a3511769
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1
@@ -0,0 +1 @@
+70f59d940c965a899f69743ec36a8eb099f539ef
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.749.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.749.jar.sha1
deleted file mode 100644
index af794dc59dd7f..0000000000000
--- a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.749.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7d069f82723907ccdbd0c91ef0ac76046f5c9652
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1
new file mode 100644
index 0000000000000..2d32399f871b4
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1
@@ -0,0 +1 @@
+648c59d979e2792b4aa8f444a4748abd62a65783
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-sts-1.11.749.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-sts-1.11.749.jar.sha1
deleted file mode 100644
index 29c9a93542058..0000000000000
--- a/plugins/repository-s3/licenses/aws-java-sdk-sts-1.11.749.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-724bd22c0ff41c496469e18f9bea12bdfb2f7540
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1
new file mode 100644
index 0000000000000..31ce4a4e6a5cb
--- /dev/null
+++ b/plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1
@@ -0,0 +1 @@
+3e77a7409ccf7ef3c3d342897dd75590147d2ffe
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/jmespath-java-1.11.749.jar.sha1 b/plugins/repository-s3/licenses/jmespath-java-1.11.749.jar.sha1
deleted file mode 100644
index 3467802d074c7..0000000000000
--- a/plugins/repository-s3/licenses/jmespath-java-1.11.749.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-778866bc557dba508ee0eab2a0c5bfde468e49e6
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1 b/plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1
new file mode 100644
index 0000000000000..fd71f57f9a5fc
--- /dev/null
+++ b/plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1
@@ -0,0 +1 @@
+a1f7acde495f815af705490f2a37b3758299a8e4
\ No newline at end of file