From 4202e3b93aded04ddcd24aca8fd5889426d0a557 Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Mon, 5 Sep 2022 21:56:00 +0300 Subject: [PATCH 01/10] Bump dbt-clickhouse version from 1.1.7 to 1.1.8 --- .../bases/base-normalization/clickhouse.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile index 2d02ecc86396..b69479a95f0b 100644 --- a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile +++ b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile @@ -20,7 +20,7 @@ WORKDIR /airbyte/normalization_code RUN pip install . WORKDIR /airbyte/normalization_code/dbt-template/ -RUN pip install dbt-clickhouse==1.1.7 +RUN pip install dbt-clickhouse==1.1.8 # Download external dbt dependencies RUN dbt deps From 476bf8922adcfd7d299456e0bcb99bdb4fbcfb64 Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Mon, 5 Sep 2022 23:17:47 +0300 Subject: [PATCH 02/10] pin dbt<1.2 --- .../bases/base-normalization/clickhouse.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile index b69479a95f0b..51eee81ba5e7 100644 --- a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile +++ b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile @@ -20,7 +20,7 @@ WORKDIR /airbyte/normalization_code RUN pip install . WORKDIR /airbyte/normalization_code/dbt-template/ -RUN pip install dbt-clickhouse==1.1.8 +RUN pip install dbt-clickhouse==1.1.8 dbt-core==1.1.2 # Download external dbt dependencies RUN dbt deps From e83bca46a17781955b9a55447a3807f63e08bf6a Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Mon, 5 Sep 2022 23:37:25 +0300 Subject: [PATCH 03/10] update doc --- docs/understanding-airbyte/basic-normalization.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/understanding-airbyte/basic-normalization.md b/docs/understanding-airbyte/basic-normalization.md index ceba642243bf..1e71418ad486 100644 --- a/docs/understanding-airbyte/basic-normalization.md +++ b/docs/understanding-airbyte/basic-normalization.md @@ -353,6 +353,7 @@ Therefore, in order to "upgrade" to the desired normalization version, you need | Airbyte Version | Normalization Version | Date | Pull Request | Subject | |:----------------|:----------------------|:-----------| :--- |:---------------------------------------------------------------------------| +| | 0.2.20 | 2022-09-05 | [\#16339](https://github.com/airbytehq/airbyte/pull/16339) | Update Clickhouse DBT to 1.1.8 | | | 0.2.20 | 2022-08-30 | [\#15592](https://github.com/airbytehq/airbyte/pull/15592) | Add TiDB support | | | 0.2.19 | 2022-08-21 | [\#14897](https://github.com/airbytehq/airbyte/pull/14897) | Update Clickhouse DBT to 1.1.7 | | | 0.2.16 | 2022-08-04 | [\#14295](https://github.com/airbytehq/airbyte/pull/14295) | Fixed SSH tunnel port usage | From 9a5a83bf136fd6d1c3422ba3ee9838486c4a5cff Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Tue, 6 Sep 2022 14:27:11 +0300 Subject: [PATCH 04/10] pin dbt core lt 1.2 --- .../bases/base-normalization/clickhouse.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile index 51eee81ba5e7..af7f05cdbfd7 100644 --- a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile +++ b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile @@ -20,7 +20,7 @@ WORKDIR /airbyte/normalization_code RUN pip install . WORKDIR /airbyte/normalization_code/dbt-template/ -RUN pip install dbt-clickhouse==1.1.8 dbt-core==1.1.2 +RUN pip install dbt-clickhouse==1.1.8 "dbt-core<1.2" # Download external dbt dependencies RUN dbt deps From 1c47a540e81c6706ee611c0bf7539eb15ffab483 Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Tue, 6 Sep 2022 22:48:12 +0300 Subject: [PATCH 05/10] bump normalization version --- docs/understanding-airbyte/basic-normalization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/understanding-airbyte/basic-normalization.md b/docs/understanding-airbyte/basic-normalization.md index 1e71418ad486..bf9b323d6415 100644 --- a/docs/understanding-airbyte/basic-normalization.md +++ b/docs/understanding-airbyte/basic-normalization.md @@ -353,7 +353,7 @@ Therefore, in order to "upgrade" to the desired normalization version, you need | Airbyte Version | Normalization Version | Date | Pull Request | Subject | |:----------------|:----------------------|:-----------| :--- |:---------------------------------------------------------------------------| -| | 0.2.20 | 2022-09-05 | [\#16339](https://github.com/airbytehq/airbyte/pull/16339) | Update Clickhouse DBT to 1.1.8 | +| | 0.2.21 | 2022-09-05 | [\#16339](https://github.com/airbytehq/airbyte/pull/16339) | Update Clickhouse DBT to 1.1.8 | | | 0.2.20 | 2022-08-30 | [\#15592](https://github.com/airbytehq/airbyte/pull/15592) | Add TiDB support | | | 0.2.19 | 2022-08-21 | [\#14897](https://github.com/airbytehq/airbyte/pull/14897) | Update Clickhouse DBT to 1.1.7 | | | 0.2.16 | 2022-08-04 | [\#14295](https://github.com/airbytehq/airbyte/pull/14295) | Fixed SSH tunnel port usage | From 820836c1490e2ae7b6ca2b2d3da506c33459b62b Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Fri, 9 Sep 2022 11:12:34 +0300 Subject: [PATCH 06/10] loosen requirements --- .../bases/base-normalization/clickhouse.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile index af7f05cdbfd7..b69479a95f0b 100644 --- a/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile +++ b/airbyte-integrations/bases/base-normalization/clickhouse.Dockerfile @@ -20,7 +20,7 @@ WORKDIR /airbyte/normalization_code RUN pip install . WORKDIR /airbyte/normalization_code/dbt-template/ -RUN pip install dbt-clickhouse==1.1.8 "dbt-core<1.2" +RUN pip install dbt-clickhouse==1.1.8 # Download external dbt dependencies RUN dbt deps From 93df3cdacfe3df334c105fc5a45c6324529a0a3d Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Mon, 12 Sep 2022 15:07:35 +0300 Subject: [PATCH 07/10] fix md --- docs/understanding-airbyte/basic-normalization.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/understanding-airbyte/basic-normalization.md b/docs/understanding-airbyte/basic-normalization.md index 16a471cd081f..4f445dc073fe 100644 --- a/docs/understanding-airbyte/basic-normalization.md +++ b/docs/understanding-airbyte/basic-normalization.md @@ -354,7 +354,7 @@ Therefore, in order to "upgrade" to the desired normalization version, you need | Airbyte Version | Normalization Version | Date | Pull Request | Subject | |:----------------|:----------------------|:-----------|:------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------| -| | 0.2.22 | 2022-09-05 | [\#16339](https://github.com/airbytehq/airbyte/pull/16339) | Update Clickhouse DBT to 1.1.8 | +| | 0.2.22 | 2022-09-05 | [\#16339](https://github.com/airbytehq/airbyte/pull/16339) | Update Clickhouse DBT to 1.1.8 | | | 0.2.21 | 2022-09-09 | [\#15833](https://github.com/airbytehq/airbyte/pull/15833/) | SSH Tunnel: allow using OPENSSH key format (published in [\#16545](https://github.com/airbytehq/airbyte/pull/16545)) | | | 0.2.20 | 2022-08-30 | [\#15592](https://github.com/airbytehq/airbyte/pull/15592) | Add TiDB support | | | 0.2.19 | 2022-08-21 | [\#14897](https://github.com/airbytehq/airbyte/pull/14897) | Update Clickhouse DBT to 1.1.7 | From 55419d61a75d6d9f5e8551617802f389b78fb646 Mon Sep 17 00:00:00 2001 From: Filipp Balakin Date: Mon, 12 Sep 2022 15:08:17 +0300 Subject: [PATCH 08/10] remove empty line --- docs/understanding-airbyte/basic-normalization.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/understanding-airbyte/basic-normalization.md b/docs/understanding-airbyte/basic-normalization.md index 4f445dc073fe..26a095eed246 100644 --- a/docs/understanding-airbyte/basic-normalization.md +++ b/docs/understanding-airbyte/basic-normalization.md @@ -351,7 +351,6 @@ Note that Basic Normalization is packaged in a docker image `airbyte/normalizati Therefore, in order to "upgrade" to the desired normalization version, you need to use the corresponding Airbyte version that it's being released in: - | Airbyte Version | Normalization Version | Date | Pull Request | Subject | |:----------------|:----------------------|:-----------|:------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------| | | 0.2.22 | 2022-09-05 | [\#16339](https://github.com/airbytehq/airbyte/pull/16339) | Update Clickhouse DBT to 1.1.8 | From 9df7ee02dedc1a50dbebc821683a0972cdc5ce17 Mon Sep 17 00:00:00 2001 From: marcosmarxm Date: Tue, 13 Sep 2022 13:52:06 -0300 Subject: [PATCH 09/10] bump normalization version in worker --- .../workers/normalization/NormalizationRunnerFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationRunnerFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationRunnerFactory.java index f5cab54e4283..eb9a8ae74204 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationRunnerFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/normalization/NormalizationRunnerFactory.java @@ -14,7 +14,7 @@ public class NormalizationRunnerFactory { public static final String BASE_NORMALIZATION_IMAGE_NAME = "airbyte/normalization"; - public static final String NORMALIZATION_VERSION = "0.2.21"; + public static final String NORMALIZATION_VERSION = "0.2.22"; static final Map> NORMALIZATION_MAPPING = ImmutableMap.>builder() From 32a3057c33b7d3265944681687c881e753feb02f Mon Sep 17 00:00:00 2001 From: marcosmarxm Date: Tue, 13 Sep 2022 14:07:18 -0300 Subject: [PATCH 10/10] bump normalization version --- airbyte-integrations/bases/base-normalization/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airbyte-integrations/bases/base-normalization/Dockerfile b/airbyte-integrations/bases/base-normalization/Dockerfile index 3f908af980d5..5b4de8302135 100644 --- a/airbyte-integrations/bases/base-normalization/Dockerfile +++ b/airbyte-integrations/bases/base-normalization/Dockerfile @@ -28,5 +28,5 @@ WORKDIR /airbyte ENV AIRBYTE_ENTRYPOINT "/airbyte/entrypoint.sh" ENTRYPOINT ["/airbyte/entrypoint.sh"] -LABEL io.airbyte.version=0.2.21 +LABEL io.airbyte.version=0.2.22 LABEL io.airbyte.name=airbyte/normalization