Merge branch 'master' into TDL-25030-fix-pk-chunking-condition

singer-io · Mar 6, 2024 · f72f15f · f72f15f
2 parents 234c838 + e27ff3b
commit f72f15f
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 10 deletions.
diff --git 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:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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