From 9e2eab3df8589620a762ac5e4fdf2a72e40f0f92 Mon Sep 17 00:00:00 2001
From: Wangjunqi123 <wangjunqi@kylinos.cn>
Date: Fri, 15 Sep 2023 14:51:57 +0800
Subject: [PATCH] reduce topology agent golang version to 1.17

---
 .gitignore                             | 3 ++-
 topology/agent/go.mod                  | 4 ++--
 topology/server/collector/collector.go | 2 +-
 topology/server/go.mod                 | 2 +-
 topology/server/handler/handler.go     | 2 +-
 topology/server/processor/processor.go | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index e5ed5dba..b4493c7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 .vscode/
 !build
 topology/server/vendor/
-topology/pkg/
\ No newline at end of file
+topology/pkg/
+topology/build
\ No newline at end of file
diff --git a/topology/agent/go.mod b/topology/agent/go.mod
index ffec8119..ec1c21b4 100644
--- a/topology/agent/go.mod
+++ b/topology/agent/go.mod
@@ -1,10 +1,11 @@
 module gitee.com/openeuler/PilotGo-plugin-topology-agent
 
-go 1.20
+go 1.17
 
 require (
 	gitee.com/openeuler/PilotGo-plugins/sdk v0.0.0-20230816095049-1964124218b1
 	github.com/gin-gonic/gin v1.9.1
+	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil v3.21.11+incompatible
 	github.com/shirou/gopsutil/v3 v3.23.7
 	gopkg.in/yaml.v3 v3.0.1
@@ -30,7 +31,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
diff --git a/topology/server/collector/collector.go b/topology/server/collector/collector.go
index 66b4cb8f..6c04b9aa 100644
--- a/topology/server/collector/collector.go
+++ b/topology/server/collector/collector.go
@@ -26,7 +26,7 @@ func (d *DataCollector) Collect_instant_data() []error {
 	var errorlist []error
 
 	agentmanager.Topo.AgentMap.Range(
-		func(key, value any) bool {
+		func(key, value interface{}) bool {
 			wg.Add(1)
 
 			go func() {
diff --git a/topology/server/go.mod b/topology/server/go.mod
index a73e4ca9..c2fdc796 100644
--- a/topology/server/go.mod
+++ b/topology/server/go.mod
@@ -1,6 +1,6 @@
 module gitee.com/openeuler/PilotGo-plugin-topology-server
 
-go 1.20
+go 1.17
 
 require (
 	gitee.com/openeuler/PilotGo-plugins/sdk v0.0.0-20230815015659-4fdcce82d047
diff --git a/topology/server/handler/handler.go b/topology/server/handler/handler.go
index e18154fd..f5f811bd 100644
--- a/topology/server/handler/handler.go
+++ b/topology/server/handler/handler.go
@@ -148,7 +148,7 @@ func MultiHostHandle(ctx *gin.Context) {
 
 func AgentListHandle(ctx *gin.Context) {
 	agentmap := make(map[string]string)
-	agentmanager.Topo.AgentMap.Range(func(key, value any) bool {
+	agentmanager.Topo.AgentMap.Range(func(key, value interface{}) bool {
 		agent := value.(*agentmanager.Agent_m)
 		if agent.Host_2 != nil {
 			agentmap[agent.UUID] = agent.IP + ":" + agent.Port
diff --git a/topology/server/processor/processor.go b/topology/server/processor/processor.go
index 3b59b4de..c26e1abe 100644
--- a/topology/server/processor/processor.go
+++ b/topology/server/processor/processor.go
@@ -43,7 +43,7 @@ func (d *DataProcesser) Process_data() (*meta.Nodes, *meta.Edges, []error, []err
 
 	// 获取运行状态agent的数目
 	// TODO: 暂时默认topo agent运行状态的数目与pilotgo agent运行状态的数目一致
-	agentmanager.Topo.AgentMap.Range(func(key, value any) bool {
+	agentmanager.Topo.AgentMap.Range(func(key, value interface{}) bool {
 		agent := value.(*agentmanager.Agent_m)
 		if agent.Host_2 != nil {
 			agent_count++
@@ -63,7 +63,7 @@ func (d *DataProcesser) Process_data() (*meta.Nodes, *meta.Edges, []error, []err
 	}
 
 	agentmanager.Topo.AgentMap.Range(
-		func(key, value any) bool {
+		func(key, value interface{}) bool {
 			wg.Add(1)
 
 			go func() {
-- 
Gitee