Merge branch 'master' into ddavydov/#1299-source-stripe-fix-schema

.bumpversion.cfg

@@ -22,9 +22,9 @@ serialize =
 
 [bumpversion:file:airbyte-server/Dockerfile]
 
-[bumpversion:file:airbyte-webapp/package-lock.json]
-
 [bumpversion:file:airbyte-webapp/package.json]
+search = "version": "{current_version}"
+replace = "version": "{new_version}"
 
 [bumpversion:file:airbyte-workers/Dockerfile]
 
@@ -49,10 +49,14 @@ serialize =
 [bumpversion:file:docs/operator-guides/upgrading-airbyte.md]
 
 [bumpversion:file:kube/overlays/stable-with-resource-limits/.env]
+search = AIRBYTE_VERSION={current_version}
+replace = AIRBYTE_VERSION={new_version}
 
 [bumpversion:file:kube/overlays/stable-with-resource-limits/kustomization.yaml]
 
 [bumpversion:file:kube/overlays/stable/.env]
+search = AIRBYTE_VERSION={current_version}
+replace = AIRBYTE_VERSION={new_version}
 
 [bumpversion:file:kube/overlays/stable/kustomization.yaml]
 
@@ -63,7 +67,11 @@ serialize =
 [bumpversion:file:octavia-cli/install.sh]
 
 [bumpversion:file:octavia-cli/setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"
 
 [bumpversion:file:airbyte-connector-builder-server/Dockerfile]
 
 [bumpversion:file:airbyte-connector-builder-server/setup.py]
+search = version="{current_version}"
+replace = version="{new_version}"

.github/workflows/gradle.yml

@@ -85,6 +85,8 @@ jobs:
               - 'airbyte-db/**'
             frontend:
               - 'airbyte-api/src/main/openapi/config.yaml'
+              - 'airbyte-connector-builder-server/CDK_VERSION'
+              - 'airbyte-connector-builder-server/src/main/openapi/openapi.yaml'
               - 'airbyte-webapp/**'
               - 'airbyte-webapp-e2e-tests/**'
 
@@ -714,21 +716,6 @@ jobs:
           update-comment: true
           debug-mode: false
 
-      - name: Integration test
-        uses: Wandalen/wretry.action@master
-        with:
-          command: SUB_BUILD=PLATFORM ./gradlew newIntegrationTest
-          attempt_limit: 3
-          attempt_delay: 5000 # in ms
-
-      - name: Slow integration test
-        if: contains(github.ref, 'bump-version') || contains(github.ref, 'master')
-        uses: Wandalen/wretry.action@master
-        with:
-          command: SUB_BUILD=PLATFORM ./gradlew slowIntegrationTest
-          attempt_limit: 3
-          attempt_delay: 5000 # in ms
-
       - name: Test if Seed spec is updated
         uses: Wandalen/wretry.action@master
         with:
@@ -1229,7 +1216,7 @@ jobs:
           AWS_S3_BUCKET: airbyte-ci-ac-tests-logs
           SECRET_STORE_GCP_CREDENTIALS: ${{ secrets.SECRET_STORE_GCP_CREDENTIALS }}
           SECRET_STORE_GCP_PROJECT_ID: ${{ secrets.SECRET_STORE_GCP_PROJECT_ID }}
-        timeout-minutes: 20
+        timeout-minutes: 40
         uses: Wandalen/wretry.action@master
         with:
           command: CI=true IS_MINIKUBE=true ./tools/bin/acceptance_test_kube_helm.sh

.github/workflows/run-qa-engine.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup Cloud SDK
         uses: google-github-actions/setup-gcloud@v0
         with:
-          service_account_key: ${{ secrets.PROD_SPEC_CACHE_SA_KEY }}
+          service_account_key: ${{ secrets.QA_ENGINE_AIRBYTE_DATA_PROD_SA }}
           export_default_credentials: true
       - name: Install Python
         uses: actions/setup-python@v4
@@ -28,5 +28,8 @@ jobs:
         run: pip install --quiet -e ./tools/ci_connector_ops
       - name: Run QA Engine
         env:
-          QA_ENGINE_AIRBYTE_DATA_PROD_SA: '${{ secrets.QA_ENGINE_AIRBYTE_DATA_PROD_SA }}'
+          LOGLEVEL: INFO
+          GITHUB_API_TOKEN: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
         run: run-qa-engine
+        # TODO: enable PR creation when all the QA checks are implemented:
+        # run: run-qa-engine --create-prs

.github/workflows/test-command.yml

@@ -152,8 +152,7 @@ jobs:
           retention-days: 3
       - name: Run QA checks for ${{ github.event.inputs.connector }}
         id: qa_checks
-        # TODO: Disabled for on master until #22127 resolved
-        if: contains(github.ref, 'feat-qa-engine')
+        if: always()
         run: |
           run-qa-checks ${{ github.event.inputs.connector }}
       - name: Report Status

LICENSE_SHORT

@@ -1 +1 @@
-Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+Copyright (c) 2023 Airbyte, Inc., all rights reserved.

README.md

@@ -47,7 +47,7 @@ Explore our [demo app](https://demo.airbyte.io/).
 You can run Airbyte locally with Docker.
 
 ```bash
-git clone https://github.com/airbytehq/airbyte.git
+git clone --depth 1 https://github.com/airbytehq/airbyte.git
 cd airbyte
 docker compose up
 ```
@@ -105,4 +105,4 @@ See the [LICENSE](docs/project-overview/licenses/) file for licensing informatio
 - [Newsletter](https://airbyte.com/newsletter) for product updates and data news
 - [Blog](https://airbyte.com/blog) for data insigts articles, tutorials and updates
 - [Docs](https://docs.airbyte.com/) for Airbyte features
-- [Roadmap](https://app.harvestr.io/roadmap/view/pQU6gdCyc/launch-week-roadmap) for planned features
+- [Roadmap](https://app.harvestr.io/roadmap/view/pQU6gdCyc/launch-week-roadmap) for planned features

airbyte-analytics/src/main/java/io/airbyte/analytics/Deployment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/test/java/io/airbyte/analytics/SegmentTrackingClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.api.client;

airbyte-api/src/main/java/io/airbyte/api/client/PatchedLogsApi.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.api.client;

airbyte-api/src/main/openapi/config.yaml

@@ -2214,6 +2214,26 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/InternalOperationResult"
+  /v1/attempt/save_sync_config:
+    post:
+      tags:
+        - attempt
+        - internal
+      summary: For worker to save the AttemptSyncConfig for an attempt.
+      operationId: saveSyncConfig
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/SaveAttemptSyncConfigRequestBody"
+        required: true
+      responses:
+        "200":
+          description: Successful Operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/InternalOperationResult"
 
 components:
   securitySchemes:
@@ -2769,6 +2789,8 @@ components:
           format: uuid
         disable_cache:
           type: boolean
+        notifySchemaChange:
+          type: boolean
     SourceUpdate:
       type: object
       required:
@@ -4167,6 +4189,7 @@ components:
         - config_error
         - system_error
         - manual_cancellation
+        - refresh_schema
     AttemptStatus:
       type: string
       enum:
@@ -5025,6 +5048,31 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/AttemptStreamStats"
+    AttemptSyncConfig:
+      type: object
+      required:
+        - sourceConfiguration
+        - destinationConfiguration
+      properties:
+        sourceConfiguration:
+          $ref: "#/components/schemas/SourceConfiguration"
+        destinationConfiguration:
+          $ref: "#/components/schemas/DestinationConfiguration"
+        state:
+          $ref: "#/components/schemas/ConnectionState"
+    SaveAttemptSyncConfigRequestBody:
+      type: object
+      required:
+        - jobId
+        - attemptNumber
+        - syncConfig
+      properties:
+        jobId:
+          $ref: "#/components/schemas/JobId"
+        attemptNumber:
+          $ref: "#/components/schemas/AttemptNumber"
+        syncConfig:
+          $ref: "#/components/schemas/AttemptSyncConfig"
     InternalOperationResult:
       type: object
       required:

airbyte-api/src/test/java/io/airbyte/api/client/AirbyteApiClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.api.client;

airbyte-bootloader/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     implementation project(':airbyte-config:config-persistence')
     implementation project(':airbyte-db:db-lib')
     implementation project(":airbyte-json-validation")
-    implementation project(':airbyte-protocol:protocol-models')
+    implementation libs.airbyte.protocol
     implementation project(':airbyte-persistence:job-persistence')
 
     testAnnotationProcessor platform(libs.micronaut.bom)

airbyte-bootloader/src/main/java/io/airbyte/bootloader/Application.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/Bootloader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/DefaultPostLoadExecutor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/ProtocolVersionChecker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/SecretMigrator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/config/ApplicationBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader.config;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/config/DatabaseBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader.config;

airbyte-bootloader/src/main/java/io/airbyte/bootloader/config/SecretPersistenceBeanFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader.config;

airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;
@@ -82,7 +82,8 @@ class BootloaderTest {
 
   // ⚠️ This line should change with every new migration to show that you meant to make a new
   // migration to the prod database
-  private static final String CURRENT_MIGRATION_VERSION = "0.40.28.001";
+  private static final String CURRENT_CONFIGS_MIGRATION_VERSION = "0.40.28.001";
+  private static final String CURRENT_JOBS_MIGRATION_VERSION = "0.40.28.001";
 
   @BeforeEach
   void setup() {
@@ -147,10 +148,10 @@ void testBootloaderAppBlankDb() throws Exception {
       bootloader.load();
 
       val jobsMigrator = new JobsDatabaseMigrator(jobDatabase, jobsFlyway);
-      assertEquals("0.40.26.001", jobsMigrator.getLatestMigration().getVersion().getVersion());
+      assertEquals(CURRENT_JOBS_MIGRATION_VERSION, jobsMigrator.getLatestMigration().getVersion().getVersion());
 
       val configsMigrator = new ConfigsDatabaseMigrator(configDatabase, configsFlyway);
-      assertEquals(CURRENT_MIGRATION_VERSION, configsMigrator.getLatestMigration().getVersion().getVersion());
+      assertEquals(CURRENT_CONFIGS_MIGRATION_VERSION, configsMigrator.getLatestMigration().getVersion().getVersion());
 
       assertEquals(VERSION_0330_ALPHA, jobsPersistence.getVersion().get());
       assertEquals(new Version(PROTOCOL_VERSION_123), jobsPersistence.getAirbyteProtocolVersionMin().get());

airbyte-bootloader/src/test/java/io/airbyte/bootloader/DefaultPostLoadExecutorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/test/java/io/airbyte/bootloader/ProtocolVersionCheckerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;

airbyte-bootloader/src/test/java/io/airbyte/bootloader/SecretMigratorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2023 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.bootloader;