Merge branch 'master' of https://github.com/airbytehq/airbyte

Author: shrodingers

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.35.66-alpha
+current_version = 0.39.7-alpha
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-[a-z]+)?
@@ -47,3 +47,7 @@ serialize =
 [bumpversion:file:octavia-cli/README.md]
 
 [bumpversion:file:octavia-cli/Dockerfile]
+
+[bumpversion:file:octavia-cli/setup.py]
+serialize = 
+	{major}.{minor}.{patch}

.env

@@ -10,7 +10,7 @@
 
 
 ### SHARED ###
-VERSION=0.35.66-alpha
+VERSION=0.39.7-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data
@@ -40,7 +40,7 @@ DATABASE_PASSWORD=docker
 DATABASE_HOST=db
 DATABASE_PORT=5432
 DATABASE_DB=airbyte
-# translate manually DATABASE_URL=jdbc:postgresql://${DATABASE_HOST}:${DATABASE_PORT/${DATABASE_DB} (do not include the username or password here)
+# translate manually DATABASE_URL=jdbc:postgresql://${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_DB} (do not include the username or password here)
 DATABASE_URL=jdbc:postgresql://db:5432/airbyte
 JOBS_DATABASE_MINIMUM_FLYWAY_MIGRATION_VERSION=0.29.15.001
 
@@ -90,6 +90,6 @@ MAX_DISCOVER_WORKERS=5
 
 
 ### FEATURE FLAGS ###
-NEW_SCHEDULER=false
 AUTO_DISABLE_FAILING_CONNECTIONS=false
 EXPOSE_SECRETS_IN_EXPORT=false
+FORCE_MIGRATE_SECRET_STORE=false

.gitbook.yaml

@@ -8,6 +8,7 @@ assignees: ''
 ---
 <!-- 
 Welcome to Airbyte!
+
 We're really 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 
@@ -28,7 +29,6 @@ You can remove the examples bellow and fill out with your information.
 - **Deployment**: example are Docker or Kubernetes deploy env
 - **Source Connector and version**: (if applicable example Salesforce 0.2.3) <!-- Found in the admin page in the UI in the Source tab. -->
 - **Destination Connector and version**: (if applicable example Postgres 0.3.3) <!-- Found in the admin page in the UI in the Destination tab. -->
-- **Severity**: Very Low / Low / Medium / High / Critical
 - **Step where error happened**: Deploy / Sync job / Setup new connection / Update connector / Upgrade Airbyte
 
 ## Current Behavior
@@ -38,22 +38,14 @@ You can remove the examples bellow and fill out with your information.
 *Tell us what should happen.*
 
 ## Logs
-*If applicable, please upload the logs from the failing operation. 
-For sync jobs, you can download the full logs from the UI by going to the sync attempt page and 
-clicking the download logs button at the top right of the logs display window.*
-
-<details>
-<summary>LOG</summary> 
-
-```
+<!--
+Please upload the complete log files from the failing operation. 
 
-replace this with
-your long log
-output here
-
-```
-
-</details>
+We ask for complete log files because these files capture essential metadata about your environment.
+The team will read the full stack trace of errors and try to find the root cause of the error. 
+For a sync failure, you can download the log in the sync page, and for other errors please download the server and scheduler logs in the Settings Page -> Configuration.
+You can remove this after uploading the file.
+-->
 
 ## Steps to Reproduce
 1.

.github/ISSUE_TEMPLATE/bug-report.md

@@ -4,60 +4,30 @@ inputs:
   branch_version_tag:
     description: 'Used to tag jars and docker images with a branch-specific version (should use the form "dev-<commit_hash>" to pass AirbyteVersion validation)'
     required: false
+  dockerhub_username:
+    description: "Used to log in to dockerhub for pushing images"
+    required: true
   dockerhub_token:
     description: "Used to log in to dockerhub for pushing images"
     required: true
 runs:
   using: "composite"
   steps:
-    - name: "Parse Input"
-      id: parse-input
-      shell: bash
-      run: |-
-        # if the *branch_version_tag* input param is not specified, then generate it as 'dev-<commit_hash>`
-        #
-        [[ "${{ inputs.branch_version_tag }}" != '' ]] && echo "::set-output name=branch_version_tag::${{ inputs.branch_version_tag }}" \
-          || { short_hash=$(git rev-parse --short HEAD); echo "::set-output name=branch_version_tag::dev-$short_hash"; }
-
-    - uses: actions/setup-java@v1
-      with:
-        java-version: "17"
-
-    - uses: actions/setup-node@v1
-      with:
-        node-version: "16.13.0"
-
-    - name: Set up CI Gradle Properties
-      run: |
-        mkdir -p ~/.gradle/
-        cat > ~/.gradle/gradle.properties <<EOF
-        org.gradle.jvmargs=-Xmx8g -Xss4m --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-          --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-          --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-          --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-          --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
-        org.gradle.workers.max=8
-        org.gradle.vfs.watch=false
-        EOF
-      shell: bash
-
     - name: Build
-      run: VERSION=${{ steps.parse-input.outputs.branch_version_tag }} SUB_BUILD=PLATFORM ./gradlew build --scan
-      shell: bash
-
-    - name: Publish to Maven Local
-      run: VERSION=${{ steps.parse-input.outputs.branch_version_tag }} SUB_BUILD=PLATFORM ./gradlew publishToMavenLocal
-      shell: bash
+      id: build
+      uses: ./.github/actions/build-branch
+      with:
+        branch_version_tag: ${{ inputs.branch_version_tag }}
 
     - name: Login to Docker (on Master)
       uses: docker/login-action@v1
       with:
-        username: airbytebot
+        username: ${{ inputs.dockerhub_username }}
         password: ${{ inputs.dockerhub_token }}
 
     - name: Push Docker Images
       run: |
         GIT_REVISION=$(git rev-parse HEAD)
         [ [ -z "$GIT_REVISION" ] ] && echo "Couldn't get the git revision..." && exit 1
-        VERSION=${{ steps.parse-input.outputs.branch_version_tag }} GIT_REVISION=$GIT_REVISION docker-compose -f docker-compose-cloud.build.yaml push
+        VERSION=${{ steps.build.outputs.branch_version_tag }} GIT_REVISION=$GIT_REVISION docker-compose -f docker-compose-cloud.build.yaml push
       shell: bash

.github/actions/build-and-push-branch/action.yml

@@ -0,0 +1,52 @@
+name: "Build OSS Branch"
+description: "Build jars and docker images tagged for a particular branch. Primarily used for running OSS branch code in Cloud."
+inputs:
+  branch_version_tag:
+    description: 'Used to tag jars and docker images with a branch-specific version (should use the form "dev-<commit_hash>" to pass AirbyteVersion validation)'
+    required: false
+outputs:
+  branch_version_tag:
+    description: 'Tag used for jars and docker images. Either user specified or auto generated as `dev-<commit_hash>`'
+    value: ${{ steps.parse-input.outputs.branch_version_tag }}
+runs:
+  using: "composite"
+  steps:
+    - name: "Parse Input"
+      id: parse-input
+      shell: bash
+      run: |-
+        # if the *branch_version_tag* input param is not specified, then generate it as 'dev-<commit_hash>`
+        #
+        [[ "${{ inputs.branch_version_tag }}" != '' ]] && echo "::set-output name=branch_version_tag::${{ inputs.branch_version_tag }}" \
+          || { short_hash=$(git rev-parse --short HEAD); echo "::set-output name=branch_version_tag::dev-$short_hash"; }
+
+    - uses: actions/setup-java@v1
+      with:
+        java-version: "17"
+
+    - uses: actions/setup-node@v1
+      with:
+        node-version: "16.13.0"
+
+    - name: Set up CI Gradle Properties
+      run: |
+        mkdir -p ~/.gradle/
+        cat > ~/.gradle/gradle.properties <<EOF
+        org.gradle.jvmargs=-Xmx8g -Xss4m --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+          --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+          --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+          --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+          --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+        org.gradle.workers.max=8
+        org.gradle.vfs.watch=false
+        EOF
+      shell: bash
+
+    - name: Build
+      run: VERSION=${{ steps.parse-input.outputs.branch_version_tag }} SUB_BUILD=PLATFORM ./gradlew build --scan
+      shell: bash
+
+    - name: Publish to Maven Local
+      run: VERSION=${{ steps.parse-input.outputs.branch_version_tag }} SUB_BUILD=PLATFORM ./gradlew publishToMavenLocal
+      shell: bash
+

.github/actions/build-branch/action.yml

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

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

@@ -17,7 +17,7 @@ area/platform:
   - charts/*
   - charts/**/*
 
-area/frontend:
+team/frontend:
   - airbyte-webapp/*
   - airbyte-webapp/**/*
 

.github/labeler.yml

@@ -18,63 +18,5 @@ jobs:
             # Specify which label should get added to which project. The project number can be found
             # as part of the URL after projects/<id> when viewing the project on GitHub.
             projects: |
-              area/frontend=7
+              team/frontend=7
               project/onboarding-improvements=16
-  # Specific handling for platform project handling, which also sets several
-  # fields of newly added items
-  add-area-platform-issues-to-platform-project:
-    runs-on: ubuntu-latest
-    name: Add area/platform issue to Platform Project
-    env:
-      ORG: airbytehq
-      CLOUD_PROJECT_ID: 6 # https://github.com/orgs/airbytehq/projects/6/views/8
-      OSS_PROJECT_ID: 11 # https://github.com/orgs/airbytehq/projects/11
-      FIELD_STATUS: Status
-      STATUS_TODO: Todo
-      FIELD_DATE_ADDED: Date Added
-    steps:
-      - name: Set current date env var
-        id: set_date
-        run: echo ::set-output name=CURRENT_DATE::$(date +'%Y-%m-%dT%H:%M:%S%z')
-
-      - name: Add issue to the cloud project if labelled with area/platform and not area/platform-oss
-        uses: leonsteinhaeuser/[email protected]
-        if: contains(github.event.issue.labels.*.name, 'area/platform') && !contains(github.event.issue.labels.*.name, 'area/platform-oss')
-        with:
-          gh_token: ${{ env.GH_PROJECT_TOKEN }}
-          organization: ${{ env.ORG }}
-          project_id: ${{ env.CLOUD_PROJECT_ID }}
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: custom_field
-          custom_field_values: '[{\"name\": \"Status\",\"type\": \"single_select\",\"value\": \"${{ env.STATUS_TODO }}\"},{\"name\": \"${{ env.FIELD_DATE_ADDED }}\",\"type\": \"date\",\"value\": \"${{ steps.set_date.outputs.CURRENT_DATE }}\"}]'
-      - name: Add issue to the cloud oss if labelled with area/platform and not area/platform-cloud
-        uses: leonsteinhaeuser/[email protected]
-        if: contains(github.event.issue.labels.*.name, 'area/platform') && !contains(github.event.issue.labels.*.name, 'area/platform-cloud')
-        with:
-          gh_token: ${{ env.GH_PROJECT_TOKEN }}
-          organization: ${{ env.ORG }}
-          project_id: ${{ env.OSS_PROJECT_ID }}
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: custom_field
-          custom_field_values: '[{\"name\": \"Status\",\"type\": \"single_select\",\"value\": \"${{ env.STATUS_TODO }}\"},{\"name\": \"${{ env.FIELD_DATE_ADDED }}\",\"type\": \"date\",\"value\": \"${{ steps.set_date.outputs.CURRENT_DATE }}\"}]'
-      - name: Add issue to project if labelled with area/platform-cloud
-        uses: leonsteinhaeuser/[email protected]
-        if: contains(github.event.issue.labels.*.name, 'area/platform-cloud')
-        with:
-          gh_token: ${{ env.GH_PROJECT_TOKEN }}
-          organization: ${{ env.ORG }}
-          project_id: ${{ env.CLOUD_PROJECT_ID }}
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: custom_field
-          custom_field_values: '[{\"name\": \"Status\",\"type\": \"single_select\",\"value\": \"${{ env.STATUS_TODO }}\"},{\"name\": \"${{ env.FIELD_DATE_ADDED }}\",\"type\": \"date\",\"value\": \"${{ steps.set_date.outputs.CURRENT_DATE }}\"}]'
-      - name: Add issue to project if labelled with area/platform-oss
-        uses: leonsteinhaeuser/[email protected]
-        if: contains(github.event.issue.labels.*.name, 'area/platform-oss')
-        with:
-          gh_token: ${{ env.GH_PROJECT_TOKEN }}
-          organization: ${{ env.ORG }}
-          project_id: ${{ env.OSS_PROJECT_ID }}
-          resource_node_id: ${{ github.event.issue.node_id }}
-          operation_mode: custom_field
-          custom_field_values: '[{\"name\": \"Status\",\"type\": \"single_select\",\"value\": \"${{ env.STATUS_TODO }}\"},{\"name\": \"${{ env.FIELD_DATE_ADDED }}\",\"type\": \"date\",\"value\": \"${{ steps.set_date.outputs.CURRENT_DATE }}\"}]'
-