Skip to content

Source Clickhouse: Fix exception in case password field is not provided in configuration #10214

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

Merged
merged 10 commits into from
Feb 16, 2022
Merged

Source Clickhouse: Fix exception in case password field is not provided in configuration #10214

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2399a40
Fix exception in case password is not provided for Clickhouse source
CrafterKolyan Feb 9, 2022
120f57f
Update changelog
CrafterKolyan Feb 9, 2022
a296071
Bump version for Source Clickhouse
CrafterKolyan Feb 9, 2022
8fdf5fa
Bump version of source-clickhouse-strict-encrypt
CrafterKolyan Feb 9, 2022
b9bdfc1
Update version in docs
CrafterKolyan Feb 9, 2022
44ea6f6
correct conflicts
marcosmarxm Feb 16, 2022
e244500
correct conflict in docs
marcosmarxm Feb 16, 2022
10b723c
bump connector version
marcosmarxm Feb 16, 2022
75f3928
correct doc
marcosmarxm Feb 16, 2022
ee1a017
Merge branch 'master' into marcos/test-pr-10214
marcosmarxm Feb 16, 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
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-clickhouse-strict-encrypt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ENV APPLICATION source-clickhouse-strict-encrypt

COPY --from=build /airbyte /airbyte

LABEL io.airbyte.version=0.1.4
LABEL io.airbyte.version=0.1.5
LABEL io.airbyte.name=airbyte/source-clickhouse-strict-encrypt
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-clickhouse/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ ENV APPLICATION source-clickhouse

COPY --from=build /airbyte /airbyte

LABEL io.airbyte.version=0.1.7
LABEL io.airbyte.version=0.1.8
LABEL io.airbyte.name=airbyte/source-clickhouse
14 changes: 9 additions & 5 deletions ...-clickhouse/src/main/java/io/airbyte/integrations/source/clickhouse/ClickHouseSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,15 @@ public JsonNode toDatabaseConfig(final JsonNode config) {
jdbcUrl.append("?").append(String.join("&", SSL_PARAMETERS));
}

return Jsons.jsonNode(ImmutableMap.builder()
.put("username", config.get("username").asText())
.put("password", config.get("password").asText())
.put("jdbc_url", jdbcUrl.toString())
.build());
ImmutableMap.Builder<Object, Object> configBuilder = ImmutableMap.builder()
.put("username", config.get("username").asText())
.put("jdbc_url", jdbcUrl.toString());

if (config.has("password")) {
configBuilder.put("password", config.get("password").asText());
}

return Jsons.jsonNode(configBuilder.build());
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions docs/integrations/sources/clickhouse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Using this feature requires additional configuration, when creating the source.

| Version | Date | Pull Request | Subject |
|:--------| :--- |:---------------------------------------------------------|:-----------------------------------------------------------------|
| 0.1.8 | 2022-02-09 | [\#10214](https://github.com/airbytehq/airbyte/pull/10214) | Fix exception in case `password` field is not provided |
| 0.1.7 | 2021-12-24 | [\#8958](https://github.com/airbytehq/airbyte/pull/8958) | Add support for JdbcType.ARRAY |
| 0.1.6 | 2021-12-15 | [\#8429](https://github.com/airbytehq/airbyte/pull/8429) | Update titles and descriptions |
| 0.1.5 | 2021-12-01 | [\#8371](https://github.com/airbytehq/airbyte/pull/8371) | Fixed incorrect handling "\n" in ssh key |
Expand All @@ -90,6 +91,7 @@ Using this feature requires additional configuration, when creating the source.

| Version | Date | Pull Request | Subject |
|:---| :--- |:---------------------------------------------------------|:---------------------------------------------------------------------------|
| 0.1.5 | 2022-02-09 | [\#10214](https://github.com/airbytehq/airbyte/pull/10214) | Fix exception in case `password` field is not provided |
| 0.1.3 | 2021-12-29 | [\#9182](https://github.com/airbytehq/airbyte/pull/9182) [\#8958](https://github.com/airbytehq/airbyte/pull/8958) | Add support for JdbcType.ARRAY. Fixed tests |
| 0.1.2 | 2021-12-01 | [\#8371](https://github.com/airbytehq/airbyte/pull/8371) | Fixed incorrect handling "\n" in ssh key |
| 0.1.1 | 20.10.2021 | [\#7327](https://github.com/airbytehq/airbyte/pull/7327) | Added support for connection via SSH tunnel(aka Bastion server). |
Expand Down