Skip to content

Commit 0b6fef1

Browse files
Merge branch 'master' into leti/remove-empty-state-in-connector-setup
* master: (74 commits) Fix support icon in sidebar fix: add BuildPulse report for helm ac tests (#19785) fix: yaml syntax (#19775) 🪟 🐛 Fix custom connection creation endpoint (#19702) Source facebook marketing: check "breakdowns" combinations (#19645) fix typo: notify instead of sync (#19737) find_non_rate_limited_PAT (#19736) Source Google Ads: fix schema for "campaigns" stream (#19700) 🎉 Source Asana: migrate to new SAT, added base HTTP errors handling (#19561) fix order not to randomly fail backward compatibility check (#19377) Bump helm chart version reference to 0.42.0 (#19706) fix: add extraEnv block (#19703) Bump Airbyte version from 0.40.21 to 0.40.22 (#19687) Bump helm chart version reference to 0.41.3 (#19685) Add connector builder server to airbyte proxy, kube overlays, and helm charts (#19554) dbt Cloud integration doc (#19619) 🪟 🎉 Display service token validation errors in the UI (#19578) 17644 Update Destination data type test to use the new data types (#19281) Docs: fix broken connector builder UI docs links (#19631) Bump Airbyte version from 0.40.20 to 0.40.21 (#19634) ...
2 parents 516a2d3 + 6c4e262 commit 0b6fef1

File tree

714 files changed

+21875
-6149
lines changed

Some content is hidden

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

714 files changed

+21875
-6149
lines changed

.bumpversion.cfg

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 0.40.18
2+
current_version = 0.40.22
33
commit = False
44
tag = False
55
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
@@ -42,6 +42,8 @@ serialize =
4242

4343
[bumpversion:file:charts/airbyte/Chart.yaml]
4444

45+
[bumpversion:file:charts/airbyte-connector-builder-server/Chart.yaml]
46+
4547
[bumpversion:file:charts/airbyte/README.md]
4648

4749
[bumpversion:file:docs/operator-guides/upgrading-airbyte.md]
@@ -62,10 +64,6 @@ serialize =
6264

6365
[bumpversion:file:octavia-cli/setup.py]
6466

65-
[bumpversion:file:connector-builder-server/Dockerfile]
66-
67-
[bumpversion:file:connector-builder-server/README.md]
68-
69-
[bumpversion:file:connector-builder-server/install.sh]
67+
[bumpversion:file:airbyte-connector-builder-server/Dockerfile]
7068

71-
[bumpversion:file:connector-builder-server/setup.py]
69+
[bumpversion:file:airbyte-connector-builder-server/setup.py]

.env

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
### SHARED ###
13-
VERSION=0.40.18
13+
VERSION=0.40.22
1414

1515
# When using the airbyte-db via default docker image
1616
CONFIG_ROOT=/data
@@ -57,10 +57,11 @@ CONFIGS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION=0.35.15.001
5757
### AIRBYTE SERVICES ###
5858
TEMPORAL_HOST=airbyte-temporal:7233
5959
INTERNAL_API_HOST=airbyte-server:8001
60-
#CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80 #FIXME: Uncomment this when enabling the connector-builder
60+
CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
6161
WEBAPP_URL=http://localhost:8000/
6262
# Although not present as an env var, required for webapp configuration.
6363
API_URL=/api/v1/
64+
CONNECTOR_BUILDER_API_URL=/connector-builder-api
6465

6566
### JOBS ###
6667
# Relevant to scaling.

.env.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ HACK_LOCAL_ROOT_PARENT=/tmp
2323
WEBAPP_URL=http://localhost:8000/
2424
API_URL=/api/v1/
2525
INTERNAL_API_HOST=airbyte-server:8001
26-
#CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:8003 #FIXME: Uncomment this when enabling the connector-builder
26+
CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
2727
SYNC_JOB_MAX_ATTEMPTS=3
2828
SYNC_JOB_MAX_TIMEOUT_DAYS=3
2929
WORKERS_MICRONAUT_ENVIRONMENTS=control-plane

.github/comment_templates/connector_dependency_template.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
NOTE ⚠️ Changes in this PR affect the following connectors. Make sure to do the following as needed:
66
- Run integration tests
7-
- Bump connector version
7+
- Bump connector or module version
88
- Add changelog
99
- Publish the new version
1010

@@ -38,7 +38,16 @@ NOTE ⚠️ Changes in this PR affect the following connectors. Make sure to do
3838

3939
</details>
4040

41-
{others}
41+
<details open>
42+
<summary>
43+
44+
### {other_status_summary} Other Modules ({num_others})
45+
46+
</summary>
47+
48+
{others_rows}
49+
50+
</details>
4251

4352
<details>
4453

.github/workflows/gke-kube-test-command.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,10 @@ on:
1717
required: false
1818

1919
jobs:
20-
find_valid_pat:
21-
name: "Find a PAT with room for actions"
22-
timeout-minutes: 10
23-
runs-on: ubuntu-latest
24-
outputs:
25-
pat: ${{ steps.variables.outputs.pat }}
26-
steps:
27-
- name: Checkout Airbyte
28-
uses: actions/checkout@v3
29-
- name: Check PAT rate limits
30-
id: variables
31-
run: |
32-
./tools/bin/find_non_rate_limited_PAT \
33-
${{ secrets.AIRBYTEIO_PAT }} \
34-
${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} \
35-
${{ secrets.SUPERTOPHER_PAT }} \
36-
${{ secrets.DAVINCHIA_PAT }}
3720
start-gke-kube-acceptance-test-runner:
3821
timeout-minutes: 10
3922
name: Start GKE Kube Acceptance Test EC2 Runner
4023
runs-on: ubuntu-latest
41-
needs: find_valid_pat
4224
outputs:
4325
label: ${{ steps.start-ec2-runner.outputs.label }}
4426
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
@@ -48,13 +30,20 @@ jobs:
4830
with:
4931
repository: ${{ github.event.inputs.repo }}
5032
ref: ${{ github.event.inputs.gitref }}
33+
- name: Check PAT rate limits
34+
run: |
35+
./tools/bin/find_non_rate_limited_PAT \
36+
${{ secrets.AIRBYTEIO_PAT }} \
37+
${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} \
38+
${{ secrets.SUPERTOPHER_PAT }} \
39+
${{ secrets.DAVINCHIA_PAT }}
5140
- name: Start AWS Runner
5241
id: start-ec2-runner
5342
uses: ./.github/actions/start-aws-runner
5443
with:
5544
aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
5645
aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
57-
github-token: ${{ needs.find_valid_pat.outputs.pat }}
46+
github-token: ${{ env.PAT }}
5847
gke-kube-acceptance-test:
5948
# In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest.
6049
needs: start-gke-kube-acceptance-test-runner # required to start the main job when the runner is ready
@@ -146,7 +135,6 @@ jobs:
146135
needs:
147136
- start-gke-kube-acceptance-test-runner # required to get output from the start-runner job
148137
- gke-kube-acceptance-test # required to wait when the main job is done
149-
- find_valid_pat
150138
runs-on: ubuntu-latest
151139
if: ${{ always() }}
152140
steps:
@@ -156,10 +144,22 @@ jobs:
156144
aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
157145
aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
158146
aws-region: us-east-2
147+
- name: Checkout Airbyte
148+
uses: actions/checkout@v3
149+
with:
150+
repository: ${{ github.event.inputs.repo }}
151+
ref: ${{ github.event.inputs.gitref }}
152+
- name: Check PAT rate limits
153+
run: |
154+
./tools/bin/find_non_rate_limited_PAT \
155+
${{ secrets.AIRBYTEIO_PAT }} \
156+
${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} \
157+
${{ secrets.SUPERTOPHER_PAT }} \
158+
${{ secrets.DAVINCHIA_PAT }}
159159
- name: Stop EC2 runner
160160
uses: supertopher/[email protected]
161161
with:
162162
mode: stop
163-
github-token: ${{ needs.find_valid_pat.outputs.pat }}
163+
github-token: ${{ env.PAT }}
164164
label: ${{ needs.start-gke-kube-acceptance-test-runner.outputs.label }}
165165
ec2-instance-id: ${{ needs.start-gke-kube-acceptance-test-runner.outputs.ec2-instance-id }}

0 commit comments

Comments
 (0)