Merge pull request #55 from FlowCI/develop

gy2006 · web-flow · commit 94367c6c0cf7 · 2022-03-28T20:05:54.000+02:00
Develop
diff --git a/.run/flow-agent-01.run.xml b/.run/flow-agent-01.run.xml
@@ -0,0 +1,21 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="flow-agent-01" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <module name="flow-agent-x" />
+    <working_directory value="$PROJECT_DIR$/" />
+    <go_parameters value="-i" />
+    <envs>
+      <env name="FLOWCI_AGENT_TOKEN" value="f45d9f29-3b67-482e-8d64-afb215d05a37" />
+      <env name="FLOWCI_SERVER_URL" value="http://192.168.31.173:8080" />
+      <env name="FLOWCI_AGENT_VOLUMES" value="name=pyenv,dest=/ci/python,script=init.sh,image=flowci/pyenv,init=init-pyenv-volume.sh" />
+      <env name="GIN_MODE" value="release" />
+      <env name="GODEBUG" value="memprofilerate=1" />
+      <env name="FLOWCI_AGENT_DEBUG" value="true" />
+      <env name="FLOWCI_DOCKER_AGENT" value="false" />
+    </envs>
+    <kind value="FILE" />
+    <package value="flow-agent-x" />
+    <directory value="$PROJECT_DIR$/" />
+    <filePath value="$PROJECT_DIR$/app.go" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/Dockerfile b/Dockerfile
@@ -19,7 +19,7 @@ RUN echo "StrictHostKeyChecking=no" >> $HOME/.ssh/config
 
 ## install python3 environment
 RUN apt install python3.6-distutils -y
-RUN curl https://bootstrap.pypa.io/get-pip.py | python3.6
+RUN curl https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3.6
 
 RUN ln -s /usr/bin/python3.6 /usr/bin/python
 
diff --git a/Makefile b/Makefile
@@ -3,17 +3,19 @@ CURRENT_DIR 	:= $(shell pwd)
 
 LINUX_AMD64     := GOOS=linux GOARCH=amd64
 MAC_AMD64       := GOOS=darwin GOARCH=amd64
+MAC_ARM64       := GOOS=darwin GOARCH=arm64
 WIN_AMD64       := GOOS=windows GOARCH=amd64
 
 GO		    	:= go
 GOGEN			:= $(GO) generate ./...
 GOBUILD_LINUX   := $(LINUX_AMD64) $(GO) build -o bin/$(PROJECT)-linux -v
 GOBUILD_MAC     := $(MAC_AMD64) $(GO) build -o bin/$(PROJECT)-mac -v
+GOBUILD_MAC_ARM := $(MAC_ARM64) $(GO) build -o bin/$(PROJECT)-mac-arm -v
 GOBUILD_WIN     := $(WIN_AMD64) $(GO) build -o bin/$(PROJECT)-win -v
 
 GOTEST_MOCK_GEN := docker run --rm -v "$(CURRENT_DIR)":/src -w /src vektra/mockery --all
 GOTEST      	:= $(GO) test ./... -v -timeout 10s
-GOENV			:= -e GOCACHE=/ws/.cache -e GOPATH=/ws/.vender -e GO111MODULE=on
+GOENV			:= -e GOCACHE=/ws/.cache -e GOPATH=/ws/.vender
 
 DOCKER_IMG		:= golang:1.17
 DOCKER_RUN 		:= docker run -it --rm -v $(CURRENT_DIR):/ws $(GOENV) -w /ws --network host $(DOCKER_IMG) /bin/bash -c
@@ -23,7 +25,7 @@ DOCKER_BUILD 	:= ./build.sh
 .PHONY: build protogen test image clean cleanall
 
 build:
-	$(DOCKER_RUN) "$(GOGEN) && $(GOBUILD_LINUX) && $(GOBUILD_MAC) && $(GOBUILD_WIN)"
+	$(DOCKER_RUN) "$(GOGEN) && $(GOBUILD_LINUX) && $(GOBUILD_MAC) && $(GOBUILD_MAC_ARM) && $(GOBUILD_WIN)"
 
 test:
 	$(GOTEST_MOCK_GEN)
diff --git a/api/client.go b/api/client.go
@@ -16,8 +16,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 )
 
 const (
diff --git a/api/util.go b/api/util.go
@@ -2,7 +2,7 @@ package api
 
 import (
 	"encoding/base64"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 	"strings"
 )
 
diff --git a/app.go b/app.go
@@ -6,16 +6,16 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/flowci/flow-agent-x/config"
+	"github.com/flowci/flow-agent-x/controller"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"github.com/gin-contrib/pprof"
 	"github.com/gin-gonic/gin"
 	"github.com/urfave/cli"
-	"github/flowci/flow-agent-x/config"
-	"github/flowci/flow-agent-x/controller"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
 )
 
-const version = "1.21.40"
+const version = "1.22.12"
 
 func init() {
 	util.LogInit()
diff --git a/build.sh b/build.sh
@@ -6,6 +6,8 @@ if [[ -n $version ]]; then
   VersionTag="-t flowci/agent:$version"
 fi
 
-docker build -f ./Dockerfile -t flowci/agent:latest $VersionTag ./bin
+# docker buildx create --name flowci --use
+
+docker buildx build -f ./Dockerfile --platform linux/arm64,linux/amd64 --push -t flowci/agent:latest $VersionTag ./bin
 
 # docker rmi -f $(docker images -f 'dangling=true' -q)
diff --git a/config/factory.go b/config/factory.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/domain"
 	"sync"
 )
 
diff --git a/config/manager.go b/config/manager.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/flowci/flow-agent-x/api"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
-	"github/flowci/flow-agent-x/api"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
 )
 
 const pluginDir = ".plugins"
diff --git a/controller/cmd_controller.go b/controller/cmd_controller.go
@@ -3,8 +3,8 @@ package controller
 import (
 	"net/http"
 
+	"github.com/flowci/flow-agent-x/service"
 	"github.com/gin-gonic/gin"
-	"github/flowci/flow-agent-x/service"
 )
 
 type CmdController struct {
diff --git a/controller/cmd_controller_test.go b/controller/cmd_controller_test.go
@@ -1,10 +1,10 @@
 package controller
 
 import (
+	"github.com/flowci/flow-agent-x/api"
+	"github.com/flowci/flow-agent-x/config"
+	"github.com/flowci/flow-agent-x/mocks"
 	"github.com/streadway/amqp"
-	"github/flowci/flow-agent-x/api"
-	"github/flowci/flow-agent-x/config"
-	"github/flowci/flow-agent-x/mocks"
 	"testing"
 
 	"github.com/gin-gonic/gin"
diff --git a/controller/root_controller.go b/controller/root_controller.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 
 	"github.com/gin-gonic/gin"
 )
diff --git a/dao/builder.go b/dao/builder.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strings"
 
-	u "github/flowci/flow-agent-x/util"
+	u "github.com/flowci/flow-agent-x/util"
 )
 
 type QueryBuilder struct {
diff --git a/dao/client.go b/dao/client.go
@@ -3,13 +3,13 @@ package dao
 import (
 	"database/sql"
 
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 
 	_ "github.com/mattn/go-sqlite3"
 )
 
 const (
-	//file = "agent.db"
+//file = "agent.db"
 )
 
 // Client for sqlite3
diff --git a/dao/entity.go b/dao/entity.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 )
 
 const (
diff --git a/dao/entity_test.go b/dao/entity_test.go
@@ -3,7 +3,7 @@ package dao
 import (
 	"testing"
 
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/domain/docker.go b/domain/docker.go
@@ -2,7 +2,7 @@ package domain
 
 import (
 	"fmt"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 	"strings"
 )
 
diff --git a/domain/docker_option.go b/domain/docker_option.go
@@ -3,7 +3,7 @@ package domain
 import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/go-connections/nat"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 )
 
 type (
diff --git a/domain/secret_token.go b/domain/secret_token.go
@@ -1,6 +1,6 @@
 package domain
 
-import "github/flowci/flow-agent-x/util"
+import "github.com/flowci/flow-agent-x/util"
 
 type (
 	TokenSecret struct {
diff --git a/domain/variables.go b/domain/variables.go
@@ -2,7 +2,7 @@ package domain
 
 import (
 	"fmt"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 )
 
 const (
@@ -19,7 +19,7 @@ const (
 	VarAgentDockerNetwork = "FLOWCI_AGENT_DOCKER_NETWORK"
 	VarAgentDockerAuth    = "FLOWCI_AGENT_DOCKER_AUTH"     // for private docker repo auth
 	VarAgentEnableProfile = "FLOWCI_AGENT_PROFILE_ENABLED" // boolean
-	VarAgentFromDocker    = "FLOWCI_DOCKER_AGENT" // boolean
+	VarAgentFromDocker    = "FLOWCI_DOCKER_AGENT"          // boolean
 
 	VarK8sEnabled   = "FLOWCI_AGENT_K8S_ENABLED"    // boolean
 	VarK8sInCluster = "FLOWCI_AGENT_K8S_IN_CLUSTER" // boolean
diff --git a/executor/docker.go b/executor/docker.go
@@ -12,8 +12,8 @@ import (
 	"github.com/docker/docker/api/types/volume"
 	volumetypes "github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"io/ioutil"
 	"os"
 	"strings"
diff --git a/executor/docker_test.go b/executor/docker_test.go
@@ -2,10 +2,10 @@ package executor
 
 import (
 	"encoding/base64"
+	"github.com/flowci/flow-agent-x/config"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"github.com/stretchr/testify/assert"
-	"github/flowci/flow-agent-x/config"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
 	"testing"
 	"time"
 )
@@ -157,12 +157,12 @@ func TestShouldRunWithTwoContainers(t *testing.T) {
 		Environment: map[string]string{
 			"MYSQL_ROOT_PASSWORD": "test",
 		},
-		Ports: []string{"3306:3306"},
+		Ports:             []string{"3306:3306"},
 		IsDeleteContainer: true,
 	})
 	cmd.Dockers = append(cmd.Dockers, &domain.DockerOption{
-		Image: "mysql:5.6",
-		Command: []string{"mysql", "-h127.0.0.1", "-uroot", "-ptest"},
+		Image:             "mysql:5.6",
+		Command:           []string{"mysql", "-h127.0.0.1", "-uroot", "-ptest"},
 		IsDeleteContainer: true,
 	})
 
diff --git a/executor/docker_util.go b/executor/docker_util.go
@@ -4,7 +4,7 @@ import (
 	"archive/tar"
 	"bufio"
 	"bytes"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 	"io"
 	"os"
 	"path/filepath"
diff --git a/executor/executor.go b/executor/executor.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"io"
 	"sync"
 	"sync/atomic"
@@ -88,17 +88,17 @@ type BaseExecutor struct {
 type Options struct {
 	K8s *domain.K8sConfig
 
-	AgentId                        string
-	Parent                         context.Context
+	AgentId                   string
+	Parent                    context.Context
 	Workspace                 string
 	WorkspaceFromDockerVolume bool
 	PluginDir                 string
-	CacheSrcDir                    string
-	Cmd                            *domain.ShellIn
-	Vars                           domain.Variables
-	SecretVars                     domain.Variables
-	ConfigVars                     domain.Variables
-	Volumes                        []*domain.DockerVolume
+	CacheSrcDir               string
+	Cmd                       *domain.ShellIn
+	Vars                      domain.Variables
+	SecretVars                domain.Variables
+	ConfigVars                domain.Variables
+	Volumes                   []*domain.DockerVolume
 }
 
 func NewExecutor(options Options) Executor {
diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -3,10 +3,10 @@ package executor
 import (
 	"context"
 	"encoding/base64"
+	"github.com/flowci/flow-agent-x/config"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"github.com/stretchr/testify/assert"
-	"github/flowci/flow-agent-x/config"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
 	"path"
 	"runtime"
 	"time"
diff --git a/executor/shell.go b/executor/shell.go
@@ -3,8 +3,8 @@ package executor
 import (
 	"context"
 	"fmt"
-	"github/flowci/flow-agent-x/domain"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/domain"
+	"github.com/flowci/flow-agent-x/util"
 	"io/ioutil"
 	"os"
 	"os/exec"
diff --git a/executor/shell_bash.go b/executor/shell_bash.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package executor
@@ -6,7 +7,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/creack/pty"
-	"github/flowci/flow-agent-x/util"
+	"github.com/flowci/flow-agent-x/util"
 	"io/ioutil"
 	"os"
 	"os/exec"
diff --git a/executor/shell_bash_test.go b/executor/shell_bash_test.go
diff --git a/executor/shell_powershell.go b/executor/shell_powershell.go
diff --git a/executor/shell_powershell_test.go b/executor/shell_powershell_test.go
diff --git a/executor/util.go b/executor/util.go
diff --git a/executor/util_unix.go b/executor/util_unix.go
diff --git a/executor/util_win.go b/executor/util_win.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/service/cache_manager.go b/service/cache_manager.go
diff --git a/service/cmd_service.go b/service/cmd_service.go
diff --git a/service/factory.go b/service/factory.go
diff --git a/service/plugin_manager.go b/service/plugin_manager.go

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ import (`
`16`	`16`	`"sync/atomic"`
`17`	`17`	`"time"`
`18`	`18`
`19`		`- "github/flowci/flow-agent-x/domain"`
`20`		`- "github/flowci/flow-agent-x/util"`
	`19`	`+ "github.com/flowci/flow-agent-x/domain"`
	`20`	`+ "github.com/flowci/flow-agent-x/util"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package api`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/base64"`
`5`		`- "github/flowci/flow-agent-x/util"`
	`5`	`+ "github.com/flowci/flow-agent-x/util"`
`6`	`6`	`"strings"`
`7`	`7`	`)`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package config`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github/flowci/flow-agent-x/domain"`
	`4`	`+ "github.com/flowci/flow-agent-x/domain"`
`5`	`5`	`"sync"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ package controller`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
`5`	`5`
	`6`	`+ "github.com/flowci/flow-agent-x/service"`
`6`	`7`	`"github.com/gin-gonic/gin"`
`7`		`- "github/flowci/flow-agent-x/service"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type CmdController struct {`