Merge branch 'airbytehq:master' into master

.github/workflows/airbyte-ci-release.yml

@@ -6,8 +6,6 @@ concurrency:
 
 on:
   push:
-    branches:
-      - master
     paths:
       - "airbyte-ci/connectors/pipelines/**"
   workflow_dispatch:

.github/workflows/airbyte-ci-tests.yml

@@ -13,8 +13,9 @@ on:
       - synchronize
 jobs:
   run-airbyte-ci-tests:
+    # Note if you are changing this name you must also change it in the approve-and-merge-dispatch.yml workflow
     name: Run Airbyte CI tests
-    runs-on: "conn-prod-xlarge-runner"
+    runs-on: "ci-runner-connector-test-large-dagger-0-6-4"
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v3

.github/workflows/approve-and-merge-demo-dispatch.yml

@@ -0,0 +1,50 @@
+name: Approve and Merge Demo Command Dispatch
+
+# Note: We have a two stage dispatch so that we can wait for the formatters to run before approving and merging.
+on:
+  repository_dispatch:
+    types: [approve-and-merge-demo-command]
+
+jobs:
+  checkFormat:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Wait for formatters to succeed
+        id: wait-for-formatters
+        uses: lewagon/wait-on-check-action@v1.3.1
+        with:
+          ref: ${{ github.event.client_payload.pull_request.head.ref }}
+          check-name: "Apply All Formatting Rules"
+          repo-token: ${{ secrets.GH_PAT_APPROVINGTON_OCTAVIA }}
+          wait-interval: 30
+      - name: Comment if formatters failed
+        if: failure()
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          body: |
+            > Error: Formatters failed. Ensure formatting is passing before using approve-and-merge.
+
+  approveAndMergeDispatch:
+    runs-on: ubuntu-latest
+    needs: [checkFormat]
+    steps:
+      - name: Auto Approve Slash Command Dispatch
+        uses: peter-evans/slash-command-dispatch@v3
+        id: scd
+        with:
+          token: ${{ secrets.GH_PAT_APPROVINGTON_OCTAVIA }}
+          permission: write
+          issue-type: pull-request
+          repository: airbytehq/airbyte-cloud
+          dispatch-type: repository
+          commands: |
+            approve-and-merge
+
+      - name: Edit comment with error message
+        if: steps.scd.outputs.error-message
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ github.event.client_payload.github.payload.comment.id }}
+          body: |
+            > Error: ${{ steps.scd.outputs.error-message }}

.github/workflows/cat-tests.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   run-cat-unit-tests:
     name: Run CAT unit tests
-    runs-on: "conn-prod-xlarge-runner"
+    runs-on: "ci-runner-connector-test-large-dagger-0-6-4"
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v3

.github/workflows/connectors_nightly_build.yml

@@ -8,19 +8,19 @@ on:
     inputs:
       runs-on:
         type: string
-        default: conn-nightly-xlarge-runner
+        default: ci-runner-connector-nightly-xlarge-dagger-0-6-4
         required: true
       test-connectors-options:
         default: --concurrency=5 --support-level=certified
         required: true
 
-run-name: "Test connectors: ${{ inputs.test-connectors-options || 'nightly build for Certified connectors' }} - on ${{ inputs.runs-on || 'conn-nightly-xlarge-runner' }}"
+run-name: "Test connectors: ${{ inputs.test-connectors-options || 'nightly build for Certified connectors' }} - on ${{ inputs.runs-on || 'ci-runner-connector-nightly-xlarge-dagger-0-6-4' }}"
 
 jobs:
   test_connectors:
-    name: "Test connectors: ${{ inputs.test-connectors-options || 'nightly build for Certified connectors' }} - on ${{ inputs.runs-on || 'conn-nightly-xlarge-runner' }}"
+    name: "Test connectors: ${{ inputs.test-connectors-options || 'nightly build for Certified connectors' }} - on ${{ inputs.runs-on || 'ci-runner-connector-nightly-xlarge-dagger-0-6-4' }}"
     timeout-minutes: 720 # 12 hours
-    runs-on: ${{ inputs.runs-on || 'conn-nightly-xlarge-runner' }}
+    runs-on: ${{ inputs.runs-on || 'ci-runner-connector-nightly-xlarge-dagger-0-6-4' }}
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v3

.github/workflows/connectors_tests.yml

@@ -19,7 +19,7 @@ on:
         default: "--modified"
       runner:
         description: "The runner to use for this job"
-        default: "conn-prod-xlarge-runner"
+        default: "ci-runner-connector-test-large-dagger-0-6-4"
   pull_request:
     types:
       - opened
@@ -29,7 +29,7 @@ jobs:
   connectors_ci:
     name: Connectors CI
     timeout-minutes: 1440 # 24 hours
-    runs-on: ${{ inputs.runner || 'conn-prod-xlarge-runner'}}
+    runs-on: ${{ inputs.runner || 'ci-runner-connector-test-large-dagger-0-6-4'}}
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v3

.github/workflows/connectors_weekly_build.yml

@@ -8,19 +8,19 @@ on:
     inputs:
       runs-on:
         type: string
-        default: conn-nightly-xlarge-runner
+        default: ci-runner-connector-nightly-xlarge-dagger-0-6-4
         required: true
       test-connectors-options:
         default: --concurrency=3 --support-level=community
         required: true
 
-run-name: "Test connectors: ${{ inputs.test-connectors-options || 'weekly build for Community connectors' }} - on ${{ inputs.runs-on || 'conn-nightly-xlarge-runner' }}"
+run-name: "Test connectors: ${{ inputs.test-connectors-options || 'weekly build for Community connectors' }} - on ${{ inputs.runs-on || 'ci-runner-connector-nightly-xlarge-dagger-0-6-4' }}"
 
 jobs:
   test_connectors:
-    name: "Test connectors: ${{ inputs.test-connectors-options || 'weekly build for Community connectors' }} - on ${{ inputs.runs-on || 'conn-nightly-xlarge-runner' }}"
+    name: "Test connectors: ${{ inputs.test-connectors-options || 'weekly build for Community connectors' }} - on ${{ inputs.runs-on || 'ci-runner-connector-nightly-xlarge-dagger-0-6-4' }}"
     timeout-minutes: 8640 # 6 days
-    runs-on: ${{ inputs.runs-on || 'conn-nightly-xlarge-runner' }}
+    runs-on: ${{ inputs.runs-on || 'ci-runner-connector-nightly-xlarge-dagger-0-6-4' }}
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v3

.github/workflows/format_check.yml

@@ -10,7 +10,7 @@ on:
       - master
 jobs:
   format-check:
-    runs-on: "conn-prod-xlarge-runner"
+    runs-on: "ci-runner-connector-format-medium-dagger-0-6-4"
     name: "Check for formatting errors on ${{ github.head_ref }}"
     timeout-minutes: 40
     steps:

.github/workflows/format_fix.yml

@@ -10,7 +10,8 @@ on:
   pull_request:
 jobs:
   format-fix:
-    runs-on: "conn-prod-xlarge-runner"
+    runs-on: "ci-runner-connector-format-medium-dagger-0-6-4"
+    # Note if you are changing this name you must also change it in the approve-and-merge-dispatch.yml workflow
     name: "Apply All Formatting Rules"
     timeout-minutes: 40
     steps:

.github/workflows/gradle.yml

@@ -54,6 +54,7 @@ jobs:
     # In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest.
     needs: start-check-runner # required to start the main job when the runner is ready
     runs-on: ${{ needs.start-check-runner.outputs.label }} # run the job on the newly created runner
+    # Note if you are changing this name you must also change it in the approve-and-merge-dispatch.yml workflow
     name: Gradle Check
     timeout-minutes: 30
     steps:

.github/workflows/metadata_service_deploy_orchestrator_dagger.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   connector_metadata_service_deploy_orchestrator:
     name: Connector metadata service deploy orchestrator
-    runs-on: medium-runner
+    runs-on: ci-runner-connector-test-large-dagger-0-6-4
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v2

.github/workflows/publish_connectors.yml

@@ -16,12 +16,12 @@ on:
         default: "--pre-release"
       runs-on:
         type: string
-        default: conn-prod-xlarge-runner
+        default: ci-runner-connector-publish-large-dagger-0-6-4
         required: true
 jobs:
   publish_connectors:
     name: Publish connectors
-    runs-on: ${{ inputs.runs-on || 'conn-prod-xlarge-runner' }}
+    runs-on: ${{ inputs.runs-on || 'ci-runner-connector-publish-large-dagger-0-6-4' }}
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v3

.github/workflows/publish_pypi.yml

@@ -5,12 +5,12 @@ on:
     inputs:
       runs-on:
         type: string
-        default: conn-prod-xlarge-runner
+        default: ci-runner-connector-publish-large-dagger-0-6-4
         required: true
 
 jobs:
   no-op:
     name: No-op
-    runs-on: ${{ inputs.runs-on || 'conn-prod-xlarge-runner' }}
+    runs-on: ${{ inputs.runs-on || 'ci-runner-connector-publish-large-dagger-0-6-4' }}
     steps:
       - run: echo 'hi!'

.github/workflows/slash-commands.yml

@@ -15,9 +15,9 @@ jobs:
           echo ref="$(echo $pr_info | jq -r '.head.ref')" >> $GITHUB_OUTPUT
           echo repo="$(echo $pr_info | jq -r '.head.repo.full_name')" >> $GITHUB_OUTPUT
 
-      - name: Slash Command Dispatch
+      - name: Slash Command Dispatch (Workflow)
         id: scd
-        uses: peter-evans/slash-command-dispatch@v2
+        uses: peter-evans/slash-command-dispatch@v3
         with:
           token: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
           permission: write
@@ -35,6 +35,16 @@ jobs:
             comment-id=${{ github.event.comment.id }}
           dispatch-type: workflow
 
+      - name: Slash Command Dispatch (Repository)
+        id: scdr
+        uses: peter-evans/slash-command-dispatch@v3
+        with:
+          token: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
+          permission: write
+          commands: |
+            approve-and-merge-demo
+          dispatch-type: repository
+
       - name: Edit comment with error message
         if: steps.scd.outputs.error-message
         uses: peter-evans/create-or-update-comment@v1

LICENSE

@@ -1,14 +1,17 @@
 Airbyte monorepo uses multiple licenses.
 
 The license for a particular work is defined with following prioritized rules:
+
 1. License directly present in the file
 2. LICENSE file in the same directory as the work
-3. First LICENSE found when exploring parent directories up to the project top level directory
-4. Defaults to Elastic License 2.0
+3. A `license` property defined in the `metadata.yaml` configuration file found when exploring parent directories (most connectors)
+4. First LICENSE found when exploring parent directories up to the project top level directory
+5. Defaults to Elastic License 2.0
 
 If you have any question regarding licenses, just visit our [FAQ](https://airbyte.io/license-faq) or [contact us](mailto:license@airbyte.io).
 
-------------------------------------------------------------------------------------
+---
+
 MIT License
 
 Copyright (c) 2020 Airbyte, Inc.
@@ -31,7 +34,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-------------------------------------------------------------------------------------
+---
+
 Elastic License 2.0 (ELv2)
 
 **Acceptance**
@@ -65,16 +69,16 @@ If you use the software in violation of these terms, such use is not licensed, a
 As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
 
 **Definitions**
-The *licensor* is the entity offering these terms, and the *software* is the software the licensor makes available under these terms, including any portion of it.
+The _licensor_ is the entity offering these terms, and the _software_ is the software the licensor makes available under these terms, including any portion of it.
 
-*you* refers to the individual or entity agreeing to these terms.
+_you_ refers to the individual or entity agreeing to these terms.
 
-*your company* is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. *control* means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
+_your company_ is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. _control_ means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
 
-*your licenses* are all the licenses granted to you for the software under these terms.
+_your licenses_ are all the licenses granted to you for the software under these terms.
 
-*use* means anything you do with the software requiring one of your licenses.
+_use_ means anything you do with the software requiring one of your licenses.
 
-*trademark* means trademarks, service marks, and similar rights.
+_trademark_ means trademarks, service marks, and similar rights.
 
-------------------------------------------------------------------------------------
+---

airbyte-cdk/java/airbyte-cdk/README.md

@@ -156,6 +156,7 @@ MavenLocal debugging steps:
 
 | Version | Date       | Pull Request                                               | Subject                                                                                                                                                        |
 | :------ | :--------- | :--------------------------------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 0.5.0   | 2023-11-22 | [\#32656](https://github.com/airbytehq/airbyte/pull/32656) | Introduce TestDatabase test fixture, refactor database source test base classes.                                                                               |
 | 0.4.11  | 2023-11-14 | [\#32526](https://github.com/airbytehq/airbyte/pull/32526) | Clean up memory manager logs.                                                                                                                                  |
 | 0.4.10  | 2023-11-13 | [\#32285](https://github.com/airbytehq/airbyte/pull/32285) | Fix UUID codec ordering for MongoDB connector                                                                                                                  |
 | 0.4.9   | 2023-11-13 | [\#32468](https://github.com/airbytehq/airbyte/pull/32468) | Further error grouping improvements for DV2 connectors                                                                                                         |

airbyte-cdk/java/airbyte-cdk/core/build.gradle

@@ -77,6 +77,7 @@ dependencies {
     testImplementation libs.testcontainers.jdbc
     testImplementation libs.testcontainers.mysql
     testImplementation libs.testcontainers.postgresql
+    testImplementation libs.testcontainers.mssqlserver
     implementation 'org.codehaus.plexus:plexus-utils:3.4.2'
 
     // bouncycastle is pinned to version-match the transitive dependency from kubernetes client-java