From a7d2983c54d8330dfd3d976f757e6c8b017e0712 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 21 Oct 2024 01:19:20 +0100 Subject: [PATCH] fix: use proper module versioning, closes #417 --- api_tests/main.go | 6 +++--- cloudflare/api.go | 8 ++++---- cmd/generate/generate.go | 10 +++++----- cmd/register/register.go | 10 +++++----- cmd/root.go | 16 ++++++++-------- cmd/shared/shared.go | 6 +++--- cmd/status/status.go | 6 +++--- cmd/trace/trace.go | 4 ++-- cmd/update/update.go | 8 ++++---- go.mod | 7 ++----- main.go | 4 ++-- openapi/go.mod | 5 ----- openapi/go.sum | 3 --- 13 files changed, 41 insertions(+), 52 deletions(-) delete mode 100644 openapi/go.mod delete mode 100644 openapi/go.sum diff --git a/api_tests/main.go b/api_tests/main.go index d94dd775..95817d9f 100644 --- a/api_tests/main.go +++ b/api_tests/main.go @@ -10,9 +10,9 @@ import ( opticgo "github.com/ViRb3/optic-go" "github.com/ViRb3/sling/v2" - "github.com/ViRb3/wgcf/cloudflare" - "github.com/ViRb3/wgcf/util" - "github.com/ViRb3/wgcf/wireguard" + "github.com/ViRb3/wgcf/v2/cloudflare" + "github.com/ViRb3/wgcf/v2/util" + "github.com/ViRb3/wgcf/v2/wireguard" ) var defaultHeaders = map[string]string{} diff --git a/cloudflare/api.go b/cloudflare/api.go index 6a042bc9..78fdd474 100644 --- a/cloudflare/api.go +++ b/cloudflare/api.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "github.com/ViRb3/wgcf/config" - "github.com/ViRb3/wgcf/openapi" - "github.com/ViRb3/wgcf/util" - "github.com/ViRb3/wgcf/wireguard" + "github.com/ViRb3/wgcf/v2/config" + "github.com/ViRb3/wgcf/v2/openapi" + "github.com/ViRb3/wgcf/v2/util" + "github.com/ViRb3/wgcf/v2/wireguard" ) const ( diff --git a/cmd/generate/generate.go b/cmd/generate/generate.go index cd20672e..cb815d40 100644 --- a/cmd/generate/generate.go +++ b/cmd/generate/generate.go @@ -3,11 +3,11 @@ package generate import ( "log" - "github.com/ViRb3/wgcf/cloudflare" - . "github.com/ViRb3/wgcf/cmd/shared" - "github.com/ViRb3/wgcf/config" - "github.com/ViRb3/wgcf/util" - "github.com/ViRb3/wgcf/wireguard" + "github.com/ViRb3/wgcf/v2/cloudflare" + . "github.com/ViRb3/wgcf/v2/cmd/shared" + "github.com/ViRb3/wgcf/v2/config" + "github.com/ViRb3/wgcf/v2/util" + "github.com/ViRb3/wgcf/v2/wireguard" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/register/register.go b/cmd/register/register.go index daca0db5..643ef09b 100644 --- a/cmd/register/register.go +++ b/cmd/register/register.go @@ -4,11 +4,11 @@ import ( "fmt" "log" - "github.com/ViRb3/wgcf/cloudflare" - . "github.com/ViRb3/wgcf/cmd/shared" - "github.com/ViRb3/wgcf/config" - "github.com/ViRb3/wgcf/util" - "github.com/ViRb3/wgcf/wireguard" + "github.com/ViRb3/wgcf/v2/cloudflare" + . "github.com/ViRb3/wgcf/v2/cmd/shared" + "github.com/ViRb3/wgcf/v2/config" + "github.com/ViRb3/wgcf/v2/util" + "github.com/ViRb3/wgcf/v2/wireguard" "github.com/manifoldco/promptui" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/root.go b/cmd/root.go index 68e29d9c..72399556 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -4,14 +4,14 @@ import ( "errors" "log" - "github.com/ViRb3/wgcf/cmd/generate" - "github.com/ViRb3/wgcf/cmd/register" - . "github.com/ViRb3/wgcf/cmd/shared" - "github.com/ViRb3/wgcf/cmd/status" - "github.com/ViRb3/wgcf/cmd/trace" - "github.com/ViRb3/wgcf/cmd/update" - "github.com/ViRb3/wgcf/config" - "github.com/ViRb3/wgcf/util" + "github.com/ViRb3/wgcf/v2/cmd/generate" + "github.com/ViRb3/wgcf/v2/cmd/register" + . "github.com/ViRb3/wgcf/v2/cmd/shared" + "github.com/ViRb3/wgcf/v2/cmd/status" + "github.com/ViRb3/wgcf/v2/cmd/trace" + "github.com/ViRb3/wgcf/v2/cmd/update" + "github.com/ViRb3/wgcf/v2/config" + "github.com/ViRb3/wgcf/v2/util" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/shared/shared.go b/cmd/shared/shared.go index 23f9c7bb..d61c2dd5 100644 --- a/cmd/shared/shared.go +++ b/cmd/shared/shared.go @@ -6,9 +6,9 @@ import ( "math" "strings" - "github.com/ViRb3/wgcf/cloudflare" - "github.com/ViRb3/wgcf/config" - "github.com/ViRb3/wgcf/util" + "github.com/ViRb3/wgcf/v2/cloudflare" + "github.com/ViRb3/wgcf/v2/config" + "github.com/ViRb3/wgcf/v2/util" "github.com/pkg/errors" "github.com/spf13/viper" diff --git a/cmd/status/status.go b/cmd/status/status.go index 40b98446..df983649 100644 --- a/cmd/status/status.go +++ b/cmd/status/status.go @@ -3,9 +3,9 @@ package status import ( "log" - "github.com/ViRb3/wgcf/cloudflare" - . "github.com/ViRb3/wgcf/cmd/shared" - "github.com/ViRb3/wgcf/util" + "github.com/ViRb3/wgcf/v2/cloudflare" + . "github.com/ViRb3/wgcf/v2/cmd/shared" + "github.com/ViRb3/wgcf/v2/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/cmd/trace/trace.go b/cmd/trace/trace.go index 450406ff..61a3e7f7 100644 --- a/cmd/trace/trace.go +++ b/cmd/trace/trace.go @@ -7,8 +7,8 @@ import ( "net/http" "strings" - . "github.com/ViRb3/wgcf/cmd/shared" - "github.com/ViRb3/wgcf/util" + . "github.com/ViRb3/wgcf/v2/cmd/shared" + "github.com/ViRb3/wgcf/v2/util" "github.com/spf13/cobra" ) diff --git a/cmd/update/update.go b/cmd/update/update.go index 4157e986..ff5d75eb 100644 --- a/cmd/update/update.go +++ b/cmd/update/update.go @@ -3,10 +3,10 @@ package update import ( "log" - "github.com/ViRb3/wgcf/cloudflare" - . "github.com/ViRb3/wgcf/cmd/shared" - "github.com/ViRb3/wgcf/config" - "github.com/ViRb3/wgcf/util" + "github.com/ViRb3/wgcf/v2/cloudflare" + . "github.com/ViRb3/wgcf/v2/cmd/shared" + "github.com/ViRb3/wgcf/v2/config" + "github.com/ViRb3/wgcf/v2/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) diff --git a/go.mod b/go.mod index de5b4ae2..df018a99 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,16 @@ -module github.com/ViRb3/wgcf +module github.com/ViRb3/wgcf/v2 go 1.18 -replace github.com/ViRb3/wgcf/openapi => ./openapi - require ( github.com/ViRb3/optic-go v0.0.0-20240309111653-486347a8369d github.com/ViRb3/sling/v2 v2.0.2 - github.com/ViRb3/wgcf/openapi v0.0.0-20240309112324-7db4fc9fa5d9 github.com/manifoldco/promptui v0.9.0 github.com/pkg/errors v0.9.1 github.com/spf13/cobra v1.8.1 github.com/spf13/viper v1.19.0 golang.org/x/crypto v0.28.0 + golang.org/x/oauth2 v0.23.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -43,7 +41,6 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sys v0.26.0 // indirect golang.org/x/text v0.19.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/main.go b/main.go index aa290450..87dd766f 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/ViRb3/wgcf/cmd" - "github.com/ViRb3/wgcf/util" + "github.com/ViRb3/wgcf/v2/cmd" + "github.com/ViRb3/wgcf/v2/util" ) func main() { diff --git a/openapi/go.mod b/openapi/go.mod deleted file mode 100644 index b83870fa..00000000 --- a/openapi/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/GIT_USER_ID/GIT_REPO_ID - -go 1.18 - -require golang.org/x/oauth2 v0.23.0 diff --git a/openapi/go.sum b/openapi/go.sum deleted file mode 100644 index 014685ab..00000000 --- a/openapi/go.sum +++ /dev/null @@ -1,3 +0,0 @@ -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= -golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=