Merge pull request #21 from hotgluexyz/feature/selectApiVersion

added support for selecting salesforce api version
hotgluexyz · Jul 20, 2022 · 9620df2 · 9620df2
2 parents a74ae00 + 793e5dd
commit 9620df2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/tap_salesforce/__init__.py b/tap_salesforce/__init__.py
@@ -495,7 +495,8 @@ def main_impl():
             default_start_date=CONFIG.get('start_date'),
             api_type=CONFIG.get('api_type'),
             list_reports=CONFIG.get('list_reports'),
-            list_views=CONFIG.get('list_views')
+            list_views=CONFIG.get('list_views'),
+            api_version=CONFIG.get('api_version')
             )
         sf.login()
 

diff --git a/tap_salesforce/salesforce/__init__.py b/tap_salesforce/salesforce/__init__.py
@@ -45,7 +45,8 @@
 NUMBER_TYPES = set([
     'double',
     'currency',
-    'percent'
+    'percent',
+    'long'
 ])
 
 DATE_TYPES = set([
@@ -207,7 +208,8 @@ def __init__(self,
                  default_start_date=None,
                  api_type=None,
                  list_reports=False,
-                 list_views=False):
+                 list_views=False,
+                 api_version=None):
         self.api_type = api_type.upper() if api_type else None
         self.refresh_token = refresh_token
         self.token = token
@@ -232,7 +234,8 @@ def __init__(self,
         self.rest_requests_attempted = 0
         self.jobs_completed = 0
         self.login_timer = None
-        self.data_url = "{}/services/data/v41.0/{}"
+        self.version = api_version or "41.0"
+        self.data_url = "{}/services/data/v" + self.version + "/{}"
         self.pk_chunking = False
 
         # validate start_date

diff --git a/tap_salesforce/salesforce/bulk.py b/tap_salesforce/salesforce/bulk.py
@@ -40,7 +40,9 @@ def find_parent(stream):
 
 class Bulk():
 
-    bulk_url = "{}/services/async/41.0/{}"
+    @property
+    def bulk_url(self):
+        return "{}/services/async/" + self.sf.version + "/{}"
 
     def __init__(self, sf):
         # Set csv max reading size to the platform's max size available.
@@ -73,10 +75,14 @@ def check_bulk_quota_usage(self):
         with metrics.http_request_timer(endpoint):
             resp = self.sf._make_request('GET', url, headers=self.sf._get_standard_headers()).json()
 
-        quota_max = resp['DailyBulkApiRequests']['Max']
+        quota = resp.get('DailyBulkApiRequests')
+        if not quota:
+            quota = resp.get('DailyBulkApiBatches')
+        quota_max = quota['Max']
+
         max_requests_for_run = int((self.sf.quota_percent_per_run * quota_max) / 100)
 
-        quota_remaining = resp['DailyBulkApiRequests']['Remaining']
+        quota_remaining = quota['Remaining']
         percent_used = (1 - (quota_remaining / quota_max)) * 100
 
         if percent_used > self.sf.quota_percent_total:

diff --git a/tap_salesforce/salesforce/rest.py b/tap_salesforce/salesforce/rest.py
@@ -28,7 +28,7 @@ def _query_recur(
             end_date=None,
             retries=MAX_RETRIES):
         params = {"q": query}
-        url = "{}/services/data/v41.0/queryAll".format(self.sf.instance_url)
+        url = "{}/services/data/v{}/queryAll".format(self.sf.instance_url, self.sf.version)
         headers = self.sf._get_standard_headers()
 
         sync_start = singer_utils.now()