forked from opensearch-project/data-prepper
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Incorporated review comments changes for opensearch-project#1985, ope…
…nsearch-project#2264 Signed-off-by: rajeshLovesToCode <[email protected]>
- Loading branch information
1 parent
f7abe8e
commit 1c35ca2
Showing
25 changed files
with
759 additions
and
163 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 0 additions & 60 deletions
60
...g/opensearch/dataprepper/plugins/source/configuration/AwsAuthenticationConfiguration.java
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
...opensearch/dataprepper/plugins/source/configuration/SchedulingParameterConfiguration.java
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
...in/java/org/opensearch/dataprepper/plugins/source/configuration/SortingConfiguration.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...h/dataprepper/plugins/source/opensearch/configuration/AwsAuthenticationConfiguration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.dataprepper.plugins.source.opensearch.configuration; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import jakarta.validation.constraints.Size; | ||
| import software.amazon.awssdk.arns.Arn; | ||
| import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider; | ||
| import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider; | ||
| import software.amazon.awssdk.regions.Region; | ||
| import software.amazon.awssdk.services.sts.StsClient; | ||
| import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider; | ||
| import software.amazon.awssdk.services.sts.model.AssumeRoleRequest; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| public class AwsAuthenticationConfiguration { | ||
| private static final String AWS_IAM_ROLE = "role"; | ||
| private static final String AWS_IAM = "iam"; | ||
|
|
||
| @JsonProperty("region") | ||
| @Size(min = 1, message = "Region cannot be empty string") | ||
| private String awsRegion; | ||
|
|
||
| @JsonProperty("sts_role_arn") | ||
| @Size(min = 20, max = 2048, message = "awsStsRoleArn length should be between 1 and 2048 characters") | ||
| private String awsStsRoleArn; | ||
|
|
||
| @JsonProperty("sts_header_overrides") | ||
| @Size(max = 5, message = "sts_header_overrides supports a maximum of 5 headers to override") | ||
| private Map<String, String> awsStsHeaderOverrides; | ||
|
|
||
| private void validateStsRoleArn() { | ||
| final Arn arn = getArn(); | ||
| if (!AWS_IAM.equals(arn.service())) { | ||
| throw new IllegalArgumentException("sts_role_arn must be an IAM Role"); | ||
| } | ||
| final Optional<String> resourceType = arn.resource().resourceType(); | ||
| if (resourceType.isEmpty() || !resourceType.get().equals(AWS_IAM_ROLE)) { | ||
| throw new IllegalArgumentException("sts_role_arn must be an IAM Role"); | ||
| } | ||
| } | ||
|
|
||
| private Arn getArn() { | ||
| try { | ||
| return Arn.fromString(awsStsRoleArn); | ||
| } catch (final Exception e) { | ||
| throw new IllegalArgumentException(String.format("Invalid ARN format for awsStsRoleArn. Check the format of %s", awsStsRoleArn)); | ||
| } | ||
| } | ||
|
|
||
| public String getAwsStsRoleArn() { | ||
| return awsStsRoleArn; | ||
| } | ||
|
|
||
| public Region getAwsRegion() { | ||
| return awsRegion != null ? Region.of(awsRegion) : null; | ||
| } | ||
|
|
||
| public AwsCredentialsProvider authenticateAwsConfiguration() { | ||
|
|
||
| final AwsCredentialsProvider awsCredentialsProvider; | ||
| if (awsStsRoleArn != null && !awsStsRoleArn.isEmpty()) { | ||
|
|
||
| validateStsRoleArn(); | ||
|
|
||
| final StsClient stsClient = StsClient.builder() | ||
| .region(getAwsRegion()) | ||
| .build(); | ||
|
|
||
| AssumeRoleRequest.Builder assumeRoleRequestBuilder = AssumeRoleRequest.builder() | ||
| .roleSessionName("S3-Source-" + UUID.randomUUID()) | ||
| .roleArn(awsStsRoleArn); | ||
| if(awsStsHeaderOverrides != null && !awsStsHeaderOverrides.isEmpty()) { | ||
| assumeRoleRequestBuilder = assumeRoleRequestBuilder | ||
| .overrideConfiguration(configuration -> awsStsHeaderOverrides.forEach(configuration::putHeader)); | ||
| } | ||
|
|
||
| awsCredentialsProvider = StsAssumeRoleCredentialsProvider.builder() | ||
| .stsClient(stsClient) | ||
| .refreshRequest(assumeRoleRequestBuilder.build()) | ||
| .build(); | ||
|
|
||
| } else { | ||
| // use default credential provider | ||
| awsCredentialsProvider = DefaultCredentialsProvider.create(); | ||
| } | ||
|
|
||
| return awsCredentialsProvider; | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.