Merge branch 'master' into ddavydov/#1467-source-s3-validate-config

.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:

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

@@ -2,10 +2,10 @@ name: Run QA Engine
 
 on:
   workflow_dispatch:
-  schedule:
-    # 1pm UTC is 6am PDT.
-    # same time as Generate Build Report
-    - cron: "0 13 * * *"
+  # schedule:
+  ## 1pm UTC is 6am PDT.
+  ## same time as Generate Build Report
+  # - cron: "0 13 * * *"
 
 jobs:
   run-qa-engine:
@@ -28,5 +28,7 @@ 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
+          QA_ENGINE_AIRBYTE_DATA_PROD_SA: "${{ secrets.QA_ENGINE_AIRBYTE_DATA_PROD_SA }}"
+          GITHUB_API_TOKEN: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
         run: run-qa-engine

.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.

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:
@@ -4167,6 +4187,7 @@ components:
         - config_error
         - system_error
         - manual_cancellation
+        - refresh_schema
     AttemptStatus:
       type: string
       enum:
@@ -5025,6 +5046,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/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;

airbyte-cdk/python/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.27.0
+current_version = 0.28.0
 commit = False
 
 [bumpversion:file:setup.py]

airbyte-cdk/python/.gitignore

@@ -2,3 +2,5 @@
 
 # TODO: these are tmp files generated by unit tests. They should go to the /tmp directory.
 cache_http_stream*.yml
+<MagicMock*
+cache*.sqlite

airbyte-cdk/python/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.28.0
+Low-Code: improve day_delta macro and MinMaxDatetime component
+
 ## 0.27.0
 Make HttpAvailabilityStrategy default for HttpStreams
 

airbyte-cdk/python/airbyte_cdk/config_observation.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Airbyte, Inc., all rights reserved.
+# Copyright (c) 2023 Airbyte, Inc., all rights reserved.
 #
 
 from __future__ import (  # Used to evaluate type hints at runtime, a NameError: name 'ConfigObserver' is not defined is thrown otherwise

airbyte-cdk/python/airbyte_cdk/connector.py

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