Skip to content

Commit 71f5b1c

Browse files
authored
🎉 Destination DynamoDB: rename dynamodb_table_name to dynamodb_table_name_prefix (#9314)
1 parent c904b44 commit 71f5b1c

File tree

11 files changed

+25
-24
lines changed

11 files changed

+25
-24
lines changed

‎airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION_DEFINITION/8ccd8909-4e99-4141-b48d-4984b70b2d89.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"destinationDefinitionId": "8ccd8909-4e99-4141-b48d-4984b70b2d89",
33
"name": "DynamoDB",
44
"dockerRepository": "airbyte/destination-dynamodb",
5-
"dockerImageTag": "0.1.0",
5+
"dockerImageTag": "0.1.1",
66
"documentationUrl": "https://docs.airbyte.io/integrations/destinations/dynamodb",
77
"icon": "dynamodb.svg"
88
}

‎airbyte-integrations/connectors/destination-dynamodb/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ ENV APPLICATION destination-dynamodb
1616

1717
COPY --from=build /airbyte /airbyte
1818

19-
LABEL io.airbyte.version=0.1.0
19+
LABEL io.airbyte.version=0.1.1
2020
LABEL io.airbyte.name=airbyte/destination-dynamodb

‎airbyte-integrations/connectors/destination-dynamodb/sample_secrets/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"dynamodb_table_name": "paste-table-name-here",
2+
"dynamodb_table_name_prefix": "paste-table-name-here",
33
"dynamodb_region": "paste-dynamodb-region-here",
44
"access_key_id": "paste-access-key-id-here",
55
"secret_access_key": "paste-secret-access-key-here"

‎airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class DynamodbChecker {
2323
private static final Logger LOGGER = LoggerFactory.getLogger(DynamodbChecker.class);
2424

2525
public static void attemptDynamodbWriteAndDelete(final DynamodbDestinationConfig dynamodbDestinationConfig) throws Exception {
26-
final var prefix = dynamodbDestinationConfig.getTableName();
26+
final var prefix = dynamodbDestinationConfig.getTableNamePrefix();
2727
final String outputTableName = prefix + "_airbyte_connection_test_" + UUID.randomUUID().toString().replaceAll("-", "");
2828
attemptWriteAndDeleteDynamodbItem(dynamodbDestinationConfig, outputTableName);
2929
}

‎airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
public class DynamodbDestinationConfig {
1010

1111
private final String endpoint;
12-
private final String tableName;
12+
private final String tableNamePrefix;
1313
private final String accessKeyId;
1414
private final String secretAccessKey;
1515
private final String region;
1616

1717
public DynamodbDestinationConfig(
1818
final String endpoint,
19-
final String tableName,
19+
final String tableNamePrefix,
2020
final String region,
2121
final String accessKeyId,
2222
final String secretAccessKey) {
2323
this.endpoint = endpoint;
24-
this.tableName = tableName;
24+
this.tableNamePrefix = tableNamePrefix;
2525
this.region = region;
2626
this.accessKeyId = accessKeyId;
2727
this.secretAccessKey = secretAccessKey;
@@ -30,7 +30,7 @@ public DynamodbDestinationConfig(
3030
public static DynamodbDestinationConfig getDynamodbDestinationConfig(final JsonNode config) {
3131
return new DynamodbDestinationConfig(
3232
config.get("dynamodb_endpoint") == null ? "" : config.get("dynamodb_endpoint").asText(),
33-
config.get("dynamodb_table_name").asText(),
33+
config.get("dynamodb_table_name_prefix").asText(),
3434
config.get("dynamodb_region").asText(),
3535
config.get("access_key_id").asText(),
3636
config.get("secret_access_key").asText());
@@ -52,8 +52,8 @@ public String getRegion() {
5252
return region;
5353
}
5454

55-
public String getTableName() {
56-
return tableName;
55+
public String getTableNamePrefix() {
56+
return tableNamePrefix;
5757
}
5858

5959
}

‎airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbOutputTableHelper.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
public class DynamodbOutputTableHelper {
1313

14-
public static String getOutputTableName(final String tableName, final AirbyteStream stream) {
15-
return getOutputTableName(tableName, stream.getNamespace(), stream.getName());
14+
public static String getOutputTableName(final String tableNamePrefix, final AirbyteStream stream) {
15+
return getOutputTableName(tableNamePrefix, stream.getNamespace(), stream.getName());
1616
}
1717

18-
public static String getOutputTableName(final String tableName, final String namespace, final String streamName) {
18+
public static String getOutputTableName(final String tableNamePrefix, final String namespace, final String streamName) {
1919
final List<String> paths = new LinkedList<>();
2020

21-
if (tableName != null) {
22-
paths.add(tableName);
21+
if (tableNamePrefix != null) {
22+
paths.add(tableNamePrefix);
2323
}
2424
if (namespace != null) {
2525
paths.add(new ExtendedNameTransformer().convertStreamName(namespace));

‎airbyte-integrations/connectors/destination-dynamodb/src/main/java/io/airbyte/integrations/destination/dynamodb/DynamodbWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DynamodbWriter(final DynamodbDestinationConfig config,
4646
this.dynamodb = new DynamoDB(amazonDynamodb);
4747
this.configuredStream = configuredStream;
4848
this.uploadTimestamp = uploadTimestamp;
49-
this.outputTableName = DynamodbOutputTableHelper.getOutputTableName(config.getTableName(), configuredStream.getStream());
49+
this.outputTableName = DynamodbOutputTableHelper.getOutputTableName(config.getTableNamePrefix(), configuredStream.getStream());
5050

5151
final DestinationSyncMode syncMode = configuredStream.getDestinationSyncMode();
5252
if (syncMode == null) {

‎airbyte-integrations/connectors/destination-dynamodb/src/main/resources/spec.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"title": "DynamoDB Destination Spec",
1010
"type": "object",
1111
"required": [
12-
"dynamodb_table_name",
12+
"dynamodb_table_name_prefix",
1313
"dynamodb_region",
1414
"access_key_id",
1515
"secret_access_key"
@@ -23,10 +23,10 @@
2323
"description": "This is your DynamoDB endpoint url.(if you are working with AWS DynamoDB, just leave empty).",
2424
"examples": ["http://localhost:9000"]
2525
},
26-
"dynamodb_table_name": {
27-
"title": "DynamoDB Table Name",
26+
"dynamodb_table_name_prefix": {
27+
"title": "Table name prefix",
2828
"type": "string",
29-
"description": "The name of the DynamoDB table.",
29+
"description": "The prefix to use when naming DynamoDB tables.",
3030
"examples": ["airbyte_sync"]
3131
},
3232
"dynamodb_region": {

‎airbyte-integrations/connectors/destination-dynamodb/src/test-integration/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationAcceptanceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected JsonNode getFailCheckConfig() {
6666
*/
6767
protected List<Item> getAllSyncedObjects(final String streamName, final String namespace) {
6868
final var dynamodb = new DynamoDB(this.client);
69-
final var tableName = DynamodbOutputTableHelper.getOutputTableName(this.config.getTableName(), streamName, namespace);
69+
final var tableName = DynamodbOutputTableHelper.getOutputTableName(this.config.getTableNamePrefix(), streamName, namespace);
7070
final var table = dynamodb.getTable(tableName);
7171
final List<Item> items = new ArrayList<Item>();
7272
final List<Item> resultItems = new ArrayList<Item>();
@@ -148,7 +148,7 @@ protected void tearDown(final TestDestinationEnv testEnv) {
148148
final var dynamodb = new DynamoDB(this.client);
149149
final List<String> tables = new ArrayList<String>();
150150
dynamodb.listTables().forEach(o -> {
151-
if (o.getTableName().startsWith(this.config.getTableName()))
151+
if (o.getTableName().startsWith(this.config.getTableNamePrefix()))
152152
tables.add(o.getTableName());
153153
});
154154

‎airbyte-integrations/connectors/destination-dynamodb/src/test/java/io/airbyte/integrations/destination/dynamodb/DynamodbDestinationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ void testGetOutputTableNameWithStream() throws Exception {
3131
@Test
3232
void testGetDynamodbDestinationdbConfig() throws Exception {
3333
final JsonNode json = Jsons.deserialize("{\n" +
34-
" \"dynamodb_table_name\": \"test_table\",\n" +
34+
" \"dynamodb_table_name_prefix\": \"test_table\",\n" +
3535
" \"dynamodb_region\": \"test_region\",\n" +
3636
" \"access_key_id\": \"test_key_id\",\n" +
3737
" \"secret_access_key\": \"test_access_key\"\n" +
3838
"}");
3939
final var config = DynamodbDestinationConfig.getDynamodbDestinationConfig(json);
4040

41-
assertEquals(config.getTableName(), "test_table");
41+
assertEquals(config.getTableNamePrefix(), "test_table");
4242
assertEquals(config.getRegion(), "test_region");
4343
assertEquals(config.getAccessKeyId(), "test_key_id");
4444
assertEquals(config.getSecretAccessKey(), "test_access_key");

0 commit comments

Comments
 (0)