SQL上线自动审批支持按照实例标签过滤

hhyo · Nov 2, 2019 · c31ef13 · c31ef13
1 parent 4a09cb1
commit c31ef13
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/common/templates/config.html b/common/templates/config.html
@@ -227,6 +227,17 @@ <h5 style="color: darkgrey"><b>SQL上线</b></h5>
                                 </div>
                             </div>
                             <div id="div-auto-review-config" style="display: none">
+                                <div class="form-group">
+                                    <label for="auto_review_tag"
+                                           class="col-sm-4 control-label">AUTO_REVIEW_TAG</label>
+                                    <div class="col-sm-5">
+                                        <input type="text" class="form-control"
+                                               id="auto_review_tag"
+                                               key="auto_review_tag"
+                                               value="{{ config.auto_review_tag }}"
+                                               placeholder="自动审批的实例标签CODE，多个使用逗号分隔">
+                                    </div>
+                                </div>
                                 <div class="form-group">
                                     <label for="auto_review_regex"
                                            class="col-sm-4 control-label">AUTO_REVIEW_REGEX</label>

diff --git a/sql/utils/sql_review.py b/sql/utils/sql_review.py
@@ -14,9 +14,12 @@ def is_auto_review(workflow_id):
     :param workflow_id:
     :return:
     """
+
     workflow = SqlWorkflow.objects.get(id=workflow_id)
+    auto_review_tags = SysConfig().get('auto_review_tag', '').split(',')
     # TODO 这里也可以放到engine中实现，但是配置项可能会相对复杂
-    if workflow.instance.db_type == 'mysql':
+    if workflow.instance.db_type == 'mysql' and workflow.instance.instancetag_set.filter(
+            tag_code__in=auto_review_tags).exists():
         # 获取正则表达式
         auto_review_regex = SysConfig().get('auto_review_regex',
                                             '^alter|^create|^drop|^truncate|^rename|^delete')