From 5c1fd2a462576d9c7997493ec955359c46f08001 Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 20 Oct 2022 08:04:43 +0000 Subject: [PATCH 1/3] remove vcr Signed-off-by: Sergey Chvalyuk --- .../connectors/source-intercom/Dockerfile | 2 +- .../connectors/source-intercom/setup.py | 2 +- .../source-intercom/source_intercom/source.py | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/airbyte-integrations/connectors/source-intercom/Dockerfile b/airbyte-integrations/connectors/source-intercom/Dockerfile index 8d46e345b891..72eea895dca2 100644 --- a/airbyte-integrations/connectors/source-intercom/Dockerfile +++ b/airbyte-integrations/connectors/source-intercom/Dockerfile @@ -35,5 +35,5 @@ COPY source_intercom ./source_intercom ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py" ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=0.1.27 +LABEL io.airbyte.version=0.1.28 LABEL io.airbyte.name=airbyte/source-intercom diff --git a/airbyte-integrations/connectors/source-intercom/setup.py b/airbyte-integrations/connectors/source-intercom/setup.py index 592a7adca0ad..cba74a441da8 100644 --- a/airbyte-integrations/connectors/source-intercom/setup.py +++ b/airbyte-integrations/connectors/source-intercom/setup.py @@ -6,7 +6,7 @@ from setuptools import find_packages, setup MAIN_REQUIREMENTS = [ - "airbyte-cdk~=0.1", + "airbyte-cdk~=0.2.0", ] TEST_REQUIREMENTS = [ diff --git a/airbyte-integrations/connectors/source-intercom/source_intercom/source.py b/airbyte-integrations/connectors/source-intercom/source_intercom/source.py index 483c46f3eee2..161c89ff3bfd 100755 --- a/airbyte-integrations/connectors/source-intercom/source_intercom/source.py +++ b/airbyte-integrations/connectors/source-intercom/source_intercom/source.py @@ -9,8 +9,6 @@ from urllib.parse import parse_qsl, urljoin, urlparse import requests -import vcr -import vcr.cassette as Cassette from airbyte_cdk.logger import AirbyteLogger from airbyte_cdk.sources import AbstractSource from airbyte_cdk.sources.streams import Stream @@ -136,15 +134,6 @@ class IncrementalIntercomSearchStream(IncrementalIntercomStream): sort_order = "ascending" use_cache = True - def request_cache(self) -> Cassette: - """ - Override the default `request_cache` method, due to `match_on` is different for POST requests. - We should check additional criteria like ['query', 'body'] instead of default ['uri', 'method'] - """ - match_on = ["uri", "query", "method", "body"] - cassette = vcr.use_cassette(self.cache_filename, record_mode="new_episodes", serializer="yaml", match_on=match_on) - return cassette - @stream_state_cache.cache_stream_state def request_params(self, **kwargs) -> MutableMapping[str, Any]: """ From 6edb511a7b976257c234eaa2aadad9a26b5fcb1b Mon Sep 17 00:00:00 2001 From: Sergey Chvalyuk Date: Thu, 20 Oct 2022 18:04:38 +0300 Subject: [PATCH 2/3] intercom.md updated Signed-off-by: Sergey Chvalyuk --- docs/integrations/sources/intercom.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/integrations/sources/intercom.md b/docs/integrations/sources/intercom.md index 96e70483c350..2c27147d1d2b 100644 --- a/docs/integrations/sources/intercom.md +++ b/docs/integrations/sources/intercom.md @@ -49,6 +49,7 @@ The Intercom connector should not run into Intercom API limitations under normal | Version | Date | Pull Request | Subject | | :------ | :--------- | :------------------------------------------------------- | :-------------------------------------------------------------------------------------------- | +| 0.1.28 | 2022-10-20 | [18216](https://github.com/airbytehq/airbyte/pull/18216) | Use airbyte-cdk~=0.2.0 with SQLite caching | | 0.1.27 | 2022-08-28 | [17326](https://github.com/airbytehq/airbyte/pull/17326) | Migrate to per-stream states. | | 0.1.26 | 2022-08-18 | [16540](https://github.com/airbytehq/airbyte/pull/16540) | Fix JSON schema | | 0.1.25 | 2022-08-18 | [15681](https://github.com/airbytehq/airbyte/pull/15681) | Update Intercom API to v 2.5 | From 1d68ecc88de1b39c1fbe84586d2c561ce1e8208b Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Thu, 20 Oct 2022 15:47:30 +0000 Subject: [PATCH 3/3] auto-bump connector version --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml index b983d9d5f3e7..5960faafd7bd 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -510,7 +510,7 @@ - name: Intercom sourceDefinitionId: d8313939-3782-41b0-be29-b3ca20d8dd3a dockerRepository: airbyte/source-intercom - dockerImageTag: 0.1.27 + dockerImageTag: 0.1.28 documentationUrl: https://docs.airbyte.com/integrations/sources/intercom icon: intercom.svg sourceType: api diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml index 8194fd7eb100..f1a4ef305424 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -5030,7 +5030,7 @@ oauthFlowInitParameters: [] oauthFlowOutputParameters: - - "access_token" -- dockerImage: "airbyte/source-intercom:0.1.27" +- dockerImage: "airbyte/source-intercom:0.1.28" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/intercom" connectionSpecification: