refactor: using try and catch for new after_deploy callbacks to simplify the code.

Signed-off-by: Yuki Ito <yuki462@ibm.com>

Author: yuki462-b

oper8/rollout_manager.py

@@ -6,7 +6,6 @@
 # Standard
 from functools import partial
 from typing import Callable, Optional
-import inspect
 
 # First Party
 import alog
@@ -19,9 +18,6 @@
 from .session import Session
 
 log = alog.use_channel("ROLMGR")
-# New argument introduced at oper8 v0.1.33 for after_deploy or after_verify functions.
-DEPLOY_COMPLETION_STATE_ARG_NAME = "deploy_completion_state"
-VERIFY_COMPLETION_STATE_ARG_NAME = "verify_completion_state"
 
 ## Rollout Functions ###########################################################
 
@@ -329,17 +325,14 @@ def rollout(  # pylint: disable=too-many-locals,too-many-statements
         if (not phase1_complete or phase1_failed) and self._after_deploy_unsuccessful:
             log.debug2("Running after-deploy-unsuccessful")
             try:
-                # Check DEPLOY_COMPLETION_STATE_ARG_NAME argument for backward compatibility.
-                if (
-                    DEPLOY_COMPLETION_STATE_ARG_NAME
-                    in inspect.signature(self._after_deploy_unsuccessful).parameters
-                ):
+                # Check deploy_completion_state argument for backward compatibility.
+                try:
                     is_after_deploy_unsuccessful_completed = (
                         self._after_deploy_unsuccessful(
                             self._session, phase1_failed, deploy_completion_state
                         )
                     )
-                else:
+                except TypeError:
                     log.warning(
                         "Detected old after_deploy function. Please migrate oper8 to ^0.1.33."
                     )
@@ -363,14 +356,11 @@ def rollout(  # pylint: disable=too-many-locals,too-many-statements
         if phase1_complete and self._after_deploy:
             log.debug2("Running after-deploy")
             try:
-                if (
-                    DEPLOY_COMPLETION_STATE_ARG_NAME
-                    in inspect.signature(self._after_deploy).parameters
-                ):
+                try:
                     phase2_complete = self._after_deploy(
                         self._session, deploy_completion_state
                     )
-                else:
+                except TypeError:
                     log.warning(
                         "Detected old after_deploy function. Please migrate oper8 to ^0.1.33."
                     )
@@ -466,16 +456,13 @@ def rollout(  # pylint: disable=too-many-locals,too-many-statements
         ) and self._after_verify_unsuccessful:
             log.debug("Running after-verify-unsuccessful")
             try:
-                if (
-                    VERIFY_COMPLETION_STATE_ARG_NAME
-                    in inspect.signature(self._after_verify_unsuccessful).parameters
-                ):
+                try:
                     is_after_verify_unsuccessful_completed = (
                         self._after_verify_unsuccessful(
                             self._session, phase3_failed, verify_completion_state
                         )
                     )
-                else:
+                except TypeError:
                     log.warning(
                         "Detected old after_verify function. Please migrate oper8 to ^0.1.33."
                     )
@@ -495,14 +482,11 @@ def rollout(  # pylint: disable=too-many-locals,too-many-statements
         if phase3_complete and self._after_verify:
             log.debug("Running after-verify")
             try:
-                if (
-                    VERIFY_COMPLETION_STATE_ARG_NAME
-                    in inspect.signature(self._after_verify).parameters
-                ):
+                try:
                     phase4_complete = self._after_verify(
                         self._session, verify_completion_state
                     )
-                else:
+                except TypeError:
                     log.warning(
                         "Detected old after_verify function. Please migrate oper8 to ^0.1.33."
                     )