Merge pull request #166 from subhash12/master

option to choose a range on timestamp field for /v2/events

Author: antechrestos

main/cloudfoundry_client/v2/entities.py

@@ -50,6 +50,8 @@ class EntityManager(object):
 
     list_multi_parameters = ["order-by"]
 
+    timestamp_parameters = ["timestamp"]
+
     def __init__(
         self, target_endpoint: str, client: "CloudFoundryClient", entity_uri: str, entity_builder: Optional[EntityBuilder] = None
     ):
@@ -150,6 +152,13 @@ def _append_encoded_parameter(parameters: List[str], args: Tuple[str, Any]) -> L
                     value_list = [value_list]
                 for value in value_list:
                     parameters.append("%s=%s" % (parameter_name, str(value)))
+            elif parameter_name in self.timestamp_parameters:
+                if isinstance(args[1], dict):
+                    operator_list = args[1].keys()
+                    for operator in operator_list:
+                        parameters.append("q=%s" % quote("%s%s%s" % (parameter_name, operator, args[1][operator])))
+                else:
+                    parameters.append("q=%s" % quote("%s:%s" % (parameter_name, str(parameter_value))))
             elif isinstance(parameter_value, (list, tuple)):
                 parameters.append("q=%s" % quote("%s IN %s" % (parameter_name, ",".join(parameter_value))))
             else:

test/v2/test_entities.py

@@ -65,6 +65,12 @@ def test_multi_query(self):
         )
         self.assertEqual("/v2/events?q=organization_guid%3Aorg-id&q=type%20IN%20create%2Cupdate", url)
 
+    def test_range_query(self):
+        url = EntityManager("http://cf.api", None, "/v2/events")._get_url_filtered(
+            "/v2/events", **{"type": "app.crash", "space_guid": "space-id", "timestamp": {">": "2022-02-08T16:41:25Z"}}
+        )
+        self.assertEqual("/v2/events?q=space_guid%3Aspace-id&q=timestamp%3E2022-02-08T16%3A41%3A25Z&q=type%3Aapp.crash", url)
+
     def test_list(self):
         client = MagicMock()
         entity_manager = EntityManager(self.TARGET_ENDPOINT, client, "/fake/first")