From d4916fc30d92c0d2ef0002c1b0e46b447ee13ec8 Mon Sep 17 00:00:00 2001 From: Georg K Date: Thu, 3 Mar 2022 02:08:22 +0300 Subject: [PATCH] feat: change package for fork --- cmd/gomodproxy/main.go | 8 ++++---- go.mod | 19 +++++++++++++++++-- pkg/api/api.go | 4 ++-- pkg/store/disk.go | 2 +- pkg/store/mem.go | 2 +- pkg/store/store.go | 2 +- 6 files changed, 26 insertions(+), 11 deletions(-) diff --git a/cmd/gomodproxy/main.go b/cmd/gomodproxy/main.go index 07c5a0e..eec6d23 100644 --- a/cmd/gomodproxy/main.go +++ b/cmd/gomodproxy/main.go @@ -16,7 +16,7 @@ import ( "time" "unicode" - "github.com/bilus/gomodproxy/pkg/api" + "gitlab.connectone.pro/github/gomodproxy/pkg/api" "expvar" _ "net/http/pprof" @@ -103,7 +103,7 @@ func main() { verbose := flag.Bool("v", false, "verbose logging") prometheus := flag.String("prometheus", "", "prometheus address") debug := flag.Bool("debug", false, "enable debug HTTP API (pprof/expvar)") - json := flag.Bool("json", false, "json structured logging") + useJsonLog := flag.Bool("json", false, "json structured logging") dir := flag.String("dir", filepath.Join(os.Getenv("HOME"), ".gomodproxy/cache"), "modules cache directory") gitdir := flag.String("gitdir", filepath.Join(os.Getenv("HOME"), ".gomodproxy/git"), "git cache directory") memLimit := flag.Int64("mem", 256, "in-memory cache size in MB") @@ -123,8 +123,8 @@ func main() { options := []api.Option{} logger := func(...interface{}) {} - if *verbose || *json { - if *json { + if *verbose || *useJsonLog { + if *useJsonLog { logger = jsonLog } else { logger = prettyLog diff --git a/go.mod b/go.mod index 94a80a8..8baa410 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,20 @@ -module github.com/bilus/gomodproxy +module gitlab.connectone.pro/github/gomodproxy -go 1.16 +go 1.17 require gopkg.in/src-d/go-git.v4 v4.13.1 + +require ( + github.com/emirpasic/gods v1.12.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/sergi/go-diff v1.0.0 // indirect + github.com/src-d/gcfg v1.4.0 // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect + golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect + golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect + golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e // indirect + gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect +) diff --git a/pkg/api/api.go b/pkg/api/api.go index 55b10ba..9e8c41d 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -15,8 +15,8 @@ import ( "time" "unicode" - "github.com/bilus/gomodproxy/pkg/store" - "github.com/bilus/gomodproxy/pkg/vcs" + "gitlab.connectone.pro/github/gomodproxy/pkg/store" + "gitlab.connectone.pro/github/gomodproxy/pkg/vcs" ) type logger = func(v ...interface{}) diff --git a/pkg/store/disk.go b/pkg/store/disk.go index a219258..3066dac 100644 --- a/pkg/store/disk.go +++ b/pkg/store/disk.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/bilus/gomodproxy/pkg/vcs" + "gitlab.connectone.pro/github/gomodproxy/pkg/vcs" ) type disk string diff --git a/pkg/store/mem.go b/pkg/store/mem.go index d1eddac..8163eed 100644 --- a/pkg/store/mem.go +++ b/pkg/store/mem.go @@ -5,7 +5,7 @@ import ( "errors" "sync" - "github.com/bilus/gomodproxy/pkg/vcs" + "gitlab.connectone.pro/github/gomodproxy/pkg/vcs" ) type memory struct { diff --git a/pkg/store/store.go b/pkg/store/store.go index b694b54..d649a88 100644 --- a/pkg/store/store.go +++ b/pkg/store/store.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/bilus/gomodproxy/pkg/vcs" + "gitlab.connectone.pro/github/gomodproxy/pkg/vcs" ) type logger = func(...interface{})