Browse Source

update AWS SDK for ECS Task IAM support in discovery-ec2 (#26479)

This commit contains:

* update AWS SDK for ECS Task IAM support
* ignore dependencies not essential to `discovery-ec2`:
  * jmespath seems to be used for `waiters`
  * amazon ion is a protocol not used by EC2 or IAM
mohit 8 years ago
parent
commit
06150d40a2

+ 21 - 1
plugins/discovery-ec2/build.gradle

@@ -23,7 +23,7 @@ esplugin {
 }
 
 versions << [
-  'aws': '1.10.69'
+  'aws': '1.11.187'
 ]
 
 dependencies {
@@ -55,6 +55,26 @@ test {
 
 thirdPartyAudit.excludes = [
   // classes are missing
+  'com.amazonaws.jmespath.JmesPathEvaluationVisitor',
+  'com.amazonaws.jmespath.JmesPathExpression',
+  'com.amazonaws.jmespath.JmesPathField',
+  'com.amazonaws.jmespath.JmesPathFlatten',
+  'com.amazonaws.jmespath.JmesPathIdentity',
+  'com.amazonaws.jmespath.JmesPathLengthFunction',
+  'com.amazonaws.jmespath.JmesPathLiteral',
+  'com.amazonaws.jmespath.JmesPathProjection',
+  'com.amazonaws.jmespath.JmesPathSubExpression',
+  'com.amazonaws.jmespath.ObjectMapperSingleton',
+  'com.amazonaws.jmespath.OpGreaterThan',
+  'software.amazon.ion.IonReader',
+  'software.amazon.ion.IonSystem',
+  'software.amazon.ion.IonType',
+  'software.amazon.ion.IonWriter',
+  'software.amazon.ion.Timestamp',
+  'software.amazon.ion.system.IonBinaryWriterBuilder',
+  'software.amazon.ion.system.IonSystemBuilder',
+  'software.amazon.ion.system.IonTextWriterBuilder',
+  'software.amazon.ion.system.IonWriterBuilder',
   'javax.servlet.ServletContextEvent', 
   'javax.servlet.ServletContextListener', 
   'org.apache.avalon.framework.logger.Logger', 

+ 0 - 1
plugins/discovery-ec2/licenses/aws-java-sdk-core-1.10.69.jar.sha1

@@ -1 +0,0 @@
-a1f02d5f26ba1d8c37e2bf9c847db3c6729dda00

+ 1 - 0
plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.187.jar.sha1

@@ -0,0 +1 @@
+6f47fcd3c2917bef69dc36aba203c5ea4af9bf24

+ 0 - 1
plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.10.69.jar.sha1

@@ -1 +0,0 @@
-afbff1ece8365859eb4cfe0d3ba543d68b154d26

+ 1 - 0
plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.187.jar.sha1

@@ -0,0 +1 @@
+f3e5a8601f3105624674b1a12ca34f453a4b5895

File diff suppressed because it is too large
+ 352 - 52
plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/AmazonEC2Mock.java


Some files were not shown because too many files changed in this diff