Skip to content

Commit

Permalink
Merge branch 'airbytehq:master' into teradata_master
Browse files Browse the repository at this point in the history
  • Loading branch information
sc250072 authored Dec 27, 2024
2 parents b749e3b + c519289 commit ee954a3
Show file tree
Hide file tree
Showing 5,150 changed files with 488,025 additions and 237,269 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 16 additions & 18 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
/airbyte-integrations/connectors/destination-qdrant @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-chroma @airbytehq/ai-language-models
/airbyte-integrations/connectors/destination-snowflake-cortex @airbytehq/ai-language-models
/airbyte-cdk/python/airbyte_cdk/destinations/vector_db_based @airbytehq/ai-language-models

# CI/CD
/.github/ @airbytehq/dev-tooling
/airbyte-ci/ @airbytehq/dev-tooling

# Python CDK and Connector Acceptance Tests
/airbyte-cdk/python @airbytehq/python-team
/airbyte-integrations/connector-templates/ @airbytehq/dev-marketplace-contributions
/airbyte-integrations/bases/connector-acceptance-test/ @airbytehq/dev-tooling

Expand All @@ -23,27 +21,27 @@
/docs/understanding-airbyte/airbyte-protocol.md @airbytehq/protocol-reviewers

# Bulk CDK
/airbyte-cdk/bulk @airbytehq/dbsources @airbytehq/destinations
/airbyte-cdk/bulk @airbytehq/dbsources @airbytehq/move-destinations
/airbyte-cdk/bulk/core/extract/ @airbytehq/dbsources
/airbyte-cdk/bulk/core/load/ @airbytehq/destinations
/airbyte-cdk/bulk/core/load/ @airbytehq/move-destinations
/airbyte-cdk/bulk/toolkits/extract-*/ @airbytehq/dbsources
/airbyte-cdk/bulk/toolkits/load-*/ @airbytehq/destinations
/airbyte-cdk/bulk/toolkits/load-*/ @airbytehq/move-destinations

# Java CDK
/airbyte-cdk/java/airbyte-cdk @airbytehq/dbsources @airbytehq/destinations
/airbyte-cdk/java/airbyte-cdk @airbytehq/dbsources @airbytehq/move-destinations
/airbyte-cdk/java/airbyte-cdk/*-sources/ @airbytehq/dbsources
/airbyte-cdk/java/airbyte-cdk/*-destinations/ @airbytehq/destinations
/airbyte-cdk/java/airbyte-cdk/typing-deduping/ @airbytehq/destinations
/airbyte-cdk/java/airbyte-cdk/*-destinations/ @airbytehq/move-destinations
/airbyte-cdk/java/airbyte-cdk/typing-deduping/ @airbytehq/move-destinations

# Java connectors catch-all
/buildSrc/ @airbytehq/dbsources @airbytehq/destinations
/buildSrc/ @airbytehq/dbsources @airbytehq/move-destinations
/airbyte-integrations/connectors/source-*/**/*.java @airbytehq/dbsources
/airbyte-integrations/connectors/source-*/**/*.kt @airbytehq/dbsources
/airbyte-integrations/connectors/source-*/**/*.gradle @airbytehq/dbsources
/airbyte-integrations/connectors-performance/source-harness/ @airbytehq/dbsources
/airbyte-integrations/connectors/destination-*/**/*.java @airbytehq/destinations
/airbyte-integrations/connectors/destination-*/**/*.kt @airbytehq/destinations
/airbyte-integrations/connectors/destination-*/**/*.gradle @airbytehq/destinations
/airbyte-integrations/connectors/destination-*/**/*.java @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-*/**/*.kt @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-*/**/*.gradle @airbytehq/move-destinations
/airbyte-integrations/connectors-performance/destination-harness/ @airbytehq/dbsources

# Java-based certified or incubating source connectors
Expand All @@ -53,12 +51,12 @@
/airbyte-integrations/connectors/source-postgres/ @airbytehq/dbsources

# Java-based certified or incubating destination connectors
/airbyte-integrations/connectors/destination-bigquery/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-postgres/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-postgres-strict-encrypt/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-s3/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-snowflake/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-redshift/ @airbytehq/destinations
/airbyte-integrations/connectors/destination-bigquery/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-postgres/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-postgres-strict-encrypt/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-s3/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-snowflake/ @airbytehq/move-destinations
/airbyte-integrations/connectors/destination-redshift/ @airbytehq/move-destinations

# Python critical connectors
/airbyte-integrations/connectors/source-facebook-marketing/ @airbytehq/python-team
Expand Down
17 changes: 16 additions & 1 deletion .github/actions/run-airbyte-ci/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ runs:
id: get-start-timestamp
shell: bash
run: echo "start-timestamp=$(date +%s)" >> $GITHUB_OUTPUT
- name: Debug-print local paths checked out
shell: bash
run: |
set -x
echo "Working directory: $(pwd)"
ls -la
ls -la airbyte-python-cdk || echo "No airbyte-python-cdk directory"
ls -laL ../airbyte-python-cdk || echo "No airbyte-python-cdk symlink"
- name: Docker login
id: docker-login
uses: docker/login-action@v3
Expand Down Expand Up @@ -186,11 +195,17 @@ runs:
shell: bash
run: tar cvzf ./dagger_engine_logs.tgz ./dagger_engine_logs

- name: Hash subcommand
id: hash-subcommand
shell: bash
if: always()
run: echo "subcommand_hash=$(echo ${{ inputs.subcommand }} | sha256sum | cut -d ' ' -f 1)" >> $GITHUB_OUTPUT

- name: Upload logs to GitHub
id: upload-dagger-engine-logs
if: always()
uses: actions/upload-artifact@v4
with:
name: ${{ github.job }}_dagger_engine_logs.tgz
name: ${{ github.job }}_${{ steps.hash-subcommand.outputs.subcommand_hash }}_dagger_engine_logs.tgz
path: ./dagger_engine_logs.tgz
retention-days: 7
2 changes: 1 addition & 1 deletion .github/workflows/airbyte-ci-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
if: github.ref == 'refs/heads/master'
working-directory: airbyte-ci/connectors/pipelines/
run: |
echo "::set-output name=version::$(poetry version --short)"
echo "version=$(poetry version --short)" >> $GITHUB_OUTPUT
- name: Authenticate to Google Cloud Prod
id: auth_prod
Expand Down
24 changes: 21 additions & 3 deletions .github/workflows/airbyte-ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
- synchronize
jobs:
changes:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
internal_poetry_packages: ${{ steps.changes.outputs.internal_poetry_packages }}

Expand All @@ -42,7 +42,6 @@ jobs:
- airbyte-ci/connectors/erd/**
- airbyte-ci/connectors/metadata_service/lib/**
- airbyte-ci/connectors/metadata_service/orchestrator/**
- airbyte-cdk/python/**
- airbyte-integrations/bases/connector-acceptance-test/**
run-tests:
Expand All @@ -60,6 +59,25 @@ jobs:
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.ref }}
- name: Checkout Airbyte Python CDK
uses: actions/checkout@v4
with:
repository: airbytehq/airbyte-python-cdk
ref: main
# We can't clone into a parent directory of the repo, so we clone into
# a subdirectory and then move it over as a sibling directory.
# This will be used for the `--use-local-cdk` flag in `airbyte-ci` command
path: airbyte-python-cdk
- name: Move airbyte-python-cdk to sibling directory path
shell: bash
run: mv ./airbyte-python-cdk ../airbyte-python-cdk
- name: Show local paths checked out
shell: bash
run: |
set -x
echo "Current directory: $(pwd)"
ls -la
ls -la ../airbyte-python-cdk || echo "No airbyte-python-cdk directory"
- name: Extract branch name [WORKFLOW DISPATCH]
shell: bash
Expand All @@ -69,7 +87,7 @@ jobs:
- name: Fetch last commit id from remote branch [PULL REQUESTS]
if: github.event_name == 'pull_request'
id: fetch_last_commit_id_pr
run: echo "commit_id=$(git ls-remote --heads origin ${{ github.head_ref }} | cut -f 1)" >> $GITHUB_OUTPUT
run: echo "commit_id=$(git ls-remote --heads origin refs/heads/${{ github.head_ref }} | cut -f 1)" >> $GITHUB_OUTPUT
- name: Fetch last commit id from remote branch [WORKFLOW DISPATCH]
if: github.event_name == 'workflow_dispatch'
id: fetch_last_commit_id_wd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/approve-and-merge-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [created]
jobs:
approveAndMergeDispatch:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Auto Approve Slash Command Dispatch
uses: peter-evans/slash-command-dispatch@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/approve-regression-tests-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ run-name: "Approve Regression Tests #${{ github.event.inputs.pr }}"
jobs:
approve-regression-tests:
name: "Approve Regression Tests"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Get job variables
id: job-vars
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assign-issue-to-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
assign_one_project:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
name: Assign to Airbyte Github Project
steps:
- name: Assign documentation issues to the Documentation Roadmap project
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
run_auto_merge:
name: Run auto-merge
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bump-version-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ concurrency:
jobs:
bump-version:
name: "Bump version of connectors in this PR"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- name: Get job variables
id: job-vars
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Check for changes
id: git-diff
run: |
git diff --quiet && echo "No changes to commit" || echo "::set-output name=changes::true"
git diff --quiet && echo "No changes to commit" || echo "changes=true" >> $GITHUB_OUTPUT
shell: bash

# Commit changes (if any)
Expand Down
95 changes: 0 additions & 95 deletions .github/workflows/cdk_connectors_tests.yml

This file was deleted.

43 changes: 1 addition & 42 deletions .github/workflows/community_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
fail_on_protected_path_changes:
name: "Check fork do not change protected paths"
if: github.event.pull_request.head.repo.fork == true
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
pull-requests: read
steps:
Expand All @@ -37,45 +37,6 @@ jobs:
echo "The fork has changes in protected paths. This is not allowed."
exit 1
format_check:
# IMPORTANT: This name must match the require check name on the branch protection settings
name: "Check for formatting errors"
if: github.event.pull_request.head.repo.fork == true
environment: community-ci-auto
runs-on: community-tooling-test-small
needs: fail_on_protected_path_changes
timeout-minutes: 30
env:
MAIN_BRANCH_NAME: "master"
steps:
# This checkouts a fork which can contain untrusted code
# It's deemed safe as the formatter are not executing any checked out code
- name: Checkout fork
uses: actions/checkout@v4
with:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 1

# This will sync the .github folder of the main repo with the fork
# This allows us to use up to date actions and CI logic from the main repo
- name: Pull .github folder and internal packages from main repository
id: pull_github_folder
run: |
git remote add main https://github.com/airbytehq/airbyte.git
git fetch main ${MAIN_BRANCH_NAME}
git checkout main/${MAIN_BRANCH_NAME} -- .github
git checkout main/${MAIN_BRANCH_NAME} -- airbyte-ci
- name: Run airbyte-ci format check all
# This path refers to the fork .github folder.
# We make sure its content is in sync with the main repo .github folder by pulling it in the previous step
uses: ./.github/actions/run-airbyte-ci
with:
context: "pull_request"
sentry_dsn: ${{ secrets.SENTRY_AIRBYTE_CI_DSN }}
subcommand: "format check all"
is_fork: "true"
connectors_early_ci:
name: Run connectors early CI on fork
if: github.event.pull_request.head.repo.fork == true
Expand Down Expand Up @@ -172,7 +133,6 @@ jobs:
uses: ./.github/actions/run-airbyte-ci
with:
context: "pull_request"
dagger_cloud_token: ${{ secrets.DAGGER_CLOUD_TOKEN_CACHE_4 }}
docker_hub_password: ${{ secrets.DOCKER_HUB_PASSWORD }}
docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
gcp_gsm_credentials: ${{ secrets.GCP_GSM_CREDENTIALS }}
Expand Down Expand Up @@ -237,7 +197,6 @@ jobs:
uses: ./.github/actions/run-airbyte-ci
with:
context: "pull_request"
dagger_cloud_token: ${{ secrets.DAGGER_CLOUD_TOKEN_CACHE_4 }}
docker_hub_password: ${{ secrets.DOCKER_HUB_PASSWORD }}
docker_hub_username: ${{ secrets.DOCKER_HUB_USERNAME }}
gcp_gsm_credentials: ${{ secrets.GCP_GSM_CREDENTIALS }}
Expand Down
Loading

0 comments on commit ee954a3

Please sign in to comment.