From 00f2e7f6270d1c8321f0cb234cb47b858cdbe39d Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Tue, 24 Sep 2019 17:15:11 +0200 Subject: [PATCH] Update AWS SDK for repository-s3 plugin to support IAM Roles for Service Accounts (#46969) (#47004) * Update AWS SDK for repository-s3 and discovery-ec2 plugins --- plugins/discovery-ec2/build.gradle | 2 +- .../discovery-ec2/licenses/aws-java-sdk-core-1.11.562.jar.sha1 | 1 - .../discovery-ec2/licenses/aws-java-sdk-core-1.11.636.jar.sha1 | 1 + .../discovery-ec2/licenses/aws-java-sdk-ec2-1.11.562.jar.sha1 | 1 - .../discovery-ec2/licenses/aws-java-sdk-ec2-1.11.636.jar.sha1 | 1 + plugins/repository-s3/build.gradle | 2 +- .../repository-s3/licenses/aws-java-sdk-core-1.11.562.jar.sha1 | 1 - .../repository-s3/licenses/aws-java-sdk-core-1.11.636.jar.sha1 | 1 + .../repository-s3/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 | 1 - .../repository-s3/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 | 1 + plugins/repository-s3/licenses/jmespath-java-1.11.562.jar.sha1 | 1 - plugins/repository-s3/licenses/jmespath-java-1.11.636.jar.sha1 | 1 + .../snapshot-tool/licenses/aws-java-sdk-core-1.11.562.jar.sha1 | 1 - .../snapshot-tool/licenses/aws-java-sdk-core-1.11.636.jar.sha1 | 1 + x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 | 1 - x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 | 1 + x-pack/snapshot-tool/licenses/jmespath-java-1.11.562.jar.sha1 | 1 - x-pack/snapshot-tool/licenses/jmespath-java-1.11.636.jar.sha1 | 1 + 18 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.562.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.636.jar.sha1 delete mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.562.jar.sha1 create mode 100644 plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.636.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/aws-java-sdk-core-1.11.562.jar.sha1 create mode 100644 plugins/repository-s3/licenses/aws-java-sdk-core-1.11.636.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 create mode 100644 plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 delete mode 100644 plugins/repository-s3/licenses/jmespath-java-1.11.562.jar.sha1 create mode 100644 plugins/repository-s3/licenses/jmespath-java-1.11.636.jar.sha1 delete mode 100644 x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.562.jar.sha1 create mode 100644 x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.636.jar.sha1 delete mode 100644 x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 create mode 100644 x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 delete mode 100644 x-pack/snapshot-tool/licenses/jmespath-java-1.11.562.jar.sha1 create mode 100644 x-pack/snapshot-tool/licenses/jmespath-java-1.11.636.jar.sha1 diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index e7f027a7517..2dcee91c481 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/build.gradle @@ -23,7 +23,7 @@ esplugin { } versions << [ - 'aws': '1.11.562' + 'aws': '1.11.636' ] dependencies { diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.562.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.562.jar.sha1 deleted file mode 100644 index ed8ded6a360..00000000000 --- a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b5fc47ec1b5afe180f5ebb4eda755acdca7a20ae \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.636.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.636.jar.sha1 new file mode 100644 index 00000000000..b9ee9c102db --- /dev/null +++ b/plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.636.jar.sha1 @@ -0,0 +1 @@ +84c9f180f8f60f6f1433c9c5253fcb704593b121 \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.562.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.562.jar.sha1 deleted file mode 100644 index 040d28de70b..00000000000 --- a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0211a055fb3e036033af4b1ca25ada0574a756ec \ No newline at end of file diff --git a/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.636.jar.sha1 b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.636.jar.sha1 new file mode 100644 index 00000000000..ed737c808c1 --- /dev/null +++ b/plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.636.jar.sha1 @@ -0,0 +1 @@ +d32fc4ae314dbee9717302a3119cba0f735c04b1 \ No newline at end of file diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index ab4597cf7f4..2d7e60ae16e 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -29,7 +29,7 @@ esplugin { } versions << [ - 'aws': '1.11.562' + 'aws': '1.11.636' ] dependencies { diff --git a/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.562.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.562.jar.sha1 deleted file mode 100644 index ed8ded6a360..00000000000 --- a/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b5fc47ec1b5afe180f5ebb4eda755acdca7a20ae \ No newline at end of file diff --git a/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.636.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.636.jar.sha1 new file mode 100644 index 00000000000..b9ee9c102db --- /dev/null +++ b/plugins/repository-s3/licenses/aws-java-sdk-core-1.11.636.jar.sha1 @@ -0,0 +1 @@ +84c9f180f8f60f6f1433c9c5253fcb704593b121 \ No newline at end of file diff --git a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 deleted file mode 100644 index 8e852fe9b27..00000000000 --- a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1712c878f7e9483ceac1eb2356a9457a3c8df03e \ No newline at end of file diff --git a/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 new file mode 100644 index 00000000000..1e05e98d240 --- /dev/null +++ b/plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 @@ -0,0 +1 @@ +f86fc1993ac8122f6f02a8eb9b467b5f945cd76b \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jmespath-java-1.11.562.jar.sha1 b/plugins/repository-s3/licenses/jmespath-java-1.11.562.jar.sha1 deleted file mode 100644 index 8e2d0e1935a..00000000000 --- a/plugins/repository-s3/licenses/jmespath-java-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1147ed0ad1f2c5a16b8271e38e3cda5cd488c8ae \ No newline at end of file diff --git a/plugins/repository-s3/licenses/jmespath-java-1.11.636.jar.sha1 b/plugins/repository-s3/licenses/jmespath-java-1.11.636.jar.sha1 new file mode 100644 index 00000000000..70c0d3633af --- /dev/null +++ b/plugins/repository-s3/licenses/jmespath-java-1.11.636.jar.sha1 @@ -0,0 +1 @@ +e468c349ce410171a1d5df7fa0fa377d52c5d651 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.562.jar.sha1 b/x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.562.jar.sha1 deleted file mode 100644 index ed8ded6a360..00000000000 --- a/x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b5fc47ec1b5afe180f5ebb4eda755acdca7a20ae \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.636.jar.sha1 b/x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.636.jar.sha1 new file mode 100644 index 00000000000..b9ee9c102db --- /dev/null +++ b/x-pack/snapshot-tool/licenses/aws-java-sdk-core-1.11.636.jar.sha1 @@ -0,0 +1 @@ +84c9f180f8f60f6f1433c9c5253fcb704593b121 \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 b/x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 deleted file mode 100644 index 8e852fe9b27..00000000000 --- a/x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1712c878f7e9483ceac1eb2356a9457a3c8df03e \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 b/x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 new file mode 100644 index 00000000000..1e05e98d240 --- /dev/null +++ b/x-pack/snapshot-tool/licenses/aws-java-sdk-s3-1.11.636.jar.sha1 @@ -0,0 +1 @@ +f86fc1993ac8122f6f02a8eb9b467b5f945cd76b \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/jmespath-java-1.11.562.jar.sha1 b/x-pack/snapshot-tool/licenses/jmespath-java-1.11.562.jar.sha1 deleted file mode 100644 index 8e2d0e1935a..00000000000 --- a/x-pack/snapshot-tool/licenses/jmespath-java-1.11.562.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1147ed0ad1f2c5a16b8271e38e3cda5cd488c8ae \ No newline at end of file diff --git a/x-pack/snapshot-tool/licenses/jmespath-java-1.11.636.jar.sha1 b/x-pack/snapshot-tool/licenses/jmespath-java-1.11.636.jar.sha1 new file mode 100644 index 00000000000..70c0d3633af --- /dev/null +++ b/x-pack/snapshot-tool/licenses/jmespath-java-1.11.636.jar.sha1 @@ -0,0 +1 @@ +e468c349ce410171a1d5df7fa0fa377d52c5d651 \ No newline at end of file