Merge branch 'master' into liren/destination-namespace-charset

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.35.43-alpha
+current_version = 0.35.57-alpha
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?

.env

@@ -10,7 +10,7 @@
 
 
 ### SHARED ###
-VERSION=0.35.43-alpha
+VERSION=0.35.57-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data

.github/CODEOWNERS

@@ -1,3 +1,6 @@
 # Frontend code
-/airbyte-webapp/  @airbytehq/frontend
 /airbyte-webapp-e2e-tests/  @airbytehq/frontend
+/airbyte-webapp/  @airbytehq/frontend
+## Exclude the package(-lock).json from code ownership to prevent version bump PRs from triggering codeowners review
+/airbyte-webapp/package.json
+/airbyte-webapp/package-lock.json

.github/actions/cache-build-artifacts/action.yml

@@ -0,0 +1,42 @@
+name: "Cache Build Artifacts"
+description: "Cache Java, Javascript and Python build artifacts to reduce build time"
+inputs:
+  cache-key:
+    description: "Key to use for caching"
+    required: true
+  cache-python:
+    description: "Whether to cache Python dependencies. Only relevant if building connector modules. true or false"
+    default: "true"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Pip Caching
+      if: ${{ inputs.cache_python }} == 'true'
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cache/pip
+        key: ${{ inputs.cache-key }}-pip-${{ runner.os }}-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ inputs.cache-key }}-pip-${{ runner.os }}-
+
+    - name: Npm Caching
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.npm
+        key: ${{ inputs.cache-key }}-npm-${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ inputs.cache-key }}-npm-${{ runner.os }}-
+
+    # this intentionally does not use restore-keys so we don't mess with gradle caching
+    - name: Gradle and Python Caching
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.gradle/caches
+          ~/.gradle/wrapper
+          **/.venv
+        key: ${{ inputs.cache-key }}-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/setup.py') }}-${{ hashFiles('**/requirements.txt') }}

.github/actions/ci-tests-runner/action.yml

@@ -113,8 +113,11 @@ runs:
 
           [ -f ${{ steps.ci-py-tests.outputs.coverage-paths }} ] && OPTIONS+=("-Dsonar.python.coverage.reportPaths=${{ steps.ci-py-tests.outputs.coverage-paths }}")
           [ -f ${{ steps.ci-py-tests.outputs.flake8-logs }} ] && OPTIONS+=("-Dsonar.python.flake8.reportPaths=${{ steps.ci-py-tests.outputs.flake8-logs }}")
+          # TODO: figure out how to make this check work for Java-based connectors
+          # See more in https://github.com/airbytehq/airbyte/issues/10924
+          cat ${REPORT_FOLDER}/*
         fi
-        cat ${REPORT_FOLDER}/*
+
         if [ ${{ inputs.module-lang }} == 'java' ]; then
              [ -d "./src/main/java" ] && OPTIONS+=("-Dsonar.sources=./src/main/java")
              [ -d "./src/test/java" ] && OPTIONS+=("-Dsonar.tests=./src/test/java")

.github/actions/start-aws-runner/action.yml

@@ -8,8 +8,8 @@ inputs:
   github-token:
     required: true
   ec2-image-id:
-    # github-self-hosted-runner-ubuntu-20-100g-disk
-    default: "ami-0ccd67e0abd945eec"
+    # github-self-hosted-runner-ubuntu-20-100g-disk-with-cypress-deps
+    default: "ami-08927c058921b27f4"
     required: true
   ec2-instance-type:
     default: "c5.2xlarge"

.github/pull_request_template.md

@@ -38,7 +38,7 @@ If this is a community PR, the Airbyte engineer reviewing this PR is responsible
 
 - [ ] Create a non-forked branch based on this PR and test the below items on it
 - [ ] Build is successful
-- [ ] Credentials added to Github CI. [Instructions](https://docs.airbyte.io/connector-development#using-credentials-in-ci).
+- [ ] If new credentials are required for use in CI, add them to GSM. [Instructions](https://docs.airbyte.io/connector-development#using-credentials-in-ci).
 - [ ] [`/test connector=connectors/<name>` command](https://docs.airbyte.io/connector-development#updating-an-existing-connector) is passing
 - [ ] New Connector version released on Dockerhub by running the `/publish` command described [here](https://docs.airbyte.io/connector-development#updating-an-existing-connector)
 - [ ] After the connector is published, connector added to connector index as described [here](https://docs.airbyte.io/connector-development#publishing-a-connector)
@@ -66,7 +66,7 @@ If this is a community PR, the Airbyte engineer reviewing this PR is responsible
 
 - [ ] Create a non-forked branch based on this PR and test the below items on it
 - [ ] Build is successful
-- [ ] Credentials added to Github CI. [Instructions](https://docs.airbyte.io/connector-development#using-credentials-in-ci).
+- [ ] If new credentials are required for use in CI, add them to GSM. [Instructions](https://docs.airbyte.io/connector-development#using-credentials-in-ci).
 - [ ] [`/test connector=connectors/<name>` command](https://docs.airbyte.io/connector-development#updating-an-existing-connector) is passing
 - [ ] New Connector version released on Dockerhub by running the `/publish` command described [here](https://docs.airbyte.io/connector-development#updating-an-existing-connector)
 - [ ] After the new connector version is published, connector version bumped in the seed directory as described [here](https://docs.airbyte.io/connector-development#publishing-a-connector)

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

@@ -4,6 +4,14 @@ on:
     - cron: '0 */6 * * *'
   workflow_dispatch:
     inputs:
+      repo:
+        description: "Repo to check out code from. Defaults to the main airbyte repo. Set this when building connectors from forked repos."
+        required: false
+        default: "airbytehq/airbyte"
+      gitref:
+        description: "The git ref to check out from the specified repository."
+        required: false
+        default: master
       comment-id:
         description: 'The comment-id of the slash command. Used to update the comment with the status.'
         required: false
@@ -19,6 +27,9 @@ jobs:
     steps:
       - name: Checkout Airbyte
         uses: actions/checkout@v2
+        with:
+          repository: ${{ github.event.inputs.repo }}
+          ref: ${{ github.event.inputs.gitref }}
       - name: Start AWS Runner
         id: start-ec2-runner
         uses: ./.github/actions/start-aws-runner
@@ -43,6 +54,9 @@ jobs:
 
       - name: Checkout Airbyte
         uses: actions/checkout@v2
+        with:
+          repository: ${{ github.event.inputs.repo }}
+          ref: ${{ github.event.inputs.gitref }}
 
       - uses: actions/setup-java@v1
         with: