From f6f1c174f5781aafdafff6fe101097491d8cbfe5 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Tue, 14 Nov 2023 16:01:16 +0800
Subject: [PATCH] fix bug

---
 agent-go/executor/HarborExecutor.go | 25 ++++++++++++-------------
 agent-go/main.go                    |  1 +
 agent-go/readme.md                  | 15 +++++++++++++++
 agent-go/server-env.yaml            |  2 +-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/agent-go/executor/HarborExecutor.go b/agent-go/executor/HarborExecutor.go
index adc465d..15234ab 100644
--- a/agent-go/executor/HarborExecutor.go
+++ b/agent-go/executor/HarborExecutor.go
@@ -63,7 +63,6 @@ func (hOp *HarborOperator) Exec(baseFuncName string, funcArgs ...string) (bool,
 
 func (hOp *HarborOperator) CreateProjectExec(funcArgs []string) (bool, []string) {
 
-	client := hOp.TargetHarborClient
 	if hOp.TargetHarborClient == nil {
 		ok, createClient := hOp.CheckAndBuildHarborClient(funcArgs)
 		if !ok {
@@ -73,18 +72,18 @@ func (hOp *HarborOperator) CreateProjectExec(funcArgs []string) (bool, []string)
 		}
 		hOp.TargetHarborClient = createClient
 	}
+	client := hOp.TargetHarborClient
 
 	// create project
 	// 定义你想要创建的仓库（项目）的详细信息
 
 	log.Debug("[Harbor Create Project] - create project !")
 	needToCreateProjectNameList := []string{"cmii", "rancher"}
-	var err error
 	// 使用客户端创建项目
 	ctx := context.Background()
 	for _, projectName := range needToCreateProjectNameList {
 
-		log.DebugF("start to create => %s", projectName)
+		log.DebugF("start to create proect => %s", projectName)
 		projectReq := &model.ProjectReq{
 			ProjectName: projectName, // 仓库名称
 			Metadata: &model.ProjectMetadata{
@@ -93,16 +92,16 @@ func (hOp *HarborOperator) CreateProjectExec(funcArgs []string) (bool, []string)
 		}
 
 		exists, _ := client.ProjectExists(ctx, projectName)
-		if exists {
-			log.DebugF("[Harbor Create Project] - Project %s already exists ! continue ", projectName)
-			continue
+		if !exists {
+
+			err := client.NewProject(ctx, projectReq)
+			if err != nil {
+				errorLog := fmt.Sprintf("Error creating project %s: %s\n", projectName, err.Error())
+				return false, []string{errorLog}
+			}
 		}
 
-		err = client.NewProject(ctx, projectReq)
-		if err != nil {
-			errorLog := fmt.Sprintf("Error creating project %s: %s\n", projectName, err.Error())
-			return false, []string{errorLog}
-		}
+		log.DebugF("[Harbor Create Project] - Project %s already exists ! continue ", projectName)
 
 	}
 
@@ -141,7 +140,6 @@ func (hOp *HarborOperator) CheckAndBuildHarborClient(funcArgs []string) (bool, *
 
 func (hOp *HarborOperator) ListProjectExec(funcArgs []string) (bool, []string) {
 
-	client := hOp.TargetHarborClient
 	if hOp.TargetHarborClient == nil {
 		ok, createClient := hOp.CheckAndBuildHarborClient(funcArgs)
 		if !ok {
@@ -151,10 +149,11 @@ func (hOp *HarborOperator) ListProjectExec(funcArgs []string) (bool, []string) {
 		}
 		hOp.TargetHarborClient = createClient
 	}
+	client := hOp.TargetHarborClient
 
 	// 使用客户端列出所有项目
 	ctx := context.Background()
-	projects, err := client.ListProjects(ctx, "*")
+	projects, err := client.ListProjects(ctx, "")
 	if err != nil {
 		fmt.Printf("Error listing projects: %v\n", err)
 		os.Exit(1)
diff --git a/agent-go/main.go b/agent-go/main.go
index 85c3ba2..64bcfad 100644
--- a/agent-go/main.go
+++ b/agent-go/main.go
@@ -31,4 +31,5 @@ func main() {
 
 	// 永远等待 runtime的队列消息
 	<-businessForeverChan
+
 }
diff --git a/agent-go/readme.md b/agent-go/readme.md
index 421d1a1..91f7233 100644
--- a/agent-go/readme.md
+++ b/agent-go/readme.md
@@ -1,4 +1,17 @@
 使用GO语言重构Octopus-Agent项目
+
+---
+# VS CODE RUN
+
+go mod tidy
+go mod download
+go mod vender
+
+
+#### in folder agent-go
+
+go build && ./agent-go -version=shanghai -agentServerInfoConf=/home/wdd/IdeaProjects/ProjectOctopus/agent-go/server-env.yaml
+
 ---
 
 ## Message
@@ -38,3 +51,5 @@
 4. 配置环境变量
 5. 安装GONB
 6. 启动jupyter lab即可
+
+
diff --git a/agent-go/server-env.yaml b/agent-go/server-env.yaml
index b88e0cd..1260e45 100644
--- a/agent-go/server-env.yaml
+++ b/agent-go/server-env.yaml
@@ -1,6 +1,6 @@
 serverName: "Chengdu-amd64-65"
 serverIpPbV4: "183.220.149.17"
-serverIpInV4: "10.250.0.65  "
+serverIpInV4: "10.250.0.100  "
 serverIpPbV6: ""
 serverIpInV6: ""
 location: "Chengdu Sichuan CN"