fix: Ensure APIs can be used by other Go modules

The go module versioning rules states that packages with a major version greater than v1 must have a major version suffix (https://go.dev/ref/mod#module-path) Since the latest versions of this project are v4, the module name must end in `/v4`. Otherwise, - regular 'go get' will fetch v0.2.3 of this repo - 'go get ...@v4.18.1' will complain that the module name is invalid. Signed-off-by: Manuel Hutter <manuel@hutter.io>
vshn · Aug 10, 2023 · cc5d7e2 · cc5d7e2
1 parent 8ac2bf6
commit cc5d7e2
Show file tree

Hide file tree

Showing 103 changed files with 201 additions and 201 deletions.
diff --git a/apis/appcat/v1/generated.pb.go b/apis/appcat/v1/generated.pb.go
diff --git a/apis/exoscale/v1/dbaas_exoscale_kafka.go b/apis/exoscale/v1/dbaas_exoscale_kafka.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	"github.com/vshn/appcat/apis/v1"
+	"github.com/vshn/appcat/v4/apis/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

diff --git a/apis/exoscale/v1/dbaas_exoscale_mysql.go b/apis/exoscale/v1/dbaas_exoscale_mysql.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	"github.com/vshn/appcat/apis/v1"
+	"github.com/vshn/appcat/v4/apis/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

diff --git a/apis/exoscale/v1/dbaas_exoscale_opensearch.go b/apis/exoscale/v1/dbaas_exoscale_opensearch.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	v1 "github.com/vshn/appcat/apis/v1"
+	v1 "github.com/vshn/appcat/v4/apis/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

diff --git a/apis/exoscale/v1/dbaas_exoscale_postgresql.go b/apis/exoscale/v1/dbaas_exoscale_postgresql.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	v1 "github.com/vshn/appcat/apis/v1"
+	v1 "github.com/vshn/appcat/v4/apis/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

diff --git a/apis/exoscale/v1/dbaas_exoscale_redis.go b/apis/exoscale/v1/dbaas_exoscale_redis.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	v1 "github.com/vshn/appcat/apis/v1"
+	v1 "github.com/vshn/appcat/v4/apis/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 )

diff --git a/apis/exoscale/v1/zz_generated.deepcopy.go b/apis/exoscale/v1/zz_generated.deepcopy.go
diff --git a/apis/vshn/v1/dbaas_vshn_postgresql.go b/apis/vshn/v1/dbaas_vshn_postgresql.go
@@ -2,7 +2,7 @@ package v1
 
 import (
 	alertmanagerv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
-	v1 "github.com/vshn/appcat/apis/v1"
+	v1 "github.com/vshn/appcat/v4/apis/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/apis/vshn/v1/dbaas_vshn_redis.go b/apis/vshn/v1/dbaas_vshn_redis.go
@@ -1,7 +1,7 @@
 package v1
 
 import (
-	v1 "github.com/vshn/appcat/apis/v1"
+	v1 "github.com/vshn/appcat/v4/apis/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/apis/vshn/v1/zz_generated.deepcopy.go b/apis/vshn/v1/zz_generated.deepcopy.go
diff --git a/cmd/apiserver.go b/cmd/apiserver.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	appcatv1 "github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/pkg/apiserver/appcat"
-	vshnpostgres "github.com/vshn/appcat/pkg/apiserver/vshn/postgres"
-	vshnredis "github.com/vshn/appcat/pkg/apiserver/vshn/redis"
+	appcatv1 "github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/pkg/apiserver/appcat"
+	vshnpostgres "github.com/vshn/appcat/v4/pkg/apiserver/vshn/postgres"
+	vshnredis "github.com/vshn/appcat/v4/pkg/apiserver/vshn/redis"
 	"sigs.k8s.io/apiserver-runtime/pkg/builder"
 )
 

diff --git a/cmd/controller.go b/cmd/controller.go
@@ -3,8 +3,8 @@ package cmd
 import (
 	"github.com/go-logr/logr"
 	"github.com/spf13/cobra"
-	"github.com/vshn/appcat/pkg"
-	"github.com/vshn/appcat/pkg/controller/postgres"
+	"github.com/vshn/appcat/v4/pkg"
+	"github.com/vshn/appcat/v4/pkg/controller/postgres"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"

diff --git a/cmd/grpc.go b/cmd/grpc.go
@@ -8,12 +8,12 @@ import (
 	pb "github.com/crossplane/crossplane/apis/apiextensions/fn/proto/v1alpha1"
 	"github.com/go-logr/logr"
 	"github.com/spf13/cobra"
-	"github.com/vshn/appcat/pkg"
-	"github.com/vshn/appcat/pkg/comp-functions/functions/helper"
-	"github.com/vshn/appcat/pkg/comp-functions/functions/miniodev"
-	vpf "github.com/vshn/appcat/pkg/comp-functions/functions/vshn-postgres-func"
-	"github.com/vshn/appcat/pkg/comp-functions/functions/vshnredis"
-	"github.com/vshn/appcat/pkg/comp-functions/runtime"
+	"github.com/vshn/appcat/v4/pkg"
+	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/helper"
+	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/miniodev"
+	vpf "github.com/vshn/appcat/v4/pkg/comp-functions/functions/vshn-postgres-func"
+	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/vshnredis"
+	"github.com/vshn/appcat/v4/pkg/comp-functions/runtime"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/cmd/maintenance.go b/cmd/maintenance.go
@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/thediveo/enumflag/v2"
-	"github.com/vshn/appcat/pkg"
-	"github.com/vshn/appcat/pkg/maintenance"
+	"github.com/vshn/appcat/v4/pkg"
+	"github.com/vshn/appcat/v4/pkg/maintenance"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )

diff --git a/cmd/slareport.go b/cmd/slareport.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/vshn/appcat/pkg/slareport"
+	"github.com/vshn/appcat/v4/pkg/slareport"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 

diff --git a/cmd/sliexporter.go b/cmd/sliexporter.go
@@ -3,9 +3,9 @@ package cmd
 import (
 	"github.com/go-logr/logr"
 	"github.com/spf13/cobra"
-	"github.com/vshn/appcat/pkg"
-	"github.com/vshn/appcat/pkg/sliexporter"
-	"github.com/vshn/appcat/pkg/sliexporter/probes"
+	"github.com/vshn/appcat/v4/pkg"
+	"github.com/vshn/appcat/v4/pkg/sliexporter"
+	"github.com/vshn/appcat/v4/pkg/sliexporter/probes"
 	"k8s.io/apimachinery/pkg/runtime"
 	"os"
 	ctrl "sigs.k8s.io/controller-runtime"

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/vshn/appcat
+module github.com/vshn/appcat/v4
 
 go 1.20
 

diff --git a/main.go b/main.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"github.com/vshn/appcat/cmd"
+	"github.com/vshn/appcat/v4/cmd"
 )
 
 func init() {

diff --git a/pkg/apiserver/appcat/appcat.go b/pkg/apiserver/appcat/appcat.go
@@ -2,7 +2,7 @@ package appcat
 
 import (
 	crossplane "github.com/crossplane/crossplane/apis/apiextensions/v1"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/rest"

diff --git a/pkg/apiserver/appcat/appcat_test.go b/pkg/apiserver/appcat/appcat_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	crossplanev1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/test/mocks"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/test/mocks"
 	"k8s.io/apiserver/pkg/registry/rest"
 
 	"github.com/golang/mock/gomock"

diff --git a/pkg/apiserver/appcat/delete.go b/pkg/apiserver/appcat/delete.go
@@ -2,7 +2,7 @@ package appcat
 
 import (
 	"context"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/apiserver/appcat/get.go b/pkg/apiserver/appcat/get.go
@@ -2,8 +2,8 @@ package appcat
 
 import (
 	"context"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/pkg/apiserver"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/pkg/apiserver"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/apiserver/appcat/get_test.go b/pkg/apiserver/appcat/get_test.go
@@ -2,7 +2,7 @@ package appcat
 
 import (
 	crossplanev1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/pkg/apiserver/appcat/list.go b/pkg/apiserver/appcat/list.go
@@ -3,8 +3,8 @@ package appcat
 import (
 	"context"
 	crossplanev1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
-	"github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/pkg/apiserver"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/pkg/apiserver"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/apiserver/appcat/list_test.go b/pkg/apiserver/appcat/list_test.go
@@ -2,7 +2,7 @@ package appcat
 
 import (
 	crossplanev1 "github.com/crossplane/crossplane/apis/apiextensions/v1"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/watch"

diff --git a/pkg/apiserver/appcat/table.go b/pkg/apiserver/appcat/table.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/apiserver/appcat/table_test.go b/pkg/apiserver/appcat/table_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/pkg/apiserver/appcat/update.go b/pkg/apiserver/appcat/update.go
@@ -2,7 +2,7 @@ package appcat
 
 import (
 	"context"
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/rest"

diff --git a/pkg/apiserver/vshn/postgres/backup.go b/pkg/apiserver/vshn/postgres/backup.go
@@ -1,8 +1,8 @@
 package postgres
 
 import (
-	"github.com/vshn/appcat/apis/appcat/v1"
-	vshnv1 "github.com/vshn/appcat/apis/vshn/v1"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
+	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic"
 	"k8s.io/apiserver/pkg/registry/rest"

diff --git a/pkg/apiserver/vshn/postgres/backup_test.go b/pkg/apiserver/vshn/postgres/backup_test.go
@@ -1,10 +1,10 @@
 package postgres
 
 import (
-	"github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/test/mocks"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/test/mocks"
 
-	vshnv1 "github.com/vshn/appcat/apis/vshn/v1"
+	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/rest"

diff --git a/pkg/apiserver/vshn/postgres/delete.go b/pkg/apiserver/vshn/postgres/delete.go
@@ -2,7 +2,7 @@ package postgres
 
 import (
 	"context"
-	"github.com/vshn/appcat/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/apiserver/vshn/postgres/get.go b/pkg/apiserver/vshn/postgres/get.go
@@ -3,8 +3,8 @@ package postgres
 import (
 	"context"
 	"fmt"
-	"github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/pkg/apiserver"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/pkg/apiserver"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/apiserver/vshn/postgres/get_test.go b/pkg/apiserver/vshn/postgres/get_test.go
@@ -1,9 +1,9 @@
 package postgres
 
 import (
-	"github.com/vshn/appcat/apis/appcat/v1"
-	vshnv1 "github.com/vshn/appcat/apis/vshn/v1"
-	"github.com/vshn/appcat/test/mocks"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
+	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
+	"github.com/vshn/appcat/v4/test/mocks"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"testing"
 

diff --git a/pkg/apiserver/vshn/postgres/list.go b/pkg/apiserver/vshn/postgres/list.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	v1 "github.com/vshn/appcat/apis/appcat/v1"
-	"github.com/vshn/appcat/pkg/apiserver"
+	v1 "github.com/vshn/appcat/v4/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/pkg/apiserver"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"

diff --git a/pkg/apiserver/vshn/postgres/list_test.go b/pkg/apiserver/vshn/postgres/list_test.go
@@ -2,9 +2,9 @@ package postgres
 
 import (
 	"fmt"
-	"github.com/vshn/appcat/apis/appcat/v1"
-	vshnv1 "github.com/vshn/appcat/apis/vshn/v1"
-	"github.com/vshn/appcat/test/mocks"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
+	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
+	"github.com/vshn/appcat/v4/test/mocks"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/pkg/apiserver/vshn/postgres/sgbackups.go b/pkg/apiserver/vshn/postgres/sgbackups.go
@@ -3,7 +3,7 @@ package postgres
 import (
 	"context"
 	"fmt"
-	"github.com/vshn/appcat/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
 	metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

diff --git a/pkg/apiserver/vshn/postgres/sgbackups_test.go b/pkg/apiserver/vshn/postgres/sgbackups_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
-	"github.com/vshn/appcat/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/apiserver/vshn/postgres/table.go b/pkg/apiserver/vshn/postgres/table.go
@@ -3,7 +3,7 @@ package postgres
 import (
 	"context"
 	"fmt"
-	"github.com/vshn/appcat/apis/appcat/v1"
+	"github.com/vshn/appcat/v4/apis/appcat/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"