From 89dba993e11d35117ad94323d8908f085ed88ba6 Mon Sep 17 00:00:00 2001 From: Rushikesh Todkar <98420315+RushiT0122@users.noreply.github.com> Date: Tue, 27 Feb 2024 12:01:51 +0530 Subject: [PATCH 1/2] Fix integration tests (#177) * Fix integration tests * Fix pylint issue --------- Co-authored-by: RushiT0122 --- tap_salesforce/salesforce/bulk.py | 2 +- tap_salesforce/salesforce/rest.py | 2 +- tests/base.py | 19 +++++++++++++ tests/sfbase.py | 36 ++++++++++++++++++++----- tests/test_salesforce_discovery_rest.py | 1 + 5 files changed, 51 insertions(+), 9 deletions(-) diff --git a/tap_salesforce/salesforce/bulk.py b/tap_salesforce/salesforce/bulk.py index 081db803..59952f2f 100644 --- a/tap_salesforce/salesforce/bulk.py +++ b/tap_salesforce/salesforce/bulk.py @@ -1,4 +1,4 @@ -# pylint: disable=protected-access +# pylint: disable=protected-access,use-yield-from import csv import json import sys diff --git a/tap_salesforce/salesforce/rest.py b/tap_salesforce/salesforce/rest.py index 408cd4d0..a7e0c1d5 100644 --- a/tap_salesforce/salesforce/rest.py +++ b/tap_salesforce/salesforce/rest.py @@ -1,4 +1,4 @@ -# pylint: disable=protected-access +# pylint: disable=protected-access,use-yield-from import singer import singer.utils as singer_utils from requests.exceptions import HTTPError diff --git a/tests/base.py b/tests/base.py index e9dae5ab..48e5a75d 100644 --- a/tests/base.py +++ b/tests/base.py @@ -875,6 +875,25 @@ def expected_metadata(self): 'WebStoreBuyerGroup': default, 'WebStoreCatalog': default, 'WebStoreCatalogHistory': incremental_created_date, + # added on 2024/02/19 + 'Address': default, + 'FulfillmentOrderShare': incremental_last_modified, + 'FulfillmentOrderLineItemFeed': default, + 'FulfillmentOrderItemTax': default, + 'FulfillmentOrder': default, + 'FulfillmentOrderItemTaxFeed': default, + 'FulfillmentOrderLineItem': default, + 'FulfillmentOrderItemAdjustment': default, + 'FulfillmentOrderItemAdjustmentFeed': default, + 'FulfillmentOrderFeed': default, + 'OperatingHoursShare': incremental_last_modified, + 'Shipment': default, + 'ShipmentItemHistory': incremental_created_date, + 'ShipmentHistory': incremental_created_date, + 'ShipmentShare': incremental_last_modified, + 'ShipmentItem': default, + 'ShipmentItemFeed': default, + 'ShipmentFeed': default } def rest_only_streams(self): diff --git a/tests/sfbase.py b/tests/sfbase.py index 147a827a..5a6c7e27 100644 --- a/tests/sfbase.py +++ b/tests/sfbase.py @@ -866,7 +866,26 @@ def expected_metadata(): 'WebStoreBuyerGroup': default, 'WebStoreCatalog': default, 'WebStoreCatalogHistory': incremental_created_date, - } + # added on 2024/02/19 + 'Address': default, + 'FulfillmentOrderShare': incremental_last_modified, + 'FulfillmentOrderLineItemFeed': default, + 'FulfillmentOrderItemTax': default, + 'FulfillmentOrder': default, + 'FulfillmentOrderItemTaxFeed': default, + 'FulfillmentOrderLineItem': default, + 'FulfillmentOrderItemAdjustment': default, + 'FulfillmentOrderItemAdjustmentFeed': default, + 'FulfillmentOrderFeed': default, + 'OperatingHoursShare': incremental_last_modified, + 'Shipment': default, + 'ShipmentItemHistory': incremental_created_date, + 'ShipmentHistory': incremental_created_date, + 'ShipmentShare': incremental_last_modified, + 'ShipmentItem': default, + 'ShipmentItemFeed': default, + 'ShipmentFeed': default + } @staticmethod @@ -1005,21 +1024,24 @@ def get_streams_with_data(): 'LoginHistory', 'LeadStatus', 'Lead', - 'LightningUsageByFlexiPageMetrics', 'FormulaFunctionAllowedType', 'LoginIp', - 'LightningUsageByAppTypeMetrics', 'FileSearchActivity', 'FormulaFunctionCategory', - 'LightningUsageByBrowserMetrics', 'Folder', 'FormulaFunction', 'MatchingRule', - 'LightningUsageByPageMetrics', + + # removing form the list has not getting any data + # 'LightningUsageByFlexiPageMetrics', + # 'LightningUsageByAppTypeMetrics', + # 'LightningUsageByBrowserMetrics', + # 'LightningUsageByPageMetrics', + # 'LightningToggleMetrics', + # 'LightningExitByPageMetrics', + 'LoginGeo', 'FlowDefinitionView', - 'LightningToggleMetrics', - #'LightningExitByPageMetrics', --- removing form the list has not getting any data 'PermissionSetTabSetting', 'MilestoneType', 'Period', diff --git a/tests/test_salesforce_discovery_rest.py b/tests/test_salesforce_discovery_rest.py index b5121a87..1738b5cb 100644 --- a/tests/test_salesforce_discovery_rest.py +++ b/tests/test_salesforce_discovery_rest.py @@ -139,6 +139,7 @@ def discovery_test(self): 'ApiEvent', 'WorkOrder', 'ContactCleanInfo', 'ResourceAbsence', 'ReturnOrder', 'LegalEntity', 'PaymentMethod', 'EventLogFile', 'ServiceAppointment', 'DandBCompany', 'AccountCleanInfo', 'Organization', 'Document', 'Account', + 'Address', 'FulfillmentOrder' } # verify that all other fields have inclusion of available From e27ff3b5c82177e33d8252b60cee5e2973da0961 Mon Sep 17 00:00:00 2001 From: Vishal Date: Tue, 5 Mar 2024 21:46:31 +0530 Subject: [PATCH 2/2] Updates Cron schedule (#178) * updated cron schedule --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4cb2208e..ff5a4ea4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -127,7 +127,7 @@ workflows: <<: *commit_jobs triggers: - schedule: - cron: "0 1 * * *" + cron: "0 1 * * 6,0" filters: branches: only: