Skip to content

Added ACM for SLL and Discovery Mode Configurations #1645

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

Merged
asifsmohammed merged 2 commits into from
Aug 9, 2022
Merged

Added ACM for SLL and Discovery Mode Configurations #1645

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
862ccdb
Added ACM for SLL and Discovery Mode Configurations
asifsmohammed Aug 8, 2022
165201a
Addressed feedback to update test class names
asifsmohammed Aug 9, 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
4 changes: 4 additions & 0 deletions data-prepper-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ dependencies {
}
implementation 'software.amazon.cloudwatchlogs:aws-embedded-metrics:2.0.0-beta-1'
testImplementation 'org.springframework:spring-test:5.3.22'
implementation "com.linecorp.armeria:armeria:${versionMap.armeria}"
implementation 'commons-validator:commons-validator:1.7'
implementation 'software.amazon.awssdk:servicediscovery'
testImplementation "org.mockito:mockito-inline:${versionMap.mockito}"
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
}

jar {
Expand Down
137 changes: 134 additions & 3 deletions ...r-core/src/main/java/com/amazon/dataprepper/peerforwarder/PeerForwarderConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;

/**
* Class to hold configuration for Core Peer Forwarder in {@link com.amazon.dataprepper.parser.model.DataPrepperConfiguration},
Expand All @@ -26,7 +30,15 @@ public class PeerForwarderConfiguration {
private boolean ssl = true;
private String sslCertificateFile;
private String sslKeyFile;
private boolean useAcmCertificateForSsl = false;
private String acmCertificateArn;
private DiscoveryMode discoveryMode = DiscoveryMode.STATIC;
private String awsCloudMapNamespaceName;
private String awsCloudMapServiceName;
private String awsRegion;
private Map<String, String> awsCloudMapQueryParameters = Collections.emptyMap();
private String domainName;
private List<String> staticEndpoints = new ArrayList<>();
private Integer batchSize = 48;
private Integer bufferSize = 512;

Expand All @@ -42,7 +54,15 @@ public PeerForwarderConfiguration (
@JsonProperty("ssl") final Boolean ssl,
@JsonProperty("ssl_certificate_file") final String sslCertificateFile,
@JsonProperty("ssl_key_file") final String sslKeyFile,
@JsonProperty("use_acm_certificate_for_ssl") final Boolean useAcmCertificateForSsl,
@JsonProperty("acm_certificate_arn") final String acmCertificateArn,
@JsonProperty("discovery_mode") final String discoveryMode,
@JsonProperty("aws_cloud_map_namespace_name") final String awsCloudMapNamespaceName,
@JsonProperty("aws_cloud_map_service_name") final String awsCloudMapServiceName,
@JsonProperty("aws_region") final String awsRegion,
@JsonProperty("aws_cloud_map_query_parameters") final Map<String, String> awsCloudMapQueryParameters,
@JsonProperty("domain_name") final String domainName,
@JsonProperty("static_endpoints") final List<String> staticEndpoints,
@JsonProperty("batch_size") final Integer batchSize,
@JsonProperty("buffer_size") final Integer bufferSize
) {
Expand All @@ -52,9 +72,17 @@ public PeerForwarderConfiguration (
setMaxConnectionCount(maxConnectionCount);
setMaxPendingRequests(maxPendingRequests);
setSsl(ssl);
setDiscoveryMode(discoveryMode);
setSslCertificateFile(sslCertificateFile);
setSslKeyFile(sslKeyFile);
setUseAcmCertificateForSsl(useAcmCertificateForSsl);
setAcmCertificateArn(acmCertificateArn);
setDiscoveryMode(discoveryMode);
setAwsCloudMapNamespaceName(awsCloudMapNamespaceName);
setAwsCloudMapServiceName(awsCloudMapServiceName);
setAwsRegion(awsRegion);
setAwsCloudMapQueryParameters(awsCloudMapQueryParameters);
setDomainName(domainName);
setStaticEndpoints(staticEndpoints);
setBatchSize(batchSize);
setBufferSize(bufferSize);
}
Expand Down Expand Up @@ -91,10 +119,42 @@ public String getSslKeyFile() {
return sslKeyFile;
}

public boolean isUseAcmCertificateForSsl() {
return useAcmCertificateForSsl;
}

public String getAcmCertificateArn() {
return acmCertificateArn;
}

public DiscoveryMode getDiscoveryMode() {
return discoveryMode;
}

public String getAwsCloudMapNamespaceName() {
return awsCloudMapNamespaceName;
}

public String getAwsCloudMapServiceName() {
return awsCloudMapServiceName;
}

public String getAwsRegion() {
return awsRegion;
}

public Map<String, String> getAwsCloudMapQueryParameters() {
return awsCloudMapQueryParameters;
}

public List<String> getStaticEndpoints() {
return staticEndpoints;
}

public String getDomainName() {
return domainName;
}

public int getBatchSize() {
return batchSize;
}
Expand Down Expand Up @@ -154,7 +214,7 @@ private void setSsl(final Boolean ssl) {
}
}

private void setSslCertificateFile(String sslCertificateFile) {
private void setSslCertificateFile(final String sslCertificateFile) {
if (!ssl || isValidFilePath(sslCertificateFile)) {
this.sslCertificateFile = sslCertificateFile;
}
Expand All @@ -163,7 +223,7 @@ private void setSslCertificateFile(String sslCertificateFile) {
}
}

private void setSslKeyFile(String sslKeyFile) {
private void setSslKeyFile(final String sslKeyFile) {
if (!ssl || isValidFilePath(sslKeyFile)) {
this.sslKeyFile = sslKeyFile;
}
Expand All @@ -172,12 +232,83 @@ private void setSslKeyFile(String sslKeyFile) {
}
}

private void setUseAcmCertificateForSsl(final Boolean useAcmCertificateForSsl) {
if (useAcmCertificateForSsl != null) {
this.useAcmCertificateForSsl = useAcmCertificateForSsl;
}
}

private void setAcmCertificateArn(final String acmCertificateArn) {
if (!useAcmCertificateForSsl || acmCertificateArn != null) {
this.acmCertificateArn = acmCertificateArn;
}
else {
throw new IllegalArgumentException("ACM certificate ARN cannot be empty if ACM certificate is ued for SSL.");
}
}

private void setDiscoveryMode(final String discoveryMode) {
if (discoveryMode != null) {
this.discoveryMode = DiscoveryMode.valueOf(discoveryMode.toUpperCase());
}
}

private void setAwsCloudMapNamespaceName(final String awsCloudMapNamespaceName) {
if (discoveryMode.equals(DiscoveryMode.AWS_CLOUD_MAP)) {
if (awsCloudMapNamespaceName != null) {
this.awsCloudMapNamespaceName = awsCloudMapNamespaceName;
}
else {
throw new IllegalArgumentException("Cloud Map namespace cannot be null if discover mode is AWS Cloud Map.");
}
}
}

private void setAwsCloudMapServiceName(final String awsCloudMapServiceName) {
if (discoveryMode.equals(DiscoveryMode.AWS_CLOUD_MAP)) {
if (awsCloudMapServiceName != null) {
this.awsCloudMapServiceName = awsCloudMapServiceName;
}
else {
throw new IllegalArgumentException("Cloud Map service name cannot be null if discover mode is AWS Cloud Map.");
}
}
}

private void setAwsRegion(final String awsRegion) {
if (discoveryMode.equals(DiscoveryMode.AWS_CLOUD_MAP) || useAcmCertificateForSsl) {
if (awsRegion != null) {
this.awsRegion = awsRegion;
}
else {
throw new IllegalArgumentException("AWS region cannot be null if discover mode is AWS Cloud Map or if ACM certificate for SLL is enabled.");
}
}
}

public void setAwsCloudMapQueryParameters(Map<String, String> awsCloudMapQueryParameters) {
if (awsCloudMapQueryParameters != null) {
this.awsCloudMapQueryParameters = awsCloudMapQueryParameters;
}
}

private void setDomainName(final String domainName) {
if (discoveryMode.equals(DiscoveryMode.DNS)) {
if (domainName != null) {
this.domainName = domainName;
}
else {
throw new IllegalArgumentException("Domain name cannot be null if discover mode is DNS.");
}
}
}

private void setStaticEndpoints(final List<String> staticEndpoints) {
if (staticEndpoints != null) {
this.staticEndpoints = staticEndpoints;
}
}

private void setBatchSize(final Integer batchSize) {
if (batchSize != null) {
if (batchSize <= 0) {
Expand Down
Loading