Source Salesforce: drop ActivityMetricRollup stream (#22322)

* #1330 source salesforce: drop activitymetricrollup stream * #1330 source salesforce: upd changelog * auto-bump connector version --------- Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
airbytehq · Feb 8, 2023 · e7d7b23 · e7d7b23
1 parent 31f3bb7
commit e7d7b23
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 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
@@ -1562,7 +1562,7 @@
 - name: Salesforce
   sourceDefinitionId: b117307c-14b6-41aa-9422-947e34922962
   dockerRepository: airbyte/source-salesforce
-  dockerImageTag: 1.0.30
+  dockerImageTag: 2.0.0
   documentationUrl: https://docs.airbyte.com/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
@@ -13106,7 +13106,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-salesforce:1.0.30"
+- dockerImage: "airbyte/source-salesforce:2.0.0"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/salesforce"
     connectionSpecification:

diff --git 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.30
+LABEL io.airbyte.version=2.0.0
 LABEL io.airbyte.name=airbyte/source-salesforce
diff --git a/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py b/airbyte-integrations/connectors/source-salesforce/source_salesforce/api.py
@@ -201,6 +201,8 @@
     "UriEvent",
 ]
 
+UNSUPPORTED_STREAMS = ["ActivityMetric", "ActivityMetricRollup"]
+
 
 class Salesforce:
     logger = logging.getLogger("airbyte")
@@ -256,7 +258,7 @@ def get_validated_streams(self, config: Mapping[str, Any], catalog: ConfiguredAi
         """
         stream_objects = {}
         for stream_object in self.describe()["sobjects"]:
-            if stream_object["name"].lower() == "activitymetric":
+            if stream_object["name"] in UNSUPPORTED_STREAMS:
                 self.logger.warning(f"Stream {stream_object['name']} can not be used without object ID therefore will be ignored.")
                 continue
             if stream_object["queryable"]:

diff --git a/airbyte-integrations/connectors/source-salesforce/unit_tests/discovery_test.py b/airbyte-integrations/connectors/source-salesforce/unit_tests/discovery_test.py
@@ -70,6 +70,7 @@ def test_discovery_filter(stream_config):
             "sobjects": [
                 {"name": "Account", "queryable": True},
                 {"name": "ActivityMetric", "queryable": True},
+                {"name": "ActivityMetricRollup", "queryable": True},
                 {"name": "Leads", "queryable": False},
             ]
         }

diff --git a/docs/integrations/sources/salesforce.md b/docs/integrations/sources/salesforce.md
@@ -129,7 +129,8 @@ Now that you have set up the Salesforce source connector, check out the followin
 
 | Version | Date       | Pull Request                                             | Subject                                                                                                                          |
 |:--------|:-----------|:---------------------------------------------------------|:---------------------------------------------------------------------------------------------------------------------------------|
-| 1.0.30  | 2023-01-27 | [22016](https://github.com/airbytehq/airbyte/pull/22016) | Set `AvailabilityStrategy` for streams explicitly to `None`                                                     |
+| 2.0.0   | 2023-02-02 | [22322](https://github.com/airbytehq/airbyte/pull/22322) | Remove `ActivityMetricRollup` stream                                                                                             |
+| 1.0.30  | 2023-01-27 | [22016](https://github.com/airbytehq/airbyte/pull/22016) | Set `AvailabilityStrategy` for streams explicitly to `None`                                                                      |
 | 1.0.29  | 2023-01-05 | [20886](https://github.com/airbytehq/airbyte/pull/20886) | Remove `ActivityMetric` stream                                                                                                   |
 | 1.0.28  | 2022-12-29 | [20927](https://github.com/airbytehq/airbyte/pull/20927) | Fix tests; add expected records                                                                                                  |
 | 1.0.27  | 2022-11-29 | [19869](https://github.com/airbytehq/airbyte/pull/19869) | Remove `AccountHistory` from unsupported BULK streams                                                                            |