2018-07-04 02:04:07 -04:00
|
|
|
import org.elasticsearch.gradle.MavenFilteringHack
|
2019-11-01 14:33:11 -04:00
|
|
|
import org.elasticsearch.gradle.info.BuildParams
|
2018-07-04 02:04:07 -04:00
|
|
|
import org.elasticsearch.gradle.test.RestIntegTestTask
|
|
|
|
|
2019-07-10 18:42:28 -04:00
|
|
|
import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE
|
|
|
|
|
2015-10-29 14:40:19 -04:00
|
|
|
/*
|
|
|
|
* Licensed to Elasticsearch under one or more contributor
|
|
|
|
* license agreements. See the NOTICE file distributed with
|
|
|
|
* this work for additional information regarding copyright
|
|
|
|
* ownership. Elasticsearch licenses this file to you under
|
|
|
|
* the Apache License, Version 2.0 (the "License"); you may
|
|
|
|
* not use this file except in compliance with the License.
|
|
|
|
* You may obtain a copy of the License at
|
|
|
|
*
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
*
|
|
|
|
* Unless required by applicable law or agreed to in writing,
|
|
|
|
* software distributed under the License is distributed on an
|
|
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
|
|
* KIND, either express or implied. See the License for the
|
|
|
|
* specific language governing permissions and limitations
|
|
|
|
* under the License.
|
|
|
|
*/
|
|
|
|
esplugin {
|
2016-05-20 02:56:06 -04:00
|
|
|
description 'The S3 repository plugin adds S3 repositories'
|
2017-04-04 18:15:25 -04:00
|
|
|
classname 'org.elasticsearch.repositories.s3.S3RepositoryPlugin'
|
2015-10-29 14:40:19 -04:00
|
|
|
}
|
|
|
|
|
2015-11-10 17:58:46 -05:00
|
|
|
versions << [
|
2020-03-23 10:31:29 -04:00
|
|
|
'aws': '1.11.749'
|
2015-11-10 17:58:46 -05:00
|
|
|
]
|
|
|
|
|
2015-10-29 14:40:19 -04:00
|
|
|
dependencies {
|
2015-11-10 17:58:46 -05:00
|
|
|
compile "com.amazonaws:aws-java-sdk-s3:${versions.aws}"
|
|
|
|
compile "com.amazonaws:aws-java-sdk-core:${versions.aws}"
|
2018-09-12 09:27:57 -04:00
|
|
|
compile "com.amazonaws:jmespath-java:${versions.aws}"
|
2015-10-29 14:40:19 -04:00
|
|
|
compile "org.apache.httpcomponents:httpclient:${versions.httpclient}"
|
2015-11-10 17:58:46 -05:00
|
|
|
compile "org.apache.httpcomponents:httpcore:${versions.httpcore}"
|
|
|
|
compile "commons-logging:commons-logging:${versions.commonslogging}"
|
2019-05-30 16:06:11 -04:00
|
|
|
compile "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}"
|
2015-11-10 17:58:46 -05:00
|
|
|
compile "commons-codec:commons-codec:${versions.commonscodec}"
|
2018-09-12 09:27:57 -04:00
|
|
|
compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
|
2020-03-17 13:26:35 -04:00
|
|
|
compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
|
2019-02-20 13:03:27 -05:00
|
|
|
compile "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
|
2018-09-12 09:27:57 -04:00
|
|
|
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
|
2018-11-12 04:02:41 -05:00
|
|
|
compile "joda-time:joda-time:${versions.joda}"
|
2016-05-20 02:56:06 -04:00
|
|
|
|
|
|
|
// HACK: javax.xml.bind was removed from default modules in java 9, so we pull the api in here,
|
2020-03-23 18:30:10 -04:00
|
|
|
// and whitelist this hack in JarHell
|
2016-05-20 02:56:06 -04:00
|
|
|
compile 'javax.xml.bind:jaxb-api:2.2.2'
|
2019-11-13 10:03:59 -05:00
|
|
|
|
2020-06-14 16:30:44 -04:00
|
|
|
testImplementation project(':test:fixtures:s3-fixture')
|
2015-10-29 14:40:19 -04:00
|
|
|
}
|
|
|
|
|
2020-06-18 02:15:50 -04:00
|
|
|
tasks.named("dependencyLicenses").configure {
|
2015-10-29 14:40:19 -04:00
|
|
|
mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'
|
2018-09-12 09:27:57 -04:00
|
|
|
mapping from: /jmespath-java.*/, to: 'aws-java-sdk'
|
2015-10-29 14:40:19 -04:00
|
|
|
mapping from: /jackson-.*/, to: 'jackson'
|
2016-05-20 02:56:06 -04:00
|
|
|
mapping from: /jaxb-.*/, to: 'jaxb'
|
2015-10-29 14:40:19 -04:00
|
|
|
}
|
|
|
|
|
2016-09-03 06:41:07 -04:00
|
|
|
bundlePlugin {
|
|
|
|
from('config/repository-s3') {
|
|
|
|
into 'config'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-09 14:52:50 -04:00
|
|
|
task testRepositoryCreds(type: Test) {
|
2018-06-18 02:42:11 -04:00
|
|
|
include '**/RepositoryCredentialsTests.class'
|
2017-05-11 15:14:23 -04:00
|
|
|
systemProperty 'es.allow_insecure_settings', 'true'
|
|
|
|
}
|
2019-03-27 02:37:04 -04:00
|
|
|
check.dependsOn(testRepositoryCreds)
|
2017-05-11 15:14:23 -04:00
|
|
|
|
2019-04-09 14:52:50 -04:00
|
|
|
test {
|
2020-06-02 05:26:58 -04:00
|
|
|
// this is tested explicitly in separate test tasks
|
2019-08-26 08:53:31 -04:00
|
|
|
exclude '**/RepositoryCredentialsTests.class'
|
2019-05-28 04:46:22 -04:00
|
|
|
exclude '**/S3RepositoryThirdPartyTests.class'
|
2017-05-11 15:14:23 -04:00
|
|
|
}
|
|
|
|
|
2018-07-04 02:04:07 -04:00
|
|
|
boolean useFixture = false
|
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
def fixtureAddress = { fixture, name, port ->
|
|
|
|
assert useFixture: 'closure should not be used without a fixture'
|
|
|
|
int ephemeralPort = project(":test:fixtures:${fixture}").postProcessFixture.ext."test.fixtures.${name}.tcp.${port}"
|
|
|
|
assert ephemeralPort > 0
|
|
|
|
'http://127.0.0.1:' + ephemeralPort
|
|
|
|
}
|
|
|
|
|
2018-07-04 02:04:07 -04:00
|
|
|
// We test against two repositories, one which uses the usual two-part "permanent" credentials and
|
|
|
|
// the other which uses three-part "temporary" or "session" credentials.
|
|
|
|
|
|
|
|
String s3PermanentAccessKey = System.getenv("amazon_s3_access_key")
|
|
|
|
String s3PermanentSecretKey = System.getenv("amazon_s3_secret_key")
|
|
|
|
String s3PermanentBucket = System.getenv("amazon_s3_bucket")
|
|
|
|
String s3PermanentBasePath = System.getenv("amazon_s3_base_path")
|
|
|
|
|
|
|
|
String s3TemporaryAccessKey = System.getenv("amazon_s3_access_key_temporary")
|
|
|
|
String s3TemporarySecretKey = System.getenv("amazon_s3_secret_key_temporary")
|
|
|
|
String s3TemporarySessionToken = System.getenv("amazon_s3_session_token_temporary")
|
|
|
|
String s3TemporaryBucket = System.getenv("amazon_s3_bucket_temporary")
|
|
|
|
String s3TemporaryBasePath = System.getenv("amazon_s3_base_path_temporary")
|
|
|
|
|
2018-07-18 06:18:00 -04:00
|
|
|
String s3EC2Bucket = System.getenv("amazon_s3_bucket_ec2")
|
|
|
|
String s3EC2BasePath = System.getenv("amazon_s3_base_path_ec2")
|
|
|
|
|
2018-07-19 06:54:38 -04:00
|
|
|
String s3ECSBucket = System.getenv("amazon_s3_bucket_ecs")
|
|
|
|
String s3ECSBasePath = System.getenv("amazon_s3_base_path_ecs")
|
|
|
|
|
2019-11-01 14:33:11 -04:00
|
|
|
boolean s3DisableChunkedEncoding = (new Random(Long.parseUnsignedLong(BuildParams.testSeed.tokenize(':').get(0), 16))).nextBoolean()
|
2019-07-18 10:57:56 -04:00
|
|
|
|
2018-07-04 02:04:07 -04:00
|
|
|
// If all these variables are missing then we are testing against the internal fixture instead, which has the following
|
|
|
|
// credentials hard-coded in.
|
|
|
|
|
2018-12-06 10:05:05 -05:00
|
|
|
if (!s3PermanentAccessKey && !s3PermanentSecretKey && !s3PermanentBucket && !s3PermanentBasePath) {
|
2019-11-13 10:03:59 -05:00
|
|
|
s3PermanentAccessKey = 'access_key'
|
|
|
|
s3PermanentSecretKey = 'secret_key'
|
|
|
|
s3PermanentBucket = 'bucket'
|
2019-11-18 05:56:59 -05:00
|
|
|
s3PermanentBasePath = 'base_path'
|
2018-07-04 02:04:07 -04:00
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
apply plugin: 'elasticsearch.test.fixtures'
|
2018-07-12 03:21:10 -04:00
|
|
|
useFixture = true
|
|
|
|
|
2018-07-24 08:09:41 -04:00
|
|
|
} else if (!s3PermanentAccessKey || !s3PermanentSecretKey || !s3PermanentBucket || !s3PermanentBasePath) {
|
2018-07-25 10:34:30 -04:00
|
|
|
throw new IllegalArgumentException("not all options specified to run against external S3 service as permanent credentials are present")
|
2018-07-12 03:21:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!s3TemporaryAccessKey && !s3TemporarySecretKey && !s3TemporaryBucket && !s3TemporaryBasePath && !s3TemporarySessionToken) {
|
2019-11-18 05:56:59 -05:00
|
|
|
s3TemporaryAccessKey = 'session_token_access_key'
|
|
|
|
s3TemporarySecretKey = 'session_token_secret_key'
|
|
|
|
s3TemporaryBucket = 'session_token_bucket'
|
|
|
|
s3TemporaryBasePath = 'session_token_base_path'
|
|
|
|
s3TemporarySessionToken = 'session_token'
|
2018-07-04 02:04:07 -04:00
|
|
|
|
2018-07-12 03:21:10 -04:00
|
|
|
} else if (!s3TemporaryAccessKey || !s3TemporarySecretKey || !s3TemporaryBucket || !s3TemporaryBasePath || !s3TemporarySessionToken) {
|
2018-07-25 10:34:30 -04:00
|
|
|
throw new IllegalArgumentException("not all options specified to run against external S3 service as temporary credentials are present")
|
2018-07-04 02:04:07 -04:00
|
|
|
}
|
|
|
|
|
2018-12-06 10:05:05 -05:00
|
|
|
if (!s3EC2Bucket && !s3EC2BasePath && !s3ECSBucket && !s3ECSBasePath) {
|
2019-11-18 05:56:59 -05:00
|
|
|
s3EC2Bucket = 'ec2_bucket'
|
|
|
|
s3EC2BasePath = 'ec2_base_path'
|
|
|
|
s3ECSBucket = 'ecs_bucket'
|
|
|
|
s3ECSBasePath = 'ecs_base_path'
|
2018-12-06 10:05:05 -05:00
|
|
|
} else if (!s3EC2Bucket || !s3EC2BasePath || !s3ECSBucket || !s3ECSBasePath) {
|
|
|
|
throw new IllegalArgumentException("not all options specified to run EC2/ECS tests are present")
|
|
|
|
}
|
|
|
|
|
2018-07-04 02:04:07 -04:00
|
|
|
processTestResources {
|
2019-03-27 02:37:04 -04:00
|
|
|
Map<String, Object> expansions = [
|
2019-11-14 06:01:23 -05:00
|
|
|
'permanent_bucket': s3PermanentBucket,
|
|
|
|
'permanent_base_path': s3PermanentBasePath + "_integration_tests",
|
|
|
|
'temporary_bucket': s3TemporaryBucket,
|
|
|
|
'temporary_base_path': s3TemporaryBasePath + "_integration_tests",
|
|
|
|
'ec2_bucket': s3EC2Bucket,
|
|
|
|
'ec2_base_path': s3EC2BasePath,
|
|
|
|
'ecs_bucket': s3ECSBucket,
|
|
|
|
'ecs_base_path': s3ECSBasePath,
|
|
|
|
'disable_chunked_encoding': s3DisableChunkedEncoding,
|
2019-03-27 02:37:04 -04:00
|
|
|
]
|
2018-07-04 02:04:07 -04:00
|
|
|
inputs.properties(expansions)
|
|
|
|
MavenFilteringHack.filter(it, expansions)
|
2018-04-03 05:30:43 -04:00
|
|
|
}
|
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
test {
|
|
|
|
// this is tested explicitly in a separate test task
|
|
|
|
exclude '**/S3RepositoryThirdPartyTests.class'
|
|
|
|
}
|
2019-11-18 05:56:59 -05:00
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
// IntegTest
|
|
|
|
integTest {
|
|
|
|
runner {
|
|
|
|
systemProperty 'tests.rest.blacklist', (
|
|
|
|
useFixture ?
|
|
|
|
['repository_s3/50_repository_ecs_credentials/*']
|
|
|
|
:
|
|
|
|
[
|
|
|
|
'repository_s3/30_repository_temporary_credentials/*',
|
|
|
|
'repository_s3/40_repository_ec2_credentials/*',
|
|
|
|
'repository_s3/50_repository_ecs_credentials/*'
|
|
|
|
]
|
|
|
|
).join(",")
|
|
|
|
}
|
2018-07-12 03:21:10 -04:00
|
|
|
}
|
|
|
|
|
2019-03-27 02:37:04 -04:00
|
|
|
testClusters.integTest {
|
|
|
|
keystore 's3.client.integration_test_permanent.access_key', s3PermanentAccessKey
|
|
|
|
keystore 's3.client.integration_test_permanent.secret_key', s3PermanentSecretKey
|
2018-07-04 02:04:07 -04:00
|
|
|
|
2019-03-27 02:37:04 -04:00
|
|
|
keystore 's3.client.integration_test_temporary.access_key', s3TemporaryAccessKey
|
|
|
|
keystore 's3.client.integration_test_temporary.secret_key', s3TemporarySecretKey
|
|
|
|
keystore 's3.client.integration_test_temporary.session_token', s3TemporarySessionToken
|
2018-07-04 02:04:07 -04:00
|
|
|
|
|
|
|
if (useFixture) {
|
2020-06-02 05:26:58 -04:00
|
|
|
testFixtures.useFixture(':test:fixtures:s3-fixture', 's3-fixture')
|
|
|
|
testFixtures.useFixture(':test:fixtures:s3-fixture', 's3-fixture-with-session-token')
|
|
|
|
testFixtures.useFixture(':test:fixtures:s3-fixture', 's3-fixture-with-ec2')
|
|
|
|
|
|
|
|
normalization {
|
|
|
|
runtimeClasspath {
|
|
|
|
// ignore generated address file for the purposes of build avoidance
|
|
|
|
ignore 's3Fixture.address'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2018-07-18 06:18:00 -04:00
|
|
|
|
|
|
|
// to redirect InstanceProfileCredentialsProvider to custom auth point
|
2020-06-02 05:26:58 -04:00
|
|
|
systemProperty "com.amazonaws.sdk.ec2MetadataServiceEndpointOverride", { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-ec2', '80')}" }, IGNORE_VALUE
|
2018-07-04 02:04:07 -04:00
|
|
|
} else {
|
|
|
|
println "Using an external service to test the repository-s3 plugin"
|
|
|
|
}
|
2017-04-11 18:42:56 -04:00
|
|
|
}
|
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
// MinIO
|
|
|
|
if (useFixture) {
|
|
|
|
testFixtures.useFixture(':test:fixtures:minio-fixture', 'minio-fixture')
|
|
|
|
|
|
|
|
task integTestMinio(type: RestIntegTestTask) {
|
|
|
|
description = "Runs REST tests using the Minio repository."
|
|
|
|
dependsOn tasks.bundlePlugin
|
|
|
|
runner {
|
|
|
|
// Minio only supports a single access key, see https://github.com/minio/minio/pull/5968
|
|
|
|
systemProperty 'tests.rest.blacklist', [
|
|
|
|
'repository_s3/30_repository_temporary_credentials/*',
|
|
|
|
'repository_s3/40_repository_ec2_credentials/*',
|
|
|
|
'repository_s3/50_repository_ecs_credentials/*'
|
|
|
|
].join(",")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
check.dependsOn(integTestMinio)
|
|
|
|
|
|
|
|
testClusters.integTestMinio {
|
|
|
|
keystore 's3.client.integration_test_permanent.access_key', s3PermanentAccessKey
|
|
|
|
keystore 's3.client.integration_test_permanent.secret_key', s3PermanentSecretKey
|
|
|
|
setting 's3.client.integration_test_permanent.endpoint', { "${-> fixtureAddress('minio-fixture', 'minio-fixture', '9000')}" }, IGNORE_VALUE
|
|
|
|
plugin tasks.bundlePlugin.archiveFile
|
|
|
|
}
|
2019-07-30 11:16:41 -04:00
|
|
|
}
|
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
// ECS
|
2018-07-25 10:34:30 -04:00
|
|
|
if (useFixture) {
|
2020-06-02 05:26:58 -04:00
|
|
|
testFixtures.useFixture(':test:fixtures:s3-fixture', 's3-fixture-with-ecs')
|
|
|
|
|
2019-03-27 02:37:04 -04:00
|
|
|
task integTestECS(type: RestIntegTestTask.class) {
|
2018-07-25 10:34:30 -04:00
|
|
|
description = "Runs tests using the ECS repository."
|
2019-11-18 05:56:59 -05:00
|
|
|
dependsOn('bundlePlugin')
|
2019-03-27 02:37:04 -04:00
|
|
|
runner {
|
|
|
|
systemProperty 'tests.rest.blacklist', [
|
2019-11-14 06:01:23 -05:00
|
|
|
'repository_s3/10_basic/*',
|
|
|
|
'repository_s3/20_repository_permanent_credentials/*',
|
|
|
|
'repository_s3/30_repository_temporary_credentials/*',
|
|
|
|
'repository_s3/40_repository_ec2_credentials/*'
|
2019-03-27 02:37:04 -04:00
|
|
|
].join(",")
|
|
|
|
}
|
2018-07-25 10:34:30 -04:00
|
|
|
}
|
2019-03-27 02:37:04 -04:00
|
|
|
check.dependsOn(integTestECS)
|
2018-07-19 06:54:38 -04:00
|
|
|
|
2019-03-27 02:37:04 -04:00
|
|
|
testClusters.integTestECS {
|
2020-06-02 05:26:58 -04:00
|
|
|
setting 's3.client.integration_test_ecs.endpoint', { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-ecs', '80')}" }, IGNORE_VALUE
|
2020-04-13 11:53:35 -04:00
|
|
|
plugin tasks.bundlePlugin.archiveFile
|
2020-06-02 05:26:58 -04:00
|
|
|
environment 'AWS_CONTAINER_CREDENTIALS_FULL_URI', { "${-> fixtureAddress('s3-fixture', 's3-fixture-with-ecs', '80')}/ecs_credentials_endpoint" }, IGNORE_VALUE
|
2018-07-25 10:34:30 -04:00
|
|
|
}
|
2020-06-02 05:26:58 -04:00
|
|
|
}
|
2019-07-30 11:16:41 -04:00
|
|
|
|
2020-06-02 05:26:58 -04:00
|
|
|
// 3rd Party Tests
|
|
|
|
task s3ThirdPartyTest(type: Test) {
|
|
|
|
include '**/S3RepositoryThirdPartyTests.class'
|
|
|
|
systemProperty 'test.s3.account', s3PermanentAccessKey
|
|
|
|
systemProperty 'test.s3.key', s3PermanentSecretKey
|
|
|
|
systemProperty 'test.s3.bucket', s3PermanentBucket
|
|
|
|
nonInputProperties.systemProperty 'test.s3.base', s3PermanentBasePath + "_third_party_tests_" + BuildParams.testSeed
|
|
|
|
if (useFixture) {
|
|
|
|
dependsOn tasks.integTestMinio
|
|
|
|
nonInputProperties.systemProperty 'test.s3.endpoint', "${-> fixtureAddress('minio-fixture', 'minio-fixture', '9000') }"
|
|
|
|
} else {
|
|
|
|
dependsOn tasks.integTest
|
2019-07-30 11:16:41 -04:00
|
|
|
}
|
2018-07-19 06:54:38 -04:00
|
|
|
}
|
2020-06-02 05:26:58 -04:00
|
|
|
check.dependsOn(s3ThirdPartyTest)
|
2018-07-19 06:54:38 -04:00
|
|
|
|
2019-11-14 06:01:23 -05:00
|
|
|
thirdPartyAudit.ignoreMissingClasses(
|
2015-12-28 22:38:55 -05:00
|
|
|
// classes are missing
|
2019-11-14 06:01:23 -05:00
|
|
|
'javax.servlet.ServletContextEvent',
|
|
|
|
'javax.servlet.ServletContextListener',
|
|
|
|
'org.apache.avalon.framework.logger.Logger',
|
|
|
|
'org.apache.log.Hierarchy',
|
2015-12-28 22:38:55 -05:00
|
|
|
'org.apache.log.Logger',
|
2017-11-09 07:25:51 -05:00
|
|
|
'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',
|
2019-07-09 03:04:03 -04:00
|
|
|
'software.amazon.ion.system.IonWriterBuilder',
|
2020-03-23 18:30:10 -04:00
|
|
|
// We don't use the kms dependency
|
2019-07-09 03:04:03 -04:00
|
|
|
'com.amazonaws.services.kms.AWSKMS',
|
|
|
|
'com.amazonaws.services.kms.AWSKMSClient',
|
|
|
|
'com.amazonaws.services.kms.model.DecryptRequest',
|
|
|
|
'com.amazonaws.services.kms.model.DecryptResult',
|
|
|
|
'com.amazonaws.services.kms.model.EncryptRequest',
|
|
|
|
'com.amazonaws.services.kms.model.EncryptResult',
|
|
|
|
'com.amazonaws.services.kms.model.GenerateDataKeyRequest',
|
|
|
|
'com.amazonaws.services.kms.model.GenerateDataKeyResult'
|
2019-01-07 10:24:19 -05:00
|
|
|
)
|
Upgrade AWS SDK to 1.10.69
* Moving from JSON.org to Jackson for request marshallers.
* The Java SDK now supports retry throttling to limit the rate of retries during periods of reduced availability. This throttling behavior can be enabled via ClientConfiguration or via the system property "-Dcom.amazonaws.sdk.enableThrottledRetry".
* Fixed String case conversion issues when running with non English locales.
* AWS SDK for Java introduces a new dynamic endpoint system that can compute endpoints for services in new regions.
* Introducing a new AWS region, ap-northeast-2.
* Added a new metric, HttpSocketReadTime, that records socket read latency. You can enable this metric by adding enableHttpSocketReadMetric to the system property com.amazonaws.sdk.enableDefaultMetrics. For more information, see [Enabling Metrics with the AWS SDK for Java](https://java.awsblog.com/post/Tx3C0RV4NRRBKTG/Enabling-Metrics-with-the-AWS-SDK-for-Java).
* New Client Execution timeout feature to set a limit spent across retries, backoffs, ummarshalling, etc. This new timeout can be specified at the client level or per request.
Also included in this release is the ability to specify the existing HTTP Request timeout per request rather than just per client.
* Added support for RequesterPays for all operations.
* Ignore the 'Connection' header when generating S3 responses.
* Allow users to generate an AmazonS3URI from a string without using URL encoding.
* Fixed issue that prevented creating buckets when using a client configured for the s3-external-1 endpoint.
* Amazon S3 bucket lifecycle configuration supports two new features: the removal of expired object delete markers and an action to abort incomplete multipart uploads.
* Allow TransferManagerConfiguration to accept integer values for multipart upload threshold.
* Copy the list of ETags before sorting https://github.com/aws/aws-sdk-java/pull/589.
* Option to disable chunked encoding https://github.com/aws/aws-sdk-java/pull/586.
* Adding retry on InternalErrors in CompleteMultipartUpload operation. https://github.com/aws/aws-sdk-java/issues/538
* Deprecated two APIs : AmazonS3#changeObjectStorageClass and AmazonS3#setObjectRedirectLocation.
* Added support for the aws-exec-read canned ACL. Owner gets FULL_CONTROL. Amazon EC2 gets READ access to GET an Amazon Machine Image (AMI) bundle from Amazon S3.
* Added support for referencing security groups in peered Virtual Private Clouds (VPCs). For more information see the service announcement at https://aws.amazon.com/about-aws/whats-new/2016/03/announcing-support-for-security-group-references-in-a-peered-vpc/ .
* Fixed a bug in AWS SDK for Java - Amazon EC2 module that returns NPE for dry run requests.
* Regenerated client with new implementation of code generator.
* This feature enables support for DNS resolution of public hostnames to private IP addresses when queried over ClassicLink. Additionally, you can now access private hosted zones associated with your VPC from a linked EC2-Classic instance. ClassicLink DNS support makes it easier for EC2-Classic instances to communicate with VPC resources using public DNS hostnames.
* You can now use Network Address Translation (NAT) Gateway, a highly available AWS managed service that makes it easy to connect to the Internet from instances within a private subnet in an AWS Virtual Private Cloud (VPC). Previously, you needed to launch a NAT instance to enable NAT for instances in a private subnet. Amazon VPC NAT Gateway is available in the US East (N. Virginia), US West (Oregon), US West (N. California), EU (Ireland), Asia Pacific (Tokyo), Asia Pacific (Singapore), and Asia Pacific (Sydney) regions. To learn more about Amazon VPC NAT, see [New - Managed NAT (Network Address Translation) Gateway for AWS](https://aws.amazon.com/blogs/aws/new-managed-nat-network-address-translation-gateway-for-aws/)
* A default read timeout is now applied when querying data from EC2 metadata service.
2016-04-15 05:51:47 -04:00
|
|
|
|
2017-07-27 10:14:04 -04:00
|
|
|
// jarhell with jdk (intentionally, because jaxb was removed from default modules in java 9)
|
2020-03-23 18:30:10 -04:00
|
|
|
if (BuildParams.runtimeJavaVersion <= JavaVersion.VERSION_1_8) {
|
|
|
|
thirdPartyAudit.ignoreJarHellWithJDK(
|
|
|
|
'javax.xml.bind.Binder',
|
|
|
|
'javax.xml.bind.ContextFinder$1',
|
|
|
|
'javax.xml.bind.ContextFinder',
|
|
|
|
'javax.xml.bind.DataBindingException',
|
|
|
|
'javax.xml.bind.DatatypeConverter',
|
|
|
|
'javax.xml.bind.DatatypeConverterImpl$CalendarFormatter',
|
|
|
|
'javax.xml.bind.DatatypeConverterImpl',
|
|
|
|
'javax.xml.bind.DatatypeConverterInterface',
|
|
|
|
'javax.xml.bind.Element',
|
|
|
|
'javax.xml.bind.GetPropertyAction',
|
|
|
|
'javax.xml.bind.JAXB$Cache',
|
|
|
|
'javax.xml.bind.JAXB',
|
|
|
|
'javax.xml.bind.JAXBContext',
|
|
|
|
'javax.xml.bind.JAXBElement$GlobalScope',
|
|
|
|
'javax.xml.bind.JAXBElement',
|
|
|
|
'javax.xml.bind.JAXBException',
|
|
|
|
'javax.xml.bind.JAXBIntrospector',
|
|
|
|
'javax.xml.bind.JAXBPermission',
|
|
|
|
'javax.xml.bind.MarshalException',
|
|
|
|
'javax.xml.bind.Marshaller$Listener',
|
|
|
|
'javax.xml.bind.Marshaller',
|
|
|
|
'javax.xml.bind.Messages',
|
|
|
|
'javax.xml.bind.NotIdentifiableEvent',
|
|
|
|
'javax.xml.bind.ParseConversionEvent',
|
|
|
|
'javax.xml.bind.PrintConversionEvent',
|
|
|
|
'javax.xml.bind.PropertyException',
|
|
|
|
'javax.xml.bind.SchemaOutputResolver',
|
|
|
|
'javax.xml.bind.TypeConstraintException',
|
|
|
|
'javax.xml.bind.UnmarshalException',
|
|
|
|
'javax.xml.bind.Unmarshaller$Listener',
|
|
|
|
'javax.xml.bind.Unmarshaller',
|
|
|
|
'javax.xml.bind.UnmarshallerHandler',
|
|
|
|
'javax.xml.bind.ValidationEvent',
|
|
|
|
'javax.xml.bind.ValidationEventHandler',
|
|
|
|
'javax.xml.bind.ValidationEventLocator',
|
|
|
|
'javax.xml.bind.ValidationException',
|
|
|
|
'javax.xml.bind.Validator',
|
|
|
|
'javax.xml.bind.WhiteSpaceProcessor',
|
|
|
|
'javax.xml.bind.annotation.DomHandler',
|
|
|
|
'javax.xml.bind.annotation.W3CDomHandler',
|
|
|
|
'javax.xml.bind.annotation.XmlAccessOrder',
|
|
|
|
'javax.xml.bind.annotation.XmlAccessType',
|
|
|
|
'javax.xml.bind.annotation.XmlAccessorOrder',
|
|
|
|
'javax.xml.bind.annotation.XmlAccessorType',
|
|
|
|
'javax.xml.bind.annotation.XmlAnyAttribute',
|
|
|
|
'javax.xml.bind.annotation.XmlAnyElement',
|
|
|
|
'javax.xml.bind.annotation.XmlAttachmentRef',
|
|
|
|
'javax.xml.bind.annotation.XmlAttribute',
|
|
|
|
'javax.xml.bind.annotation.XmlElement$DEFAULT',
|
|
|
|
'javax.xml.bind.annotation.XmlElement',
|
|
|
|
'javax.xml.bind.annotation.XmlElementDecl$GLOBAL',
|
|
|
|
'javax.xml.bind.annotation.XmlElementDecl',
|
|
|
|
'javax.xml.bind.annotation.XmlElementRef$DEFAULT',
|
|
|
|
'javax.xml.bind.annotation.XmlElementRef',
|
|
|
|
'javax.xml.bind.annotation.XmlElementRefs',
|
|
|
|
'javax.xml.bind.annotation.XmlElementWrapper',
|
|
|
|
'javax.xml.bind.annotation.XmlElements',
|
|
|
|
'javax.xml.bind.annotation.XmlEnum',
|
|
|
|
'javax.xml.bind.annotation.XmlEnumValue',
|
|
|
|
'javax.xml.bind.annotation.XmlID',
|
|
|
|
'javax.xml.bind.annotation.XmlIDREF',
|
|
|
|
'javax.xml.bind.annotation.XmlInlineBinaryData',
|
|
|
|
'javax.xml.bind.annotation.XmlList',
|
|
|
|
'javax.xml.bind.annotation.XmlMimeType',
|
|
|
|
'javax.xml.bind.annotation.XmlMixed',
|
|
|
|
'javax.xml.bind.annotation.XmlNs',
|
|
|
|
'javax.xml.bind.annotation.XmlNsForm',
|
|
|
|
'javax.xml.bind.annotation.XmlRegistry',
|
|
|
|
'javax.xml.bind.annotation.XmlRootElement',
|
|
|
|
'javax.xml.bind.annotation.XmlSchema',
|
|
|
|
'javax.xml.bind.annotation.XmlSchemaType$DEFAULT',
|
|
|
|
'javax.xml.bind.annotation.XmlSchemaType',
|
|
|
|
'javax.xml.bind.annotation.XmlSchemaTypes',
|
|
|
|
'javax.xml.bind.annotation.XmlSeeAlso',
|
|
|
|
'javax.xml.bind.annotation.XmlTransient',
|
|
|
|
'javax.xml.bind.annotation.XmlType$DEFAULT',
|
|
|
|
'javax.xml.bind.annotation.XmlType',
|
|
|
|
'javax.xml.bind.annotation.XmlValue',
|
|
|
|
'javax.xml.bind.annotation.adapters.CollapsedStringAdapter',
|
|
|
|
'javax.xml.bind.annotation.adapters.HexBinaryAdapter',
|
|
|
|
'javax.xml.bind.annotation.adapters.NormalizedStringAdapter',
|
|
|
|
'javax.xml.bind.annotation.adapters.XmlAdapter',
|
|
|
|
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter$DEFAULT',
|
|
|
|
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter',
|
|
|
|
'javax.xml.bind.annotation.adapters.XmlJavaTypeAdapters',
|
|
|
|
'javax.xml.bind.attachment.AttachmentMarshaller',
|
|
|
|
'javax.xml.bind.attachment.AttachmentUnmarshaller',
|
|
|
|
'javax.xml.bind.helpers.AbstractMarshallerImpl',
|
|
|
|
'javax.xml.bind.helpers.AbstractUnmarshallerImpl',
|
|
|
|
'javax.xml.bind.helpers.DefaultValidationEventHandler',
|
|
|
|
'javax.xml.bind.helpers.Messages',
|
|
|
|
'javax.xml.bind.helpers.NotIdentifiableEventImpl',
|
|
|
|
'javax.xml.bind.helpers.ParseConversionEventImpl',
|
|
|
|
'javax.xml.bind.helpers.PrintConversionEventImpl',
|
|
|
|
'javax.xml.bind.helpers.ValidationEventImpl',
|
|
|
|
'javax.xml.bind.helpers.ValidationEventLocatorImpl',
|
|
|
|
'javax.xml.bind.util.JAXBResult',
|
|
|
|
'javax.xml.bind.util.JAXBSource$1',
|
|
|
|
'javax.xml.bind.util.JAXBSource',
|
|
|
|
'javax.xml.bind.util.Messages',
|
|
|
|
'javax.xml.bind.util.ValidationEventCollector'
|
|
|
|
)
|
|
|
|
} else {
|
|
|
|
thirdPartyAudit.ignoreMissingClasses 'javax.activation.DataHandler'
|
2017-07-27 10:14:04 -04:00
|
|
|
}
|