mirror of
https://github.com/gravitl/netmaker.git
synced 2026-04-22 16:07:11 +08:00
NM-288: populate grp names for posture check apis
This commit is contained in:
@@ -110,6 +110,7 @@ func createPostureCheck(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
go mq.PublishPeerUpdate(false)
|
||||
go proLogic.RunPostureChecks()
|
||||
proLogic.PopulatePostureCheckGroupNames([]schema.PostureCheck{pc})
|
||||
logic.ReturnSuccessResponseWithJson(w, r, pc, "created posture check")
|
||||
}
|
||||
|
||||
@@ -148,6 +149,7 @@ func listPostureChecks(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
}
|
||||
proLogic.PopulatePostureCheckGroupNames([]schema.PostureCheck{pc})
|
||||
logic.ReturnSuccessResponseWithJson(w, r, pc, "fetched posture check")
|
||||
return
|
||||
}
|
||||
@@ -161,6 +163,7 @@ func listPostureChecks(w http.ResponseWriter, r *http.Request) {
|
||||
)
|
||||
return
|
||||
}
|
||||
proLogic.PopulatePostureCheckGroupNames(list)
|
||||
logic.ReturnSuccessResponseWithJson(w, r, list, "fetched posture checks")
|
||||
}
|
||||
|
||||
@@ -246,6 +249,7 @@ func updatePostureCheck(w http.ResponseWriter, r *http.Request) {
|
||||
logic.LogEvent(event)
|
||||
go mq.PublishPeerUpdate(false)
|
||||
go proLogic.RunPostureChecks()
|
||||
proLogic.PopulatePostureCheckGroupNames([]schema.PostureCheck{pc})
|
||||
logic.ReturnSuccessResponseWithJson(w, r, pc, "updated posture check")
|
||||
}
|
||||
|
||||
|
||||
@@ -504,6 +504,24 @@ func compareVersions(a, b string) int {
|
||||
return 0
|
||||
}
|
||||
|
||||
// PopulatePostureCheckGroupNames sets group name as the value for each user group key
|
||||
func PopulatePostureCheckGroupNames(pcs []schema.PostureCheck) {
|
||||
for i := range pcs {
|
||||
for groupID := range pcs[i].UserGroups {
|
||||
if groupID == "*" {
|
||||
pcs[i].UserGroups[groupID] = "*"
|
||||
continue
|
||||
}
|
||||
grp, err := logic.GetUserGroup(schema.UserGroupID(groupID))
|
||||
if err == nil {
|
||||
pcs[i].UserGroups[groupID] = grp.Name
|
||||
} else {
|
||||
pcs[i].UserGroups[groupID] = groupID
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func ValidatePostureCheck(pc *schema.PostureCheck) error {
|
||||
if pc.Name == "" {
|
||||
return errors.New("name cannot be empty")
|
||||
|
||||
Reference in New Issue
Block a user