merge with master

.bumpversion.cfg

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

.github/pull_request_template.md

@@ -83,3 +83,23 @@ If this is a community PR, the Airbyte engineer reviewing this PR is responsible
 - [ ] Documentation which references the generator is updated as needed
 
 </details>
+
+## Tests
+
+<details><summary><strong>Unit</strong></summary>
+
+*Put your unit tests output here.*
+
+</details>
+
+<details><summary><strong>Integration</strong></summary>
+
+*Put your integration tests output here.*
+
+</details>
+
+<details><summary><strong>Acceptance</strong></summary>
+
+*Put your acceptance tests output here.*
+
+</details>

.github/workflows/gradle.yml

@@ -305,8 +305,8 @@ jobs:
         with:
           java-version: "17"
 
-      # octavia-cli install and testing requires Python. 
-      # We use 3.8 in this project because 3.7 is not supported on Apple M1. 
+      # octavia-cli install and testing requires Python.
+      # We use 3.8 in this project because 3.7 is not supported on Apple M1.
       - uses: actions/setup-python@v2
         with:
           python-version: "3.8"
@@ -482,8 +482,8 @@ jobs:
         id: start-ec2-runner
         uses: ./.github/actions/start-aws-runner
         with:
-          # github-self-hosted-runner-ubuntu-20-with-120gdisk-docker-20.10.7
-          ec2-image-id: ami-0d4083c04fde515c4
+          # github-self-hosted-runner-ubuntu-20-with-150gdisk-docker-20.10.7-and-socat
+          ec2-image-id: ami-0c1a9bc22624339d8
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
@@ -523,16 +523,6 @@ jobs:
           org.gradle.vfs.watch=false
           EOF
 
-      - name: Install socat (required for port forwarding)
-        run: |
-          # wait to receive lock (see https://askubuntu.com/questions/132059/how-to-make-a-package-manager-wait-if-another-instance-of-apt-is-running)
-          while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do
-             sleep 1
-          done
-
-          sudo apt-get update
-          sudo apt-get install socat
-
       - name: Create cluster config file
         run: |
           cat > /tmp/kind-config.yaml <<EOF
@@ -644,8 +634,8 @@ jobs:
         id: start-ec2-runner
         uses: ./.github/actions/start-aws-runner
         with:
-          # github-self-hosted-runner-ubuntu-20-with-120gdisk-docker-20.10.7
-          ec2-image-id: ami-0d4083c04fde515c4
+          # github-self-hosted-runner-ubuntu-20-with-150gdisk-docker-20.10.7-and-socat
+          ec2-image-id: ami-0c1a9bc22624339d8
           aws-access-key-id: ${{ secrets.SELF_RUNNER_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.SELF_RUNNER_AWS_SECRET_ACCESS_KEY }}
           github-token: ${{ secrets.SELF_RUNNER_GITHUB_ACCESS_TOKEN }}
@@ -685,16 +675,6 @@ jobs:
           org.gradle.vfs.watch=false
           EOF
 
-      - name: Install socat (required for port forwarding)
-        run: |
-          # wait to receive lock (see https://askubuntu.com/questions/132059/how-to-make-a-package-manager-wait-if-another-instance-of-apt-is-running)
-          while sudo fuser /var/{lib/{dpkg,apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do
-             sleep 1
-          done
-
-          sudo apt-get update
-          sudo apt-get install socat
-
       - name: Create cluster config file
         run: |
           cat > /tmp/kind-config.yaml <<EOF

.pre-commit-config.yaml

@@ -8,17 +8,18 @@ repos:
       - id: licenseheaders
         args: ["--tmpl=LICENSE_SHORT", "--ext=py", "-f"]
   - repo: https://github.com/ambv/black
-    rev: 21.11b1
+    rev: 22.1.0
     hooks:
       - id: black
-        args: ["--line-length=140"]
+        args: ["--config", "pyproject.toml"]
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.10.1
+    rev: 5.6.4
     hooks:
       - id: isort
         args:
           [
-            "--settings-path=tools/python/.isort.cfg",
+            "--settings-file",
+            "pyproject.toml",
             "--dont-follow-links",
             "--jobs=-1",
           ]
@@ -37,17 +38,17 @@ repos:
           ).?$
 
   - repo: https://github.com/csachs/pyproject-flake8
-    rev: v0.0.1a2.post1
+    rev: 0.0.1a2
     hooks:
       - id: pyproject-flake8
-        args: ["--config=tools/python/.flake8"]
+        args: ["--config", "pyproject.toml"]
         additional_dependencies: ["mccabe"]
         alias: flake8
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910-1
+    rev: 0.930
     hooks:
       - id: mypy
-        args: ["--config-file=tools/python/.mypy.ini"]
+        args: ["--config-file", "pyproject.toml"]
         exclude: |
           (?x)^.*(
               octavia-cli/unit_tests/|

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

@@ -494,6 +494,29 @@ paths:
                 $ref: "#/components/schemas/SourceReadList"
         "422":
           $ref: "#/components/responses/InvalidInputResponse"
+  /v1/sources/clone:
+    post:
+      tags:
+        - source
+      summary: Clone source
+      operationId: cloneSource
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/SourceIdRequestBody"
+        required: true
+      responses:
+        "200":
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/SourceRead"
+        "404":
+          $ref: "#/components/responses/NotFoundResponse"
+        "422":
+          $ref: "#/components/responses/InvalidInputResponse"
   /v1/sources/delete:
     post:
       tags:
@@ -892,6 +915,29 @@ paths:
           $ref: "#/components/responses/NotFoundResponse"
         "422":
           $ref: "#/components/responses/InvalidInputResponse"
+  /v1/destinations/clone:
+    post:
+      tags:
+        - destination
+      summary: Clone destination
+      operationId: cloneDestination
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/DestinationIdRequestBody"
+        required: true
+      responses:
+        "200":
+          description: Successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/DestinationRead"
+        "404":
+          $ref: "#/components/responses/NotFoundResponse"
+        "422":
+          $ref: "#/components/responses/InvalidInputResponse"
   /v1/connections/create:
     post:
       tags:

airbyte-bootloader/Dockerfile

@@ -5,6 +5,6 @@ ENV APPLICATION airbyte-bootloader
 
 WORKDIR /app
 
-ADD bin/${APPLICATION}-0.35.32-alpha.tar /app
+ADD bin/${APPLICATION}-0.35.35-alpha.tar /app
 
-ENTRYPOINT ["/bin/bash", "-c", "${APPLICATION}-0.35.32-alpha/bin/${APPLICATION}"]
+ENTRYPOINT ["/bin/bash", "-c", "${APPLICATION}-0.35.35-alpha/bin/${APPLICATION}"]

airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java

@@ -80,7 +80,7 @@ void testBootloaderAppBlankDb() throws Exception {
         mockedConfigs.getConfigDatabaseUrl())
             .getAndInitialize();
     val configsMigrator = new ConfigsDatabaseMigrator(configDatabase, this.getClass().getName());
-    assertEquals("0.35.28.001", configsMigrator.getLatestMigration().getVersion().getVersion());
+    assertEquals("0.35.32.001", configsMigrator.getLatestMigration().getVersion().getVersion());
 
     val jobsPersistence = new DefaultJobPersistence(jobDatabase);
     assertEquals(version, jobsPersistence.getVersion().get());

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/2817b3f0-04e4-4c7a-9f32-7a5e8a83db95.json

@@ -0,0 +1,8 @@
+{
+  "sourceDefinitionId": "2817b3f0-04e4-4c7a-9f32-7a5e8a83db95",
+  "name": "PagerDuty",
+  "dockerRepository": "farosai/airbyte-pagerduty-source",
+  "dockerImageTag": "0.1.23",
+  "documentationUrl": "https://docs.airbyte.io/integrations/sources/pagerduty",
+  "icon": "pagerduty.svg"
+}

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/6fe89830-d04d-401b-aad6-6552ffa5c4af.json

@@ -0,0 +1,8 @@
+{
+  "sourceDefinitionId": "6fe89830-d04d-401b-aad6-6552ffa5c4af",
+  "name": "Harness",
+  "dockerRepository": "farosai/airbyte-harness-source",
+  "dockerImageTag": "0.1.23",
+  "documentationUrl": "https://docs.airbyte.io/integrations/sources/harness",
+  "icon": "harness.svg"
+}

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/7e20ce3e-d820-4327-ad7a-88f3927fd97a.json

@@ -0,0 +1,8 @@
+{
+  "sourceDefinitionId": "7e20ce3e-d820-4327-ad7a-88f3927fd97a",
+  "name": "VictorOps",
+  "dockerRepository": "farosai/airbyte-victorops-source",
+  "dockerImageTag": "0.1.23",
+  "documentationUrl": "https://docs.airbyte.io/integrations/sources/victorops",
+  "icon": "victorops.svg"
+}

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/c47d6804-8b98-449f-970a-5ddb5cb5d7aa.json

@@ -0,0 +1,8 @@
+{
+  "sourceDefinitionId": "c47d6804-8b98-449f-970a-5ddb5cb5d7aa",
+  "name": "Customer.io",
+  "dockerRepository": "farosai/airbyte-customer-io-source",
+  "dockerImageTag": "0.1.23",
+  "documentationUrl": "https://docs.airbyte.io/integrations/sources/customer-io",
+  "icon": "customer-io.svg"
+}