From 5d1dcdcf3c2cd0482748ada6e67ecf2a144a7621 Mon Sep 17 00:00:00 2001 From: alafanechere Date: Wed, 18 Dec 2024 16:46:55 +0100 Subject: [PATCH 1/2] airbyte-ci: java build - give ownership of built artifact to the current image user --- airbyte-ci/connectors/pipelines/README.md | 1 + .../connectors/pipelines/pipelines/dagger/containers/java.py | 3 ++- airbyte-ci/connectors/pipelines/pyproject.toml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/airbyte-ci/connectors/pipelines/README.md b/airbyte-ci/connectors/pipelines/README.md index 297fc7145936..7fbf89f96c24 100644 --- a/airbyte-ci/connectors/pipelines/README.md +++ b/airbyte-ci/connectors/pipelines/README.md @@ -854,6 +854,7 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only | Version | PR | Description | | ------- | ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | +| 4.47.1 | [#49917](https://github.com/airbytehq/airbyte/pull/49917) | Java connector build: give ownership of built artifacts to the current image user. | | 4.47.0 | [#49832](https://github.com/airbytehq/airbyte/pull/49462) | Build java connectors from the base image declared in `metadata.yaml`. | | 4.46.5 | [#49835](https://github.com/airbytehq/airbyte/pull/49835) | Fix connector language discovery for projects with Kotlin Gradle build scripts. | | 4.46.4 | [#49462](https://github.com/airbytehq/airbyte/pull/49462) | Support Kotlin Gradle build scripts in connectors. | diff --git a/airbyte-ci/connectors/pipelines/pipelines/dagger/containers/java.py b/airbyte-ci/connectors/pipelines/pipelines/dagger/containers/java.py index 9c595db41f63..61ee8c4337d7 100644 --- a/airbyte-ci/connectors/pipelines/pipelines/dagger/containers/java.py +++ b/airbyte-ci/connectors/pipelines/pipelines/dagger/containers/java.py @@ -183,10 +183,11 @@ async def with_airbyte_java_connector(context: ConnectorContext, connector_java_ ) base = with_integration_base_java(context, build_platform).with_entrypoint(["/airbyte/base.sh"]) + current_user = (await base.with_exec(["whoami"]).stdout()).strip() connector_container = ( base.with_workdir("/airbyte") .with_env_variable("APPLICATION", application) - .with_mounted_directory("built_artifacts", build_stage.directory("/airbyte")) + .with_mounted_directory("built_artifacts", build_stage.directory("/airbyte"), owner=current_user) .with_exec(sh_dash_c(["mv built_artifacts/* ."])) ) return await finalize_build(context, connector_container) diff --git a/airbyte-ci/connectors/pipelines/pyproject.toml b/airbyte-ci/connectors/pipelines/pyproject.toml index 468b9b0e925c..7a8b641475b5 100644 --- a/airbyte-ci/connectors/pipelines/pyproject.toml +++ b/airbyte-ci/connectors/pipelines/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] name = "pipelines" -version = "4.47.0" +version = "4.47.1" description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines" authors = ["Airbyte "] From e992f8a2a413ff4d35637e2eda242136c69ecdb2 Mon Sep 17 00:00:00 2001 From: alafanechere Date: Wed, 18 Dec 2024 16:53:47 +0100 Subject: [PATCH 2/2] revert me: test non-root base image on source-postgres --- airbyte-integrations/connectors/source-postgres/metadata.yaml | 4 ++-- docs/integrations/sources/postgres.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airbyte-integrations/connectors/source-postgres/metadata.yaml b/airbyte-integrations/connectors/source-postgres/metadata.yaml index 37621ef4f388..734e2acf40d3 100644 --- a/airbyte-integrations/connectors/source-postgres/metadata.yaml +++ b/airbyte-integrations/connectors/source-postgres/metadata.yaml @@ -9,7 +9,7 @@ data: connectorSubtype: database connectorType: source definitionId: decd338e-5647-4c0b-adf4-da0e75f5a750 - dockerImageTag: 3.6.25 + dockerImageTag: 3.6.26 dockerRepository: airbyte/source-postgres documentationUrl: https://docs.airbyte.com/integrations/sources/postgres githubIssueLabel: source-postgres @@ -27,7 +27,7 @@ data: tags: - language:java connectorBuildOptions: - baseImage: docker.io/airbyte/java-connector-base:1.0.0@sha256:be86e5684e1e6d9280512d3d8071b47153698fe08ad990949c8eeff02803201a + baseImage: docker.io/airbyte/java-connector-base:2.0.0-rc.2@sha256:e5543b3de4c38e9ef45dba886bad5ee319b0d7bfe921f310c788f1d4466e25eb connectorTestSuitesOptions: - suite: unitTests - suite: integrationTests diff --git a/docs/integrations/sources/postgres.md b/docs/integrations/sources/postgres.md index 19a62d63a833..3a6bf9022d25 100644 --- a/docs/integrations/sources/postgres.md +++ b/docs/integrations/sources/postgres.md @@ -329,6 +329,7 @@ According to Postgres [documentation](https://www.postgresql.org/docs/14/datatyp | Version | Date | Pull Request | Subject | |---------|------------|----------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| 3.6.26 | 2024-12-18 | [49917](https://github.com/airbytehq/airbyte/pull/49917) | Use a non root base image | | 3.6.25 | 2024-12-17 | [49838](https://github.com/airbytehq/airbyte/pull/49838) | Use a base image: airbyte/java-connector-base:1.0.0 | | 3.6.24 | 2024-12-16 | [49469](https://github.com/airbytehq/airbyte/pull/49469) | Simplify CTID_TABLE_BLOCK_SIZE query for Postgres integration | | 3.6.23 | 2024-11-13 | [\#48482](https://github.com/airbytehq/airbyte/pull/48482) | Convert large integer typed using NUMERIC(X, 0) into a BigInteger. l