Skip to content

Commit

Permalink
Merge branch 'master' into daryna/metabase-to-beta-yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
darynaishchenko committed Nov 18, 2022
2 parents dd17096 + 937f6b4 commit c3a8bfb
Show file tree
Hide file tree
Showing 2,987 changed files with 130,362 additions and 16,103 deletions.
6 changes: 5 additions & 1 deletion .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.19
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
Expand Down Expand Up @@ -61,3 +61,7 @@ serialize =
[bumpversion:file:octavia-cli/install.sh]

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

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

[bumpversion:file:airbyte-connector-builder-server/setup.py]
5 changes: 4 additions & 1 deletion .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.19

# When using the airbyte-db via default docker image
CONFIG_ROOT=/data
Expand Down Expand Up @@ -57,6 +57,7 @@ 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
WEBAPP_URL=http://localhost:8000/
# Although not present as an env var, required for webapp configuration.
API_URL=/api/v1/
Expand Down Expand Up @@ -92,6 +93,8 @@ MAX_SYNC_WORKERS=5
MAX_SPEC_WORKERS=5
MAX_CHECK_WORKERS=5
MAX_DISCOVER_WORKERS=5
MAX_NOTIFY_WORKERS=5
SHOULD_RUN_NOTIFY_WORKFLOWS=false
# Temporal Activity configuration
ACTIVITY_MAX_ATTEMPT=
ACTIVITY_INITIAL_DELAY_BETWEEN_ATTEMPTS_SECONDS=
Expand Down
1 change: 1 addition & 0 deletions .env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +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:80
SYNC_JOB_MAX_ATTEMPTS=3
SYNC_JOB_MAX_TIMEOUT_DAYS=3
WORKERS_MICRONAUT_ENVIRONMENTS=control-plane
Expand Down
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
/airbyte-webapp/package.json
/airbyte-webapp/package-lock.json

# Design
/airbyte-config/init/src/main/resources/icons/*.svg @airbytehq/design

# CDK and SAT
/airbyte-cdk/ @airbytehq/api-connectors-dx
/airbyte-integrations/bases/source-acceptance-tests/ @airbytehq/api-connectors-dx
Expand Down
8 changes: 2 additions & 6 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@ assignees: ''
<!--
Welcome to Airbyte!
We're really appreciate your report and know that this will help us build an
We appreciate your report and know that this will help us build an
amazing tool. If you want to contribute yourself, you can find a good place
to start by searching for the good-first-issues label or maybe... by trying
to solve this one? (we can help debug this with you!)
Right now we are in alpha, so we're releasing versions a lot more frequently than
normal. You can help us get to the root of the problem faster by filling out the
questionnaire below!
It's really important having all information and context.
It's really important to have all the information and context.
You can remove the examples bellow and fill out with your information.
-->
Expand Down
26 changes: 0 additions & 26 deletions .github/ISSUE_TEMPLATE/source-connector-type.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/build-and-push-branch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
branch_version_tag: ${{ inputs.branch_version_tag }}

- name: Login to Docker (on Master)
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ inputs.dockerhub_username }}
password: ${{ inputs.dockerhub_token }}
Expand Down
11 changes: 8 additions & 3 deletions .github/actions/build-branch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,21 @@ runs:
# if the *branch_version_tag* input param is not specified, then generate it as 'dev-<commit_hash>`
#
[[ "${{ inputs.branch_version_tag }}" != '' ]] && echo "branch_version_tag=${{ inputs.branch_version_tag }}" >> $GITHUB_OUTPUT \
|| { short_hash=$(git rev-parse --short=7 HEAD); echo "branch_version_tag=dev-$short_hash" >> $GITHUB_OUTPUT ; }
|| { short_hash=$(git rev-parse --short=10 HEAD); echo "branch_version_tag=dev-$short_hash" >> $GITHUB_OUTPUT ; }
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

- uses: actions/setup-python@v4
with:
python-version: "3.9"

- name: Set up CI Gradle Properties
run: |
mkdir -p ~/.gradle/
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/cache-build-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ runs:
steps:
- name: Pip Caching
if: ${{ inputs.cache_python }} == 'true'
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cache/pip
Expand All @@ -23,7 +23,7 @@ runs:
${{ inputs.cache-key }}-pip-${{ runner.os }}-
- name: Npm Caching
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.npm
Expand All @@ -33,7 +33,7 @@ runs:
# this intentionally does not use restore-keys so we don't mess with gradle caching
- name: Gradle and Python Caching
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
Expand Down
5 changes: 3 additions & 2 deletions .github/actions/ci-tests-runner/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,14 @@ runs:
using: "composite"
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.9

- name: Install Java
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: "17"

- name: Tests of CI
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
environment: more-secrets
steps:
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/commands-for-testing-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
command: ${{ steps.regex.outputs.first_match }}
steps:
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Check PAT rate limits
run: |
./tools/bin/find_non_rate_limited_PAT \
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Pull Testing Tool docker image
run: docker pull airbyte/airbyte-e2e-testing-tool:latest
run: ./tools/bin/pull_image.sh -i airbyte/airbyte-e2e-testing-tool:latest
- name: Create input and output folders
run: |
mkdir secrets
Expand Down Expand Up @@ -97,14 +97,14 @@ jobs:
comment-id: ${{ needs.set-params.outputs.comment-id }}
reactions: eyes, rocket
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: ${{ needs.set-params.outputs.repo }}
ref: ${{ needs.set-params.outputs.ref }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Pull Testing Tool docker image
run: docker pull airbyte/airbyte-e2e-testing-tool:latest
run: ./tools/bin/pull_image.sh -i airbyte/airbyte-e2e-testing-tool:latest
- name: Change wrapper permissions
run: |
mkdir secrets
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/connector_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:
schedule:
# 11am UTC is 4am PDT.
- cron: '0 11 * * *'
- cron: "0 11 * * *"

jobs:
launch_integration_tests:
Expand All @@ -15,11 +15,12 @@ jobs:
if: github.ref == 'refs/heads/master'
steps:
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Java
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: "zulu"
java-version: "17"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/connector_ops_ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Connector Ops CI

on:
pull_request:
paths:
- "airbyte-integrations/connectors/source-**"
jobs:
test-strictness-level:
name: "Check test strictness level"
runs-on: ubuntu-latest
steps:
- name: Checkout Airbyte
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Install Python
uses: actions/setup-python@v4
with:
python-version: "3.9"
- name: Install ci-connector-ops package
run: pip install --quiet -e ./tools/ci_connector_ops
- name: Check test strictness level
run: check-test-strictness-level
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
echo -e "$CHANGELOG" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Get Version
id: get_version
shell: bash
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/deploy-docs-site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- master
paths:
- 'docs/**'
- "docs/**"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -23,10 +23,10 @@ jobs:

# Node.js is needed for Yarn
- name: Setup Yarn
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '16.14.0'
cache: 'yarn'
node-version: "16.14.0"
cache: "yarn"
cache-dependency-path: docusaurus

- name: Run Docusaurus
Expand Down
18 changes: 15 additions & 3 deletions .github/workflows/deploy-oss-catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- master
paths:
paths:
- airbyte-config/init/src/main/resources/seed/**

workflow_dispatch:
Expand All @@ -17,15 +17,16 @@ jobs:
concurrency: deploy-oss-connector-catalog
steps:
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Cloud SDK
uses: google-github-actions/setup-gcloud@v0
with:
service_account_key: ${{ secrets.PROD_SPEC_CACHE_SA_KEY }}
export_default_credentials: true
- name: Install Java
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: "17"
- name: Generate catalog
run: SUB_BUILD=PLATFORM ./gradlew :airbyte-config:init:processResources
Expand All @@ -35,3 +36,14 @@ jobs:
gcs_bucket_name="prod-airbyte-cloud-connector-metadata-service"
catalog_path="airbyte-config/init/src/main/resources/seed/oss_catalog.json"
gsutil -h "Cache-Control:public, max-age=10" cp "$catalog_path" "gs://$gcs_bucket_name/oss_catalog.json"
- name: Check PAT rate limits
run: |
./tools/bin/find_non_rate_limited_PAT \
${{ secrets.OCTAVIA_4_ROOT_ACCESS }} \
${{ secrets.OCTAVIA_PAT }}
- name: Trigger Cloud catalog generation
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ env.PAT }}
repository: airbytehq/airbyte-cloud
event-type: generate-cloud-catalog
11 changes: 6 additions & 5 deletions .github/workflows/fe-validate-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Check for broken links in FE
on:
workflow_dispatch:
schedule:
- cron: '0 14 * * *'
- cron: "0 14 * * *"

jobs:
validate-frontend-links:
Expand All @@ -12,13 +12,14 @@ jobs:
timeout-minutes: 15
steps:
- name: Checkout Airbyte
uses: actions/checkout@v2
uses: actions/checkout@v3

- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
distribution: "zulu"
java-version: "17"

- uses: actions/setup-node@v2
- uses: actions/setup-node@v3
with:
node-version: "lts/gallium"

Expand Down Expand Up @@ -47,4 +48,4 @@ jobs:
args: >-
{\"channel\":\"C03088BTMFC\", \"blocks\":[
{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\":alarm: The periodic link validation failed!\n\n\"}},
{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"See details on <https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}|GitHub>\n\"}}]}
{\"type\":\"section\",\"text\":{\"type\":\"mrkdwn\",\"text\":\"See details on <https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}|GitHub>\n\"}}]}
Loading

0 comments on commit c3a8bfb

Please sign in to comment.