Merge branch 'master' into workflow_engine_graceful_shutdown

khushboobhatia01 · web-flow · commit 6f697e59259b · 2022-07-05T09:42:47.000+05:30
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,51 +7,20 @@ in development
 Fixed
 ~~~~~
 
-* Fix deserialization bug in st2 API for url encoded payloads. #5536
-
-  Contributed by @sravs-dev
-
-* Fix issue of WinRM parameter passing fails for larger scripts.#5538
-
-  Contributed by @ashwini-orchestral
-
-* Fix Type error for ``time_diff`` critera comparison. convert the timediff value as float to match
-  ``timedelta.total_seconds()`` return. #5462
-
-  Contributed by @blackstrip
-
-* Fix issue with pack option not working when running policy list cli #5534
-
-  Contributed by @momokuri-3
-
-* Fix exception thrown if action parameter contains {{ or {% and no closing jinja characters. #5556
-
-  contributed by @guzzijones12
-
-* Link shutdown routine and sigterm handler to main thread #5555
-
-  Contributed by @khushboobhatia01
-
-* Change compound index for ActionExecutionDB to improve query performance #5568
-
-  Contributed by @khushboobhatia01
-
-* Fix build issue due to MarkUpSafe 2.1.0 removing soft_unicode
-
-  Contributed by Amanda McGuinness (@amanda11 intive) #5581
+* Fix redis SSL problems with sentinel #5660
 
-* Downgrade tenacity as tooz dependency on tenacity has always been < 7.0.0 #5607
+Added
+~~~~~
 
+* Added graceful shutdown for workflow engine. #5463
   Contributed by @khushboobhatia01
 
-* Updated paramiko version to 2.10.3 to add support for more key verification algorithms. #5600
+3.7.0 - May 05, 2022
+--------------------
 
 Added
 ~~~~~
 
-* Minor updates for RockyLinux. #5552
-  Contributed by Amanda McGuinness (@amanda11 intive)
-
 * Added st2 API get action parameters by ref. #5509
 
   API endpoint ``/api/v1/actions/views/parameters/{action_id}`` accepts ``ref_or_id``.
@@ -66,12 +35,12 @@ Added
 
   API endpoint ``/api/v1/actions/{ref_or_id}/clone`` takes ``ref_or_id`` of source action.
   Request method body takes destination pack and action name. Request method body also takes
-  optional paramater ``overwrite``. ``overwrite = true`` in case of destination action already exists and to be
+  optional parameter ``overwrite``. ``overwrite = true`` in case of destination action already exists and to be
   overwritten.
 
   CLI command ``st2 action clone <ref_or_id> <dest_pack> <dest_action>`` takes source ``ref_or_id``, destination
   pack name and destination action name as mandatory arguments.
-  In case destionation already exists then command takes optional arugument ``-f`` or ``--force`` to overwrite
+  In case destination already exists then command takes optional argument ``-f`` or ``--force`` to overwrite
   destination action. #5345
 
   Contributed by @mahesh-orch.
@@ -81,7 +50,7 @@ Added
 
   Contributed by @m4dcoder and @ashwini-orchestral
 
-* Added service degerestration on shutdown of a service. #5396
+* Added service deregistration on shutdown of a service. #5396
 
   Contributed by @khushboobhatia01
 
@@ -167,11 +136,54 @@ Added
 * Added garbage collection for workflow execution and task execution objects #4924
   Contributed by @srimandaleeka01 and @amanda11
 
-* Added graceful shutdown for workflow engine. #5463
+=======
+Changed
+~~~~~~~
+
+* Minor updates for RockyLinux. #5552
+
+  Contributed by Amanda McGuinness (@amanda11 intive)
+
+* Bump black to v22.3.0 - This is  used internally to reformat our python code. #5606
+
+* Updated paramiko version to 2.10.3 to add support for more key verification algorithms. #5600
 
 Fixed
 ~~~~~
 
+* Fix deserialization bug in st2 API for url encoded payloads. #5536
+
+  Contributed by @sravs-dev
+
+* Fix issue of WinRM parameter passing fails for larger scripts.#5538
+
+  Contributed by @ashwini-orchestral
+
+* Fix Type error for ``time_diff`` critera comparison. convert the timediff value as float to match
+  ``timedelta.total_seconds()`` return. #5462
+
+  Contributed by @blackstrip
+
+* Fix issue with pack option not working when running policy list cli #5534
+
+  Contributed by @momokuri-3
+
+* Fix exception thrown if action parameter contains {{ or {% and no closing jinja characters. #5556
+
+  contributed by @guzzijones12
+
+* Link shutdown routine and sigterm handler to main thread #5555
+
+  Contributed by @khushboobhatia01
+
+* Change compound index for ActionExecutionDB to improve query performance #5568
+
+  Contributed by @khushboobhatia01
+
+* Fix build issue due to MarkUpSafe 2.1.0 removing soft_unicode
+
+  Contributed by Amanda McGuinness (@amanda11 intive) #5581
+
 * Fixed regression caused by #5358. Use string lock name instead of object ID. #5484
 
   Contributed by @khushboobhatia01
@@ -198,10 +210,12 @@ Fixed
 
   Contributed by @nzlosh
 
-Changed
-~~~~~~~
+* Downgrade tenacity as tooz dependency on tenacity has always been < 7.0.0 #5607
+
+  Contributed by @khushboobhatia01
+
+* Pin ``typing-extensions<4.2`` (used indirectly by st2client) to maintain python 3.6 support. #5638
 
-* Bump black to v22.3.0 - This is  used internally to reformat our python code. #5606
 
 3.6.0 - October 29, 2021
 ------------------------
diff --git a/OWNERS.md b/OWNERS.md
@@ -21,6 +21,8 @@ Have deep platform knowledge & experience and demonstrate technical leadership a
   - Ansible, Core, deb/rpm packages, CI/CD, Deployments, Release Engineering, Infrastructure, Documentation.
 * Eugen Cusmaunsa ([@armab](https://github.com/armab)) <<armab@stackstorm.com>>
   - Systems, Deployments, Docker, K8s, HA, Ansible, Chef, Vagrant, deb/rpm, CI/CD, Infrastructure, Release Engineering, Community.
+* Jacob Floyd ([@cognifloyd](https://github.com/cognifloyd/)), _Copart_ <<cognifloyd@gmail.com>>
+  - StackStorm Exchange, Kubernetes, ChatOps, Core, Discussions.
 * Nick Maludy ([@nmaludy](https://github.com/nmaludy)) <<nmaludy@gmail.com>>
   - Community, Core, Systems, Infrastructure, StackStorm Exchange, Puppet deployment. [Case Study](https://stackstorm.com/case-study-encore/).
 * Tomaz Muraus ([@kami](https://github.com/kami)) <<tomaz@stackstorm.com>>
@@ -33,12 +35,14 @@ Have deep platform knowledge & experience and demonstrate technical leadership a
 Being part of Technical Steering Committee (TSC) [@StackStorm/maintainers](https://github.com/orgs/StackStorm/teams/maintainers) provide significant and reliable value to the project helping it grow and improve through development and maintenance. See [Maintainer Responsibilities](https://github.com/StackStorm/st2/blob/master/GOVERNANCE.md#maintainer-responsibilities) for more info.
 * AJ Jonen ([@guzzijones](https://github.com/guzzijones)), _Cypherint_ <<aaron.jonen@cypherint.com>>
   - Workflows, st2 Core Performance, Releases.
+* Ankur Singh ([@rush-skills](https://github.com/rush-skills)), _CERN_ <<ankur.singh@cern.ch>>
+  - Community, Puppet, Workflows, HA.
 * Carlos ([@nzlosh](https://github.com/nzlosh)) <<nzlosh@yahoo.com>>
   - Packaging, Systems, Chatops, Errbot, Community, Discussions, StackStorm Exchange.
-* Jacob Floyd ([@cognifloyd](https://github.com/cognifloyd/)), _Copart_ <<cognifloyd@gmail.com>>
-  - StackStorm Exchange, Kubernetes, ChatOps, Core, Ansible, Discussions.
 * JP Bourget ([@punkrokk](https://github.com/punkrokk)) <<jp.bourget@gmail.com>>
   - Systems, deb/rpm, Deployments, Community, StackStorm Exchange, SecOps, CircleCI.
+* Khushboo Bhatia ([@khushboobhatia01](https://github.com/khushboobhatia01)), _VMware_ <<khushb99@gmail.com>>
+  - StackStorm Core, Workflows.
 * Marcel Weinberg ([@winem](https://github.com/winem)), _CoreMedia_ <<mweinberg-os@email.de>>
   - Systems, Core, CI/CD, Docker, Community.
 * Mick McGrath ([@mickmcgrath13](https://github.com/mickmcgrath13)), _Bitovi_ <<mick@bitovi.com>>
@@ -51,15 +55,14 @@ Contributors are using and occasionally contributing back to the project, might
 They're not part of the TSC voting process, but appreciated for their contribution, involvement and may become Maintainers in the future depending on their effort and involvement. See [How to become a Maintainer?](https://github.com/StackStorm/st2/blob/master/GOVERNANCE.md#how-to-become-a-maintainer)
 [@StackStorm/contributors](https://github.com/orgs/StackStorm/teams/contributors) are invited to StackStorm Github organization and have permissions to help triage the Issues and review PRs.
 * Anand Patel ([@arms11](https://github.com/arms11)), _VMware_ - Docker, Kubernetes.
-* Ankur Singh ([@rush-skills](https://github.com/rush-skills)), _CERN_ - Puppet, Core, Docker, K8s.
+* Bradley Bishop ([@bishopbm1](https://github.com/bishopbm1)), _Encore_, - Puppet, StackStorm Exchange.
 * Harsh Nanchahal ([@hnanchahal](https://github.com/hnanchahal)), _Starbucks_ - Core, Docker, Kubernetes.
 * Hiroyasu Ohyama ([@userlocalhost](https://github.com/userlocalhost)) - Orquesta, Workflows, st2 Japan Community. [Case Study](https://stackstorm.com/case-study-dmm/).
-* Khushboo Bhatia ([@khushboobhatia01](https://github.com/khushboobhatia01)), _VMware_ - Core, Orquesta.
 * Rick Kauffman ([@xod442](https://github.com/xod442)), _HPE_ - Community, HOWTOs, Blogs, Publications, Docker.
 * Sheshagiri Rao Mallipedhi ([@sheshagiri](https://github.com/sheshagiri)) - Docker, Core, StackStorm Exchange.
 * Shital Raut ([@shital-orchestral](https://github.com/shital-orchestral)), _Orchestral.ai_ - Web UI.
 * Tristan Struthers ([@trstruth](https://github.com/trstruth)) - Docker, K8s, Orquesta, Community.
-
+* Yuri Dubler ([@lm-ydubler](https://github.com/lm-ydubler)) - _LogicMonitor_ - StackStorm Exchange, CI.
 
 # Friends
 People that are currently not very active maintainers/contributors but who participated in and formed the project we have today.
diff --git a/contrib/runners/action_chain_runner/action_chain_runner/__init__.py b/contrib/runners/action_chain_runner/action_chain_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/announcement_runner/announcement_runner/__init__.py b/contrib/runners/announcement_runner/announcement_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/http_runner/http_runner/__init__.py b/contrib/runners/http_runner/http_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/inquirer_runner/inquirer_runner/__init__.py b/contrib/runners/inquirer_runner/inquirer_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/local_runner/local_runner/__init__.py b/contrib/runners/local_runner/local_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/noop_runner/noop_runner/__init__.py b/contrib/runners/noop_runner/noop_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/orquesta_runner/orquesta_runner/__init__.py b/contrib/runners/orquesta_runner/orquesta_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/python_runner/python_runner/__init__.py b/contrib/runners/python_runner/python_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/remote_runner/remote_runner/__init__.py b/contrib/runners/remote_runner/remote_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/contrib/runners/winrm_runner/winrm_runner/__init__.py b/contrib/runners/winrm_runner/winrm_runner/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/fixed-requirements.txt b/fixed-requirements.txt
@@ -50,7 +50,7 @@ python-keyczar==0.716
 pytz==2021.1
 pywinrm==0.4.1
 pyyaml==5.4.1
-redis==3.5.3
+redis==4.1.4
 requests[security]==2.25.1
 retrying==1.3.3
 routes==2.4.1
@@ -60,6 +60,8 @@ argparse==1.12.2
 argcomplete==1.12.2
 prettytable==2.1.0
 importlib-metadata==3.10.1
+# importlib-metadata requires typing-extensions but v4.2.0 requires py3.7+
+typing-extensions<4.2
 # NOTE: sseclient has various issues which sometimes hang the connection for a long time, etc.
 sseclient-py==1.7
 stevedore==1.30.1
diff --git a/requirements.txt b/requirements.txt
@@ -60,7 +60,7 @@ python-statsd==2.1.0
 pytz==2021.1
 pywinrm==0.4.1
 pyyaml==5.4.1
-redis==3.5.3
+redis==4.1.4
 rednose
 requests[security]==2.25.1
 retrying==1.3.3
@@ -72,6 +72,7 @@ sseclient-py==1.7
 stevedore==1.30.1
 tenacity>=3.2.1,<7.0.0
 tooz==2.8.0
+typing-extensions<4.2
 udatetime==0.0.16
 unittest2
 webob==1.8.7
diff --git a/st2actions/st2actions/__init__.py b/st2actions/st2actions/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2api/st2api/__init__.py b/st2api/st2api/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2auth/st2auth/__init__.py b/st2auth/st2auth/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2client/in-requirements.txt b/st2client/in-requirements.txt
@@ -1,5 +1,7 @@
 # Remember to list implicit packages here, otherwise version won't be fixated!
 importlib-metadata
+# importlib-metadata requires typing-extensions
+typing-extensions
 argcomplete
 prettytable
 pytz
diff --git a/st2client/requirements.txt b/st2client/requirements.txt
@@ -24,3 +24,4 @@ pyyaml==5.4.1
 requests[security]==2.25.1
 six==1.13.0
 sseclient-py==1.7
+typing-extensions<4.2
diff --git a/st2client/st2client/__init__.py b/st2client/st2client/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2common/requirements.txt b/st2common/requirements.txt
@@ -35,7 +35,7 @@ pymongo==3.11.3
 python-dateutil==2.8.1
 python-statsd==2.1.0
 pyyaml==5.4.1
-redis==3.5.3
+redis==4.1.4
 requests[security]==2.25.1
 retrying==1.3.3
 routes==2.4.1
diff --git a/st2common/st2common/__init__.py b/st2common/st2common/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2common/st2common/util/monkey_patch.py b/st2common/st2common/util/monkey_patch.py
@@ -43,14 +43,21 @@ def monkey_patch(patch_thread=None):
                          patched unless debugger is used.
     :type patch_thread: ``bool``
     """
+    # Eventlet when patched doesn't throw the standard ssl error on timeout, which can break
+    # some third-party libraries including redis SSL.
+    # See: https://github.com/eventlet/eventlet/issues/692
+    # Therefore set the patched ssl module to use the standard socket.timeout exception
+    from eventlet.green import ssl
     import eventlet
+    from socket import timeout
 
     if patch_thread is None:
         patch_thread = not is_use_debugger_flag_provided()
 
     eventlet.monkey_patch(
         os=True, select=True, socket=True, thread=patch_thread, time=True
     )
+    ssl.timeout_exc = timeout
 
 
 def use_select_poll_workaround(nose_only=True):
diff --git a/st2reactor/st2reactor/__init__.py b/st2reactor/st2reactor/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2stream/st2stream/__init__.py b/st2stream/st2stream/__init__.py
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
diff --git a/st2tests/st2tests/__init__.py b/st2tests/st2tests/__init__.py
@@ -30,4 +30,4 @@
     "WorkflowTestCase",
 ]
 
-__version__ = "3.7dev"
+__version__ = "3.8dev"
