Merge branch 'main' into chore-tempZendeskAuthChange

rudderlabs · Aug 21, 2023 · dd4e92c · dd4e92c
2 parents d99276f + c3665e8
commit dd4e92c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/spec.json b/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/spec.json
@@ -85,15 +85,15 @@
         "description": "If not set, data from up to one year ago will replicated by default.",
         "examples": ["2021-11-16"],
         "pattern": "^$|^[0-9]{4}-[0-9]{2}-[0-9]{2}(T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)?$",
-        "format": "date-time"
+        "format": "date"
       },
       "end_date": {
         "order": 6,
         "title": "End Date",
         "type": "string",
         "examples": ["2021-11-16"],
         "pattern": "^$|^[0-9]{4}-[0-9]{2}-[0-9]{2}(T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)?$",
-        "format": "date-time"
+        "format": "date"
       },
       "region": {
         "order": 7,

diff --git a/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/streams/export.py b/airbyte-integrations/connectors/source-mixpanel/source_mixpanel/streams/export.py
@@ -145,15 +145,17 @@ def process_response(self, response: requests.Response, **kwargs) -> Iterable[Ma
         # We prefer response.iter_lines() to response.text.split_lines() as the later can missparse text properties embeding linebreaks
         for record in self.iter_dicts(response.iter_lines(decode_unicode=True)):
             # transform record into flat dict structure
-            item = {"event": record["event"]}
+            # Changed event property name to "mp_event" to avoid conflict with "event" reserved property
+            item = {"mp_event": record["event"]}
             properties = record["properties"]
             for result in transform_property_names(properties.keys()):
                 # Convert all values to string (this is default property type)
                 # because API does not provide properties type information
                 item[result.transformed_name] = str(properties[result.source_name])
 
             # convert timestamp to datetime string
-            item["time"] = pendulum.from_timestamp(int(item["time"]), tz="UTC").to_iso8601_string()
+            if "time" in item: # time is not always present in the response
+                item["time"] = pendulum.from_timestamp(int(item["time"]), tz="UTC").to_iso8601_string()
 
             yield item
 

diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py b/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py
@@ -73,6 +73,7 @@
     "UserEntityAccess",
     "UserFieldAccess",
     "Vote",
+    "FlowTestView",
 ]
 
 # The following objects are not supported by the query method being used.
@@ -125,6 +126,7 @@
     "SessionHijackingEvent",
     "UriEventStream",
     "UserRecordAccess",
+    "DatacloudContact",
 ]
 
 # The following objects are not supported by the Bulk API. Listed objects are version specific.
@@ -177,6 +179,7 @@
     "AccountBrandShare",
     "AccountFeed",
     "AssetFeed",
+    "WorkStepStatus",
 ]
 
 UNSUPPORTED_FILTERING_STREAMS = [
@@ -199,6 +202,8 @@
     "ReportEvent",
     "TabDefinition",
     "UriEvent",
+    "PermissionSetEventStore",
+    "ActivityFieldHistory",
 ]
 
 RESOURCE_PRIMARY_KEY_MAP = {
@@ -210,7 +215,7 @@
     "Publisher": "DurableId", # https://developer.salesforce.com/docs/atlas.en-us.api_tooling.meta/api_tooling/tooling_api_objects_publisher.htm
     "ApexPageInfo": "DurableId" # https://developer.salesforce.com/docs/atlas.en-us.api_tooling.meta/api_tooling/tooling_api_objects_apexpageinfo.htm
 }
-UNSUPPORTED_STREAMS = ["ActivityMetric", "ActivityMetricRollup"]
+UNSUPPORTED_STREAMS = ["ActivityMetric", "ActivityMetricRollup", "PromotionTarget", "PromotionQualifier"]
 
 
 class Salesforce:

diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/spec.yaml b/airbyte-integrations/connectors/source-salesforce/source_salesforce/spec.yaml
@@ -37,7 +37,6 @@ connectionSpecification:
       pattern: >-
         ^([0-9]{4}-[0-9]{2}-[0-9]{2}(T[0-9]{2}:[0-9]{2}:[0-9]{2}Z)?)$
       examples:
-        - "2021-07-25"
         - "2021-07-25T00:00:00Z"
       format: date-time
       order: 5