// "sync" sub-command: collect information from remote host
-// Copyright (C) 2021 Simon Ruderich
+// Copyright (C) 2021-2023 Simon Ruderich
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
)
func (s *Sync) hostInfo(conn *rpc.Conn) ([]string, error) {
- x, err := s.sendRecv(conn, safcm.MsgInfoReq{
+ resp, err := s.loop.HostInfoMsg(s, conn, safcm.MsgInfoReq{
LogLevel: s.config.LogLevel,
DetectGroups: s.config.DetectGroups,
})
if err != nil {
return nil, err
}
- resp, ok := x.(safcm.MsgInfoResp)
- if !ok {
- return nil, fmt.Errorf("unexpected response %v", x)
- }
if resp.Error != "" {
return nil, fmt.Errorf("%s", resp.Error)
}
return hostInfoRespToGroups(resp), nil
}
-// Keep in sync with config/groups.go:groupNameRegexp
+// Keep in sync with cmd/safcm/config/groups.go:groupNameRegexp
var infoGroupDetectedRegexp = regexp.MustCompile(`[^a-z0-9_-]+`)
func hostInfoRespToGroups(resp safcm.MsgInfoResp) []string {
groups := []string{
- config.GroupDetectedPrefix + "_" + resp.Goos,
- config.GroupDetectedPrefix + "_" + resp.Goarch,
+ hostInfoDetectedGroupName(resp.Goos),
+ hostInfoDetectedGroupName(resp.Goarch),
}
for _, x := range resp.Output {
- x = strings.TrimSpace(x)
- x = strings.ToLower(x)
- x = infoGroupDetectedRegexp.ReplaceAllString(x, "_")
- groups = append(groups, config.GroupDetectedPrefix+"_"+x)
+ groups = append(groups, hostInfoDetectedGroupName(x))
}
return groups
}
+
+func hostInfoDetectedGroupName(x string) string {
+ x = strings.TrimSpace(x)
+ x = strings.ToLower(x)
+ x = infoGroupDetectedRegexp.ReplaceAllString(x, "_")
+ x = config.GroupDetectedPrefix + "_" + x
+ return x
+}