Merge branch 'master' into adding_get_by_ref

Author: David Meu

CHANGELOG.rst

@@ -13,9 +13,21 @@ Added
 
   Contributed by @DavidMeu
 
+Fixed
+~~~~~
+
+* Fix Type error for ``time_diff`` critera comparison. convert the timediff value as float to match
+  ``timedelta.total_seconds()`` return. #5462
+
+  Contributed by @blackstrip
+
 Added
 ~~~~~
 
+* Enable setting ttl for MockDatastoreService. #5468
+
+  Contributed by @ytjohn
+
 * Added st2 API and CLI command for actions clone operation.
 
   API endpoint ``/api/v1/actions/{ref_or_id}/clone`` takes ``ref_or_id`` of source action.
@@ -39,6 +51,10 @@ Added
 
   Contributed by @khushboobhatia01
 
+* Added pysocks python package for SOCKS proxy support. #5460
+
+  Contributed by @kingsleyadam
+
 Fixed
 ~~~~~
 
@@ -48,6 +64,10 @@ Fixed
 
 * Fix ``st2-self-check`` script reporting falsey success when the nested workflows runs failed. #5487
 
+* Use byte type lock name which is supported by all tooz drivers. #5529
+
+  Contributed by @khushboobhatia01
+
 3.6.0 - October 29, 2021
 ------------------------
 
@@ -4215,4 +4235,4 @@ v0.5.1 - November 3rd, 2014
 Added
 ~~~~~
 
-* Initial public release
+* Initial public release

Makefile

@@ -269,6 +269,7 @@ check-python-packages-nightly:
 	@echo ""
 
 	test -f $(VIRTUALENV_COMPONENTS_DIR)/bin/activate || $(PYTHON_VERSION) -m venv $(VIRTUALENV_COMPONENTS_DIR) --system-site-packages
+	$(VIRTUALENV_COMPONENTS_DIR)/bin/pip install wheel
 	@for component in $(COMPONENTS_WITHOUT_ST2TESTS); do \
 		echo "==========================================================="; \
 		echo "Checking component:" $$component; \

requirements.txt

@@ -50,6 +50,7 @@ pyinotify==0.9.6; platform_system=="Linux"
 pymongo==3.11.3
 pyparsing<3
 pyrabbit
+pysocks
 python-dateutil==2.8.1
 python-editor==1.0.4
 python-json-logger

st2client/in-requirements.txt

@@ -18,3 +18,5 @@ cryptography
 orjson
 # needed by requests
 chardet
+# required for SOCKS proxy support (HTTP_PROXY, HTTPS_PROXY, NO_PROXY)
+pysocks

st2client/requirements.txt

@@ -15,6 +15,7 @@ jsonschema==2.6.0
 orjson==3.5.2
 prettytable==2.1.0
 prompt-toolkit==1.0.15
+pysocks
 python-dateutil==2.8.1
 python-editor==1.0.4
 pytz==2021.1

st2common/st2common/operators.py

@@ -314,7 +314,7 @@ def _timediff(diff_target, period_seconds, operator):
     # Note: date_utils.parse uses dateutil.parse which is way more flexible then strptime and
     # supports many date formats
     diff_target_utc = date_utils.parse(diff_target)
-    return operator((utc_now - diff_target_utc).total_seconds(), period_seconds)
+    return operator((utc_now - diff_target_utc).total_seconds(), float(period_seconds))
 
 
 def timediff_lt(value, criteria_pattern):

st2common/st2common/services/executions.py

@@ -196,7 +196,7 @@ def update_execution(liveaction_db, publish=True, set_result_size=False):
     """
     execution = ActionExecution.get(liveaction__id=str(liveaction_db.id))
 
-    with coordination.get_coordinator().get_lock(str(liveaction_db.id)):
+    with coordination.get_coordinator().get_lock(str(liveaction_db.id).encode()):
         # Skip execution object update when action is already in completed state.
         if execution.status in action_constants.LIVEACTION_COMPLETED_STATES:
             LOG.debug(

st2common/st2common/services/workflows.py

@@ -938,7 +938,7 @@ def handle_action_execution_completion(ac_ex_db):
     task_ex_id = ac_ex_db.context["orquesta"]["task_execution_id"]
 
     # Acquire lock before write operations.
-    with coord_svc.get_coordinator(start_heart=True).get_lock(wf_ex_id):
+    with coord_svc.get_coordinator(start_heart=True).get_lock(str(wf_ex_id).encode()):
         # Get execution records for logging purposes.
         wf_ex_db = wf_db_access.WorkflowExecution.get_by_id(wf_ex_id)
         task_ex_db = wf_db_access.TaskExecution.get_by_id(task_ex_id)

st2common/tests/unit/test_operators.py

@@ -943,6 +943,20 @@ def test_timediff_lt_fail(self):
             "Passed test_timediff_lt with None as criteria_pattern.",
         )
 
+    def test_timediff_lt_webui_value(self):
+        op = operators.get_operator("timediff_lt")
+        self.assertTrue(
+            op(date_utils.get_datetime_utc_now().isoformat(), "10"),
+            "Failed test_timediff_lt_webui_value.",
+        )
+
+    def test_timediff_lt_webui_value_fail(self):
+        op = operators.get_operator("timediff_lt")
+        self.assertFalse(
+            op("2014-07-01T00:01:01.000000", "10"),
+            "Passed test_timediff_lt_webui_value.",
+        )
+
     def test_timediff_gt(self):
         op = operators.get_operator("timediff_gt")
         self.assertTrue(op("2014-07-01T00:01:01.000000", 1), "Failed test_timediff_gt.")
@@ -958,6 +972,20 @@ def test_timediff_gt_fail(self):
             "Passed test_timediff_gt with None as criteria_pattern.",
         )
 
+    def test_timediff_gt_webui_value(self):
+        op = operators.get_operator("timediff_gt")
+        self.assertTrue(
+            op("2014-07-01T00:01:01.000000", "1"),
+            "Failed test_timediff_gt_webui_value.",
+        )
+
+    def test_timediff_gt_webui_value_fail(self):
+        op = operators.get_operator("timediff_gt")
+        self.assertFalse(
+            op(date_utils.get_datetime_utc_now().isoformat(), "10"),
+            "Passed test_timediff_gt_webui_value.",
+        )
+
     def test_exists(self):
         op = operators.get_operator("exists")
         self.assertTrue(op(False, None), "Should return True")

st2tests/st2tests/mocks/datastore.py

@@ -34,6 +34,7 @@ def __init__(self, logger, pack_name, class_name, api_username=None):
         self._pack_name = pack_name
         self._class_name = class_name
         self._username = api_username or "admin"
+        self._logger = logger
 
         # Holds mock KeyValuePair objects
         # Key is a KeyValuePair name and value is the KeyValuePair object
@@ -96,17 +97,18 @@ def set_value(
         """
         Store a value in a dictionary which is local to this class.
         """
-        if ttl:
-            raise ValueError(
-                'MockDatastoreService.set_value doesn\'t support "ttl" argument'
-            )
 
         name = self._get_full_key_name(name=name, local=local)
 
         instance = KeyValuePair()
         instance.id = name
         instance.name = name
         instance.value = value
+        if ttl:
+            self._logger.warning(
+                "MockDatastoreService is not able to expire keys based on ttl."
+            )
+            instance.ttl = ttl
 
         self._datastore_items[name] = instance
         return True