Skip to content

Commit b997eb1

Browse files
committed
Add audit templates
1 parent 7b9475d commit b997eb1

File tree

4 files changed

+41
-15
lines changed

4 files changed

+41
-15
lines changed

apistructs/audits.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ const (
204204
UpdateAppNotifyGroupTemplate TemplateName = "updateAppNotifyGroup"
205205

206206
// ========================Test Platform================================
207-
QaTestEnvCreateTemplate TemplateName = "qaTestEnvCreate"
208-
QaTestEnvUpdateTemplate TemplateName = "qaTestEnvUpdate"
209-
QaTestEnvDeleteTemplate TemplateName = "qaTestEnvDelete"
210-
ArchiveTestplanTemplate TemplateName = "archiveTestPlan"
211-
UnarchiveTestPlanTemplate TemplateName = "unarchiveTestPlan"
212-
UpdateAutoTestSpaceTemplate TemplateName = "updateAutoTestSpace"
207+
QaTestEnvCreateTemplate TemplateName = "qaTestEnvCreate"
208+
QaTestEnvUpdateTemplate TemplateName = "qaTestEnvUpdate"
209+
QaTestEnvDeleteTemplate TemplateName = "qaTestEnvDelete"
210+
ArchiveTestplanTemplate TemplateName = "archiveTestPlan"
211+
UnarchiveTestPlanTemplate TemplateName = "unarchiveTestPlan"
212+
UpdateAutoTestSpaceTemplatePrefix string = "updateAutoTestSpace"
213213
// ========================cmdb==========================================
214214
CreateCertificatesTemplate TemplateName = "createCertificates"
215215
DeleteCertificatesTemplate TemplateName = "deleteCertificates"

apistructs/autotest_space.go

+13
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@ const (
4545
TestSpaceCompleted AutoTestSpaceArchiveStatus = "Completed"
4646
)
4747

48+
func (s AutoTestSpaceArchiveStatus) GetZhName() string {
49+
switch s {
50+
case TestSpaceInit:
51+
return "未开始"
52+
case TestSpaceInProgress:
53+
return "进行中"
54+
case TestSpaceCompleted:
55+
return "已完成"
56+
default:
57+
return ""
58+
}
59+
}
60+
4861
func (s AutoTestSpaceArchiveStatus) Valid() bool {
4962
switch s {
5063
case TestSpaceInit, TestSpaceInProgress, TestSpaceCompleted:

modules/dop/services/autotest_v2/space.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,19 @@ func getChangedFields(autoTestSpace *dao.AutoTestSpace, req apistructs.AutoTestS
160160
changedField := make(map[string][]string)
161161
if len(req.Name) > 0 {
162162
if req.Name != autoTestSpace.Name {
163-
changedField["name"] = []string{autoTestSpace.Name, req.Name}
163+
changedField["Name"] = []string{autoTestSpace.Name, req.Name}
164164
}
165165
autoTestSpace.Name = req.Name
166166
}
167167
if len(req.ArchiveStatus) > 0 {
168168
if req.ArchiveStatus != autoTestSpace.ArchiveStatus {
169-
changedField["archiveStatus"] = []string{string(autoTestSpace.ArchiveStatus), string(req.ArchiveStatus)}
169+
changedField["ArchiveStatus"] = []string{autoTestSpace.ArchiveStatus.GetZhName(), req.ArchiveStatus.GetZhName()}
170170
}
171171
autoTestSpace.ArchiveStatus = req.ArchiveStatus
172172
}
173173
if len(req.Description) > 0 {
174174
if req.Description != autoTestSpace.Description {
175-
changedField["description"] = []string{autoTestSpace.Description, req.Description}
175+
changedField["Description"] = []string{autoTestSpace.Description, req.Description}
176176
}
177177
autoTestSpace.Description = req.Description
178178
}
@@ -198,11 +198,10 @@ func (svc *Service) createAudits(space *dao.AutoTestSpace, changedField map[stri
198198
Result: "success",
199199
StartTime: now,
200200
EndTime: now,
201-
TemplateName: apistructs.UpdateAutoTestSpaceTemplate,
201+
TemplateName: apistructs.TemplateName(apistructs.UpdateAutoTestSpaceTemplatePrefix + i),
202202
Context: map[string]interface{}{
203203
"projectName": project.Name,
204204
"spaceName": space.Name,
205-
"field": i,
206205
"from": v[0],
207206
"to": v[1],
208207
},

pkg/erda-configs/audit/template.json

+18-4
Original file line numberDiff line numberDiff line change
@@ -1939,11 +1939,25 @@
19391939
"en": "Change MySQL account [@preMysqlUsername] -> [@mysqlUsername] for runtime [@runtimeName](runtimeDetailRoot) in [@projectName](project) / [@appName](app)"
19401940
}
19411941
},
1942-
"updateAutoTestSpace": {
1943-
"desc": "更新自动化测试空间",
1942+
"updateAutoTestSpaceName": {
1943+
"desc": "更新自动化测试空间名称",
19441944
"success": {
1945-
"zh": "在 [@projectName](project) 项目中, 更新了测试空间 [@spaceName] 的[@field], 由 [@from] 变成 [@to] ",
1946-
"en": "Update auto test space [@spaceName] [@field] from [@from] to [@to] in project [@projectName](project)"
1945+
"zh": "在 [@projectName](project) 项目中, 更新了测试空间 [@spaceName] 的名称, 由 [@from] 变成 [@to] ",
1946+
"en": "Update auto test space [@spaceName] name from [@from] to [@to] in project [@projectName](project)"
1947+
}
1948+
},
1949+
"updateAutoTestSpaceDescription": {
1950+
"desc": "更新自动化测试空间描述",
1951+
"success": {
1952+
"zh": "在 [@projectName](project) 项目中, 更新了测试空间 [@spaceName] 的描述, 由 [@from] 变成 [@to] ",
1953+
"en": "Update auto test space [@spaceName] Description from [@from] to [@to] in project [@projectName](project)"
1954+
}
1955+
},
1956+
"updateAutoTestSpaceArchiveStatus": {
1957+
"desc": "更新自动化测试空间状态",
1958+
"success": {
1959+
"zh": "在 [@projectName](project) 项目中, 更新了测试空间 [@spaceName] 的状态, 由 [@from] 变成 [@to] ",
1960+
"en": "Update auto test space [@spaceName] archiveStatus from [@from] to [@to] in project [@projectName](project)"
19471961
}
19481962
}
19491963
}

0 commit comments

Comments
 (0)