packages/aops-apollo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!61 [sync] PR-60: 修复不传入autoreboot 进行CVE修复任务创建时 接口返回500的问题

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @zhu-yuncheng 
Signed-off-by: @zhu-yuncheng
This commit is contained in:
openeuler-ci-bot 2023-06-09 10:17:21 +00:00 committed by Gitee
commit f8cf11cf84
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0009-cve-fix-task-generate-api-return-500-when-request-without-auto-reboot.patch Normal file
View File

@ -0,0 +1,27 @@
From f54492ae8e957888bb10e8947904490c95e47f48 Mon Sep 17 00:00:00 2001
From: rabbitali <shusheng.wen@outlook.com>
Date: Fri, 9 Jun 2023 17:19:52 +0800
Subject: [PATCH ] fix bug: API return 500 when create cve fix task without parameter auto_reboot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apollo/function/schema/task.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apollo/function/schema/task.py b/apollo/function/schema/task.py
index 5e8744b..ec6315e 100644
--- a/apollo/function/schema/task.py
+++ b/apollo/function/schema/task.py
@@ -88,7 +88,7 @@ class GenerateCveTaskSchema(Schema):
task_name = fields.String(required=True, validate=lambda s: len(s) != 0)
description = fields.String(
required=True, validate=lambda s: 0 < len(s) <= 50)
- auto_reboot = fields.Boolean(required=False, default=False)
+ auto_reboot = fields.Boolean(required=True, default=False)
accepted = fields.Boolean(required=True, validate=validate.OneOf([True, False]))
check_items = fields.String(required=False, validate=lambda s: 0 < len(s) <= 32)
info = fields.List(fields.Nested(CveInfoDictSchema), required=True, validate=lambda s: len(s) > 0)
--

7
aops-apollo.spec
View File

@ -1,6 +1,6 @@
Name: aops-apollo
Version: v1.2.1
Release: 4
Release: 5
Summary: Cve management service, monitor machine vulnerabilities and provide fix functions.
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
@ -13,6 +13,8 @@ Patch0005: 0005-fix-generate-task-is-not-verified-host-and-cve.patch
Patch0006: 0006-update-hotpatch-status-related-operation-support.patch
Patch0007: 0007-fix-hotpatch-status-filter-exception.patch
Patch0008: 0008-update-validation-rules-for-paging-parameters.patch
Patch0009: 0009-cve-fix-task-generate-api-return-500-when-request-without-auto-reboot.patch
BuildRequires: python3-setuptools
Requires: aops-vulcanus >= v1.2.0
@ -83,6 +85,9 @@ cp -r hotpatch %{buildroot}/%{python3_sitelib}/dnf-plugins/
%{python3_sitelib}/aops_apollo_tool/*
%changelog
* Fri Jun 09 2023 wenxin<shusheng.wen@outlook.com> - v1.2.1-5
- fix issue: API return 500 when create cve fix task without parameter auto_reboot
* Thu Jun 08 2023 wenxin<shusheng.wen@outlook.com> - v1.2.1-4
- fix issue: hotpatch status filter exception
- update validation rules for paging parameters