update

Python-Tools · Jul 28, 2021 · c5ef11b · c5ef11b
1 parent 1043a1b
commit c5ef11b
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,6 @@
 
 ## 接口修改
 
-+ 新增全局flag`not_verify`用于跳过https的验证
 + 子命令`updateservicebywebhook`的`tokens`参数现在是位置参数
 + 子命令`updateservicebywebhook`现在可以用执行目录下的`update_service_by_webhooks_config.json`文件作为配置
 + 子命令`createorupdatestack`的`endpoints`参数现在是位置参数

diff --git a/portainer_deploy_tool/create_or_update_stack.py b/portainer_deploy_tool/create_or_update_stack.py
@@ -288,11 +288,7 @@ def do_main(self) -> None:
         repository_password = self.config.get("repository_password")
         retry_max_times = self.config.get("retry_max_times")
         retry_interval_backoff_factor = self.config.get("retry_interval_backoff_factor")
-        not_verify = retry_interval_backoff_factor = self.config.get("not_verify")
-        if not_verify:
-            rq = requests.Session(verify=False)
-        else:
-            rq = requests.Session()
+        rq = requests.Session()
         if retry_max_times and int(retry_max_times) > 0:
             rq.mount('https://', HTTPAdapter(max_retries=Retry(total=int(retry_max_times), backoff_factor=retry_interval_backoff_factor, method_whitelist=frozenset(['GET', 'POST', 'PUT']))))
         # 初始化log

diff --git a/portainer_deploy_tool/update_service_by_webhook.py b/portainer_deploy_tool/update_service_by_webhook.py
@@ -41,11 +41,7 @@ def do_main(self) -> None:
         tokens = self.config["tokens"]
         retry_max_times = self.config.get("retry_max_times")
         retry_interval_backoff_factor = self.config.get("retry_interval_backoff_factor", 0)
-        not_verify = retry_interval_backoff_factor = self.config.get("not_verify")
-        if not_verify:
-            rq = requests.Session(verify=False)
-        else:
-            rq = requests.Session()
+        rq = requests.Session()
         if retry_max_times and int(retry_max_times) > 0:
             rq.mount('https://', HTTPAdapter(max_retries=Retry(total=int(retry_max_times), backoff_factor=retry_interval_backoff_factor, method_whitelist=frozenset(['GET', 'POST', 'PUT']))))
         log.initialize_for_app(app_name="UpdateStack", log_level=log_level)

diff --git a/portainer_deploy_tool/update_service_in_stack.py b/portainer_deploy_tool/update_service_in_stack.py
@@ -239,11 +239,7 @@ def do_main(self) -> None:
         deploy_path = self.config["deploy_path"]
         retry_max_times = self.config.get("retry_max_times")
         retry_interval_backoff_factor = self.config.get("retry_interval_backoff_factor")
-        not_verify = retry_interval_backoff_factor = self.config.get("not_verify")
-        if not_verify:
-            rq = requests.Session(verify=False)
-        else:
-            rq = requests.Session()
+        rq = requests.Session()
         if retry_max_times and int(retry_max_times) > 0:
             rq.mount('https://', HTTPAdapter(max_retries=Retry(total=int(retry_max_times), backoff_factor=retry_interval_backoff_factor, method_whitelist=frozenset(['GET', 'POST', 'PUT']))))
         log.initialize_for_app(app_name="UpdateStack", log_level=log_level)

diff --git a/portainer_deploy_tool/utils.py b/portainer_deploy_tool/utils.py
@@ -22,12 +22,7 @@
         "type": "number",
         "description": "重试间隔时间,的参数,间隔时间位`{backoff factor} * (2 ** ({number of total retries} - 1))`",
         "default": 0.1
-    },
-    "not_verify": {
-        "type": "boolean",
-        "description": "是否不验证ssl",
-        "default": False
-    },
+    }
 }