Merge branch 'airbytehq:main' into main

.bumpversion.cfg

@@ -5,18 +5,14 @@ parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
 serialize = 
 	{major}.{minor}.{patch}
 
-[bumpversion:file:.env]
+[bumpversion:file:.version]
 search = VERSION=dev
 replace = VERSION={new_version}
 
 [bumpversion:file:airbyte-container-orchestrator/Dockerfile]
 search = ARG VERSION=dev
 replace = ARG VERSION={new_version}
 
-[bumpversion:file:airbyte-proxy/Dockerfile]
-search = ARG VERSION=dev
-replace = ARG VERSION={new_version}
-
 [bumpversion:file:airbyte-server/Dockerfile]
 search = ARG VERSION=dev
 replace = ARG VERSION={new_version}
@@ -73,10 +69,6 @@ replace = appVersion: {new_version}
 search = appVersion: dev
 replace = appVersion: {new_version}
 
-[bumpversion:file:charts/airbyte-api-server/Chart.yaml]
-search = appVersion: dev
-replace = appVersion: {new_version}
-
 [bumpversion:file:charts/airbyte/README.md]
 search = ![AppVersion: dev](https://img.shields.io/badge/AppVersion-dev-informational?style=flat-square)
 replace = ![AppVersion: {new_version}](https://img.shields.io/badge/AppVersion-{new_version}-informational?style=flat-square)

.github/workflows/fe-validate-links.yml

@@ -32,8 +32,8 @@ jobs:
           org.gradle.vfs.watch=false
           EOF
 
-      - name: Run :airbyte-webapp:validateLinks
-        run: ./gradlew --no-daemon :airbyte-webapp:validateLinks --scan -DciMode=true
+      - name: Run :oss:airbyte-webapp:validateLinks
+        run: ./gradlew --no-daemon :oss:airbyte-webapp:validateLinks --scan -DciMode=true
 
       - name: Publish Failures to dev-frontend channel
         uses: abinoda/slack-action@master

.github/workflows/gradle.yml

@@ -65,7 +65,6 @@ jobs:
               - 'airbyte-!(cdk|integrations|webapp)/**'
               - 'airbyte-integrations/connectors/(destination-jdbc|destination-postgres|source-jdbc|source-postgres)/**'
               - 'airbyte-config/init/src/main/resources/seed/(source|destination)_definitions.yaml'
-              - 'docker-compose*.yaml'
               - '(charts|kube)/**'
             build:
               - '.github/**'
@@ -78,8 +77,8 @@ jobs:
             db:
               - 'airbyte-db/**'
             frontend:
-              - 'airbyte-api/src/main/openapi/config.yaml'
-              - 'oss/airbyte-api/src/main/openapi/cloud-config.yaml'
+              - 'airbyte-api/server-api/src/main/openapi/config.yaml'
+              - 'oss/airbyte-api/commons/src/main/openapi/cloud-config.yaml'
               - 'airbyte-connector-builder-resources/CDK_VERSION'
               - 'airbyte-connector-builder-server/src/main/openapi/openapi.yaml'
               - 'airbyte-webapp/**'
@@ -156,7 +155,7 @@ jobs:
           # todo (cgardens): temporarily skipping airbyte-commons-worker because one of the tests uses too much memory. we are
           # adjusting the test to use a more reasonable amount of memory. https://github.com/airbytehq/oncall/issues/4415
           # command: ./gradlew build javadoc --scan
-          command: ./gradlew build -x :airbyte-commons-worker:test javadoc --scan
+          command: ./gradlew build -x :oss:airbyte-commons-worker:test javadoc --scan
           attempt_limit: 3
           attempt_delay: 5000 # in ms
 

.python-version

@@ -1 +1 @@
-3.9.11
+3.10.14

.version

@@ -0,0 +1 @@
+VERSION=dev

README.md

@@ -40,40 +40,9 @@ Airbyte has a built-in scheduler and uses [Temporal](https://airbyte.com/blog/sc
 
 Explore our [demo app](https://demo.airbyte.io/).
 
-## Quick start
+## Quickstart
 
-You can run Airbyte locally with `abctl`. Mac users can install `abctl` with Brew:
-
-```bash
-brew tap airbytehq/tap
-brew install abctl
-```
-
-
-## Setup & launch Airbyte
-
-- Install `Docker Desktop`  \(see [instructions](https://docs.docker.com/desktop/install/mac-install/)\).
-- For users that cannot install `abctl` with `brew` you download the latest version of `abctl` from the [releases page](https://github.com/airbytehq/abctl/releases)
-- Run the following command:
-
-```bash
-./abctl local install
-```
-
-- Your browser should open to the Airbyte Application, if it does not visit [http://localhost](http://localhost)
-- You will be asked for a username and password. By default, that's username `airbyte` and password `password`. You can set these values through command line flags or environment variables. For example, to set the username and password to `foo` and `bar` respectively, you can run the following command:
-
-```bash
-./abctl local install --username foo --password bar
-
-# Or as Environment Variables
-ABCTL_LOCAL_INSTALL_PASSWORD=foo
-ABCTL_LOCAL_INSTALL_USERNAME=bar
-```
-
-Follow web app UI instructions to set up a source, destination and connection to replicate data. Connections support the most popular sync modes: full refresh, incremental and change data capture for databases.
-
-Read the [Airbyte docs](https://docs.airbyte.com).
+Read the [Quickstart documentation](https://docs.airbyte.com/using-airbyte/getting-started/oss-quickstart).
 
 ### Manage Airbyte configurations with code
 

airbyte-analytics/build.gradle.kts

@@ -13,9 +13,9 @@ dependencies {
   api(libs.bundles.micronaut.annotation)
   api(libs.bundles.micronaut.kotlin)
   api(libs.kotlin.logging)
-  api(project(":airbyte-commons"))
-  api(project(":airbyte-config:config-models"))
-  api(project(":airbyte-api"))
+  api(project(":oss:airbyte-commons"))
+  api(project(":oss:airbyte-config:config-models"))
+  api(project(":oss:airbyte-api:server-api"))
 
   testAnnotationProcessor(platform(libs.micronaut.platform))
   testAnnotationProcessor(libs.bundles.micronaut.test.annotation.processor)

airbyte-analytics/src/main/kotlin/io/airbyte/analytics/TrackingClient.kt

@@ -79,14 +79,7 @@ interface TrackingClient {
   )
 }
 
-const val AIRBYTE_ANALYTIC_SOURCE_HEADER = "X-Airbyte-Analytic-Source"
-const val AIRBYTE_DEPLOYMENT_ID = "deployment_id"
-const val AIRBYTE_DEPLOYMENT_MODE = "deployment_mode"
 const val AIRBYTE_ROLE = "airbyte_role"
-const val AIRBYTE_SOURCE = "airbyte_source"
-const val AIRBYTE_TRACKED_AT = "tracked_at"
-const val AIRBYTE_VERSION_KEY = "airbyte_version"
-const val CUSTOMER_ID_KEY = "user_id"
 const val INSTALLATION_ID = "installation_id"
 const val UNKNOWN = "unknown"
 
@@ -128,7 +121,6 @@ class SegmentTrackingClient(
         // deployment
         put(AIRBYTE_VERSION_KEY, deployment.getDeploymentVersion())
         put("deployment_mode", deployment.getDeploymentMode())
-        put("deployment_env", deployment.getDeploymentEnvironment())
         put("deployment_id", deployment.getDeploymentId().toString())
 
         // workspace (includes info that in the future we would store in an organization)
@@ -393,8 +385,6 @@ class Deployment(private val deploymentMetadata: DeploymentMetadataRead) {
 
   fun getDeploymentId(): UUID = deploymentMetadata.id
 
-  fun getDeploymentEnvironment(): String = deploymentMetadata.environment
-
   fun getDeploymentVersion(): String = deploymentMetadata.version
 }
 

airbyte-analytics/src/main/kotlin/io/airbyte/analytics/config/AnalyticsTrackingBeanFactory.kt

@@ -7,7 +7,6 @@ import io.airbyte.config.Configs
 import io.micronaut.context.annotation.Factory
 import io.micronaut.context.annotation.Requires
 import io.micronaut.context.annotation.Value
-import io.micronaut.context.env.Environment
 import io.micronaut.core.util.StringUtils
 import jakarta.inject.Named
 import jakarta.inject.Singleton
@@ -24,11 +23,9 @@ class AnalyticsTrackingBeanFactory {
   fun deploymentSupplier(
     airbyteVersion: AirbyteVersion,
     deploymentMode: Configs.DeploymentMode,
-    environment: Environment,
   ): Supplier<DeploymentMetadataRead> =
     Supplier {
       DeploymentMetadataRead(
-        environment = getDeploymentEnvironment(environment),
         id = BLANK_UUID,
         mode = deploymentMode.name,
         version = airbyteVersion.serialize(),
@@ -66,13 +63,6 @@ class AnalyticsTrackingBeanFactory {
   private fun <T> convertToEnum(
     value: String,
     creatorFunction: Function<String, T>,
-    defaultValue: T,
+    @Suppress("SameParameterValue") defaultValue: T,
   ): T = if (StringUtils.isNotEmpty(value)) creatorFunction.apply(value.uppercase()) else defaultValue
-
-  private fun getDeploymentEnvironment(environment: Environment): String =
-    if (environment.activeNames.contains(Environment.KUBERNETES)) {
-      Configs.WorkerEnvironment.KUBERNETES.name
-    } else {
-      Configs.WorkerEnvironment.DOCKER.name
-    }
 }