ar0c/goc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

refactor: go mod v2

Browse Source
This commit is contained in:
liruichen_wsl 2024-03-06 16:49:35 +08:00
parent 71d79c55db
commit 293cf38971
31 changed files with 2666 additions and 2625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/build.go
View File

@ -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"
)

2
cmd/install.go
View File

@ -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"
)

2
cmd/merge.go
View File

@ -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"

2
cmd/profile.go
View File

@ -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"
)

2
cmd/root.go
View File

@ -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"
)

2
cmd/run.go
View File

@ -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"
)

6
cmd/server.go
View File

@ -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"
)

2
cmd/service.go
View File

@ -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"
)

2
cmd/watch.go
View File

@ -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"
)

57
go.mod
View File

@ -1,6 +1,6 @@
module github.com/RickLeee/goc-v2
module github.com/RickLeee/goc/v2
go 1.16
go 1.20
require (
github.com/gin-gonic/gin v1.7.2
@ -8,8 +8,6 @@ require (
github.com/gofrs/flock v0.8.1
github.com/gorilla/websocket v1.4.2
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
github.com/olekukonko/tablewriter v0.0.5
github.com/onsi/ginkgo v1.16.4
@ -20,7 +18,6 @@ require (
github.com/tongjingran/copy v1.4.2
go.uber.org/zap v1.17.0
golang.org/x/mod v0.4.2
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/tools v0.1.3
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
@ -28,4 +25,54 @@ require (
k8s.io/test-infra v0.0.0-20210618100605-34aa2f2aa75b
)
require (
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/go-logr/logr v0.4.0 // indirect
github.com/go-playground/locales v0.13.0 // indirect
github.com/go-playground/universal-translator v0.17.0 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.2.1-0.20210504230335-f78f29fc09ea // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/leodido/go-urn v1.2.0 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-isatty v0.0.13 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/nxadm/tail v1.4.8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/ugorji/go/codec v1.1.7 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/api v0.21.2 // indirect
k8s.io/apimachinery v0.21.2 // indirect
k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible // indirect
k8s.io/klog/v2 v2.8.0 // indirect
k8s.io/utils v0.0.0-20210527160623-6fdb442a123b // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
replace k8s.io/client-go => k8s.io/client-go v0.21.1

6
go.sum
View File

@ -1195,7 +1195,6 @@ github.com/trivago/tgo v1.0.1/go.mod h1:w4dpD+3tzNIIiIfkWWa85w5/B77tlvdZckQ+6PkF
github.com/tsenart/vegeta v12.7.1-0.20190725001342-b5f4fca92137+incompatible/go.mod h1:Smz/ZWfhKRcyDDChZkG3CyTHdj87lHzio/HOCkbndXM=
github.com/ugorji/go v1.1.1/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
@ -1236,7 +1235,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA=
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg=
@ -1442,7 +1440,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@ -1526,7 +1523,6 @@ golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@ -1956,7 +1952,6 @@ k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
@ -2047,7 +2042,6 @@ sigs.k8s.io/kustomize/kyaml v0.10.17/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4
sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=
sigs.k8s.io/structured-merge-diff v1.0.1 h1:LOs1LZWMsz1xs77Phr/pkB4LFaavH7IVq/3+WTN9XTA=
sigs.k8s.io/structured-merge-diff v1.0.1/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA=
sigs.k8s.io/structured-merge-diff/v2 v2.0.1/go.mod h1:Wb7vfKAodbKgf6tn1Kl0VvGj7mRH6DGaRcixXEJXTsE=
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=

2
hack/release.sh
View File

@ -10,7 +10,7 @@ RELEASE_VERSION=$(echo $EVENT_DATA | jq -r .release.tag_name)
PROJECT_NAME=$(basename $GITHUB_REPOSITORY)
NAME="${NAME:-${PROJECT_NAME}-${RELEASE_VERSION}}-${GOOS}-${GOARCH}"
CGO_ENABLED=0 go build -o goc -ldflags "-X 'github.com/RickLeee/goc-v2/cmd.Version=${RELEASE_VERSION}'" .
CGO_ENABLED=0 go build -o goc -ldflags "-X 'github.com/RickLeee/goc/v2/cmd.Version=${RELEASE_VERSION}'" .
ARCHIVE=tmp.tar.gz
FILE_LIST=goc

2
main.go
View File

@ -14,7 +14,7 @@
package main
import (
"github.com/RickLeee/goc-v2/cmd"
"github.com/RickLeee/goc/v2/cmd"
)
func main() {

2
pkg/build/build.go
View File

@ -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"
)

2
pkg/build/build_flags.go
View File

@ -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"
)

2
pkg/build/goenv.go
View File

@ -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

6
pkg/build/inject.go
View File

@ -21,9 +21,9 @@ import (
"path/filepath"
"strings"
"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

2
pkg/build/install.go
View File

@ -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 {

2
pkg/build/internal/tool/cover.go
View File

@ -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"
)

2
pkg/build/internal/websocket/wsdep.go
View File

@ -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

6
pkg/build/run.go
View File

@ -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"
)

2
pkg/build/tmpfolder.go
View File

@ -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"
)

4
pkg/client/agent.go
View File

@ -18,8 +18,8 @@ import (
"fmt"
"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"
)

2
pkg/client/client.go
View File

@ -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"
)

6
pkg/client/profie.go
View File

@ -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) {

4
pkg/client/rest/client.go
View File

@ -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"
)

2
pkg/server/api.go
View File

@ -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"

2
pkg/server/rpcstream.go
View File

@ -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"
)

4
pkg/server/server.go
View File

@ -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"
)

2
pkg/server/watchstream.go
View File

@ -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"
)

2
pkg/watch/watch.go
View File

@ -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"
)