Skip to content

Commit

Permalink
Merge branch 'master' into leti/remove-empty-state-in-connector-setup
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
letiescanciano committed Nov 28, 2022
2 parents 516a2d3 + 6c4e262 commit 0b6fef1
Show file tree
Hide file tree
Showing 714 changed files with 21,875 additions and 6,149 deletions.
12 changes: 5 additions & 7 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.40.18
current_version = 0.40.22
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
Expand Down Expand Up @@ -42,6 +42,8 @@ serialize =

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

[bumpversion:file:charts/airbyte-connector-builder-server/Chart.yaml]

[bumpversion:file:charts/airbyte/README.md]

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

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

[bumpversion:file:connector-builder-server/Dockerfile]

[bumpversion:file:connector-builder-server/README.md]

[bumpversion:file:connector-builder-server/install.sh]
[bumpversion:file:airbyte-connector-builder-server/Dockerfile]

[bumpversion:file:connector-builder-server/setup.py]
[bumpversion:file:airbyte-connector-builder-server/setup.py]
5 changes: 3 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


### SHARED ###
VERSION=0.40.18
VERSION=0.40.22

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

### JOBS ###
# Relevant to scaling.
Expand Down
2 changes: 1 addition & 1 deletion .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ HACK_LOCAL_ROOT_PARENT=/tmp
WEBAPP_URL=http://localhost:8000/
API_URL=/api/v1/
INTERNAL_API_HOST=airbyte-server:8001
#CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:8003 #FIXME: Uncomment this when enabling the connector-builder
CONNECTOR_BUILDER_API_HOST=airbyte-connector-builder-server:80
SYNC_JOB_MAX_ATTEMPTS=3
SYNC_JOB_MAX_TIMEOUT_DAYS=3
WORKERS_MICRONAUT_ENVIRONMENTS=control-plane
Expand Down
13 changes: 11 additions & 2 deletions .github/comment_templates/connector_dependency_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

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

</details>

{others}
<details open>
<summary>

### {other_status_summary} Other Modules ({num_others})

</summary>

{others_rows}

</details>

<details>

Expand Down
42 changes: 21 additions & 21 deletions .github/workflows/gke-kube-test-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,10 @@ on:
required: false

jobs:
find_valid_pat:
name: "Find a PAT with room for actions"
timeout-minutes: 10
runs-on: ubuntu-latest
outputs:
pat: ${{ steps.variables.outputs.pat }}
steps:
- name: Checkout Airbyte
uses: actions/checkout@v3
- name: Check PAT rate limits
id: variables
run: |
./tools/bin/find_non_rate_limited_PAT \
${{ secrets.AIRBYTEIO_PAT }} \
${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} \
${{ secrets.SUPERTOPHER_PAT }} \
${{ secrets.DAVINCHIA_PAT }}
start-gke-kube-acceptance-test-runner:
timeout-minutes: 10
name: Start GKE Kube Acceptance Test EC2 Runner
runs-on: ubuntu-latest
needs: find_valid_pat
outputs:
label: ${{ steps.start-ec2-runner.outputs.label }}
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
Expand All @@ -48,13 +30,20 @@ jobs:
with:
repository: ${{ github.event.inputs.repo }}
ref: ${{ github.event.inputs.gitref }}
- name: Check PAT rate limits
run: |
./tools/bin/find_non_rate_limited_PAT \
${{ secrets.AIRBYTEIO_PAT }} \
${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} \
${{ secrets.SUPERTOPHER_PAT }} \
${{ secrets.DAVINCHIA_PAT }}
- name: Start AWS Runner
id: start-ec2-runner
uses: ./.github/actions/start-aws-runner
with:
aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
github-token: ${{ needs.find_valid_pat.outputs.pat }}
github-token: ${{ env.PAT }}
gke-kube-acceptance-test:
# In case of self-hosted EC2 errors, removed the `needs` line and switch back to running on ubuntu-latest.
needs: start-gke-kube-acceptance-test-runner # required to start the main job when the runner is ready
Expand Down Expand Up @@ -146,7 +135,6 @@ jobs:
needs:
- start-gke-kube-acceptance-test-runner # required to get output from the start-runner job
- gke-kube-acceptance-test # required to wait when the main job is done
- find_valid_pat
runs-on: ubuntu-latest
if: ${{ always() }}
steps:
Expand All @@ -156,10 +144,22 @@ jobs:
aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-2
- name: Checkout Airbyte
uses: actions/checkout@v3
with:
repository: ${{ github.event.inputs.repo }}
ref: ${{ github.event.inputs.gitref }}
- name: Check PAT rate limits
run: |
./tools/bin/find_non_rate_limited_PAT \
${{ secrets.AIRBYTEIO_PAT }} \
${{ secrets.OSS_BUILD_RUNNER_GITHUB_PAT }} \
${{ secrets.SUPERTOPHER_PAT }} \
${{ secrets.DAVINCHIA_PAT }}
- name: Stop EC2 runner
uses: supertopher/ec2-github-runner@base64v1.0.10
with:
mode: stop
github-token: ${{ needs.find_valid_pat.outputs.pat }}
github-token: ${{ env.PAT }}
label: ${{ needs.start-gke-kube-acceptance-test-runner.outputs.label }}
ec2-instance-id: ${{ needs.start-gke-kube-acceptance-test-runner.outputs.ec2-instance-id }}
Loading

0 comments on commit 0b6fef1

Please sign in to comment.