diff --git a/data-prepper-plugins/aws-common/build.gradle b/data-prepper-plugins/aws-common/build.gradle deleted file mode 100644 index 66fee25970..0000000000 --- a/data-prepper-plugins/aws-common/build.gradle +++ /dev/null @@ -1,32 +0,0 @@ -dependencies { - implementation project(':data-prepper-api') - implementation project(':data-prepper-plugins:aws-plugin-api') - implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'io.micrometer:micrometer-core' - implementation 'software.amazon.awssdk:auth' - implementation 'software.amazon.awssdk:secretsmanager' - implementation 'software.amazon.awssdk:sts' - implementation 'software.amazon.awssdk:arns' - implementation 'org.hibernate.validator:hibernate-validator:8.0.2.Final' - testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' - testImplementation project(':data-prepper-test:test-common') -} - -test { - useJUnitPlatform() -} - -jacocoTestCoverageVerification { - dependsOn jacocoTestReport - violationRules { - rule { - limit { - minimum = 1.0 - } - } - } -} - -check.dependsOn jacocoTestCoverageVerification - diff --git a/data-prepper-plugins/aws-plugin/build.gradle b/data-prepper-plugins/aws-plugin/build.gradle index 39a265031c..6d748b615b 100644 --- a/data-prepper-plugins/aws-plugin/build.gradle +++ b/data-prepper-plugins/aws-plugin/build.gradle @@ -1,7 +1,6 @@ dependencies { implementation project(':data-prepper-api') implementation project(':data-prepper-plugins:aws-plugin-api') - implementation project(':data-prepper-plugins:aws-common') implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'io.micrometer:micrometer-core' implementation 'software.amazon.awssdk:auth' diff --git a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/AwsExtensionProvider.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsExtensionProvider.java similarity index 74% rename from data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/AwsExtensionProvider.java rename to data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsExtensionProvider.java index e8a4d7020b..efe04a0a90 100644 --- a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/AwsExtensionProvider.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsExtensionProvider.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.opensearch.dataprepper.aws.api.AwsCredentialsSupplier; import org.opensearch.dataprepper.model.plugin.ExtensionProvider; import java.util.Optional; -public class AwsExtensionProvider implements ExtensionProvider { +class AwsExtensionProvider implements ExtensionProvider { private final AwsCredentialsSupplier awsCredentialsSupplier; - public AwsExtensionProvider(final AwsCredentialsSupplier awsCredentialsSupplier) { + AwsExtensionProvider(final AwsCredentialsSupplier awsCredentialsSupplier) { this.awsCredentialsSupplier = awsCredentialsSupplier; } diff --git a/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPlugin.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPlugin.java index 243d9c2766..44d2d22931 100644 --- a/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPlugin.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPlugin.java @@ -9,10 +9,6 @@ import org.opensearch.dataprepper.model.annotations.DataPrepperPluginConstructor; import org.opensearch.dataprepper.model.plugin.ExtensionPlugin; import org.opensearch.dataprepper.model.plugin.ExtensionPoints; -import org.opensearch.dataprepper.aws.common.AwsStsConfiguration; -import org.opensearch.dataprepper.aws.common.CredentialsProviderFactory; -import org.opensearch.dataprepper.aws.common.CredentialsCache; -import org.opensearch.dataprepper.aws.common.AwsExtensionProvider; /** * The {@link ExtensionPlugin} class which adds the AWS Plugin to diff --git a/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPluginConfig.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPluginConfig.java index 9a12f54c1a..3ca5fce020 100644 --- a/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPluginConfig.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsPluginConfig.java @@ -6,7 +6,6 @@ package org.opensearch.dataprepper.plugins.aws; import com.fasterxml.jackson.annotation.JsonProperty; -import org.opensearch.dataprepper.aws.common.AwsStsConfiguration; public class AwsPluginConfig { diff --git a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/AwsStsConfiguration.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsStsConfiguration.java similarity index 93% rename from data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/AwsStsConfiguration.java rename to data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsStsConfiguration.java index 4509fe41b6..ee22244fa7 100644 --- a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/AwsStsConfiguration.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/AwsStsConfiguration.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.Size; diff --git a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsCache.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsCache.java similarity index 72% rename from data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsCache.java rename to data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsCache.java index bb4664c945..34aa534c77 100644 --- a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsCache.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsCache.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.opensearch.dataprepper.aws.api.AwsCredentialsOptions; import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; @@ -12,14 +12,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -public class CredentialsCache { +class CredentialsCache { private final Map credentialsProviderMap; - public CredentialsCache() { + CredentialsCache() { credentialsProviderMap = new ConcurrentHashMap<>(); } - public AwsCredentialsProvider getOrCreate(final AwsCredentialsOptions awsCredentialsOptions, final Supplier providerSupplier) { + AwsCredentialsProvider getOrCreate(final AwsCredentialsOptions awsCredentialsOptions, final Supplier providerSupplier) { final CredentialsIdentifier identifier = CredentialsIdentifier.fromAwsCredentialsOption(awsCredentialsOptions); return credentialsProviderMap.computeIfAbsent(identifier, i -> providerSupplier.get()); diff --git a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsIdentifier.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsIdentifier.java similarity index 89% rename from data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsIdentifier.java rename to data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsIdentifier.java index c7b14c8d18..42e36b7500 100644 --- a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsIdentifier.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsIdentifier.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.opensearch.dataprepper.aws.api.AwsCredentialsOptions; import software.amazon.awssdk.regions.Region; @@ -12,16 +12,16 @@ import java.util.Objects; /** - * Class to identify credentials. This is a distinct class from + * Internal class to identify credentials. This is a distinct class from * {@link AwsCredentialsOptions} in order to ensure that the internal caching * is distinct from the external model. */ -public class CredentialsIdentifier { +class CredentialsIdentifier { private final String stsRoleArn; private final Region region; private final Map stsHeaderOverrides; - public CredentialsIdentifier( + private CredentialsIdentifier( final String stsRoleArn, final Region region, final Map stsHeaderOverrides) { diff --git a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsProviderFactory.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsProviderFactory.java similarity index 95% rename from data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsProviderFactory.java rename to data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsProviderFactory.java index 04da772c05..3084f92ae8 100644 --- a/data-prepper-plugins/aws-common/src/main/java/org/opensearch/dataprepper/aws/common/CredentialsProviderFactory.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/CredentialsProviderFactory.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.opensearch.dataprepper.aws.api.AwsCredentialsOptions; import org.slf4j.Logger; @@ -28,7 +28,7 @@ import java.util.Optional; import java.util.UUID; -public class CredentialsProviderFactory { +class CredentialsProviderFactory { private static final Logger LOG = LoggerFactory.getLogger(CredentialsProviderFactory.class); private static final String AWS_IAM = "iam"; private static final String AWS_IAM_ROLE = "role"; @@ -43,15 +43,15 @@ public CredentialsProviderFactory(final AwsStsConfiguration defaultStsConfigurat this.defaultStsConfiguration = defaultStsConfiguration; } - public Region getDefaultRegion() { + Region getDefaultRegion() { return defaultStsConfiguration.getAwsRegion(); } - public String getDefaultStsRoleArn() { + String getDefaultStsRoleArn() { return defaultStsConfiguration.getAwsStsRoleArn(); } - public AwsCredentialsProvider providerFromOptions(final AwsCredentialsOptions credentialsOptions) { + AwsCredentialsProvider providerFromOptions(final AwsCredentialsOptions credentialsOptions) { Objects.requireNonNull(credentialsOptions); if (credentialsOptions.isUseDefaultCredentialsProvider()) { diff --git a/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplier.java b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplier.java index 4425160677..00bdb70670 100644 --- a/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplier.java +++ b/data-prepper-plugins/aws-plugin/src/main/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplier.java @@ -10,9 +10,6 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.regions.Region; -import org.opensearch.dataprepper.aws.common.CredentialsProviderFactory; -import org.opensearch.dataprepper.aws.common.CredentialsCache; - import java.util.Optional; class DefaultAwsCredentialsSupplier implements AwsCredentialsSupplier { diff --git a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/AwsExtensionProviderTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsExtensionProviderTest.java similarity index 97% rename from data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/AwsExtensionProviderTest.java rename to data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsExtensionProviderTest.java index cf88939a3a..e3925c0507 100644 --- a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/AwsExtensionProviderTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsExtensionProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -50,4 +50,4 @@ void provideInstance_returns_the_AwsCredentialsSupplier_from_the_constructor() { assertThat(anotherOptionalCredentialsSupplier.isPresent(), equalTo(true)); assertThat(anotherOptionalCredentialsSupplier.get(), sameInstance(optionalCredentialsSupplier.get())); } -} +} \ No newline at end of file diff --git a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginIT.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginIT.java index 655903a7c3..d2daa7545e 100644 --- a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginIT.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginIT.java @@ -20,8 +20,6 @@ import software.amazon.awssdk.regions.Region; import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider; -import org.opensearch.dataprepper.aws.common.AwsStsConfiguration; - import java.util.Optional; import java.util.UUID; diff --git a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginTest.java index 4d49b40b6c..2bbaf3740f 100644 --- a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsPluginTest.java @@ -12,8 +12,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.opensearch.dataprepper.model.plugin.ExtensionPoints; import org.opensearch.dataprepper.model.plugin.ExtensionProvider; -import org.opensearch.dataprepper.aws.common.AwsStsConfiguration; -import org.opensearch.dataprepper.aws.common.AwsExtensionProvider; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; @@ -64,4 +62,4 @@ void null_aws_plugin_config_applies_extensions_correctly() { assertThat(actualExtensionProvider, instanceOf(AwsExtensionProvider.class)); } -} +} \ No newline at end of file diff --git a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/AwsStsConfigurationTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsStsConfigurationTest.java similarity index 67% rename from data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/AwsStsConfigurationTest.java rename to data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsStsConfigurationTest.java index 43583851f1..f44e4dd932 100644 --- a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/AwsStsConfigurationTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/AwsStsConfigurationTest.java @@ -3,11 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import software.amazon.awssdk.regions.Region; @@ -22,15 +21,6 @@ public class AwsStsConfigurationTest { private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - @Test - void testStsConfigurationWithNullRegion() throws JsonProcessingException { - final String defaultConfigurationAsString = "{\"sts_role_arn\": \"arn:aws:iam::123456789012:role/test-role\"}"; - final AwsStsConfiguration objectUnderTest = OBJECT_MAPPER.readValue(defaultConfigurationAsString, AwsStsConfiguration.class); - assertThat(objectUnderTest, notNullValue()); - assertThat(objectUnderTest.getAwsStsRoleArn(), equalTo("arn:aws:iam::123456789012:role/test-role")); - assertThat(objectUnderTest.getAwsRegion(), equalTo(null)); - } - @ParameterizedTest @MethodSource("getRegions") void testStsConfiguration(final Region region) throws JsonProcessingException { diff --git a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsCacheTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsCacheTest.java similarity index 98% rename from data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsCacheTest.java rename to data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsCacheTest.java index 1ef772d584..ab1dd51bbc 100644 --- a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsCacheTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsCacheTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -79,4 +79,4 @@ void getOrCreate_returns_value_from_supplier_as_expected_with_multiple_objects() verify(existingCredentialsProviderSupplier).get(); verify(credentialsProviderSupplier).get(); } -} +} \ No newline at end of file diff --git a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsIdentifierTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsIdentifierTest.java similarity index 99% rename from data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsIdentifierTest.java rename to data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsIdentifierTest.java index 202ae6f282..ca0c32d4ae 100644 --- a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsIdentifierTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsIdentifierTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -168,4 +168,4 @@ void equals_hashCode_on_non_equal_StsHeaderOverrides() { assertThat(objectUnderTest.equals(other), equalTo(false)); assertThat(objectUnderTest.hashCode(), not(equalTo(other.hashCode()))); } -} +} \ No newline at end of file diff --git a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsProviderFactoryTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsProviderFactoryTest.java similarity index 84% rename from data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsProviderFactoryTest.java rename to data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsProviderFactoryTest.java index f7837be6a3..c53b266535 100644 --- a/data-prepper-plugins/aws-common/src/test/java/org/opensearch/dataprepper/aws/common/CredentialsProviderFactoryTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/CredentialsProviderFactoryTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.opensearch.dataprepper.aws.common; +package org.opensearch.dataprepper.plugins.aws; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -85,7 +85,6 @@ void providerFromOptions_without_StsRoleArn_returns_DefaultCredentialsProvider() "arn:aws:notiam::123456789012:role/TestRole", "arn:aws:iam::123456789012:notrole/TestRole", "arn:aws:iam::123456789012:/", - "arn:aws:iam::123456789012:/dsf", "arn:aws:iam::123456789012:" }) void providerFromOptions_with_invalid_StsRoleArn_throws(final String stsRoleArn) { @@ -105,47 +104,6 @@ void providerFromOptions_with_StsRoleArn() { assertThat(awsCredentialsProvider, instanceOf(StsAssumeRoleCredentialsProvider.class)); } - @Test - void providerFromOptions_with_null_StsRoleArn() { - when(awsCredentialsOptions.getStsRoleArn()) - .thenReturn(null); - final AwsCredentialsProvider awsCredentialsProvider = createObjectUnderTest().providerFromOptions(awsCredentialsOptions); - assertThat(awsCredentialsProvider, instanceOf(DefaultCredentialsProvider.class)); - } - - @Test - void providerFromOptions_with_useDefaultCredentials() { - when(awsCredentialsOptions.isUseDefaultCredentialsProvider()) - .thenReturn(true); - final AwsCredentialsProvider awsCredentialsProvider = createObjectUnderTest().providerFromOptions(awsCredentialsOptions); - assertThat(awsCredentialsProvider, instanceOf(DefaultCredentialsProvider.class)); - } - - @Test - void providerFromOptions_with_null_StsConfig() { - when(awsCredentialsOptions.isUseDefaultCredentialsProvider()) - .thenReturn(false); - when(awsCredentialsOptions.getStsRoleArn()) - .thenReturn(null); - when(defaultStsConfiguration.getAwsStsRoleArn()).thenReturn(null); - final AwsCredentialsProvider awsCredentialsProvider = createObjectUnderTest().providerFromOptions(awsCredentialsOptions); - assertThat(awsCredentialsProvider, instanceOf(DefaultCredentialsProvider.class)); - } - - @Test - void providerFromOptions_with_defaultStsRoleArn() { - when(awsCredentialsOptions.getRegion()) - .thenReturn(Region.US_EAST_1); - when(awsCredentialsOptions.isUseDefaultCredentialsProvider()) - .thenReturn(false); - when(awsCredentialsOptions.getStsRoleArn()) - .thenReturn(null); - when(defaultStsConfiguration.getAwsStsRoleArn()).thenReturn(createStsRole()); - final AwsCredentialsProvider awsCredentialsProvider = createObjectUnderTest().providerFromOptions(awsCredentialsOptions); - assertThat(awsCredentialsProvider, instanceOf(StsAssumeRoleCredentialsProvider.class)); - } - - @ParameterizedTest @MethodSource("getRegions") void getDefaultRegion_returns_expected_region(final Region region) { @@ -330,38 +288,6 @@ void providerFromOptions_should_not_override_STS_Headers_when_HeaderOverrides_ar assertThat(actualAssumeRoleRequest.overrideConfiguration().isPresent(), equalTo(false)); } - - @Test - void providerFromOptions_should_not_override_STS_Headers_when_HeaderOverrides_is_null() { - when(awsCredentialsOptions.getRegion()).thenReturn(Region.US_EAST_1); - when(awsCredentialsOptions.getStsRoleArn()).thenReturn(testStsRole); - when(awsCredentialsOptions.getStsHeaderOverrides()).thenReturn(null); - - when(stsClientBuilder.region(Region.US_EAST_1)).thenReturn(stsClientBuilder); - - final CredentialsProviderFactory objectUnderTest = createObjectUnderTest(); - final AwsCredentialsProvider actualCredentialsProvider; - - try (final MockedStatic stsClientMockedStatic = mockStatic(StsClient.class); - final MockedStatic credentialsProviderMockedStatic = mockStatic(StsAssumeRoleCredentialsProvider.class)) { - stsClientMockedStatic.when(StsClient::builder).thenReturn(stsClientBuilder); - credentialsProviderMockedStatic.when(StsAssumeRoleCredentialsProvider::builder).thenReturn(stsCredentialsProviderBuilder); - actualCredentialsProvider = objectUnderTest.providerFromOptions(awsCredentialsOptions); - } - - assertThat(actualCredentialsProvider, instanceOf(StsAssumeRoleCredentialsProvider.class)); - - final ArgumentCaptor assumeRoleRequestArgumentCaptor = ArgumentCaptor.forClass(AssumeRoleRequest.class); - verify(stsCredentialsProviderBuilder).refreshRequest(assumeRoleRequestArgumentCaptor.capture()); - - final AssumeRoleRequest actualAssumeRoleRequest = assumeRoleRequestArgumentCaptor.getValue(); - assertThat(actualAssumeRoleRequest.roleArn(), equalTo(testStsRole)); - assertThat(actualAssumeRoleRequest.roleSessionName(), startsWith("Data-Prepper-")); - assertThat(actualAssumeRoleRequest.roleSessionName().length(), lessThanOrEqualTo(MAXIMUM_ROLE_SESSION_LENGTH)); - assertThat(actualAssumeRoleRequest.overrideConfiguration(), notNullValue()); - assertThat(actualAssumeRoleRequest.overrideConfiguration().isPresent(), equalTo(false)); - } - @Test void providerFromOptions_should_not_set_externalId_when_externalId_is_null() { when(awsCredentialsOptions.getRegion()).thenReturn(Region.US_EAST_1); @@ -469,4 +395,4 @@ void providerFromOptions_should_create_StsClient_with_correct_backoff(final Stri private String createStsRole() { return String.format("arn:aws:iam::123456789012:role/%s", UUID.randomUUID()); } -} +} \ No newline at end of file diff --git a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplierTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplierTest.java index b057667a0b..6f9298cfe5 100644 --- a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplierTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/DefaultAwsCredentialsSupplierTest.java @@ -17,9 +17,6 @@ import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; import software.amazon.awssdk.regions.Region; -import org.opensearch.dataprepper.aws.common.CredentialsProviderFactory; -import org.opensearch.dataprepper.aws.common.CredentialsCache; - import java.util.List; import java.util.Optional; import java.util.function.Supplier; @@ -109,4 +106,4 @@ void no_default_sts_role_arn_returns_empty_optional() { private static List getRegions() { return Region.regions(); } -} +} \ No newline at end of file diff --git a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/SecretValueDecoderTest.java b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/SecretValueDecoderTest.java index fdcad36546..c12626a997 100644 --- a/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/SecretValueDecoderTest.java +++ b/data-prepper-plugins/aws-plugin/src/test/java/org/opensearch/dataprepper/plugins/aws/SecretValueDecoderTest.java @@ -38,4 +38,4 @@ void testDecodeSecretBinary() { when(getSecretValueResponse.secretBinary()).thenReturn(SdkBytes.fromUtf8String(testSecret)); assertThat(objectUnderTest.decode(getSecretValueResponse), equalTo(testSecret)); } -} +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 5a4ced2a26..d7dfc2b90a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -165,7 +165,6 @@ include 'data-prepper-plugins:user-agent-processor' include 'data-prepper-plugins:in-memory-source-coordination-store' include 'data-prepper-plugins:aws-plugin-api' include 'data-prepper-plugins:aws-plugin' -include 'data-prepper-plugins:aws-common' include 'data-prepper-plugins:obfuscate-processor' include 'data-prepper-plugins:parquet-codecs' include 'data-prepper-plugins:aws-sqs-common'