[Excution] - base function start -2

agent-go/executor/BaseFunction.go

@@ -7,9 +7,9 @@ type BaseFunc interface {
 }
 
 type AgentOsOperator struct {
-	InstallCommandPrefix string `json:"install_command_prefix",comment:"apt-get install or yum install"`
+	InstallCommandPrefix []string `json:"install_command_prefix",comment:"apt-get install or yum install"`
 
-	RemoveCommandPrefix string `json:"remove_command_prefix",comment:"apt-get remove or yum remove"`
+	RemoveCommandPrefix []string `json:"remove_command_prefix",comment:"apt-get remove or yum remove"`
 
 	CanAccessInternet bool `json:"can_access_internet",comment:"是否可以访问公网"`
 
@@ -31,6 +31,9 @@ func (op *AgentOsOperator) Exec(baseFuncName string, funcArgs ...string) string
 	case "modifyHostname":
 		multiLineCommand = op.modifyHostname(funcArgs)
 		break
+	case "enableSwap":
+		multiLineCommand = op.enableSwap()
+		break
 	case "disableSwap":
 		multiLineCommand = op.disableSwap()
 		break
@@ -72,11 +75,15 @@ func (op *AgentOsOperator) Exec(baseFuncName string, funcArgs ...string) string
 
 	}
 
+	log.DebugF("multiLineCommand are => %v", multiLineCommand)
+
 	// exec the command here
-	result, _ := MultiLineCommandExecutor(multiLineCommand)
+	for _, singleLineCommand := range multiLineCommand {
+		ReadTimeCommandExecutor(singleLineCommand)
+	}
 
 	// 归一化处理
-	return strings.Join(result, "")
+	return strings.Join([]string{}, "")
 }
 
 func (op *AgentOsOperator) shutdownFirewall() [][]string {
@@ -105,6 +112,24 @@ func (op *AgentOsOperator) modifyHostname(args []string) [][]string {
 	return [][]string{}
 }
 
+func (op *AgentOsOperator) enableSwap() [][]string {
+
+	enableSwapFunc := [][]string{
+		{
+			"cp",
+			"-f",
+			"/etc/fstab_back",
+			"/etc/fstab",
+		},
+		{
+			"cat",
+			"/etc/fstab",
+		},
+	}
+
+	return enableSwapFunc
+}
+
 func (op *AgentOsOperator) disableSwap() [][]string {
 
 	disableSwapFunc := [][]string{
@@ -116,16 +141,12 @@ func (op *AgentOsOperator) disableSwap() [][]string {
 			"cp",
 			"-f",
 			"/etc/fstab",
-			"/etc/fstab_bak",
+			"/etc/fstab_back",
 		},
 		{
-			"cat",
-			"/etc/fstab_bak",
-			"|",
-			"grep",
-			"-v",
-			"swap",
-			">",
+			"sed",
+			"-i",
+			"/swap/d",
 			"/etc/fstab",
 		},
 	}
@@ -135,9 +156,7 @@ func (op *AgentOsOperator) disableSwap() [][]string {
 
 func (op *AgentOsOperator) removeDocker() [][]string {
 
-	removeDockerFunc := [][]string{
-		{
-			op.RemoveCommandPrefix,
+	removeDockerLine := append(op.RemoveCommandPrefix, []string{
 		"docker",
 		"docker-client",
 		"docker-client-latest",
@@ -152,7 +171,10 @@ func (op *AgentOsOperator) removeDocker() [][]string {
 		"kubelet",
 		"kubeadm",
 		"kubectl",
-		},
+	}...)
+
+	removeDockerFunc := [][]string{
+		removeDockerLine,
 	}
 
 	return removeDockerFunc
@@ -164,24 +186,64 @@ func (op *AgentOsOperator) installDocker(args []string) [][]string {
 	installDockerFunc := op.removeDocker()
 
 	if op.IsOsTypeUbuntu {
+		//
+		installFirstLine := append(op.InstallCommandPrefix, []string{
+			"apt-transport-https",
+			"ca-certificates",
+			"curl",
+			"gnupg-agent",
+			"software-properties-common",
+		}...)
+
+		if op.IsAgentInnerWall {
+			// inner gfw
 			installDockerFunc = append(installDockerFunc, [][]string{
+				installFirstLine,
 				{
-				op.InstallCommandPrefix,
-				"apt-transport-https ca-certificates curl gnupg-agent software-properties-common",
+					"curl",
+					"-o",
+					"/etc/docker/docker-utsc.gpg",
+					"https://mirrors.ustc.edu.cn/docker-ce/linux/ubuntu/gpg",
 				},
 				{
 					"apt-key",
 					"add",
-				"-",
-				"$(curl -fsSL https://mirrors.ustc.edu.cn/docker-ce/linux/ubuntu/gpg)",
+					"/etc/docker/docker-utsc.gpg",
 				},
 			}...)
 		} else {
+			// outside world
 			installDockerFunc = append(installDockerFunc, [][]string{
+				installFirstLine,
 				{
-				op.InstallCommandPrefix,
-				"yum-utils device-mapper-persistent-data lvm2",
+					"curl",
+					"-o",
+					"/etc/docker/docker-utsc.gpg",
+					"https://mirrors.ustc.edu.cn/docker-ce/linux/ubuntu/gpg",
 				},
+				{
+					"apt-key",
+					"add",
+					"/etc/docker/docker-utsc.gpg",
+				},
+			}...)
+		}
+
+		// look for specific docker-version to install
+
+	} else {
+		installFirstLine := append(op.InstallCommandPrefix,
+			[]string{
+				"yum-utils",
+				"device-mapper-persistent-data",
+				"lvm2",
+			}...,
+		)
+
+		if op.IsAgentInnerWall {
+			// inner gfw
+			installDockerFunc = append(installDockerFunc, [][]string{
+				installFirstLine,
 				{
 					"yum-config-manager",
 					"--add-repo",
@@ -195,6 +257,10 @@ func (op *AgentOsOperator) installDocker(args []string) [][]string {
 				},
 				{},
 			}...)
+		} else {
+			// outside world
+		}
+
 	}
 
 	return installDockerFunc

agent-go/executor/BaseFunction_test.go

@@ -3,8 +3,10 @@ package executor
 import "testing"
 
 var agentOP = AgentOsOperator{
-	InstallCommandPrefix: "apt-get install",
-	RemoveCommandPrefix:  "apt-get remove",
+	InstallCommandPrefix: []string{
+		"apt-get", "install", "-y",
+	},
+	RemoveCommandPrefix: []string{"/usr/bin/apt", "remove", "-y"},
 	CanAccessInternet:   true,
 	IsOsTypeUbuntu:      true,
 	IsAgentInnerWall:    true,
@@ -12,10 +14,11 @@ var agentOP = AgentOsOperator{
 
 func TestBaseFunc(t *testing.T) {
 
-	agentOP.Exec("shutdownFirewall")
-	agentOP.Exec("modifyHostname")
-	agentOP.Exec("disableSwap")
+	//agentOP.Exec("shutdownFirewall")
+	//agentOP.Exec("modifyHostname")
+	//agentOP.Exec("disableSwap")
+	//agentOP.Exec("enableSwap")
+	//agentOP.Exec("removeDocker")
 	agentOP.Exec("installDocker")
-	agentOP.Exec("removeDocker")
 
 }

agent-go/executor/CommandExecutor.go

@@ -102,7 +102,6 @@ func SingleLineCommandExecutor(singleLineCommand []string) ([]string, error) {
 	var result []string
 	for scanner.Scan() {
 		result = append(result, scanner.Text())
-
 	}
 
 	if err != nil {

agent-go/executor/RealTimeExecutor.go

@@ -12,22 +12,22 @@ func ReadTimeCommandExecutor(singleLineCommand []string) {
 	cmd := exec.Command(singleLineCommand[0], singleLineCommand[1:]...)
 	stdout, err := cmd.StdoutPipe()
 	if err != nil {
-		panic(err)
+		log.ErrorF("command  %v stdout error => %v", singleLineCommand, err)
 	}
 	stderr, err := cmd.StderrPipe()
 	if err != nil {
-		panic(err)
+		log.ErrorF("command  %v stderr error => %v", singleLineCommand, err)
 	}
 
 	if err := cmd.Start(); err != nil {
-		panic(err)
+		log.ErrorF("command  %v runtime error => %v", singleLineCommand, err)
 	}
 
 	go copyOutput(stdout)
 	go copyOutput(stderr)
 
 	if err := cmd.Wait(); err != nil {
-		panic(err)
+		log.ErrorF("command  %v result error => %v", singleLineCommand, err)
 	}
 
 }

server/src/main/java/io/wdd/ServerApplication.java

@@ -8,6 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 @MapperScan("io.wdd.server.mapper")
 public class ServerApplication {
 
+
     public static void main(String[] args) {
         SpringApplication.run(ServerApplication.class, args);
     }