Skip to content

Commit 2a53340

Browse files
committed
temp commit
1 parent 03d9055 commit 2a53340

File tree

2 files changed

+50
-2
lines changed

2 files changed

+50
-2
lines changed

dagger-core/src/main/java/com/gotocompany/dagger/core/sink/SinkOrchestrator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private void setSslPasswordsFromFile(Configuration configuration, Properties kaf
149149
}
150150
String sslKeystorePasswordFileLocation = configuration.getString(Constants.SINK_KAFKA_SSL_KEYSTORE_PASSWORD_LOCATION_KEY, StringUtils.EMPTY);
151151
if (StringUtils.isNotEmpty(sslKeystorePasswordFileLocation)) {
152-
kafkaProps.setProperty(Constants.KAFKA_PROPS_SSL_TRUSTSTORE_PASSWORD_KEY, parsePasswordFile(sslKeystorePasswordFileLocation));
152+
kafkaProps.setProperty(Constants.KAFKA_PROPS_SSL_KEYSTORE_PASSWORD_KEY, parsePasswordFile(sslKeystorePasswordFileLocation));
153153
}
154154
}
155155

dagger-core/src/test/java/com/gotocompany/dagger/core/sink/SinkOrchestratorTest.java

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@
1212
import org.apache.flink.api.java.utils.ParameterTool;
1313
import org.junit.Assert;
1414
import org.junit.Before;
15+
import org.junit.Rule;
1516
import org.junit.Test;
17+
import org.junit.rules.TemporaryFolder;
1618
import org.mockito.Mock;
1719

20+
import java.io.File;
21+
import java.io.FileWriter;
22+
import java.io.IOException;
1823
import java.util.*;
1924

2025
import static com.gotocompany.dagger.common.core.Constants.*;
@@ -36,6 +41,8 @@ public class SinkOrchestratorTest {
3641
private MetricsTelemetryExporter telemetryExporter;
3742
@Mock
3843
private DaggerStatsDReporter daggerStatsDReporter;
44+
@Rule
45+
public TemporaryFolder temporaryFolder = new TemporaryFolder();
3946

4047
@Before
4148
public void setup() {
@@ -73,14 +80,15 @@ public void shouldGiveInfluxWhenConfiguredToUseNothing() throws Exception {
7380
}
7481

7582
@Test
76-
public void shouldSetKafkaProducerConfigurations() throws Exception {
83+
public void shouldSetKafkaProducerConfigurations() {
7784
Map<String, String> additionalParameters = new HashMap<>();
7885
additionalParameters.put(SINK_KAFKA_PRODUCER_CONFIG_SASL_LOGIN_CALLBACK_HANDLER_CLASS, SASL_LOGIN_CALLBACK_HANDLER_CLASS_VALUE);
7986
when(configuration.getString(eq(Constants.SINK_KAFKA_BROKERS_KEY), anyString())).thenReturn("10.200.216.87:6668");
8087
when(configuration.getBoolean(eq(Constants.SINK_KAFKA_PRODUCE_LARGE_MESSAGE_ENABLE_KEY), anyBoolean())).thenReturn(true);
8188
when(configuration.getString(eq(Constants.SINK_KAFKA_LINGER_MS_KEY), anyString())).thenReturn("1000");
8289
when(configuration.getParam()).thenReturn(ParameterTool.fromMap(additionalParameters));
8390
when(configuration.getString(eq(SINK_KAFKA_PRODUCER_CONFIG_SASL_LOGIN_CALLBACK_HANDLER_CLASS), anyString())).thenReturn(SASL_LOGIN_CALLBACK_HANDLER_CLASS_VALUE);
91+
8492
Properties producerProperties = sinkOrchestrator.getProducerProperties(configuration);
8593

8694
assertEquals(producerProperties.getProperty("compression.type"), "snappy");
@@ -89,6 +97,38 @@ public void shouldSetKafkaProducerConfigurations() throws Exception {
8997
assertEquals(producerProperties.getProperty("sasl.login.callback.handler.class"), SASL_LOGIN_CALLBACK_HANDLER_CLASS_VALUE);
9098
}
9199

100+
@Test
101+
public void shouldParseSslPasswords() throws IOException {
102+
File trustStorePasswordFile = writeDummyPasswordFile("truststore-password.txt", "truststore-password");
103+
File keyStorePasswordFile = writeDummyPasswordFile("keystore-password.txt", "keystore-password");
104+
when(configuration.getString(eq(Constants.SINK_KAFKA_SSL_TRUSTSTORE_PASSWORD_LOCATION_KEY), anyString())).thenReturn(trustStorePasswordFile.getAbsolutePath());
105+
when(configuration.getString(eq(Constants.SINK_KAFKA_SSL_KEYSTORE_PASSWORD_LOCATION_KEY), anyString())).thenReturn(keyStorePasswordFile.getAbsolutePath());
106+
when(configuration.getString(eq(Constants.SINK_KAFKA_BROKERS_KEY), anyString())).thenReturn("10.200.216.87:6668");
107+
when(configuration.getBoolean(eq(Constants.SINK_KAFKA_PRODUCE_LARGE_MESSAGE_ENABLE_KEY), anyBoolean())).thenReturn(true);
108+
when(configuration.getString(eq(Constants.SINK_KAFKA_LINGER_MS_KEY), anyString())).thenReturn("1000");
109+
110+
Properties producerProperties = sinkOrchestrator.getProducerProperties(configuration);
111+
112+
assertEquals(producerProperties.getProperty("ssl.truststore.password"), "truststore-password");
113+
assertEquals(producerProperties.getProperty("ssl.keystore.password"), "keystore-password");
114+
}
115+
116+
@Test
117+
public void shouldThr() throws IOException {
118+
File trustStorePasswordFile = writeDummyPasswordFile("truststore-password.txt", "truststore-password");
119+
File keyStorePasswordFile = writeDummyPasswordFile("keystore-password.txt", "keystore-password");
120+
when(configuration.getString(eq(Constants.SINK_KAFKA_SSL_TRUSTSTORE_PASSWORD_LOCATION_KEY), anyString())).thenReturn(trustStorePasswordFile.getAbsolutePath());
121+
when(configuration.getString(eq(Constants.SINK_KAFKA_SSL_KEYSTORE_PASSWORD_LOCATION_KEY), anyString())).thenReturn(keyStorePasswordFile.getAbsolutePath());
122+
when(configuration.getString(eq(Constants.SINK_KAFKA_BROKERS_KEY), anyString())).thenReturn("10.200.216.87:6668");
123+
when(configuration.getBoolean(eq(Constants.SINK_KAFKA_PRODUCE_LARGE_MESSAGE_ENABLE_KEY), anyBoolean())).thenReturn(true);
124+
when(configuration.getString(eq(Constants.SINK_KAFKA_LINGER_MS_KEY), anyString())).thenReturn("1000");
125+
126+
Properties producerProperties = sinkOrchestrator.getProducerProperties(configuration);
127+
128+
assertEquals(producerProperties.getProperty("ssl.truststore.password"), "truststore-password");
129+
assertEquals(producerProperties.getProperty("ssl.keystore.password"), "keystore-password");
130+
}
131+
92132
@Test
93133
public void shouldThrowIllegalArgumentExceptionForInvalidLingerMs() throws Exception {
94134
when(configuration.getString(eq(Constants.SINK_KAFKA_BROKERS_KEY), anyString())).thenReturn("10.200.216.87:6668");
@@ -119,4 +159,12 @@ public void shouldReturnBigQuerySink() {
119159
Sink sinkFunction = sinkOrchestrator.getSink(configuration, new String[]{}, stencilClientOrchestrator, daggerStatsDReporter);
120160
assertThat(sinkFunction, instanceOf(BigQuerySink.class));
121161
}
162+
163+
private File writeDummyPasswordFile(String fileName, String password) throws IOException {
164+
File passwordFile = temporaryFolder.newFile(fileName);
165+
FileWriter writer = new FileWriter(passwordFile);
166+
writer.write(password);
167+
writer.close();
168+
return passwordFile;
169+
}
122170
}

0 commit comments

Comments
 (0)