From 3f20886321f941e43e4b378783bf8f243a78f3e8 Mon Sep 17 00:00:00 2001 From: Oleksandr Bazarnov Date: Tue, 9 Aug 2022 13:41:04 +0300 Subject: [PATCH 1/3] changed the DEFAULT_WAIT_TIMEOUT_SECONDS value to be 24-hour limit --- airbyte-integrations/connectors/source-salesforce/README.md | 2 +- .../connectors/source-salesforce/source_salesforce/streams.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airbyte-integrations/connectors/source-salesforce/README.md b/airbyte-integrations/connectors/source-salesforce/README.md index 474d96df01b7..ef03b9599b80 100644 --- a/airbyte-integrations/connectors/source-salesforce/README.md +++ b/airbyte-integrations/connectors/source-salesforce/README.md @@ -81,7 +81,7 @@ docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integrat Make sure to familiarize yourself with [pytest test discovery](https://docs.pytest.org/en/latest/goodpractices.html#test-discovery) to know how your test files and methods should be named. First install test dependencies into your virtual environment: ``` -pip install .[tests] +pip install ".[tests]" ``` ### Unit Tests To run unit tests locally, from the connector directory run: diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py b/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py index 22ec66f84191..c9448d013ca9 100644 --- a/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py +++ b/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py @@ -149,8 +149,8 @@ def read_records( class BulkSalesforceStream(SalesforceStream): - page_size = 30000 - DEFAULT_WAIT_TIMEOUT_SECONDS = 600 + page_size = 15000 + DEFAULT_WAIT_TIMEOUT_SECONDS = 86400 # 24-hour bulk job running time MAX_CHECK_INTERVAL_SECONDS = 2.0 MAX_RETRY_NUMBER = 3 From 4abccf9020c2460541ebaa38e8644c2405bf194f Mon Sep 17 00:00:00 2001 From: Oleksandr Bazarnov Date: Tue, 9 Aug 2022 13:55:09 +0300 Subject: [PATCH 2/3] updated changelog --- airbyte-integrations/connectors/source-salesforce/Dockerfile | 2 +- docs/integrations/sources/salesforce.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airbyte-integrations/connectors/source-salesforce/Dockerfile b/airbyte-integrations/connectors/source-salesforce/Dockerfile index 1395a0442e5a..d68ba279dae9 100644 --- a/airbyte-integrations/connectors/source-salesforce/Dockerfile +++ b/airbyte-integrations/connectors/source-salesforce/Dockerfile @@ -13,5 +13,5 @@ RUN pip install . ENTRYPOINT ["python", "/airbyte/integration_code/main.py"] -LABEL io.airbyte.version=1.0.11 +LABEL io.airbyte.version=1.0.12 LABEL io.airbyte.name=airbyte/source-salesforce diff --git a/docs/integrations/sources/salesforce.md b/docs/integrations/sources/salesforce.md index 4095cfdca74a..3113b5a8b757 100644 --- a/docs/integrations/sources/salesforce.md +++ b/docs/integrations/sources/salesforce.md @@ -119,6 +119,7 @@ Now that you have set up the Salesforce source connector, check out the followin | Version | Date | Pull Request | Subject | |:--------|:-----------|:-------------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------| +| 1.0.12 | 2022-08-09 | [15444](https://github.com/airbytehq/airbyte/pull/15444) | Fixed bug when `Bulk Job` was timeout by the connector, but remained running on the server | | 1.0.11 | 2022-07-07 | [13729](https://github.com/airbytehq/airbyte/pull/13729) | Improve configuration field descriptions | | 1.0.10 | 2022-06-09 | [13658](https://github.com/airbytehq/airbyte/pull/13658) | Correct logic to sync stream larger than page size | | 1.0.9 | 2022-05-06 | [12685](https://github.com/airbytehq/airbyte/pull/12685) | Update CDK to v0.1.56 to emit an `AirbyeTraceMessage` on uncaught exceptions | From 6ce02d60fc79a5ed9082e366654ec45ab97b47b6 Mon Sep 17 00:00:00 2001 From: Octavia Squidington III Date: Wed, 10 Aug 2022 14:21:32 +0000 Subject: [PATCH 3/3] auto-bump connector version [ci skip] --- .../init/src/main/resources/seed/source_definitions.yaml | 2 +- airbyte-config/init/src/main/resources/seed/source_specs.yaml | 4 ++-- .../connectors/source-salesforce/source_salesforce/streams.py | 2 +- 3 files changed, 4 insertions(+), 4 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 f474624269c5..eef97f670c1d 100644 --- a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml @@ -849,7 +849,7 @@ - name: Salesforce sourceDefinitionId: b117307c-14b6-41aa-9422-947e34922962 dockerRepository: airbyte/source-salesforce - dockerImageTag: 1.0.11 + dockerImageTag: 1.0.12 documentationUrl: https://docs.airbyte.io/integrations/sources/salesforce icon: salesforce.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 efa51da1adb7..0a3c409f7069 100644 --- a/airbyte-config/init/src/main/resources/seed/source_specs.yaml +++ b/airbyte-config/init/src/main/resources/seed/source_specs.yaml @@ -8272,7 +8272,7 @@ supportsNormalization: false supportsDBT: false supported_destination_sync_modes: [] -- dockerImage: "airbyte/source-salesforce:1.0.11" +- dockerImage: "airbyte/source-salesforce:1.0.12" spec: documentationUrl: "https://docs.airbyte.com/integrations/sources/salesforce" connectionSpecification: @@ -8312,7 +8312,7 @@ title: "Refresh Token" description: "Enter your application's Salesforce Refresh Token used for Airbyte to access your Salesforce\ - \ account. " + \ account." type: "string" airbyte_secret: true order: 4 diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py b/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py index c9448d013ca9..7234f0894a55 100644 --- a/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py +++ b/airbyte-integrations/connectors/source-salesforce/source_salesforce/streams.py @@ -150,7 +150,7 @@ def read_records( class BulkSalesforceStream(SalesforceStream): page_size = 15000 - DEFAULT_WAIT_TIMEOUT_SECONDS = 86400 # 24-hour bulk job running time + DEFAULT_WAIT_TIMEOUT_SECONDS = 86400 # 24-hour bulk job running time MAX_CHECK_INTERVAL_SECONDS = 2.0 MAX_RETRY_NUMBER = 3