Skip to content

Pass sts header overrides to awscredentialssupplier in otlp sink #6157

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

Open
graytaylor0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Pass sts header overrides to awscredentialssupplier in otlp sink #6157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions .../main/java/org/opensearch/dataprepper/plugins/sink/otlp/configuration/OtlpSinkConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

import java.net.URI;
import java.util.Arrays;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -113,6 +114,14 @@ public String getStsExternalId() {
return awsConfig.getAwsStsExternalId();
}

public Map<String, String> getStsHeaderOverrides() {
if (awsConfig == null || awsConfig.getAwsStsHeaderOverrides() == null) {
return null;
}

return awsConfig.getAwsStsHeaderOverrides();
}

/**
* Validate the AWS configuration.
* This method ensures breaking change in future release where non-AWS OTLP endpoints are supported.
Expand Down
1 change: 1 addition & 0 deletions ...tlp-sink/src/main/java/org/opensearch/dataprepper/plugins/sink/otlp/http/SigV4Signer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class SigV4Signer {
.withRegion(region)
.withStsRoleArn(config.getStsRoleArn())
.withStsExternalId(config.getStsExternalId())
.withStsHeaderOverrides(config.getStsHeaderOverrides())
.build());

this.endpointUri = config.getEndpoint() != null
Expand Down
1 change: 1 addition & 0 deletions ...t/java/org/opensearch/dataprepper/plugins/sink/otlp/configuration/OtlpSinkConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ void testMinimumConfigDefaults() throws Exception {

assertThat(config.getStsRoleArn(), nullValue());
assertThat(config.getStsExternalId(), nullValue());
assertThat(config.getStsHeaderOverrides(), nullValue());
}

@Test
Expand Down
17 changes: 15 additions & 2 deletions ...sink/src/test/java/org/opensearch/dataprepper/plugins/sink/otlp/http/SigV4SignerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.opensearch.dataprepper.aws.api.AwsCredentialsOptions;
import org.opensearch.dataprepper.aws.api.AwsCredentialsSupplier;
import org.opensearch.dataprepper.plugins.sink.otlp.configuration.OtlpSinkConfig;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
Expand All @@ -14,11 +16,14 @@
import software.amazon.awssdk.regions.Region;

import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.UUID;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand All @@ -31,16 +36,20 @@ class SigV4SignerTest {
private AwsCredentialsSupplier mockSupplier;
private SigV4Signer target;

private ArgumentCaptor<AwsCredentialsOptions> awsCredentialsOptionsArgumentCaptor;

@BeforeEach
void setup() {
mockConfig = mock(OtlpSinkConfig.class);
mockSupplier = mock(AwsCredentialsSupplier.class);
awsCredentialsOptionsArgumentCaptor = ArgumentCaptor.forClass(AwsCredentialsOptions.class);

when(mockConfig.getAwsRegion()).thenReturn(REGION);
when(mockConfig.getStsHeaderOverrides()).thenReturn(Map.of(UUID.randomUUID().toString(), UUID.randomUUID().toString()));

final AwsBasicCredentials mockCredentials = AwsBasicCredentials.create("mockAccessKey", "mockSecretKey");
final StaticCredentialsProvider mockCredentialsProvider = StaticCredentialsProvider.create(mockCredentials);
when(mockSupplier.getProvider(any())).thenReturn(mockCredentialsProvider);
when(mockSupplier.getProvider(awsCredentialsOptionsArgumentCaptor.capture())).thenReturn(mockCredentialsProvider);
}

@Test
Expand All @@ -56,6 +65,10 @@ void testSignRequest_withExplicitEndpoint() {
assertTrue(request.headers().containsKey("Authorization"));
assertEquals("application/x-protobuf", request.firstMatchingHeader("Content-Type").orElse(null));
assertEquals(endpoint, request.getUri().toString());

final AwsCredentialsOptions awsCredentialsOptions = awsCredentialsOptionsArgumentCaptor.getValue();
assertNotNull(awsCredentialsOptions);
assertThat(awsCredentialsOptions.getStsHeaderOverrides(), equalTo(mockConfig.getStsHeaderOverrides()));
}

@Test
Expand Down
Loading