Skip to content

Commit a66d315

Browse files
committed
Merge branch 'master' into ddavydov/#26229-source-google-ads-migrate-to-advancedAuth
2 parents 9310436 + 9f0b93e commit a66d315

File tree

251 files changed

+2261
-2032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+2261
-2032
lines changed

.bumpversion.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.44.7
2+
current_version = 0.44.12
33
commit = False
44
tag = False
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@
4848
/airbyte-integrations/connectors/destination-rockset/ @airbytehq/destinations
4949
/airbyte-integrations/connectors/destination-s3/ @airbytehq/destinations
5050
/airbyte-integrations/connectors/destination-snowflake/ @airbytehq/destinations
51+
/airbyte-integrations/connectors/destination-tidb/ @airbytehq/destinations

.github/workflows/connector_integration_test_single_dagger.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
if: github.event_name == 'workflow_dispatch'
5454
run: |
5555
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="unix:///var/run/buildkit/buildkitd.sock"
56-
DAGGER_CLI_COMMIT="2370d5eb65e511cf7f1611aebaacc6d48cf0907a"
56+
DAGGER_CLI_COMMIT="6ed6264f1c4efbf84d310a104b57ef1bc57d57b0"
5757
DAGGER_TMP_BINDIR="/tmp/dagger_${DAGGER_CLI_COMMIT}"
5858
export _EXPERIMENTAL_DAGGER_CLI_BIN="$DAGGER_TMP_BINDIR/dagger"
5959
if [ ! -f "$_EXPERIMENTAL_DAGGER_CLI_BIN" ]; then
@@ -77,7 +77,7 @@ jobs:
7777
if: github.event_name == 'pull_request'
7878
run: |
7979
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="unix:///var/run/buildkit/buildkitd.sock"
80-
DAGGER_CLI_COMMIT="2370d5eb65e511cf7f1611aebaacc6d48cf0907a"
80+
DAGGER_CLI_COMMIT="6ed6264f1c4efbf84d310a104b57ef1bc57d57b0"
8181
DAGGER_TMP_BINDIR="/tmp/dagger_${DAGGER_CLI_COMMIT}"
8282
export _EXPERIMENTAL_DAGGER_CLI_BIN="$DAGGER_TMP_BINDIR/dagger"
8383
if [ ! -f "$_EXPERIMENTAL_DAGGER_CLI_BIN" ]; then

.github/workflows/connector_nightly_builds_dagger.yml renamed to .github/workflows/connectors_manual_tests.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
name: POC Connectors CI - nightly builds
1+
name: Connectors CI - Manual tests
22

33
on:
4-
# schedule:
5-
# # 11AM UTC is 12AM CET, 4AM PST.
6-
# - cron: "0 8 * * *"
74
workflow_dispatch:
85
inputs:
96
runs-on:
107
type: string
118
default: dev-large-runner
129
required: true
1310
test-connectors-options:
14-
default: --concurrency=5 --release-stage=generally_available --release-stage=beta
11+
default: --concurrency=10 --release-stage=generally_available --release-stage=beta
1512
required: true
1613

17-
run-name: Test connectors ${{ inputs.test-connectors-options || 'Nightly builds GA and Beta connectors' }}
14+
run-name: "Test connectors ${{ inputs.test-connectors-options}} on ${{ inputs.runs-on }}"
1815

1916
jobs:
2017
test_connectors:
21-
name: Test connectors ${{ inputs.test-connectors-options || 'Nightly builds GA and Beta connectors' }}
22-
timeout-minutes: 360 # 6 hours
18+
name: "Test connectors ${{ inputs.test-connectors-options}} on ${{ inputs.runs-on }}"
19+
timeout-minutes: 600 # 10 hours
2320
runs-on: ${{ inputs.runs-on || 'dev-large-runner' }}
2421
steps:
2522
- name: Get start timestamp
@@ -47,17 +44,17 @@ jobs:
4744
token: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
4845
- name: Install ci-connector-ops package
4946
run: pip install ./tools/ci_connector_ops\[pipelines]\
50-
- name: Test connectors
47+
- name: "Test connectors ${{ inputs.test-connectors-options}}"
5148
run: |
5249
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="unix:///var/run/buildkit/buildkitd.sock"
53-
DAGGER_CLI_COMMIT="2370d5eb65e511cf7f1611aebaacc6d48cf0907a"
50+
DAGGER_CLI_COMMIT="6ed6264f1c4efbf84d310a104b57ef1bc57d57b0"
5451
DAGGER_TMP_BINDIR="/tmp/dagger_${DAGGER_CLI_COMMIT}"
5552
export _EXPERIMENTAL_DAGGER_CLI_BIN="$DAGGER_TMP_BINDIR/dagger"
5653
if [ ! -f "$_EXPERIMENTAL_DAGGER_CLI_BIN" ]; then
5754
mkdir -p "$DAGGER_TMP_BINDIR"
5855
curl "https://dl.dagger.io/dagger/main/${DAGGER_CLI_COMMIT}/dagger_${DAGGER_CLI_COMMIT}_$(uname -s | tr A-Z a-z)_$(uname -m | sed s/x86_64/amd64/).tar.gz" | tar xvz -C "$DAGGER_TMP_BINDIR"
5956
fi
60-
airbyte-ci --is-ci --gha-workflow-run-id=${{ github.run_id }} connectors ${{ inputs.test-connectors-options || '--concurrency=5 --release-stage=generally_available --release-stage=beta' }} test
57+
airbyte-ci --is-ci --gha-workflow-run-id=${{ github.run_id }} connectors ${{ inputs.test-connectors-options }} test
6158
env:
6259
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: "p.eyJ1IjogIjFiZjEwMmRjLWYyZmQtNDVhNi1iNzM1LTgxNzI1NGFkZDU2ZiIsICJpZCI6ICJlNjk3YzZiYy0yMDhiLTRlMTktODBjZC0yNjIyNGI3ZDBjMDEifQ.hT6eMOYt3KZgNoVGNYI3_v4CC-s19z8uQsBkGrBhU3k"
6360
GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
@@ -67,5 +64,5 @@ jobs:
6764
TEST_REPORTS_BUCKET_NAME: "airbyte-connector-build-status"
6865
CI_GITHUB_ACCESS_TOKEN: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
6966
CI_GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}
70-
CI_CONTEXT: "nightly_builds"
67+
CI_CONTEXT: "manual"
7168
CI_PIPELINE_START_TIMESTAMP: ${{ steps.get-start-timestamp.outputs.start-timestamp }}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
name: Connectors CI - nightly builds for GA and Beta connectors
2+
3+
on:
4+
schedule:
5+
# 11AM UTC is 12AM CET, 4AM PST.
6+
- cron: "0 11 * * *"
7+
workflow_dispatch:
8+
inputs:
9+
runs-on:
10+
type: string
11+
default: dev-large-runner
12+
required: true
13+
14+
run-name: "Connectors CI - nightly builds for GA and Beta connectors - ${{ inputs.runs-on }}"
15+
16+
jobs:
17+
test_connectors:
18+
name: Test GA and Beta connectors
19+
timeout-minutes: 600 # 10 hours
20+
runs-on: ${{ inputs.runs-on || 'dev-large-runner' }}
21+
steps:
22+
- name: Get start timestamp
23+
id: get-start-timestamp
24+
run: echo "::set-output name=start-timestamp::$(date +%s)"
25+
- name: Login to DockerHub
26+
run: "docker login -u ${DOCKER_HUB_USERNAME} -p ${DOCKER_HUB_PASSWORD}"
27+
env:
28+
DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
29+
DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
30+
- name: Checkout Airbyte
31+
uses: actions/checkout@v3
32+
with:
33+
repository: ${{ github.event.inputs.repo }}
34+
ref: ${{ github.event.inputs.gitref }}
35+
- name: Extract branch name
36+
shell: bash
37+
if: github.event_name == 'workflow_dispatch'
38+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
39+
id: extract_branch
40+
- name: Install Python 3.10
41+
uses: actions/setup-python@v4
42+
with:
43+
python-version: "3.10"
44+
token: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
45+
- name: Install ci-connector-ops package
46+
run: pip install ./tools/ci_connector_ops\[pipelines]\
47+
- name: Test Python connectors
48+
run: |
49+
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="unix:///var/run/buildkit/buildkitd.sock"
50+
DAGGER_CLI_COMMIT="6ed6264f1c4efbf84d310a104b57ef1bc57d57b0"
51+
DAGGER_TMP_BINDIR="/tmp/dagger_${DAGGER_CLI_COMMIT}"
52+
export _EXPERIMENTAL_DAGGER_CLI_BIN="$DAGGER_TMP_BINDIR/dagger"
53+
if [ ! -f "$_EXPERIMENTAL_DAGGER_CLI_BIN" ]; then
54+
mkdir -p "$DAGGER_TMP_BINDIR"
55+
curl "https://dl.dagger.io/dagger/main/${DAGGER_CLI_COMMIT}/dagger_${DAGGER_CLI_COMMIT}_$(uname -s | tr A-Z a-z)_$(uname -m | sed s/x86_64/amd64/).tar.gz" | tar xvz -C "$DAGGER_TMP_BINDIR"
56+
fi
57+
airbyte-ci --is-ci --gha-workflow-run-id=${{ github.run_id }} connectors --concurrency=8 --release-stage=generally_available --release-stage=beta --language=python --language=low-code test
58+
env:
59+
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: "p.eyJ1IjogIjFiZjEwMmRjLWYyZmQtNDVhNi1iNzM1LTgxNzI1NGFkZDU2ZiIsICJpZCI6ICJlNjk3YzZiYy0yMDhiLTRlMTktODBjZC0yNjIyNGI3ZDBjMDEifQ.hT6eMOYt3KZgNoVGNYI3_v4CC-s19z8uQsBkGrBhU3k"
60+
GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
61+
AWS_ACCESS_KEY_ID: ${{ secrets.STATUS_API_AWS_ACCESS_KEY_ID }}
62+
AWS_SECRET_ACCESS_KEY: ${{ secrets.STATUS_API_AWS_SECRET_ACCESS_KEY }}
63+
AWS_DEFAULT_REGION: "us-east-2"
64+
TEST_REPORTS_BUCKET_NAME: "airbyte-connector-build-status"
65+
CI_GITHUB_ACCESS_TOKEN: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
66+
CI_GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}
67+
CI_CONTEXT: "nightly_builds"
68+
CI_PIPELINE_START_TIMESTAMP: ${{ steps.get-start-timestamp.outputs.start-timestamp }}
69+
- name: Test Java connectors
70+
run: |
71+
export _EXPERIMENTAL_DAGGER_RUNNER_HOST="unix:///var/run/buildkit/buildkitd.sock"
72+
DAGGER_CLI_COMMIT="6ed6264f1c4efbf84d310a104b57ef1bc57d57b0"
73+
DAGGER_TMP_BINDIR="/tmp/dagger_${DAGGER_CLI_COMMIT}"
74+
export _EXPERIMENTAL_DAGGER_CLI_BIN="$DAGGER_TMP_BINDIR/dagger"
75+
if [ ! -f "$_EXPERIMENTAL_DAGGER_CLI_BIN" ]; then
76+
mkdir -p "$DAGGER_TMP_BINDIR"
77+
curl "https://dl.dagger.io/dagger/main/${DAGGER_CLI_COMMIT}/dagger_${DAGGER_CLI_COMMIT}_$(uname -s | tr A-Z a-z)_$(uname -m | sed s/x86_64/amd64/).tar.gz" | tar xvz -C "$DAGGER_TMP_BINDIR"
78+
fi
79+
airbyte-ci --is-ci --gha-workflow-run-id=${{ github.run_id }} connectors --concurrency=1 --release-stage=generally_available --release-stage=beta --language=java test
80+
env:
81+
_EXPERIMENTAL_DAGGER_CLOUD_TOKEN: "p.eyJ1IjogIjFiZjEwMmRjLWYyZmQtNDVhNi1iNzM1LTgxNzI1NGFkZDU2ZiIsICJpZCI6ICJlNjk3YzZiYy0yMDhiLTRlMTktODBjZC0yNjIyNGI3ZDBjMDEifQ.hT6eMOYt3KZgNoVGNYI3_v4CC-s19z8uQsBkGrBhU3k"
82+
GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
83+
AWS_ACCESS_KEY_ID: ${{ secrets.STATUS_API_AWS_ACCESS_KEY_ID }}
84+
AWS_SECRET_ACCESS_KEY: ${{ secrets.STATUS_API_AWS_SECRET_ACCESS_KEY }}
85+
AWS_DEFAULT_REGION: "us-east-2"
86+
TEST_REPORTS_BUCKET_NAME: "airbyte-connector-build-status"
87+
CI_GITHUB_ACCESS_TOKEN: ${{ secrets.GH_PAT_MAINTENANCE_OCTAVIA }}
88+
CI_GIT_BRANCH: ${{ steps.extract_branch.outputs.branch }}
89+
CI_CONTEXT: "nightly_builds"
90+
CI_PIPELINE_START_TIMESTAMP: ${{ steps.get-start-timestamp.outputs.start-timestamp }}

.github/workflows/gradle.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,14 @@ jobs:
321321
attempt_limit: 3
322322
attempt_delay: 5000 # in ms
323323

324+
# This is helpful in the case that we change a previously commited generated file to be ignored by git.
325+
- name: Remove any files that have been gitignored
326+
run: git ls-files -i -c --exclude-from=.gitignore | xargs -r git rm --cached
327+
324328
- name: Commit Changes
325329
uses: stefanzweifel/git-auto-commit-action@v4
326330
with:
327-
commit_message: Automated Change
331+
commit_message: Automated Commit - Format and Process Resources Changes
328332
commit_user_name: Octavia Squidington III
329333
commit_user_email: [email protected]
330334

.github/workflows/metadata_validate_manifest_dagger.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: Checkout Airbyte
1717
uses: actions/checkout@v2
18-
- name: Connectors' metadata.yaml files validation
18+
- name: Connectors' metadata.yaml files validation Step
1919
id: metadata-validate-pipeline
2020
uses: ./.github/actions/run-dagger-pipeline
2121
with:

.github/workflows/terminate-zombie-build-instances.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
2929
# See https://awscli.amazonaws.com/v2/documentation/api/latest/reference/ec2/describe-instances.html for describe command.
3030
# Since the AWS cli returns an ISO HH:MM timestamp, and Jq only accepts Z timestamps, we define a function toZ to convert this.
31-
export to_terminate=$(aws ec2 describe-instances --no-paginate --filters Name=instance-type,Values=c5.2xlarge Name=instance-state-name,Values=running \
31+
export to_terminate=$(aws ec2 describe-instances --no-paginate --filters --filters 'Name=tag:Repository,Values=airbytehq/airbyte-platform-internal,airbytehq/airbyte-platform,airbytehq/airbyte' Name=instance-state-name,Values=running \
3232
--query 'Reservations[*].Instances[*].{Instance:InstanceId,LaunchTime:LaunchTime}' --output json \
3333
| jq 'def toZ(str): str | (split("+")[0] + "Z") | fromdate ;
3434
flatten | map( { InstanceId: .Instance, LaunchTime: toZ(.LaunchTime) } ) | map( select ( .LaunchTime < (now - (env.TIME_LIMIT|tonumber)) ) )')

.gitignore

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
build
66
out
77
.DS_Store
8-
data
98
.dockerversions
109
.classpath
1110
.project
@@ -16,6 +15,7 @@ static_checker_reports/
1615

1716
# Logs
1817
acceptance_tests_logs/
18+
airbyte_ci_logs/
1919

2020
# Secrets
2121
secrets
@@ -87,11 +87,11 @@ charts/**/charts
8787
dd-java-agent.jar
8888

8989
# Files needed to run airbyte-platform that are downloaded on-the-fly via run-ab-platform.sh
90-
docker-compose.yaml
91-
docker-compose.debug.yaml
92-
.env
93-
.env.dev
94-
flags.yml
90+
/docker-compose.yaml
91+
/docker-compose.debug.yaml
92+
/.env
93+
/.env.dev
94+
/flags.yml
9595

9696
# Ignore generated credentials from google-github-actions/auth
9797
gha-creds-*.json

0 commit comments

Comments
 (0)