From 46c2a00419c055ff7998b7389c0d3b22e86c03eb Mon Sep 17 00:00:00 2001 From: liruichen Date: Mon, 28 Aug 2023 12:34:44 +0800 Subject: [PATCH] feat: go module change --- cmd/build.go | 2 +- cmd/install.go | 2 +- cmd/merge.go | 2 +- cmd/profile.go | 2 +- cmd/root.go | 3 ++- cmd/run.go | 2 +- cmd/server.go | 7 +++---- cmd/service.go | 2 +- cmd/watch.go | 2 +- go.mod | 2 +- main.go | 2 +- pkg/build/build.go | 2 +- pkg/build/build_flags.go | 2 +- pkg/build/goenv.go | 2 +- pkg/build/inject.go | 6 +++--- pkg/build/install.go | 2 +- pkg/build/internal/tool/cover.go | 2 +- pkg/build/internal/websocket/wsdep.go | 2 +- pkg/build/run.go | 6 +++--- pkg/build/tmpfolder.go | 2 +- pkg/client/agent.go | 4 ++-- pkg/client/client.go | 2 +- pkg/client/profie.go | 6 +++--- pkg/client/rest/client.go | 4 ++-- pkg/server/api.go | 2 +- pkg/server/rpcstream.go | 2 +- pkg/server/server.go | 4 ++-- pkg/server/watchstream.go | 2 +- pkg/watch/watch.go | 2 +- 29 files changed, 41 insertions(+), 41 deletions(-) diff --git a/cmd/build.go b/cmd/build.go index 88f2aa7..92017f7 100644 --- a/cmd/build.go +++ b/cmd/build.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/build" + "github.com/RickLeee/goc-v2/pkg/build" "github.com/spf13/cobra" ) diff --git a/cmd/install.go b/cmd/install.go index 4bb878b..212ffde 100644 --- a/cmd/install.go +++ b/cmd/install.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/build" + "github.com/RickLeee/goc-v2/pkg/build" "github.com/spf13/cobra" ) diff --git a/cmd/merge.go b/cmd/merge.go index 1431506..e78a0ba 100644 --- a/cmd/merge.go +++ b/cmd/merge.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/spf13/cobra" "golang.org/x/tools/cover" "k8s.io/test-infra/gopherage/pkg/cov" diff --git a/cmd/profile.go b/cmd/profile.go index 5c61eeb..111fe7f 100644 --- a/cmd/profile.go +++ b/cmd/profile.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/client" + "github.com/RickLeee/goc-v2/pkg/client" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/root.go b/cmd/root.go index d7d972c..7325a4d 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/spf13/cobra" ) @@ -30,6 +30,7 @@ Find more information at: log.DisplayGoc() // init logger log.NewLogger(globalDebug) + }, PersistentPostRun: func(cmd *cobra.Command, args []string) { diff --git a/cmd/run.go b/cmd/run.go index 85f9bf2..0c343a8 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/build" + "github.com/RickLeee/goc-v2/pkg/build" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index 811e40a..6e0606a 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -14,9 +14,9 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/log" - "github.com/RickLeee/goc/v2/pkg/server" - "github.com/RickLeee/goc/v2/pkg/server/store" + "github.com/RickLeee/goc-v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/server" + "github.com/RickLeee/goc-v2/pkg/server/store" "github.com/spf13/cobra" ) @@ -36,7 +36,6 @@ var ( func init() { serverCmd.Flags().StringVarP(&serverHost, "host", "", "127.0.0.1:7777", "specify the host of the goc server") serverCmd.Flags().StringVarP(&serverStore, "store", "", ".goc.kvstore", "specify the host of the goc server") - log.Infof("version: %v", Version) rootCmd.AddCommand(serverCmd) } diff --git a/cmd/service.go b/cmd/service.go index b54ffc1..3d5d036 100644 --- a/cmd/service.go +++ b/cmd/service.go @@ -14,7 +14,7 @@ package cmd import ( - "github.com/RickLeee/goc/v2/pkg/client" + "github.com/RickLeee/goc-v2/pkg/client" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/cmd/watch.go b/cmd/watch.go index 3d2613a..86b7a2c 100644 --- a/cmd/watch.go +++ b/cmd/watch.go @@ -14,7 +14,7 @@ package cmd import ( - cli "github.com/RickLeee/goc/v2/pkg/watch" + cli "github.com/RickLeee/goc-v2/pkg/watch" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index 8a638da..07c98ad 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/RickLeee/goc/v2 +module github.com/RickLeee/goc-v2 go 1.16 diff --git a/main.go b/main.go index b0b06b0..4fad2ef 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,7 @@ package main import ( - "github.com/RickLeee/goc/v2/cmd" + "github.com/RickLeee/goc-v2/cmd" ) func main() { diff --git a/pkg/build/build.go b/pkg/build/build.go index ea48214..683a00f 100644 --- a/pkg/build/build.go +++ b/pkg/build/build.go @@ -18,7 +18,7 @@ import ( "os/exec" "strings" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/spf13/pflag" ) diff --git a/pkg/build/build_flags.go b/pkg/build/build_flags.go index d53fea1..2316065 100644 --- a/pkg/build/build_flags.go +++ b/pkg/build/build_flags.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/spf13/cobra" "github.com/spf13/pflag" ) diff --git a/pkg/build/goenv.go b/pkg/build/goenv.go index 61a0d9e..faeaddf 100644 --- a/pkg/build/goenv.go +++ b/pkg/build/goenv.go @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" ) // readProjectMetaInfo reads all meta informations of the corresponding project diff --git a/pkg/build/inject.go b/pkg/build/inject.go index 8d60de4..383bc85 100644 --- a/pkg/build/inject.go +++ b/pkg/build/inject.go @@ -19,9 +19,9 @@ import ( "path" "path/filepath" - "github.com/RickLeee/goc/v2/pkg/build/internal/tool" - "github.com/RickLeee/goc/v2/pkg/build/internal/websocket" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/build/internal/tool" + "github.com/RickLeee/goc-v2/pkg/build/internal/websocket" + "github.com/RickLeee/goc-v2/pkg/log" ) // Inject injects cover variables for all the .go files in the target directory diff --git a/pkg/build/install.go b/pkg/build/install.go index 2380749..7d75cd2 100644 --- a/pkg/build/install.go +++ b/pkg/build/install.go @@ -17,7 +17,7 @@ import ( "os" "os/exec" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" ) func NewInstall(opts ...gocOption) *Build { diff --git a/pkg/build/internal/tool/cover.go b/pkg/build/internal/tool/cover.go index 5ae6917..f62cfde 100644 --- a/pkg/build/internal/tool/cover.go +++ b/pkg/build/internal/tool/cover.go @@ -18,7 +18,7 @@ import ( "os" "sort" - "github.com/RickLeee/goc/v2/pkg/log" // QINIU + "github.com/RickLeee/goc-v2/pkg/log" // QINIU // "cmd/internal/edit" // "cmd/internal/objabi" ) diff --git a/pkg/build/internal/websocket/wsdep.go b/pkg/build/internal/websocket/wsdep.go index d856f22..476e958 100644 --- a/pkg/build/internal/websocket/wsdep.go +++ b/pkg/build/internal/websocket/wsdep.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" ) //go:embed websocket.tar diff --git a/pkg/build/run.go b/pkg/build/run.go index c61bc6e..913d296 100644 --- a/pkg/build/run.go +++ b/pkg/build/run.go @@ -18,9 +18,9 @@ import ( "os/exec" "os/signal" - "github.com/RickLeee/goc/v2/pkg/log" - "github.com/RickLeee/goc/v2/pkg/server" - "github.com/RickLeee/goc/v2/pkg/server/store" + "github.com/RickLeee/goc-v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/server" + "github.com/RickLeee/goc-v2/pkg/server/store" "github.com/gin-gonic/gin" ) diff --git a/pkg/build/tmpfolder.go b/pkg/build/tmpfolder.go index 6f04e46..575c732 100644 --- a/pkg/build/tmpfolder.go +++ b/pkg/build/tmpfolder.go @@ -21,7 +21,7 @@ import ( "path/filepath" "strings" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/tongjingran/copy" "golang.org/x/mod/modfile" ) diff --git a/pkg/client/agent.go b/pkg/client/agent.go index 23414a4..a1f20c9 100644 --- a/pkg/client/agent.go +++ b/pkg/client/agent.go @@ -16,8 +16,8 @@ package client import ( "os" - "github.com/RickLeee/goc/v2/pkg/client/rest" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/client/rest" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/olekukonko/tablewriter" ) diff --git a/pkg/client/client.go b/pkg/client/client.go index 9a327fa..79f9352 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -27,7 +27,7 @@ import ( "golang.org/x/term" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/olekukonko/tablewriter" ) diff --git a/pkg/client/profie.go b/pkg/client/profie.go index ede2130..fa2b92b 100644 --- a/pkg/client/profie.go +++ b/pkg/client/profie.go @@ -20,9 +20,9 @@ import ( "os" "path/filepath" - "github.com/RickLeee/goc/v2/pkg/client/rest" - "github.com/RickLeee/goc/v2/pkg/client/rest/profile" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/client/rest" + "github.com/RickLeee/goc-v2/pkg/client/rest/profile" + "github.com/RickLeee/goc-v2/pkg/log" ) func GetProfile(host string, ids []string, skips []string, extra string, output string, need []string) { diff --git a/pkg/client/rest/client.go b/pkg/client/rest/client.go index e3bf5a1..9ff21cd 100644 --- a/pkg/client/rest/client.go +++ b/pkg/client/rest/client.go @@ -14,8 +14,8 @@ package rest import ( - "github.com/RickLeee/goc/v2/pkg/client/rest/agent" - "github.com/RickLeee/goc/v2/pkg/client/rest/profile" + "github.com/RickLeee/goc-v2/pkg/client/rest/agent" + "github.com/RickLeee/goc-v2/pkg/client/rest/profile" "github.com/go-resty/resty/v2" ) diff --git a/pkg/server/api.go b/pkg/server/api.go index 8cd2d31..8df886b 100644 --- a/pkg/server/api.go +++ b/pkg/server/api.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/gin-gonic/gin" "golang.org/x/tools/cover" "k8s.io/test-infra/gopherage/pkg/cov" diff --git a/pkg/server/rpcstream.go b/pkg/server/rpcstream.go index 3827914..906f9be 100644 --- a/pkg/server/rpcstream.go +++ b/pkg/server/rpcstream.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/gin-gonic/gin" ) diff --git a/pkg/server/server.go b/pkg/server/server.go index b8a635e..c5a4434 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/RickLeee/goc/v2/pkg/log" - "github.com/RickLeee/goc/v2/pkg/server/store" + "github.com/RickLeee/goc-v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/server/store" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" ) diff --git a/pkg/server/watchstream.go b/pkg/server/watchstream.go index 1084925..01188a6 100644 --- a/pkg/server/watchstream.go +++ b/pkg/server/watchstream.go @@ -18,7 +18,7 @@ import ( "sync" "time" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" ) diff --git a/pkg/watch/watch.go b/pkg/watch/watch.go index e306993..ccbd12b 100644 --- a/pkg/watch/watch.go +++ b/pkg/watch/watch.go @@ -16,7 +16,7 @@ package watch import ( "fmt" - "github.com/RickLeee/goc/v2/pkg/log" + "github.com/RickLeee/goc-v2/pkg/log" "github.com/gorilla/websocket" )