Merge remote-tracking branch 'origin/master' into drezchykov/4776-cdk…

…-validate-spec

.bumpversion.cfg

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

.env

@@ -1,4 +1,4 @@
-VERSION=0.29.8-alpha
+VERSION=0.29.9-alpha
 
 # Airbyte Internal Job Database, see https://docs.airbyte.io/operator-guides/configuring-airbyte-db
 DATABASE_USER=docker

.github/workflows/publish-command.yml

@@ -85,8 +85,10 @@ jobs:
           CART_TEST_CREDS: ${{ secrets.CART_TEST_CREDS }}
           CHARGEBEE_INTEGRATION_TEST_CREDS: ${{ secrets.CHARGEBEE_INTEGRATION_TEST_CREDS }}
           DESTINATION_PUBSUB_TEST_CREDS: ${{ secrets.DESTINATION_PUBSUB_TEST_CREDS }}
+          DESTINATION_KEEN_TEST_CREDS: ${{ secrets.DESTINATION_KEEN_TEST_CREDS }}
           DESTINATION_KVDB_TEST_CREDS: ${{ secrets.DESTINATION_KVDB_TEST_CREDS }}
           DRIFT_INTEGRATION_TEST_CREDS: ${{ secrets.DRIFT_INTEGRATION_TEST_CREDS }}
+          SOURCE_DIXA_TEST_CREDS: ${{ secrets.SOURCE_DIXA_TEST_CREDS }}
           EXCHANGE_RATES_TEST_CREDS: ${{ secrets.EXCHANGE_RATES_TEST_CREDS }}
           FACEBOOK_MARKETING_TEST_INTEGRATION_CREDS: ${{ secrets.FACEBOOK_MARKETING_TEST_INTEGRATION_CREDS }}
           FACEBOOK_MARKETING_API_TEST_INTEGRATION_CREDS: ${{ secrets.FACEBOOK_MARKETING_API_TEST_INTEGRATION_CREDS }}

.github/workflows/test-command.yml

@@ -85,8 +85,10 @@ jobs:
           CART_TEST_CREDS: ${{ secrets.CART_TEST_CREDS }}
           CHARGEBEE_INTEGRATION_TEST_CREDS: ${{ secrets.CHARGEBEE_INTEGRATION_TEST_CREDS }}
           DESTINATION_PUBSUB_TEST_CREDS: ${{ secrets.DESTINATION_PUBSUB_TEST_CREDS }}
+          DESTINATION_KEEN_TEST_CREDS: ${{ secrets.DESTINATION_KEEN_TEST_CREDS }}
           DESTINATION_KVDB_TEST_CREDS: ${{ secrets.DESTINATION_KVDB_TEST_CREDS }}
           DRIFT_INTEGRATION_TEST_CREDS: ${{ secrets.DRIFT_INTEGRATION_TEST_CREDS }}
+          SOURCE_DIXA_TEST_CREDS: ${{ secrets.SOURCE_DIXA_TEST_CREDS }}
           EXCHANGE_RATES_TEST_CREDS: ${{ secrets.EXCHANGE_RATES_TEST_CREDS }}
           FACEBOOK_MARKETING_TEST_INTEGRATION_CREDS: ${{ secrets.FACEBOOK_MARKETING_TEST_INTEGRATION_CREDS }}
           FACEBOOK_MARKETING_API_TEST_INTEGRATION_CREDS: ${{ secrets.FACEBOOK_MARKETING_API_TEST_INTEGRATION_CREDS }}
@@ -162,12 +164,13 @@ jobs:
           # Oracle expects this variable to be set. Although usually present, this is not set by default on Github virtual runners.
           TZ: UTC
       - name: Archive test reports artifacts
-        if: github.event.inputs.comment-id && !success()
+        if: github.event.inputs.comment-id && failure()
         uses: actions/upload-artifact@v2
         with:
           name: test-reports
           path: |
             **/${{ github.event.inputs.connector }}/build/reports/tests/**/**
+            **/${{ github.event.inputs.connector }}/acceptance_tests_logs/**
             **/normalization_test_output/**/dbt_output.log
             **/normalization_test_output/**/destination_output.log
             **/normalization_test_output/**/build/compiled/airbyte_utils/**
@@ -188,7 +191,7 @@ jobs:
           body: |
             > :white_check_mark: ${{github.event.inputs.connector}} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
       - name: Add Failure Comment
-        if: github.event.inputs.comment-id && !success()
+        if: github.event.inputs.comment-id && failure()
         uses: peter-evans/create-or-update-comment@v1
         with:
           comment-id: ${{ github.event.inputs.comment-id }}

airbyte-cdk/python/CHANGELOG.md

@@ -4,10 +4,7 @@
 Add checking specified config againt spec for read, write, check and discover commands
 
 ## 0.1.10
-Upd multiple token support: switch to list of tokens
-
-## 0.1.9
-Add multiple token support
+Add `MultipleTokenAuthenticator` class to allow cycling through a list of API tokens when making HTTP requests
 
 ## 0.1.8
 Allow to fetch primary key info from singer catalog

airbyte-config/init/build.gradle

@@ -7,42 +7,3 @@ dependencies {
 
     implementation project(':airbyte-config:models')
 }
-
-// generate seed for each yaml file.
-task generateSeed {
-    def seeds = [
-            [
-                "sourceDefinitionId",
-                new File(project.projectDir, '/src/main/resources/seed/source_definitions.yaml'),
-                new File(project.projectDir, '/src/main/resources/config/STANDARD_SOURCE_DEFINITION')
-            ],
-            [
-                "destinationDefinitionId",
-                new File(project.projectDir, '/src/main/resources/seed/destination_definitions.yaml'),
-                new File(project.projectDir, '/src/main/resources/config/STANDARD_DESTINATION_DEFINITION')
-            ],
-    ]
-    seeds.each{val ->
-        def name = val[0]
-        def taskName = "generateSeed$name"
-        dependsOn taskName
-        task "$taskName"(type: JavaExec) {
-            classpath = sourceSets.main.runtimeClasspath
-
-            main = 'io.airbyte.config.init.SeedRepository'
-
-            // arguments to pass to the application
-            args '--id-name'
-            args val[0]
-            args '--input-path'
-            args val[1]
-            args '--output-path'
-            args val[2]
-        }
-    }
-}
-
-// we only want to attempt generateSeed if tests have passed.
-generateSeed.dependsOn(check)
-generateSeed.dependsOn(assemble)
-build.dependsOn(generateSeed)

airbyte-config/init/src/main/java/io/airbyte/config/init/SeedType.java

@@ -0,0 +1,49 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020 Airbyte
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package io.airbyte.config.init;
+
+public enum SeedType {
+
+  STANDARD_SOURCE_DEFINITION("/seed/source_definitions.yaml", "sourceDefinitionId"),
+  STANDARD_DESTINATION_DEFINITION("/seed/destination_definitions.yaml", "destinationDefinitionId");
+
+  final String resourcePath;
+  // ID field name
+  final String idName;
+
+  SeedType(String resourcePath, String idName) {
+    this.resourcePath = resourcePath;
+    this.idName = idName;
+  }
+
+  public String getResourcePath() {
+    return resourcePath;
+  }
+
+  public String getIdName() {
+    return idName;
+  }
+
+}

airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION_DEFINITION/356668e2-7e34-47f3-a3b0-67a8a481b692.json

@@ -2,6 +2,6 @@
   "destinationDefinitionId": "356668e2-7e34-47f3-a3b0-67a8a481b692",
   "name": "Google PubSub",
   "dockerRepository": "airbyte/destination-pubsub",
-  "dockerImageTag": "0.1.0",
+  "dockerImageTag": "0.1.1",
   "documentationUrl": "https://docs.airbyte.io/integrations/destinations/pubsub"
 }

airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION_DEFINITION/4816b78f-1489-44c1-9060-4b19d5fa9362.json

@@ -2,6 +2,6 @@
   "destinationDefinitionId": "4816b78f-1489-44c1-9060-4b19d5fa9362",
   "name": "S3",
   "dockerRepository": "airbyte/destination-s3",
-  "dockerImageTag": "0.1.9",
+  "dockerImageTag": "0.1.10",
   "documentationUrl": "https://docs.airbyte.io/integrations/destinations/s3"
 }

airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION_DEFINITION/81740ce8-d764-4ea7-94df-16bb41de36ae.json

@@ -0,0 +1,7 @@
+{
+  "destinationDefinitionId": "81740ce8-d764-4ea7-94df-16bb41de36ae",
+  "name": "Chargify (Keen)",
+  "dockerRepository": "airbyte/destination-keen",
+  "dockerImgeTag": "0.1.0",
+  "documentationUrl": "https://docs.airbyte.io/integrations/destinations/keen"
+}

airbyte-config/init/src/main/resources/config/STANDARD_DESTINATION_DEFINITION/8aaf41d0-f6d2-46de-9e79-c9540f828142.json

@@ -0,0 +1,7 @@
+{
+  "destinationDefinitionId": "8aaf41d0-f6d2-46de-9e79-c9540f828142",
+  "name": "Keen",
+  "dockerRepository": "airbyte/destination-keen",
+  "dockerImgeTag": "0.1.0",
+  "documentationUrl": "https://docs.airbyte.io/integrations/destinations/keen"
+}

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/0b5c867e-1b12-4d02-ab74-97b2184ff6d7.json

@@ -2,6 +2,6 @@
   "sourceDefinitionId": "0b5c867e-1b12-4d02-ab74-97b2184ff6d7",
   "name": "Dixa",
   "dockerRepository": "airbyte/source-dixa",
-  "dockerImageTag": "0.1.0",
+  "dockerImageTag": "0.1.1",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/dixa"
 }

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/253487c0-2246-43ba-a21f-5116b20a2c50.json

@@ -2,6 +2,6 @@
   "sourceDefinitionId": "253487c0-2246-43ba-a21f-5116b20a2c50",
   "name": "Google Ads",
   "dockerRepository": "airbyte/source-google-ads",
-  "dockerImageTag": "0.1.5",
+  "dockerImageTag": "0.1.8",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/google-ads"
 }

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/36c891d9-4bd9-43ac-bad2-10e12756272c.json

@@ -2,7 +2,7 @@
   "sourceDefinitionId": "36c891d9-4bd9-43ac-bad2-10e12756272c",
   "name": "Hubspot",
   "dockerRepository": "airbyte/source-hubspot",
-  "dockerImageTag": "0.1.9",
+  "dockerImageTag": "0.1.10",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/hubspot",
   "icon": "hubspot.svg"
 }

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/40d24d0f-b8f9-4fe0-9e6c-b06c0f3f45e4.json

@@ -2,7 +2,7 @@
   "sourceDefinitionId": "40d24d0f-b8f9-4fe0-9e6c-b06c0f3f45e4",
   "name": "Zendesk Chat",
   "dockerRepository": "airbyte/source-zendesk-chat",
-  "dockerImageTag": "0.1.1",
+  "dockerImageTag": "0.1.2",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/zendesk-chat",
   "icon": "zendesk.svg"
 }

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/435bb9a5-7887-4809-aa58-28c27df0d7ad.json

@@ -2,7 +2,7 @@
   "sourceDefinitionId": "435bb9a5-7887-4809-aa58-28c27df0d7ad",
   "name": "MySQL",
   "dockerRepository": "airbyte/source-mysql",
-  "dockerImageTag": "0.4.2",
+  "dockerImageTag": "0.4.3",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/mysql",
   "icon": "mysql.svg"
 }

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/447e0381-3780-4b46-bb62-00a4e3c8b8e2.json

@@ -2,6 +2,6 @@
   "sourceDefinitionId": "447e0381-3780-4b46-bb62-00a4e3c8b8e2",
   "name": "IBM Db2",
   "dockerRepository": "airbyte/source-db2",
-  "dockerImageTag": "0.1.0",
+  "dockerImageTag": "0.1.1",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/db2"
 }

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/63cea06f-1c75-458d-88fe-ad48c7cb27fd.json

@@ -0,0 +1,8 @@
+{
+  "sourceDefinitionId": "63cea06f-1c75-458d-88fe-ad48c7cb27fd",
+  "name": "Braintree",
+  "dockerRepository": "airbyte/source-braintree",
+  "dockerImageTag": "0.1.0",
+  "documentationUrl": "https://docs.airbyte.io/integrations/sources/braintree",
+  "icon": "braintree.svg"
+}

airbyte-config/init/src/main/resources/config/STANDARD_SOURCE_DEFINITION/9fa5862c-da7c-11eb-8d19-0242ac130003.json

@@ -2,6 +2,6 @@
   "sourceDefinitionId": "9fa5862c-da7c-11eb-8d19-0242ac130003",
   "name": "Cockroachdb",
   "dockerRepository": "airbyte/source-cockroachdb",
-  "dockerImageTag": "0.1.1",
+  "dockerImageTag": "0.1.2",
   "documentationUrl": "https://docs.airbyte.io/integrations/sources/cockroachdb"
 }