Fix SAT tests

airbytehq · Dec 28, 2021 · 80fe69e · 80fe69e
1 parent 4007f79
commit 80fe69e
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 73 deletions.
diff --git a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/configured_catalog.json b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/configured_catalog.json
@@ -40,16 +40,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_display_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_display_targetings",
@@ -100,16 +90,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_product_targetings",

diff --git a/...tegrations/connectors/source-amazon-ads/integration_tests/configured_catalog_display.json b/...tegrations/connectors/source-amazon-ads/integration_tests/configured_catalog_display.json
@@ -30,16 +30,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_display_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_display_targetings",

diff --git a/...tions/connectors/source-amazon-ads/integration_tests/configured_catalog_full_refresh.json b/...tions/connectors/source-amazon-ads/integration_tests/configured_catalog_full_refresh.json
@@ -30,16 +30,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_display_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_display_targetings",
@@ -90,16 +80,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_product_targetings",

diff --git a/...egrations/connectors/source-amazon-ads/integration_tests/configured_catalog_products.json b/...egrations/connectors/source-amazon-ads/integration_tests/configured_catalog_products.json
@@ -50,16 +50,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_product_targetings",

diff --git a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/no_profiles_catalog.json b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/no_profiles_catalog.json
@@ -20,16 +20,6 @@
       "destination_sync_mode": "overwrite",
       "source_defined_cursor": false
     },
-    {
-      "stream": {
-        "name": "sponsored_display_product_ads",
-        "json_schema": {},
-        "supported_sync_modes": ["full_refresh"]
-      },
-      "sync_mode": "full_refresh",
-      "destination_sync_mode": "overwrite",
-      "source_defined_cursor": false
-    },
     {
       "stream": {
         "name": "sponsored_display_targetings",

diff --git a/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json b/airbyte-integrations/connectors/source-amazon-ads/integration_tests/spec.json
@@ -40,7 +40,7 @@
         "type": "string"
       },
       "region": {
-        "description": "Region to pull data from (EU/NA/FE/SANDBOX)",
+        "description": "An enumeration.",
         "default": "NA",
         "name": "Region",
         "title": "AmazonAdsRegion",

diff --git a/airbyte-integrations/connectors/source-amazon-ads/setup.py b/airbyte-integrations/connectors/source-amazon-ads/setup.py
@@ -5,7 +5,7 @@
 
 from setuptools import find_packages, setup
 
-MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1.12", "requests_oauthlib~=1.3.0", "pytz~=2021.1", "pendulum~=1.5.1"]
+MAIN_REQUIREMENTS = ["airbyte-cdk~=0.1.46", "requests_oauthlib~=1.3.0", "pytz~=2021.1", "pendulum~=1.5.1"]
 
 TEST_REQUIREMENTS = [
     "pytest~=6.1",

diff --git a/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/common.py b/airbyte-integrations/connectors/source-amazon-ads/source_amazon_ads/streams/common.py
@@ -9,6 +9,7 @@
 import requests
 from airbyte_cdk.sources.streams.core import Stream
 from airbyte_cdk.sources.streams.http import HttpStream
+from airbyte_cdk.sources.utils.schema_helpers import expand_refs
 from pydantic import BaseModel, ValidationError
 from source_amazon_ads.constants import URL_MAPPING
 from source_amazon_ads.schemas import CatalogModel
@@ -86,7 +87,9 @@ def model(self) -> CatalogModel:
         """
 
     def get_json_schema(self):
-        return self.model.schema()
+        schema = self.model.schema()
+        expand_refs(schema)
+        return schema
 
 
 # Basic full refresh stream