[source-postgres] make source-postgres work with non-root base image (#50410)

theyueli · web-flow · commit 22390331cac6 · 2024-12-23T22:33:19.000-08:00
This patch starts using non-root base image for postgres. To do so, we have to save the SSL key to "/tmp" instead of ""
diff --git a/airbyte-cdk/java/airbyte-cdk/README.md b/airbyte-cdk/java/airbyte-cdk/README.md
@@ -174,6 +174,7 @@ corresponds to that version.
 
 | Version    | Date       | Pull Request                                                | Subject                                                                                                                                                        |
 |:-----------|:-----------|:------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 0.48.4     | 2024-12-24 | [\#50410](https://github.com/airbytehq/airbyte/pull/50410)  | Save SSL key to /tmp                                                                                                                                           |
 | 0.48.3     | 2024-12-23 | [\#49858](https://github.com/airbytehq/airbyte/pull/49858)  | Relax various Destination CDK methods visibility.                                                                                                              |
 | 0.48.1     | 2024-11-13 | [\#48482](https://github.com/airbytehq/airbyte/pull/48482)  | Adding support converting very large numbers via BigInteger                                                                                                    |
 | 0.48.0     | 2024-10-23 | [\#46302](https://github.com/airbytehq/airbyte/pull/46302)  | Add support for file transfer                                                                                                                                  |
diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/db/util/SSLCertificateUtils.kt b/airbyte-cdk/java/airbyte-cdk/core/src/main/kotlin/io/airbyte/cdk/db/util/SSLCertificateUtils.kt
@@ -50,7 +50,7 @@ object SSLCertificateUtils {
         directory: String?
     ): URI {
         val fs = Objects.requireNonNullElse(filesystem, FileSystems.getDefault())
-        val pathToStore = fs!!.getPath(Objects.toString(directory, ""))
+        val pathToStore = fs!!.getPath(Objects.toString(directory, "/tmp"))
         val pathToFile =
             pathToStore.resolve(KEYSTORE_FILE_NAME + RANDOM.nextInt() + KEYSTORE_FILE_TYPE)
         val os = Files.newOutputStream(pathToFile)
diff --git a/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties b/airbyte-cdk/java/airbyte-cdk/core/src/main/resources/version.properties
@@ -1 +1 @@
-version=0.48.3
+version=0.48.4
diff --git a/airbyte-ci/connectors/pipelines/README.md b/airbyte-ci/connectors/pipelines/README.md
@@ -853,7 +853,8 @@ airbyte-ci connectors --language=low-code migrate-to-manifest-only
 ## Changelog
 
 | Version | PR                                                         | Description                                                                                                                  |
-| ------- | ---------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
+|---------|------------------------------------------------------------| ---------------------------------------------------------------------------------------------------------------------------- |
+| 4.48.1  | [#50410](https://github.com/airbytehq/airbyte/pull/50410)  | Java connector build: give ownership of built artifacts to the current image user.                                                                                          |
 | 4.48.0  | [#49960](https://github.com/airbytehq/airbyte/pull/49960)  | Deprecate airbyte-ci format command                                                                                          |
 | 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.                                              |
diff --git 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
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pipelines"
-version = "4.48.0"
+version = "4.48.1"
 description = "Packaged maintained by the connector operations team to perform CI for connectors' pipelines"
 authors = ["Airbyte <contact@airbyte.io>"]
 
diff --git a/airbyte-integrations/connectors/source-postgres/build.gradle b/airbyte-integrations/connectors/source-postgres/build.gradle
@@ -12,7 +12,7 @@ java {
 }
 
 airbyteJavaConnector {
-    cdkVersionRequired = '0.48.2'
+    cdkVersionRequired = '0.48.4'
     features = ['db-sources', 'datastore-postgres']
     useLocalCdk = false
 }
diff --git 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.26
+  dockerImageTag: 3.6.27
   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

Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,11 @@ async def with_airbyte_java_connector(context: ConnectorContext, connector_java_`
`183`	`183`	`)`
`184`	`184`	`base = with_integration_base_java(context, build_platform).with_entrypoint(["/airbyte/base.sh"])`
`185`	`185`
	`186`	`+ current_user = (await base.with_exec(["whoami"]).stdout()).strip()`
`186`	`187`	`connector_container = (`
`187`	`188`	`base.with_workdir("/airbyte")`
`188`	`189`	`.with_env_variable("APPLICATION", application)`
`189`		`- .with_mounted_directory("built_artifacts", build_stage.directory("/airbyte"))`
	`190`	`+ .with_mounted_directory("built_artifacts", build_stage.directory("/airbyte"), owner=current_user)`
`190`	`191`	`.with_exec(sh_dash_c(["mv built_artifacts/* ."]))`
`191`	`192`	`)`
`192`	`193`	`return await finalize_build(context, connector_container)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ java {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`airbyteJavaConnector {`
`15`		`- cdkVersionRequired = '0.48.2'`
	`15`	`+ cdkVersionRequired = '0.48.4'`
`16`	`16`	`features = ['db-sources', 'datastore-postgres']`
`17`	`17`	`useLocalCdk = false`
`18`	`18`	`}`