Upgrading AWS SDK dependency for native plugins (#3694)

opensearch-project · Jun 27, 2022 · 61caa01 · 61caa01
1 parent cce1ea4
commit 61caa01
Show file tree

Hide file tree

Showing 15 changed files with 12 additions and 16 deletions.
diff --git 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
@@ -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
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
@@ -0,0 +1 @@
+70f59d940c965a899f69743ec36a8eb099f539ef
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
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
@@ -0,0 +1 @@
+30120ff6617fb653d525856480d7ba99528d875d
diff --git 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}"
@@ -237,7 +233,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
@@ -383,7 +379,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
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
@@ -0,0 +1 @@
+70f59d940c965a899f69743ec36a8eb099f539ef
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
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
@@ -0,0 +1 @@
+648c59d979e2792b4aa8f444a4748abd62a65783
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
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
@@ -0,0 +1 @@
+3e77a7409ccf7ef3c3d342897dd75590147d2ffe
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
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
@@ -0,0 +1 @@
+a1f7acde495f815af705490f2a37b3758299a8e4