fix: agent version different issue (#4633)

Signed-off-by: YuTang Song <2313186065@qq.com>

Author: leebrouse

pkg/cli/zadig-agent/internal/network/connect.go

@@ -142,6 +142,7 @@ type HeartbeatParameters struct {
 	DiskSpace     uint64 `json:"disk_space"`
 	FreeDiskSpace uint64 `json:"free_disk_space"`
 	Hostname      string `json:"hostname"`
+	AgentVersion  string `json:"agent_version"`
 }
 
 type HeartbeatServerRequest struct {

pkg/cli/zadig-agent/pkg/monitor/heart_beat.go

@@ -116,6 +116,7 @@ func Heartbeat(agentCtl *agent.AgentController, errChan chan error, successChan
 	if err != nil {
 		panic(fmt.Errorf("failed to convert platform parameters to register agent parameters: %v", err))
 	}
+	params.AgentVersion = agentconfig.GetAgentVersion()
 
 	config := &network.AgentConfig{
 		Token: agentconfig.GetAgentToken(),

pkg/microservice/aslan/core/vm/service/types.go

@@ -114,6 +114,7 @@ type HeartbeatParameters struct {
 	DiskSpace     uint64 `json:"disk_space"`
 	FreeDiskSpace uint64 `json:"free_disk_space"`
 	VMname        string `json:"vm_name"`
+	AgentVersion  string `json:"agent_version"`
 }
 
 type HeartbeatRequest struct {

pkg/microservice/aslan/core/vm/service/vm.go

@@ -408,6 +408,7 @@ func RegisterAgent(args *RegisterAgentRequest, logger *zap.SugaredLogger) (*Regi
 			return nil, fmt.Errorf("zadig server vm %s agent is nil in db", args.Token)
 		}
 		vm.Agent.AgentVersion = args.Parameters.AgentVersion
+		updateAgentVersionStatus(vm.Agent, logger)
 	}
 	err = commonrepo.NewPrivateKeyColl().Update(vm.ID.Hex(), vm)
 	if err != nil {
@@ -483,6 +484,10 @@ func Heartbeat(args *HeartbeatRequest, logger *zap.SugaredLogger) (*HeartbeatRes
 		return nil, fmt.Errorf("zadig server vm %s agent is nil in db", args.Token)
 	}
 	vm.Agent.LastHeartbeatTime = time.Now().Unix()
+	if args.Parameters != nil && args.Parameters.AgentVersion != "" {
+		vm.Agent.AgentVersion = args.Parameters.AgentVersion
+	}
+	updateAgentVersionStatus(vm.Agent, logger)
 
 	err = commonrepo.NewPrivateKeyColl().Update(vm.ID.Hex(), vm)
 	if err != nil {
@@ -492,8 +497,9 @@ func Heartbeat(args *HeartbeatRequest, logger *zap.SugaredLogger) (*HeartbeatRes
 
 	if vm.Agent.NeedUpdate {
 		resp.NeedUpdateAgentVersion = true
-		resp.AgentVersion = vm.Agent.AgentVersion
+		resp.AgentVersion = vm.Agent.ZadigVersion
 	}
+	resp.ZadigVersion = vm.Agent.ZadigVersion
 
 	resp.ScheduleWorkflow = vm.ScheduleWorkflow
 	if vm.ScheduleWorkflow && vm.Agent.Workspace != "" {
@@ -506,6 +512,24 @@ func Heartbeat(args *HeartbeatRequest, logger *zap.SugaredLogger) (*HeartbeatRes
 	return resp, nil
 }
 
+func updateAgentVersionStatus(agent *commonmodels.VMAgent, logger *zap.SugaredLogger) {
+	latestVersion, err := config.GetZadigAgentVersion()
+	if err != nil {
+		logger.Warnf("failed to get zadig-agent version while handling heartbeat: %v", err)
+		return
+	}
+	agent.ZadigVersion = latestVersion
+
+	normalizedLatestVersion := strings.TrimPrefix(latestVersion, "v")
+	if normalizedLatestVersion == "" {
+		agent.NeedUpdate = false
+		return
+	}
+
+	normalizedCurrentVersion := strings.TrimPrefix(agent.AgentVersion, "v")
+	agent.NeedUpdate = normalizedCurrentVersion != normalizedLatestVersion
+}
+
 type VMJobGetterMap struct {
 	M         sync.Mutex
 	GetterMap map[string]struct{}