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

Jump to bottom

🐛 Prevented double slashes in S3 destination path #10318

Merged
merged 4 commits into from
Feb 15, 2022
Merged

🐛 Prevented double slashes in S3 destination path #10318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4efd8e8
Prevented double slashes in S3 destination path
andriikorotkov Feb 14, 2022
dd022f0
added test and update documentation
andriikorotkov Feb 14, 2022
e042c77
Merge branch 'master' of github.com:airbytehq/airbyte into akorotkov/…
andriikorotkov Feb 15, 2022
fc38a13
updated documentation
andriikorotkov Feb 15, 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
Empty file added ...esources/config/STANDARD_DESTINATION_DEFINITION/4816b78f-1489-44c1-9060-4b19d5fa9362.json
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/destination_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
- name: S3
destinationDefinitionId: 4816b78f-1489-44c1-9060-4b19d5fa9362
dockerRepository: airbyte/destination-s3
dockerImageTag: 0.2.6
dockerImageTag: 0.2.7
documentationUrl: https://docs.airbyte.io/integrations/destinations/s3
icon: s3.svg
- name: SFTP-JSON
Expand Down
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/destination_specs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3446,7 +3446,7 @@
supported_destination_sync_modes:
- "append"
- "overwrite"
- dockerImage: "airbyte/destination-s3:0.2.6"
- dockerImage: "airbyte/destination-s3:0.2.7"
spec:
documentationUrl: "https://docs.airbyte.io/integrations/destinations/s3"
connectionSpecification:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/destination-s3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ENV APPLICATION destination-s3

COPY --from=build /airbyte /airbyte

LABEL io.airbyte.version=0.2.6
LABEL io.airbyte.version=0.2.7
LABEL io.airbyte.name=airbyte/destination-s3
3 changes: 1 addition & 2 deletions ...tion-s3/src/main/java/io/airbyte/integrations/destination/s3/util/S3OutputPathHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ public static String getOutputPrefix(final String bucketPath, final String names
paths.add(NAME_TRANSFORMER.convertStreamName(namespace));
}
paths.add(NAME_TRANSFORMER.convertStreamName(streamName));

return String.join("/", paths);
return String.join("/", paths).replaceAll("/+", "/");
andriikorotkov marked this conversation as resolved.
Show resolved Hide resolved
andriikorotkov marked this conversation as resolved.
Show resolved Hide resolved
}

}
10 changes: 10 additions & 0 deletions ...-s3/src/test/java/io/airbyte/integrations/destination/s3/util/S3OutputPathHelperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ public void testGetOutputPrefix() {
assertEquals("bucket_path/namespace/stream_name", S3OutputPathHelper
.getOutputPrefix("bucket_path",
new AirbyteStream().withNamespace("namespace").withName("stream_name")));

// With empty namespace
assertEquals("bucket_path/stream_name", S3OutputPathHelper
.getOutputPrefix("bucket_path",
new AirbyteStream().withNamespace("").withName("stream_name")));

// With namespace with slash chart in the end
assertEquals("bucket_path/namespace_/stream_name", S3OutputPathHelper
.getOutputPrefix("bucket_path",
new AirbyteStream().withNamespace("namespace/").withName("stream_name")));
}

}
5 changes: 3 additions & 2 deletions docs/integrations/destinations/s3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,9 @@ Under the hood, an Airbyte data stream in Json schema is first converted to an A

| Version | Date | Pull Request | Subject |
|:--------| :--- | :--- | :--- |
| 0.2.6 | 2022-02-14 | [10256](https://github.com/airbytehq/airbyte/pull/10256) | Add `-XX:+ExitOnOutOfMemoryError` JVM option |
| 0.2.5 | 2022-01-13 | [\#9399](https://github.com/airbytehq/airbyte/pull/9399) | Use instance profile authentication if credentials are not provided |
| 0.2.7 | 2022-02-14 | [\#10318](https://github.com/airbytehq/airbyte/pull/10318) | Prevented double slashes in S3 destination path |
| 0.2.6 | 2022-02-14 | [10256](https://github.com/airbytehq/airbyte/pull/10256) | Add `-XX:+ExitOnOutOfMemoryError` JVM option |
| 0.2.5 | 2022-01-13 | [\#9399](https://github.com/airbytehq/airbyte/pull/9399) | Use instance profile authentication if credentials are not provided |
| 0.2.4 | 2022-01-12 | [\#9415](https://github.com/airbytehq/airbyte/pull/9415) | BigQuery Destination : Fix GCS processing of Facebook data |
| 0.2.3 | 2022-01-11 | [\#9367](https://github.com/airbytehq/airbyte/pull/9367) | Avro & Parquet: support array field with unknown item type; default any improperly typed field to string. |
| 0.2.2 | 2021-12-21 | [\#8574](https://github.com/airbytehq/airbyte/pull/8574) | Added namespace to Avro and Parquet record types |
Expand Down