Skip to content
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

Add AssumeRole option #19

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add AssumeRole option #19

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
04ed86f
Added STS sdk module.
Jan 18, 2018
40e909c
Minimalist tweaks to add assume role support.
Jan 18, 2018
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
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-api</artifactId>
<version>0.11.0.2</version>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
Expand All @@ -37,6 +37,11 @@
<version>6.9.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.11.265</version>
</dependency>

</dependencies>
<build>
Expand Down
19 changes: 18 additions & 1 deletion src/main/java/com/amazon/kinesis/kafka/AmazonKinesisSinkConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.apache.kafka.connect.sink.SinkConnector;

public class AmazonKinesisSinkConnector extends SinkConnector {
public static final String STS_SESSION_NAME_DEFAULT = "AmazonKinesisSink";

public static final String REGION = "region";

Expand Down Expand Up @@ -46,6 +47,10 @@ public class AmazonKinesisSinkConnector extends SinkConnector {

public static final String SLEEP_CYCLES = "sleepCycles";

public static final String PRODUCER_ROLE = "producerRole";

public static final String STS_SESSION_NAME = "stsSessionName";

private String region;

private String streamName;
Expand Down Expand Up @@ -80,6 +85,10 @@ public class AmazonKinesisSinkConnector extends SinkConnector {

private String sleepCycles;

private String producerRole;

private String stsSessionName;

@Override
public void start(Map<String, String> props) {
region = props.get(REGION);
Expand All @@ -99,6 +108,8 @@ public void start(Map<String, String> props) {
outstandingRecordsThreshold = props.get(OUTSTANDING_RECORDS_THRESHOLD);
sleepPeriod = props.get(SLEEP_PERIOD);
sleepCycles = props.get(SLEEP_CYCLES);
producerRole = props.get(PRODUCER_ROLE);
stsSessionName = props.getOrDefault(STS_SESSION_NAME, STS_SESSION_NAME_DEFAULT);
}

@Override
Expand Down Expand Up @@ -198,6 +209,12 @@ public List<Map<String, String>> taskConfigs(int maxTasks) {
config.put(SLEEP_CYCLES, sleepCycles);
else
config.put(SLEEP_CYCLES, "10");

if (producerRole != null)
config.put(PRODUCER_ROLE, producerRole);

if (stsSessionName != null)
config.put(STS_SESSION_NAME, stsSessionName);

configs.add(config);

Expand All @@ -218,4 +235,4 @@ public ConfigDef config() {
return new ConfigDef();
}

}
}
22 changes: 20 additions & 2 deletions src/main/java/com/amazon/kinesis/kafka/AmazonKinesisSinkTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
import org.apache.kafka.connect.sink.SinkTask;
import org.apache.kafka.connect.sink.SinkTaskContext;

import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
import com.amazonaws.services.kinesis.producer.Attempt;
import com.amazonaws.services.kinesis.producer.KinesisProducer;
import com.amazonaws.services.kinesis.producer.KinesisProducerConfiguration;
Expand All @@ -23,7 +25,6 @@
import com.google.common.util.concurrent.ListenableFuture;

public class AmazonKinesisSinkTask extends SinkTask {

private String streamName;

private String regionName;
Expand Down Expand Up @@ -58,6 +59,10 @@ public class AmazonKinesisSinkTask extends SinkTask {

private int sleepCycles;

private String producerRole;

private String stsSessionName;

private SinkTaskContext sinkTaskContext;

private Map<String, KinesisProducer> producerMap = new HashMap<String, KinesisProducer>();
Expand Down Expand Up @@ -264,6 +269,10 @@ public void start(Map<String, String> props) {

sleepCycles = Integer.parseInt(props.get(AmazonKinesisSinkConnector.SLEEP_CYCLES));

producerRole = props.get(AmazonKinesisSinkConnector.PRODUCER_ROLE);

stsSessionName = props.get(AmazonKinesisSinkConnector.STS_SESSION_NAME);

if (!singleKinesisProducerPerPartition)
kinesisProducer = getKinesisProducer();

Expand Down Expand Up @@ -300,10 +309,19 @@ public void stop() {

}


private AWSCredentialsProvider getCredentialsProvider() {
if (producerRole == null) {
return new DefaultAWSCredentialsProviderChain();
}

return new STSAssumeRoleSessionCredentialsProvider.Builder(producerRole, stsSessionName).build();
}

private KinesisProducer getKinesisProducer() {
KinesisProducerConfiguration config = new KinesisProducerConfiguration();
config.setRegion(regionName);
config.setCredentialsProvider(new DefaultAWSCredentialsProviderChain());
config.setCredentialsProvider(getCredentialsProvider());
config.setMaxConnections(maxConnections);

config.setAggregationEnabled(aggregration);
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/com/amazon/kinesis/kafka/FirehoseSinkConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import org.apache.kafka.connect.sink.SinkConnector;

public class FirehoseSinkConnector extends SinkConnector {
public static final String STS_SESSION_NAME_DEFAULT = "AmazonKinesisSink";

public static final String DELIVERY_STREAM = "deliveryStream";

Expand All @@ -22,6 +23,10 @@ public class FirehoseSinkConnector extends SinkConnector {

public static final String BATCH_SIZE_IN_BYTES = "batchSizeInBytes";

public static final String PRODUCER_ROLE = "producerRole";

public static final String STS_SESSION_NAME = "stsSessionName";

private String deliveryStream;

private String region;
Expand All @@ -32,6 +37,10 @@ public class FirehoseSinkConnector extends SinkConnector {

private String batchSizeInBytes;

private String producerRole;

private String stsSessionName;

private final String MAX_BATCH_SIZE = "500";

private final String MAX_BATCH_SIZE_IN_BYTES = "3670016";
Expand All @@ -44,6 +53,8 @@ public void start(Map<String, String> props) {
batch = props.get(BATCH);
batchSize = props.get(BATCH_SIZE);
batchSizeInBytes = props.get(BATCH_SIZE_IN_BYTES);
producerRole = props.get(PRODUCER_ROLE);
stsSessionName = props.getOrDefault(STS_SESSION_NAME, STS_SESSION_NAME_DEFAULT);
}

@Override
Expand Down Expand Up @@ -81,6 +92,12 @@ public List<Map<String, String>> taskConfigs(int maxTasks) {
else
config.put(BATCH_SIZE_IN_BYTES, MAX_BATCH_SIZE_IN_BYTES);

if (producerRole != null)
config.put(PRODUCER_ROLE, producerRole);

if (stsSessionName != null)
config.put(STS_SESSION_NAME, stsSessionName);

configs.add(config);
}
return configs;
Expand Down
20 changes: 19 additions & 1 deletion src/main/java/com/amazon/kinesis/kafka/FirehoseSinkTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
import org.apache.kafka.connect.sink.SinkRecord;
import org.apache.kafka.connect.sink.SinkTask;

import com.amazonaws.auth.AWSCredentialsProvider;
import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider;
import com.amazonaws.regions.RegionUtils;
import com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehoseClient;
import com.amazonaws.services.kinesisfirehose.model.AmazonKinesisFirehoseException;
Expand Down Expand Up @@ -39,6 +41,10 @@ public class FirehoseSinkTask extends SinkTask {

private int batchSizeInBytes;

private String producerRole;

private String stsSessionName;

@Override
public String version() {
return new FirehoseSinkConnector().version();
Expand All @@ -58,6 +64,14 @@ public void put(Collection<SinkRecord> sinkRecords) {

}

private AWSCredentialsProvider getCredentialsProvider() {
if (producerRole == null) {
return new DefaultAWSCredentialsProviderChain();
}

return new STSAssumeRoleSessionCredentialsProvider.Builder(producerRole, stsSessionName).build();
}

@Override
public void start(Map<String, String> props) {

Expand All @@ -69,7 +83,11 @@ public void start(Map<String, String> props) {

deliveryStreamName = props.get(FirehoseSinkConnector.DELIVERY_STREAM);

firehoseClient = new AmazonKinesisFirehoseClient(new DefaultAWSCredentialsProviderChain());
producerRole = props.get(AmazonKinesisSinkConnector.PRODUCER_ROLE);

stsSessionName = props.get(AmazonKinesisSinkConnector.STS_SESSION_NAME);

firehoseClient = new AmazonKinesisFirehoseClient(getCredentialsProvider());

firehoseClient.setRegion(RegionUtils.getRegion(props.get(FirehoseSinkConnector.REGION)));

Expand Down