Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading AWS SDK dependency for native plugins #3694

Merged
merged 2 commits into from
Jun 25, 2022
Merged

Upgrading AWS SDK dependency for native plugins #3694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
293da7b
Updating AWS SDK for repository S3
saratvemulapalli Jun 24, 2022
b086af5
Centralizing AWS dependencies for plugins
saratvemulapalli Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions plugins/discovery-ec2/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/aws-java-sdk-core-1.11.749.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/aws-java-sdk-core-1.12.247.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
70f59d940c965a899f69743ec36a8eb099f539ef
1 change: 0 additions & 1 deletion plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.11.749.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/discovery-ec2/licenses/aws-java-sdk-ec2-1.12.247.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
30120ff6617fb653d525856480d7ba99528d875d
9 changes: 3 additions & 6 deletions plugins/repository-s3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/aws-java-sdk-core-1.11.749.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/aws-java-sdk-core-1.12.247.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
70f59d940c965a899f69743ec36a8eb099f539ef
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/aws-java-sdk-s3-1.11.749.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/aws-java-sdk-s3-1.12.247.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
648c59d979e2792b4aa8f444a4748abd62a65783
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/aws-java-sdk-sts-1.11.749.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/aws-java-sdk-sts-1.12.247.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e77a7409ccf7ef3c3d342897dd75590147d2ffe
1 change: 0 additions & 1 deletion plugins/repository-s3/licenses/jmespath-java-1.11.749.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/repository-s3/licenses/jmespath-java-1.12.247.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a1f7acde495f815af705490f2a37b3758299a8e4