fix: use proper module versioning, closes #417

ViRb3 · Oct 21, 2024 · a7d2983 · a7d2983
1 parent 175559f
commit a7d2983
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/openapi/go.sum b/openapi/go.sum