Merge branch 'master' into liren/publish-mssql

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.39.1-alpha
+current_version = 0.39.5-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.39.1-alpha
+VERSION=0.39.5-alpha
 
 # When using the airbyte-db via default docker image
 CONFIG_ROOT=/data

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

@@ -19,7 +19,7 @@ runs:
     - name: Login to Docker (on Master)
       uses: docker/login-action@v1
       with:
-        username: airbytebot
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ inputs.dockerhub_token }}
 
     - name: Push Docker Images

.github/workflows/build-connector-command.yml

@@ -186,7 +186,8 @@ jobs:
         id: build
         env:
           PR_NUMBER: ${{ github.event.number }}
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           # Oracle expects this variable to be set. Although usually present, this is not set by default on Github virtual runners.
           TZ: UTC
   #      - name: Test ${{ github.event.inputs.connector }}

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

@@ -116,7 +116,8 @@ jobs:
         env:
           USER: root
           HOME: /home/runner
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           ACTION_RUN_ID: ${{github.run_id}}
         run: |
           ./tools/bin/gke-kube-acceptance-test/acceptance_test_kube_gke.sh

.github/workflows/publish-command.yml

@@ -65,14 +65,19 @@ jobs:
           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 }}
-          # 80 gb disk
-          ec2-image-id: ami-0d648081937c75a73
   publish-image:
     timeout-minutes: 240
     needs: start-publish-image-runner
     runs-on: ${{ needs.start-publish-image-runner.outputs.label }}
     environment: more-secrets
     steps:
+      - name: Link comment to workflow run
+        if: github.event.inputs.comment-id
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ github.event.inputs.comment-id }}
+          body: |
+            > :clock2: ${{github.event.inputs.connector}} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@v0
         with:
@@ -88,13 +93,6 @@ jobs:
       - name: Validate input workflow format
         if: steps.regex.outputs.first_match != github.event.inputs.connector
         run: echo "The connector provided has an invalid format!" && exit 1
-      - name: Link comment to workflow run
-        if: github.event.inputs.comment-id
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          comment-id: ${{ github.event.inputs.comment-id }}
-          body: |
-            > :clock2: ${{github.event.inputs.connector}} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
       - name: Checkout Airbyte
         uses: actions/checkout@v2
         with:
@@ -155,12 +153,12 @@ jobs:
           SENTRY_PROJECT: airbyte-connectors
       - name: Publish ${{ github.event.inputs.connector }}
         run: |
-          echo "$SPEC_CACHE_SERVICE_ACCOUNT_KEY" > spec_cache_key_file.json && docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD}
+          echo "$SPEC_CACHE_SERVICE_ACCOUNT_KEY" > spec_cache_key_file.json && docker login -u ${DOCKER_HUB_USERNAME} -p ${DOCKER_HUB_PASSWORD}
           ./tools/integrations/manage.sh publish airbyte-integrations/${{ github.event.inputs.connector }} ${{ github.event.inputs.run-tests }} --publish_spec_to_cache
         id: publish
         env:
-          DOCKER_USERNAME: airbytebot
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           # Oracle expects this variable to be set. Although usually present, this is not set by default on Github virtual runners.
           TZ: UTC
       - name: Finalize Sentry release

.github/workflows/publish-external-command.yml

@@ -85,12 +85,13 @@ jobs:
           repository: ${{ gituhb.event.inputs.repo }}
           ref: ${{ github.event.inputs.gitref }}
       - run: |
-          echo "$SPEC_CACHE_SERVICE_ACCOUNT_KEY" > spec_cache_key_file.json && docker login -u airbytebot -p ${DOCKER_PASSWORD}
+          echo "$SPEC_CACHE_SERVICE_ACCOUNT_KEY" > spec_cache_key_file.json && docker login -u ${DOCKER_HUB_USERNAME} -p ${DOCKER_HUB_PASSWORD}
           ./tools/integrations/manage.sh publish_external ${{ github.event.inputs.connector }} ${{ github.event.inputs.version }}
         name: publish ${{ github.event.inputs.connector }}
         id: publish
         env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           # Oracle expects this variable to be set. Although usually present, this is not set by default on Github virtual runners.
           TZ: UTC
       - name: Add Success Comment

.github/workflows/release-airbyte-os.yml

@@ -70,7 +70,8 @@ jobs:
       - name: Release Airbyte
         id: release_airbyte
         env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           PART_TO_BUMP: ${{ github.event.inputs.partToBump }}
           CLOUDREPO_USER: ${{ secrets.CLOUDREPO_USER }}
           CLOUDREPO_PASSWORD: ${{ secrets.CLOUDREPO_PASSWORD }}
@@ -100,7 +101,8 @@ jobs:
       - name: Release Octavia
         id: release_octavia
         env:
-          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+          DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+          DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           PART_TO_BUMP: ${{ github.event.inputs.partToBump }}
         run: ./tools/bin/release_version_octavia.sh
 

.github/workflows/test-command.yml

@@ -64,6 +64,13 @@ jobs:
     runs-on: ${{ needs.start-test-runner.outputs.label }}
     environment: more-secrets
     steps:
+      - name: Link comment to workflow run
+        if: github.event.inputs.comment-id
+        uses: peter-evans/create-or-update-comment@v1
+        with:
+          comment-id: ${{ github.event.inputs.comment-id }}
+          body: |
+            > :clock2: ${{github.event.inputs.connector}} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
       - name: Search for valid connector name format
         id: regex
         uses: AsasInnab/regex-action@v1
@@ -74,13 +81,6 @@ jobs:
       - name: Validate input workflow format
         if: steps.regex.outputs.first_match != github.event.inputs.connector
         run: echo "The connector provided has an invalid format!" && exit 1
-      - name: Link comment to workflow run
-        if: github.event.inputs.comment-id
-        uses: peter-evans/create-or-update-comment@v1
-        with:
-          comment-id: ${{ github.event.inputs.comment-id }}
-          body: |
-            > :clock2: ${{github.event.inputs.connector}} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
       - name: Checkout Airbyte
         uses: actions/checkout@v2
         with:
@@ -113,7 +113,7 @@ jobs:
         env:
           GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
 
-      - name: test ${{ github.event.inputs.connector }}
+      - name: Test ${{ github.event.inputs.connector }}
         run: |
           ./tools/bin/ci_integration_test.sh ${{ github.event.inputs.connector }}
         id: test

LICENSE_SHORT

@@ -1 +1 @@
-Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+Copyright (c) 2022 Airbyte, Inc., all rights reserved.

airbyte-analytics/src/main/java/io/airbyte/analytics/Deployment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/LoggingTrackingClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/SegmentTrackingClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingClientSingleton.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/main/java/io/airbyte/analytics/TrackingIdentity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/test/java/io/airbyte/analytics/SegmentTrackingClientTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-analytics/src/test/java/io/airbyte/analytics/TrackingClientSingletonTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.analytics;

airbyte-api/build.gradle

@@ -17,9 +17,9 @@ task generateApiServer(type: GenerateTask) {
     inputSpec = specFile
     outputDir = serverOutputDir
 
-    apiPackage = "io.airbyte.api"
-    invokerPackage = "io.airbyte.api.invoker"
-    modelPackage = "io.airbyte.api.model"
+    apiPackage = "io.airbyte.api.generated"
+    invokerPackage = "io.airbyte.api.invoker.generated"
+    modelPackage = "io.airbyte.api.model.generated"
 
     importMappings = [
             'OAuthConfiguration'                : 'com.fasterxml.jackson.databind.JsonNode',
@@ -51,9 +51,9 @@ task generateApiClient(type: GenerateTask) {
     inputSpec = specFile
     outputDir = clientOutputDir
 
-    apiPackage = "io.airbyte.api.client"
-    invokerPackage = "io.airbyte.api.client.invoker"
-    modelPackage = "io.airbyte.api.client.model"
+    apiPackage = "io.airbyte.api.client.generated"
+    invokerPackage = "io.airbyte.api.client.invoker.generated"
+    modelPackage = "io.airbyte.api.client.model.generated"
 
     importMappings = [
             'OAuthConfiguration'                : 'com.fasterxml.jackson.databind.JsonNode',
@@ -84,9 +84,9 @@ task generateApiDocs(type: GenerateTask) {
     inputSpec = specFile
     outputDir = docsOutputDir
 
-    apiPackage = "io.airbyte.api.client"
-    invokerPackage = "io.airbyte.api.client.invoker"
-    modelPackage = "io.airbyte.api.client.model"
+    apiPackage = "io.airbyte.api.client.generated"
+    invokerPackage = "io.airbyte.api.client.invoker.generated"
+    modelPackage = "io.airbyte.api.client.model.generated"
 
     importMappings = [
             'OAuthConfiguration'                : 'com.fasterxml.jackson.databind.JsonNode',

airbyte-api/src/main/java/io/airbyte/api/client/AirbyteApiClient.java

@@ -1,10 +1,22 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.api.client;
 
-import io.airbyte.api.client.invoker.ApiClient;
+import io.airbyte.api.client.generated.ConnectionApi;
+import io.airbyte.api.client.generated.DbMigrationApi;
+import io.airbyte.api.client.generated.DestinationApi;
+import io.airbyte.api.client.generated.DestinationDefinitionApi;
+import io.airbyte.api.client.generated.DestinationDefinitionSpecificationApi;
+import io.airbyte.api.client.generated.HealthApi;
+import io.airbyte.api.client.generated.JobsApi;
+import io.airbyte.api.client.generated.OperationApi;
+import io.airbyte.api.client.generated.SourceApi;
+import io.airbyte.api.client.generated.SourceDefinitionApi;
+import io.airbyte.api.client.generated.SourceDefinitionSpecificationApi;
+import io.airbyte.api.client.generated.WorkspaceApi;
+import io.airbyte.api.client.invoker.generated.ApiClient;
 
 /**
  * This class is meant to consolidate all our API endpoints into a fluent-ish client. Currently, all

airbyte-api/src/main/java/io/airbyte/api/client/PatchedLogsApi.java

@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 2021 Airbyte, Inc., all rights reserved.
+ * Copyright (c) 2022 Airbyte, Inc., all rights reserved.
  */
 
 package io.airbyte.api.client;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.airbyte.api.client.invoker.ApiClient;
-import io.airbyte.api.client.invoker.ApiException;
-import io.airbyte.api.client.invoker.ApiResponse;
-import io.airbyte.api.client.model.LogsRequestBody;
+import io.airbyte.api.client.invoker.generated.ApiClient;
+import io.airbyte.api.client.invoker.generated.ApiException;
+import io.airbyte.api.client.invoker.generated.ApiResponse;
+import io.airbyte.api.client.model.generated.LogsRequestBody;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,9 +21,9 @@
 import org.apache.commons.io.FileUtils;
 
 /**
- * This class is a copy of {@link LogsApi} except it allows Accept: text/plain. Without this
- * modification, {@link LogsApi} returns a 406 because the generated code requests the wrong
- * response type.
+ * This class is a copy of {@link io.airbyte.api.client.generated.LogsApi} except it allows Accept:
+ * text/plain. Without this modification, {@link io.airbyte.api.client.generated.LogsApi} returns a
+ * 406 because the generated code requests the wrong response type.
  */
 public class PatchedLogsApi {
 

airbyte-api/src/main/openapi/config.yaml

@@ -3844,6 +3844,8 @@ components:
           $ref: "#/components/schemas/AttemptFailureType"
         externalMessage:
           type: string
+        internalMessage:
+          type: string
         stacktrace:
           type: string
         retryable:

airbyte-bootloader/Dockerfile

@@ -2,7 +2,7 @@ ARG JDK_VERSION=17.0.1
 ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
 FROM ${JDK_IMAGE}
 
-ARG VERSION=0.39.1-alpha
+ARG VERSION=0.39.5-alpha
 
 ENV APPLICATION airbyte-bootloader
 ENV VERSION ${VERSION}