Merge pull request #206 from hanshuaikang/minor/fix_conflict

Minor/fix conflict
TencentBlueKing · Dec 6, 2023 · 0fd44da · 0fd44da
2 parents 94efa96 + eb72afe
commit 0fd44da
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 24 deletions.
diff --git a/bamboo_engine/eri/models/node.py b/bamboo_engine/eri/models/node.py
@@ -166,6 +166,7 @@ def __init__(
         conditions: List[Condition],
         converge_gateway_id: str,
         default_condition: DefaultCondition = None,
+        extra_info: dict = None,
         *args,
         **kwargs
     ):
@@ -180,14 +181,22 @@ def __init__(
         self.conditions = conditions
         self.default_condition = default_condition
         self.converge_gateway_id = converge_gateway_id
+        self.extra_info = extra_info or {}
 
 
 class ExclusiveGateway(Node):
     """
     分支网关
     """
 
-    def __init__(self, conditions: List[Condition], default_condition: DefaultCondition = None, *args, **kwargs):
+    def __init__(
+        self,
+        conditions: List[Condition],
+        default_condition: DefaultCondition = None,
+        extra_info: dict = None,
+        *args,
+        **kwargs
+    ):
         """
 
         :param conditions: 分支条件
@@ -198,6 +207,7 @@ def __init__(self, conditions: List[Condition], default_condition: DefaultCondit
         super().__init__(*args, **kwargs)
         self.conditions = conditions
         self.default_condition = default_condition
+        self.extra_info = extra_info or {}
 
 
 class ServiceActivity(Node):

diff --git a/bamboo_engine/handlers/conditional_parallel_gateway.py b/bamboo_engine/handlers/conditional_parallel_gateway.py
@@ -110,7 +110,7 @@ def execute(
 
             try:
                 expr_func = self.runtime.get_config(RuntimeSettings.PIPELINE_EXCLUSIVE_GATEWAY_EXPR_FUNC.value)
-                result = expr_func(resolved_evaluate, hydrated_context)
+                result = expr_func(resolved_evaluate, hydrated_context, extra_info=self.node.extra_info)
                 logger.info(
                     "root_pipeline[%s] node(%s) %s test result: %s",
                     root_pipeline_id,

diff --git a/bamboo_engine/handlers/exclusive_gateway.py b/bamboo_engine/handlers/exclusive_gateway.py
@@ -115,7 +115,7 @@ def execute(
             )
             try:
                 expr_func = self.runtime.get_config(RuntimeSettings.PIPELINE_EXCLUSIVE_GATEWAY_EXPR_FUNC.value)
-                result = expr_func(resolved_evaluate, hydrated_context)
+                result = expr_func(resolved_evaluate, hydrated_context, extra_info=self.node.extra_info)
                 logger.info(
                     "root_pipeline[%s] node(%s) %s test result: %s",
                     root_pipeline_id,
@@ -124,7 +124,12 @@ def execute(
                     result,
                 )
 
-                strategy = self.runtime.get_config(RuntimeSettings.PIPELINE_EXCLUSIVE_GATEWAY_STRATEGY.value)
+                if isinstance(self.node.extra_info, dict) and self.node.extra_info.get("strategy") in [
+                    s.name for s in ExclusiveGatewayStrategy
+                ]:
+                    strategy = self.node.extra_info["strategy"]
+                else:
+                    strategy = self.runtime.get_config(RuntimeSettings.PIPELINE_EXCLUSIVE_GATEWAY_STRATEGY.value)
                 # 如果策略是命中第一个，并且result为true, 则直接结束循环
                 if strategy == ExclusiveGatewayStrategy.FIRST.value and result:
                     meet_conditions.append(c.name)

diff --git a/bamboo_engine/utils/expr.py b/bamboo_engine/utils/expr.py
@@ -2,5 +2,5 @@
 from bamboo_engine.utils.boolrule import BoolRule
 
 
-def default_expr_func(expr: str, context: dict) -> bool:
+def default_expr_func(expr: str, context: dict, extra_info: dict, *args, **kwargs) -> bool:
     return BoolRule(expr).test()
diff --git a/...ime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/css/app.903f13e.css b/...ime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/css/app.903f13e.css
diff --git a/...ime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/css/app.fb328ae.css b/...ime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/css/app.fb328ae.css
diff --git a/...peline/pipeline/contrib/engine_admin/static/engine_admin/fonts/element-icons.535877f.woff b/...peline/pipeline/contrib/engine_admin/static/engine_admin/fonts/element-icons.535877f.woff
diff --git a/...ipeline/pipeline/contrib/engine_admin/static/engine_admin/fonts/element-icons.732389d.ttf b/...ipeline/pipeline/contrib/engine_admin/static/engine_admin/fonts/element-icons.732389d.ttf
diff --git a/runtime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/app.442a902.js b/runtime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/app.442a902.js
diff --git a/runtime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/app.b8f6f33.js b/runtime/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/app.b8f6f33.js
diff --git a/...e/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/vue-lib.3bbf677.js b/...e/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/vue-lib.3bbf677.js
diff --git a/...e/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/vue-lib.ac90813.js b/...e/bamboo-pipeline/pipeline/contrib/engine_admin/static/engine_admin/js/vue-lib.ac90813.js
diff --git a/runtime/bamboo-pipeline/pipeline/contrib/engine_admin/templates/index.html b/runtime/bamboo-pipeline/pipeline/contrib/engine_admin/templates/index.html
@@ -2,20 +2,24 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <link rel="icon" href="/static/images/favicon.ico" type="image/x-icon" />
         <meta charset="utf-8">
         <title> bamboo-engine-admin-frontend </title>
-    <link href="{% static 'engine_admin/css/app.903f13e.css' %}" rel="stylesheet"></head>
+    <link href="{% static 'engine_admin/css/app.fb328ae.css' %}" rel="stylesheet"></head>
     <body>
         <div id="app"></div>
         <script>
             var SITE_URL = '{{SITE_URL}}'
             var BK_STATIC_URL = '{{BK_STATIC_URL}}/'
             var REMOTE_STATIC_URL = ''
+            var APP_CODE = '{{APP_CODE}}'
         </script>
         <script>
             var pathname = window.location.pathname
             var SITE_URL = pathname.endsWith('/') ? pathname : pathname + '/'
+            function getCookie(name) {
+                var arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
+                return (arr = document.cookie.match(reg)) ? unescape(arr[2]) : null;
+            }
         </script>
-    <script type="text/javascript" src="{% static 'engine_admin/js/runtime.114327c.js' %}"></script><script type="text/javascript" src="{% static 'engine_admin/js/vue-lib.ac90813.js' %}"></script><script type="text/javascript" src="{% static 'engine_admin/js/app.442a902.js' %}"></script></body>
+    <script type="text/javascript" src="{% static 'engine_admin/js/runtime.114327c.js' %}"></script><script type="text/javascript" src="{% static 'engine_admin/js/vue-lib.3bbf677.js' %}"></script><script type="text/javascript" src="{% static 'engine_admin/js/app.b8f6f33.js' %}"></script></body>
 </html>
diff --git a/runtime/bamboo-pipeline/pipeline/eri/apps.py b/runtime/bamboo-pipeline/pipeline/eri/apps.py
@@ -44,7 +44,7 @@ def ready(self):
                 pipeline_exclusive_gateway_expr_func_text = getattr(
                     settings, "PIPELINE_EXCLUSIVE_GATEWAY_EXPR_FUNC_TEXT", "1==1"
                 )
-                check_result = pipeline_exclusive_gateway_expr_func(pipeline_exclusive_gateway_expr_func_text, {})
+                check_result = pipeline_exclusive_gateway_expr_func(pipeline_exclusive_gateway_expr_func_text, {}, {})
                 if not check_result:
                     raise ConfigValidationError("config validate error, the expr func return False")
 

diff --git a/runtime/bamboo-pipeline/pipeline/eri/imp/node.py b/runtime/bamboo-pipeline/pipeline/eri/imp/node.py
@@ -69,6 +69,7 @@ def _get_node(self, node: DBNode):
                 type=NodeType.ExclusiveGateway,
                 conditions=[Condition(**c) for c in node_detail["conditions"]],
                 default_condition=DefaultCondition(**default_condition) if default_condition else None,
+                extra_info=node_detail.get("extra_info"),
                 **common_args
             )
 
@@ -84,6 +85,7 @@ def _get_node(self, node: DBNode):
                 converge_gateway_id=node_detail["converge_gateway_id"],
                 conditions=[Condition(**c) for c in node_detail["conditions"]],
                 default_condition=DefaultCondition(**default_condition) if default_condition else None,
+                extra_info=node_detail.get("extra_info"),
                 **common_args
             )
 

diff --git a/runtime/bamboo-pipeline/pipeline/eri/runtime.py b/runtime/bamboo-pipeline/pipeline/eri/runtime.py
@@ -193,6 +193,8 @@ def _gen_gateway_node(self, gateway: dict, pipeline: dict, root_id: str, parent_
                 if default_condition
                 else None
             )
+            if gateway.get("extra_info"):
+                detail["extra_info"] = gateway["extra_info"]
         elif gateway["type"] == NodeType.ParallelGateway.value:
             detail["converge_gateway_id"] = gateway["converge_gateway_id"]
 
@@ -216,6 +218,8 @@ def _gen_gateway_node(self, gateway: dict, pipeline: dict, root_id: str, parent_
                 if default_condition
                 else None
             )
+            if gateway.get("extra_info"):
+                detail["extra_info"] = gateway["extra_info"]
             detail["converge_gateway_id"] = gateway["converge_gateway_id"]
         elif gateway["type"] == NodeType.ConvergeGateway.value:
             pass