From cc5d7e23293ecb254412ff25b318619b4c5449da Mon Sep 17 00:00:00 2001 From: Manuel Hutter Date: Thu, 10 Aug 2023 11:24:09 +0200 Subject: [PATCH] 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 --- apis/appcat/v1/generated.pb.go | 4 ++-- apis/exoscale/v1/dbaas_exoscale_kafka.go | 2 +- apis/exoscale/v1/dbaas_exoscale_mysql.go | 2 +- apis/exoscale/v1/dbaas_exoscale_opensearch.go | 2 +- apis/exoscale/v1/dbaas_exoscale_postgresql.go | 2 +- apis/exoscale/v1/dbaas_exoscale_redis.go | 2 +- apis/exoscale/v1/zz_generated.deepcopy.go | 2 +- apis/vshn/v1/dbaas_vshn_postgresql.go | 2 +- apis/vshn/v1/dbaas_vshn_redis.go | 2 +- apis/vshn/v1/zz_generated.deepcopy.go | 2 +- cmd/apiserver.go | 8 ++++---- cmd/controller.go | 4 ++-- cmd/grpc.go | 12 ++++++------ cmd/maintenance.go | 4 ++-- cmd/slareport.go | 2 +- cmd/sliexporter.go | 6 +++--- go.mod | 2 +- main.go | 2 +- pkg/apiserver/appcat/appcat.go | 2 +- pkg/apiserver/appcat/appcat_test.go | 4 ++-- pkg/apiserver/appcat/delete.go | 2 +- pkg/apiserver/appcat/get.go | 4 ++-- pkg/apiserver/appcat/get_test.go | 2 +- pkg/apiserver/appcat/list.go | 4 ++-- pkg/apiserver/appcat/list_test.go | 2 +- pkg/apiserver/appcat/table.go | 2 +- pkg/apiserver/appcat/table_test.go | 2 +- pkg/apiserver/appcat/update.go | 2 +- pkg/apiserver/vshn/postgres/backup.go | 4 ++-- pkg/apiserver/vshn/postgres/backup_test.go | 6 +++--- pkg/apiserver/vshn/postgres/delete.go | 2 +- pkg/apiserver/vshn/postgres/get.go | 4 ++-- pkg/apiserver/vshn/postgres/get_test.go | 6 +++--- pkg/apiserver/vshn/postgres/list.go | 4 ++-- pkg/apiserver/vshn/postgres/list_test.go | 6 +++--- pkg/apiserver/vshn/postgres/sgbackups.go | 2 +- pkg/apiserver/vshn/postgres/sgbackups_test.go | 2 +- pkg/apiserver/vshn/postgres/table.go | 2 +- pkg/apiserver/vshn/postgres/table_test.go | 2 +- pkg/apiserver/vshn/postgres/update.go | 2 +- pkg/apiserver/vshn/postgres/vshnpostgresql.go | 2 +- pkg/apiserver/vshn/postgres/vshnpostgresql_test.go | 4 ++-- pkg/apiserver/vshn/redis/backup.go | 6 +++--- pkg/apiserver/vshn/redis/common_test.go | 4 ++-- pkg/apiserver/vshn/redis/delete.go | 2 +- pkg/apiserver/vshn/redis/get.go | 2 +- pkg/apiserver/vshn/redis/get_test.go | 4 ++-- pkg/apiserver/vshn/redis/list.go | 2 +- pkg/apiserver/vshn/redis/list_test.go | 4 ++-- pkg/apiserver/vshn/redis/table.go | 2 +- pkg/apiserver/vshn/redis/table_test.go | 2 +- pkg/apiserver/vshn/redis/update.go | 2 +- pkg/apiserver/vshn/redis/vshnredis.go | 2 +- pkg/apiserver/vshn/redis/watch.go | 6 +++--- .../functions/common/maintenance/maintenance.go | 4 ++-- .../functions/common/maintenance/maintenance_test.go | 6 +++--- pkg/comp-functions/functions/common/rbac.go | 2 +- .../functions/commontest/commontest.go | 2 +- pkg/comp-functions/functions/helper/funcio.go | 2 +- .../functions/miniodev/objectbucket.go | 4 ++-- .../functions/vshn-postgres-func/alerting.go | 4 ++-- .../functions/vshn-postgres-func/alerting_test.go | 6 +++--- .../functions/vshn-postgres-func/encrypted_pvc.go | 6 +++--- .../vshn-postgres-func/encrypted_pvc_test.go | 10 +++++----- .../functions/vshn-postgres-func/extensions.go | 6 +++--- .../functions/vshn-postgres-func/extensions_test.go | 6 +++--- .../functions/vshn-postgres-func/loadBalancer.go | 6 +++--- .../vshn-postgres-func/loadBalancer_test.go | 4 ++-- .../functions/vshn-postgres-func/mailgun_alerting.go | 4 ++-- .../vshn-postgres-func/mailgun_alerting_test.go | 6 +++--- .../functions/vshn-postgres-func/maintenance.go | 6 +++--- .../functions/vshn-postgres-func/replication.go | 6 +++--- .../functions/vshn-postgres-func/replication_test.go | 8 ++++---- .../functions/vshn-postgres-func/restart.go | 6 +++--- .../functions/vshn-postgres-func/restart_test.go | 8 ++++---- .../functions/vshn-postgres-func/schedule.go | 6 +++--- .../functions/vshn-postgres-func/schedule_test.go | 4 ++-- .../functions/vshn-postgres-func/url.go | 4 ++-- .../functions/vshn-postgres-func/url_test.go | 4 ++-- .../functions/vshn-postgres-func/utils.go | 2 +- pkg/comp-functions/functions/vshnredis/backup.go | 8 ++++---- .../functions/vshnredis/backup_test.go | 8 ++++---- .../functions/vshnredis/maintenance.go | 6 +++--- pkg/comp-functions/functions/vshnredis/pvcresize.go | 4 ++-- .../functions/vshnredis/pvcresize_test.go | 6 +++--- pkg/comp-functions/functions/vshnredis/release.go | 4 ++-- .../functions/vshnredis/release_test.go | 6 +++--- pkg/comp-functions/functions/vshnredis/restore.go | 4 ++-- .../functions/vshnredis/restore_test.go | 4 ++-- pkg/comp-functions/functions/vshnredis/utils.go | 2 +- pkg/comp-functions/runtime/runtime.go | 4 ++-- pkg/controller/postgres/deletion_protection_test.go | 2 +- pkg/controller/postgres/reconciler.go | 2 +- pkg/controller/postgres/reconciler_test.go | 2 +- pkg/maintenance/postgresql.go | 4 ++-- pkg/maintenance/postgresql_test.go | 6 +++--- pkg/maintenance/redis.go | 2 +- pkg/maintenance/redis_test.go | 2 +- pkg/scheme.go | 6 +++--- pkg/sliexporter/vshnpostgresql_controller.go | 4 ++-- pkg/sliexporter/vshnpostgresql_controller_test.go | 6 +++--- test/mocks/mock_sgbackups.go | 2 +- test/mocks/mock_vshnpostgresqls.go | 2 +- 103 files changed, 201 insertions(+), 201 deletions(-) diff --git a/apis/appcat/v1/generated.pb.go b/apis/appcat/v1/generated.pb.go index ce64b1b20b..b130c2b1fd 100644 --- a/apis/appcat/v1/generated.pb.go +++ b/apis/appcat/v1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: .work/tmp/github.com/vshn/appcat/apis/appcat/v1/generated.proto +// source: .work/tmp/github.com/vshn/appcat/v4/apis/appcat/v1/generated.proto package v1 @@ -383,7 +383,7 @@ func init() { } func init() { - proto.RegisterFile(".work/tmp/github.com/vshn/appcat/apis/appcat/v1/generated.proto", fileDescriptor_3f37f7f54c7900be) + proto.RegisterFile(".work/tmp/github.com/vshn/appcat/v4/apis/appcat/v1/generated.proto", fileDescriptor_3f37f7f54c7900be) } var fileDescriptor_3f37f7f54c7900be = []byte{ diff --git a/apis/exoscale/v1/dbaas_exoscale_kafka.go b/apis/exoscale/v1/dbaas_exoscale_kafka.go index 41be2b3ae5..4a06acd55b 100644 --- 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 index e627c1dd12..27fc9efe81 100644 --- 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 index 34c8fc1f42..2e1e2babd2 100644 --- 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 index e426f23bb2..11f5e05b93 100644 --- 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 index f310e3dfde..635bf3f7d7 100644 --- 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 index 5c643f46af..870deae012 100644 --- a/apis/exoscale/v1/zz_generated.deepcopy.go +++ b/apis/exoscale/v1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1 import ( - apisv1 "github.com/vshn/appcat/apis/v1" + apisv1 "github.com/vshn/appcat/v4/apis/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/apis/vshn/v1/dbaas_vshn_postgresql.go b/apis/vshn/v1/dbaas_vshn_postgresql.go index 280ec3a92c..51f98501c4 100644 --- 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 index 24726b06dc..92924f8c67 100644 --- 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 index 01273afc7d..f1cb22df51 100644 --- a/apis/vshn/v1/zz_generated.deepcopy.go +++ b/apis/vshn/v1/zz_generated.deepcopy.go @@ -7,7 +7,7 @@ package v1 import ( "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1" - apisv1 "github.com/vshn/appcat/apis/v1" + apisv1 "github.com/vshn/appcat/v4/apis/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cmd/apiserver.go b/cmd/apiserver.go index 5e7d9f9a52..892ebd4b4d 100644 --- 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 index c38ae7e5ba..a3b6c10eb7 100644 --- 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 index b0da2caf3b..b31bde4bc1 100644 --- 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 index 3a07d23fd6..d885b76167 100644 --- 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 index c5c837c5a4..dc9e306f79 100644 --- 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 index 71677079bb..a50a4521e0 100644 --- 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 index efb88412a9..901637d9ef 100644 --- 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 index 57764de2fe..0a7661f961 100644 --- 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 index 37ae923236..cdca264c31 100644 --- 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 index feca43cebe..23a2f500c9 100644 --- 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 index d9164c9265..d868313cc0 100644 --- 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 index d687a03a4f..f59ac2e609 100644 --- 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 index a86648836e..2d2273d596 100644 --- 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 index 3db8c9fbc0..65cb7f31a8 100644 --- 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 index c1f86a5e07..53432c5e55 100644 --- 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 index 23778a4a80..a4017c9043 100644 --- 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 index 215f84eb50..b6d4b7461d 100644 --- 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 index ff52d1e214..e76967150d 100644 --- 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 index e0f9b895d1..0f2c05b0db 100644 --- 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 index 806a4bf08c..04b220d5f2 100644 --- 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 index d331150524..19f4bb751c 100644 --- 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 index cdbf05e0ac..976ce60eee 100644 --- 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 index eafab8ea8d..d70cfed1c5 100644 --- 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 index 4cff5ff620..f393405401 100644 --- 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 index 56e9ec4a9f..f268f62e8b 100644 --- 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 index 420532d053..396f5f8f70 100644 --- 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 index ca6cc4004a..c716f41fd4 100644 --- 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 index 4487ebc85d..b579558030 100644 --- 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" diff --git a/pkg/apiserver/vshn/postgres/table_test.go b/pkg/apiserver/vshn/postgres/table_test.go index 98fa501192..0fdc728f52 100644 --- a/pkg/apiserver/vshn/postgres/table_test.go +++ b/pkg/apiserver/vshn/postgres/table_test.go @@ -2,7 +2,7 @@ package postgres import ( "context" - "github.com/vshn/appcat/apis/appcat/v1" + "github.com/vshn/appcat/v4/apis/appcat/v1" "testing" "github.com/stretchr/testify/assert" diff --git a/pkg/apiserver/vshn/postgres/update.go b/pkg/apiserver/vshn/postgres/update.go index ed1b79e4b1..a25e54461c 100644 --- a/pkg/apiserver/vshn/postgres/update.go +++ b/pkg/apiserver/vshn/postgres/update.go @@ -2,7 +2,7 @@ package postgres import ( "context" - "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/runtime" "k8s.io/apiserver/pkg/registry/rest" diff --git a/pkg/apiserver/vshn/postgres/vshnpostgresql.go b/pkg/apiserver/vshn/postgres/vshnpostgresql.go index 66ea5e93a4..c6941f51f9 100644 --- a/pkg/apiserver/vshn/postgres/vshnpostgresql.go +++ b/pkg/apiserver/vshn/postgres/vshnpostgresql.go @@ -3,7 +3,7 @@ package postgres import ( "context" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/apiserver/vshn/postgres/vshnpostgresql_test.go b/pkg/apiserver/vshn/postgres/vshnpostgresql_test.go index db5be99b03..36b96aae8e 100644 --- a/pkg/apiserver/vshn/postgres/vshnpostgresql_test.go +++ b/pkg/apiserver/vshn/postgres/vshnpostgresql_test.go @@ -4,8 +4,8 @@ import ( "context" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/test/mocks" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/test/mocks" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "testing" ) diff --git a/pkg/apiserver/vshn/redis/backup.go b/pkg/apiserver/vshn/redis/backup.go index 644f9ff31f..ce3b64a1c6 100644 --- a/pkg/apiserver/vshn/redis/backup.go +++ b/pkg/apiserver/vshn/redis/backup.go @@ -1,9 +1,9 @@ package redis import ( - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" - "github.com/vshn/appcat/pkg" - "github.com/vshn/appcat/pkg/apiserver/vshn/k8up" + appcatv1 "github.com/vshn/appcat/v4/apis/appcat/v1" + "github.com/vshn/appcat/v4/pkg" + "github.com/vshn/appcat/v4/pkg/apiserver/vshn/k8up" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" genericregistry "k8s.io/apiserver/pkg/registry/generic" diff --git a/pkg/apiserver/vshn/redis/common_test.go b/pkg/apiserver/vshn/redis/common_test.go index 68eb9da692..38e5a41169 100644 --- a/pkg/apiserver/vshn/redis/common_test.go +++ b/pkg/apiserver/vshn/redis/common_test.go @@ -4,8 +4,8 @@ import ( "context" k8upv1 "github.com/k8up-io/k8up/v2/api/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/apiserver/vshn/k8up" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/apiserver/vshn/k8up" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" "k8s.io/apimachinery/pkg/watch" ) diff --git a/pkg/apiserver/vshn/redis/delete.go b/pkg/apiserver/vshn/redis/delete.go index 3ee65746c7..505b5b6372 100644 --- a/pkg/apiserver/vshn/redis/delete.go +++ b/pkg/apiserver/vshn/redis/delete.go @@ -3,7 +3,7 @@ package redis 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/vshn/redis/get.go b/pkg/apiserver/vshn/redis/get.go index de8948d3e9..a382f0497e 100644 --- a/pkg/apiserver/vshn/redis/get.go +++ b/pkg/apiserver/vshn/redis/get.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" + appcatv1 "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" diff --git a/pkg/apiserver/vshn/redis/get_test.go b/pkg/apiserver/vshn/redis/get_test.go index 4587761f9b..fb79e2e843 100644 --- a/pkg/apiserver/vshn/redis/get_test.go +++ b/pkg/apiserver/vshn/redis/get_test.go @@ -7,8 +7,8 @@ import ( k8upv1 "github.com/k8up-io/k8up/v2/api/v1" "github.com/stretchr/testify/assert" - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + appcatv1 "github.com/vshn/appcat/v4/apis/appcat/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/endpoints/request" diff --git a/pkg/apiserver/vshn/redis/list.go b/pkg/apiserver/vshn/redis/list.go index ab581b1338..37adfaec75 100644 --- a/pkg/apiserver/vshn/redis/list.go +++ b/pkg/apiserver/vshn/redis/list.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" + appcatv1 "github.com/vshn/appcat/v4/apis/appcat/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metainternalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apiserver/vshn/redis/list_test.go b/pkg/apiserver/vshn/redis/list_test.go index ebaa05c199..97e44e390f 100644 --- a/pkg/apiserver/vshn/redis/list_test.go +++ b/pkg/apiserver/vshn/redis/list_test.go @@ -7,8 +7,8 @@ import ( k8upv1 "github.com/k8up-io/k8up/v2/api/v1" "github.com/stretchr/testify/assert" - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + appcatv1 "github.com/vshn/appcat/v4/apis/appcat/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" "k8s.io/apimachinery/pkg/apis/meta/internalversion" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/apiserver/vshn/redis/table.go b/pkg/apiserver/vshn/redis/table.go index 6c2cfc65bc..aedfbb07b1 100644 --- a/pkg/apiserver/vshn/redis/table.go +++ b/pkg/apiserver/vshn/redis/table.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" + appcatv1 "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/vshn/redis/table_test.go b/pkg/apiserver/vshn/redis/table_test.go index b4a7bdcf74..3d56ca7adc 100644 --- a/pkg/apiserver/vshn/redis/table_test.go +++ b/pkg/apiserver/vshn/redis/table_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/appcat/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/appcat/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/pkg/apiserver/vshn/redis/update.go b/pkg/apiserver/vshn/redis/update.go index 34c24664bd..7326bcdef4 100644 --- a/pkg/apiserver/vshn/redis/update.go +++ b/pkg/apiserver/vshn/redis/update.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - 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/redis/vshnredis.go b/pkg/apiserver/vshn/redis/vshnredis.go index 2e71594eab..9cc698734a 100644 --- a/pkg/apiserver/vshn/redis/vshnredis.go +++ b/pkg/apiserver/vshn/redis/vshnredis.go @@ -3,7 +3,7 @@ package redis import ( "context" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/apiserver/vshn/redis/watch.go b/pkg/apiserver/vshn/redis/watch.go index 4e6c9e6812..e8f847c47c 100644 --- a/pkg/apiserver/vshn/redis/watch.go +++ b/pkg/apiserver/vshn/redis/watch.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - appcatv1 "github.com/vshn/appcat/apis/appcat/v1" - v1 "github.com/vshn/appcat/apis/appcat/v1" - "github.com/vshn/appcat/pkg/apiserver" + appcatv1 "github.com/vshn/appcat/v4/apis/appcat/v1" + 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/watch" "k8s.io/apiserver/pkg/endpoints/request" diff --git a/pkg/comp-functions/functions/common/maintenance/maintenance.go b/pkg/comp-functions/functions/common/maintenance/maintenance.go index 3c37adfc7a..1273b208aa 100644 --- a/pkg/comp-functions/functions/common/maintenance/maintenance.go +++ b/pkg/comp-functions/functions/common/maintenance/maintenance.go @@ -6,8 +6,8 @@ import ( "regexp" xkubev1 "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/comp-functions/functions/common/maintenance/maintenance_test.go b/pkg/comp-functions/functions/common/maintenance/maintenance_test.go index 077c56884d..bd7c9d3841 100644 --- a/pkg/comp-functions/functions/common/maintenance/maintenance_test.go +++ b/pkg/comp-functions/functions/common/maintenance/maintenance_test.go @@ -4,9 +4,9 @@ import ( "context" xkubev1 "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/comp-functions/functions/common/rbac.go b/pkg/comp-functions/functions/common/rbac.go index 7ceaec5087..5bf02d79e8 100644 --- a/pkg/comp-functions/functions/common/rbac.go +++ b/pkg/comp-functions/functions/common/rbac.go @@ -4,7 +4,7 @@ import ( "context" xkubev1 "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/comp-functions/functions/commontest/commontest.go b/pkg/comp-functions/functions/commontest/commontest.go index ff226582bc..eac7eac6e5 100644 --- a/pkg/comp-functions/functions/commontest/commontest.go +++ b/pkg/comp-functions/functions/commontest/commontest.go @@ -9,7 +9,7 @@ import ( "unsafe" xfnv1alpha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" "github.com/stretchr/testify/assert" ) diff --git a/pkg/comp-functions/functions/helper/funcio.go b/pkg/comp-functions/functions/helper/funcio.go index bf6a69cb39..a08f1e34d0 100644 --- a/pkg/comp-functions/functions/helper/funcio.go +++ b/pkg/comp-functions/functions/helper/funcio.go @@ -10,7 +10,7 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/pmezard/go-difflib/difflib" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/comp-functions/functions/miniodev/objectbucket.go b/pkg/comp-functions/functions/miniodev/objectbucket.go index 2bb5337ebc..a13d5145bf 100644 --- a/pkg/comp-functions/functions/miniodev/objectbucket.go +++ b/pkg/comp-functions/functions/miniodev/objectbucket.go @@ -4,8 +4,8 @@ import ( "context" crossplanev1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" - appcatv1 "github.com/vshn/appcat/apis/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + appcatv1 "github.com/vshn/appcat/v4/apis/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/alerting.go b/pkg/comp-functions/functions/vshn-postgres-func/alerting.go index 9bacf12b51..0d81b31c6d 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/alerting.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/alerting.go @@ -7,8 +7,8 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" alertmanagerv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/alerting_test.go b/pkg/comp-functions/functions/vshn-postgres-func/alerting_test.go index 60858e79ca..46bf487b29 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/alerting_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/alerting_test.go @@ -2,14 +2,14 @@ package vshnpostgres import ( "context" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "testing" xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" xfnv1alpha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" alertmanagerv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" v1 "k8s.io/api/core/v1" "github.com/stretchr/testify/assert" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc.go b/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc.go index 8b680d8893..4443c26238 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc.go @@ -8,10 +8,10 @@ import ( "github.com/sethvargo/go-password/password" controllerruntime "sigs.k8s.io/controller-runtime" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc_test.go b/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc_test.go index 5813aae362..337b2a7da3 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/encrypted_pvc_test.go @@ -2,16 +2,16 @@ package vshnpostgres import ( "context" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "testing" xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" xfnv1alpha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" "github.com/stretchr/testify/assert" - sgv1 "github.com/vshn/appcat/apis/stackgres/v1" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + sgv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" v1 "k8s.io/api/core/v1" "k8s.io/utils/pointer" "sigs.k8s.io/yaml" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/extensions.go b/pkg/comp-functions/functions/vshn-postgres-func/extensions.go index 3048074dc5..20f3292f52 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/extensions.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/extensions.go @@ -6,9 +6,9 @@ import ( "sort" "strings" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" controllerruntime "sigs.k8s.io/controller-runtime" ) diff --git a/pkg/comp-functions/functions/vshn-postgres-func/extensions_test.go b/pkg/comp-functions/functions/vshn-postgres-func/extensions_test.go index fa0f21086c..5e22c5a98d 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/extensions_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/extensions_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" ) func Test_enableTimescaleDB(t *testing.T) { diff --git a/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer.go b/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer.go index bce5dcd700..51005c55cb 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer_test.go b/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer_test.go index aeae410e24..5c4cc8d19f 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/loadBalancer_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" ) func TestNothingToDo(t *testing.T) { diff --git a/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting.go b/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting.go index 8ef8d7cbaa..22e4fc3c55 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting.go @@ -6,8 +6,8 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" alertmanagerv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - runtime "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + runtime "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting_test.go b/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting_test.go index f50ef390fc..3eacaf54b7 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/mailgun_alerting_test.go @@ -4,15 +4,15 @@ package vshnpostgres import ( "context" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "testing" xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" alertmanagerv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" v1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" ) diff --git a/pkg/comp-functions/functions/vshn-postgres-func/maintenance.go b/pkg/comp-functions/functions/vshn-postgres-func/maintenance.go index 1aa0e18472..42747ba436 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/maintenance.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/maintenance.go @@ -3,9 +3,9 @@ package vshnpostgres import ( "context" xkubev1 "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/common/maintenance" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/common/maintenance" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/replication.go b/pkg/comp-functions/functions/vshn-postgres-func/replication.go index 01d3260df8..404e944b1b 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/replication.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/replication.go @@ -3,9 +3,9 @@ package vshnpostgres import ( "context" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" "k8s.io/utils/pointer" ) diff --git a/pkg/comp-functions/functions/vshn-postgres-func/replication_test.go b/pkg/comp-functions/functions/vshn-postgres-func/replication_test.go index d373c11007..407a320221 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/replication_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/replication_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" ) func Test_ConfigureReplication(t *testing.T) { diff --git a/pkg/comp-functions/functions/vshn-postgres-func/restart.go b/pkg/comp-functions/functions/vshn-postgres-func/restart.go index 556b1b59d1..888060e29a 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/restart.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/restart.go @@ -7,9 +7,9 @@ import ( "strings" "time" - sgv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + sgv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" controllerruntime "sigs.k8s.io/controller-runtime" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/restart_test.go b/pkg/comp-functions/functions/vshn-postgres-func/restart_test.go index 15423e7731..0f9298fb9f 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/restart_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/restart_test.go @@ -2,15 +2,15 @@ package vshnpostgres import ( "context" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "testing" "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - sgv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + sgv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" fnv1aplha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" ) diff --git a/pkg/comp-functions/functions/vshn-postgres-func/schedule.go b/pkg/comp-functions/functions/vshn-postgres-func/schedule.go index f90e65627f..66d09ba56d 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/schedule.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/schedule.go @@ -3,9 +3,9 @@ package vshnpostgres import ( "context" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/common" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/common" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" ) // TransformSchedule initializes the backup and maintenance schedules if the user did not explicitly provide a schedule. diff --git a/pkg/comp-functions/functions/vshn-postgres-func/schedule_test.go b/pkg/comp-functions/functions/vshn-postgres-func/schedule_test.go index 2cf66ed071..0d09b65964 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/schedule_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/schedule_test.go @@ -3,14 +3,14 @@ package vshnpostgres import ( "context" "fmt" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "strconv" "strings" "testing" "time" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" fnv1aplha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" ) diff --git a/pkg/comp-functions/functions/vshn-postgres-func/url.go b/pkg/comp-functions/functions/vshn-postgres-func/url.go index 22c4e85461..3cc7fa254e 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/url.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/url.go @@ -4,8 +4,8 @@ import ( "context" "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" v1 "k8s.io/api/core/v1" controllerruntime "sigs.k8s.io/controller-runtime" ) diff --git a/pkg/comp-functions/functions/vshn-postgres-func/url_test.go b/pkg/comp-functions/functions/vshn-postgres-func/url_test.go index 94fa1ed5dc..1b12d8c0e3 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/url_test.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/url_test.go @@ -2,10 +2,10 @@ package vshnpostgres import ( "context" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "testing" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" diff --git a/pkg/comp-functions/functions/vshn-postgres-func/utils.go b/pkg/comp-functions/functions/vshn-postgres-func/utils.go index eb46eb7841..cb30ea4ed6 100644 --- a/pkg/comp-functions/functions/vshn-postgres-func/utils.go +++ b/pkg/comp-functions/functions/vshn-postgres-func/utils.go @@ -3,7 +3,7 @@ package vshnpostgres import ( "fmt" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" ) func getInstanceNamespace(comp *vshnv1.VSHNPostgreSQL) string { diff --git a/pkg/comp-functions/functions/vshnredis/backup.go b/pkg/comp-functions/functions/vshnredis/backup.go index c0d2263c71..57069a320b 100644 --- a/pkg/comp-functions/functions/vshnredis/backup.go +++ b/pkg/comp-functions/functions/vshnredis/backup.go @@ -7,10 +7,10 @@ import ( xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" k8upv1 "github.com/k8up-io/k8up/v2/api/v1" "github.com/sethvargo/go-password/password" - appcatv1 "github.com/vshn/appcat/apis/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/common" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + appcatv1 "github.com/vshn/appcat/v4/apis/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/common" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sruntime "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/comp-functions/functions/vshnredis/backup_test.go b/pkg/comp-functions/functions/vshnredis/backup_test.go index bab348e5fa..a7c62c4d0a 100644 --- a/pkg/comp-functions/functions/vshnredis/backup_test.go +++ b/pkg/comp-functions/functions/vshnredis/backup_test.go @@ -2,15 +2,15 @@ package vshnredis import ( "context" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" "testing" xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" k8upv1 "github.com/k8up-io/k8up/v2/api/v1" "github.com/stretchr/testify/assert" - appcatv1 "github.com/vshn/appcat/apis/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + appcatv1 "github.com/vshn/appcat/v4/apis/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/comp-functions/functions/vshnredis/maintenance.go b/pkg/comp-functions/functions/vshnredis/maintenance.go index d7d36a008a..9916c1164c 100644 --- a/pkg/comp-functions/functions/vshnredis/maintenance.go +++ b/pkg/comp-functions/functions/vshnredis/maintenance.go @@ -2,9 +2,9 @@ package vshnredis import ( "context" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/common/maintenance" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/common/maintenance" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" ) var service = "redis" diff --git a/pkg/comp-functions/functions/vshnredis/pvcresize.go b/pkg/comp-functions/functions/vshnredis/pvcresize.go index aba0c6a1aa..611628828a 100644 --- a/pkg/comp-functions/functions/vshnredis/pvcresize.go +++ b/pkg/comp-functions/functions/vshnredis/pvcresize.go @@ -8,8 +8,8 @@ import ( helmv1beta1 "github.com/crossplane-contrib/provider-helm/apis/release/v1beta1" xkubev1 "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/comp-functions/functions/vshnredis/pvcresize_test.go b/pkg/comp-functions/functions/vshnredis/pvcresize_test.go index dd13bd8a03..a6115d19a9 100644 --- a/pkg/comp-functions/functions/vshnredis/pvcresize_test.go +++ b/pkg/comp-functions/functions/vshnredis/pvcresize_test.go @@ -7,9 +7,9 @@ import ( xkubev1 "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" batchv1 "k8s.io/api/batch/v1" ) diff --git a/pkg/comp-functions/functions/vshnredis/release.go b/pkg/comp-functions/functions/vshnredis/release.go index ca8179daea..dfa7bdd87a 100644 --- a/pkg/comp-functions/functions/vshnredis/release.go +++ b/pkg/comp-functions/functions/vshnredis/release.go @@ -8,8 +8,8 @@ import ( "github.com/blang/semver/v4" "github.com/crossplane-contrib/provider-helm/apis/release/v1beta1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/utils/pointer" diff --git a/pkg/comp-functions/functions/vshnredis/release_test.go b/pkg/comp-functions/functions/vshnredis/release_test.go index 409df3cc47..b08c7d9cba 100644 --- a/pkg/comp-functions/functions/vshnredis/release_test.go +++ b/pkg/comp-functions/functions/vshnredis/release_test.go @@ -14,9 +14,9 @@ import ( crossfnv1alpha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" "sigs.k8s.io/yaml" ) diff --git a/pkg/comp-functions/functions/vshnredis/restore.go b/pkg/comp-functions/functions/vshnredis/restore.go index ee1ee81e4f..214ae1bfea 100644 --- a/pkg/comp-functions/functions/vshnredis/restore.go +++ b/pkg/comp-functions/functions/vshnredis/restore.go @@ -5,8 +5,8 @@ import ( _ "embed" "strings" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - runtime "github.com/vshn/appcat/pkg/comp-functions/runtime" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + runtime "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/comp-functions/functions/vshnredis/restore_test.go b/pkg/comp-functions/functions/vshnredis/restore_test.go index 16e23e4966..62a7263b88 100644 --- a/pkg/comp-functions/functions/vshnredis/restore_test.go +++ b/pkg/comp-functions/functions/vshnredis/restore_test.go @@ -8,8 +8,8 @@ import ( "testing" xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" - "github.com/vshn/appcat/pkg/comp-functions/functions/commontest" - "github.com/vshn/appcat/pkg/comp-functions/runtime" + "github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest" + "github.com/vshn/appcat/v4/pkg/comp-functions/runtime" batchv1 "k8s.io/api/batch/v1" "sigs.k8s.io/yaml" diff --git a/pkg/comp-functions/functions/vshnredis/utils.go b/pkg/comp-functions/functions/vshnredis/utils.go index fe1c1749e7..e995b71e9d 100644 --- a/pkg/comp-functions/functions/vshnredis/utils.go +++ b/pkg/comp-functions/functions/vshnredis/utils.go @@ -3,7 +3,7 @@ package vshnredis import ( "fmt" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" ) func getInstanceNamespace(comp *vshnv1.VSHNRedis) string { diff --git a/pkg/comp-functions/runtime/runtime.go b/pkg/comp-functions/runtime/runtime.go index c918437a23..0f10ef7938 100644 --- a/pkg/comp-functions/runtime/runtime.go +++ b/pkg/comp-functions/runtime/runtime.go @@ -9,8 +9,8 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" xfnv1alpha1 "github.com/crossplane/crossplane/apis/apiextensions/fn/io/v1alpha1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/postgres/deletion_protection_test.go b/pkg/controller/postgres/deletion_protection_test.go index 32178487f3..06578083bc 100644 --- a/pkg/controller/postgres/deletion_protection_test.go +++ b/pkg/controller/postgres/deletion_protection_test.go @@ -10,7 +10,7 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/go-logr/logr" "github.com/stretchr/testify/assert" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/postgres/reconciler.go b/pkg/controller/postgres/reconciler.go index 3cce45d1ea..febaf48498 100644 --- a/pkg/controller/postgres/reconciler.go +++ b/pkg/controller/postgres/reconciler.go @@ -6,7 +6,7 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/crossplane/crossplane-runtime/pkg/errors" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/postgres/reconciler_test.go b/pkg/controller/postgres/reconciler_test.go index 3d479e2b69..ee3218f300 100644 --- a/pkg/controller/postgres/reconciler_test.go +++ b/pkg/controller/postgres/reconciler_test.go @@ -7,7 +7,7 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" "github.com/stretchr/testify/assert" - v1 "github.com/vshn/appcat/apis/vshn/v1" + v1 "github.com/vshn/appcat/v4/apis/vshn/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/maintenance/postgresql.go b/pkg/maintenance/postgresql.go index 324658189e..d74e677bc0 100644 --- a/pkg/maintenance/postgresql.go +++ b/pkg/maintenance/postgresql.go @@ -14,8 +14,8 @@ import ( "github.com/go-logr/logr" "github.com/hashicorp/go-version" "github.com/spf13/viper" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" diff --git a/pkg/maintenance/postgresql_test.go b/pkg/maintenance/postgresql_test.go index eec49d580b..e4a440f6a7 100644 --- a/pkg/maintenance/postgresql_test.go +++ b/pkg/maintenance/postgresql_test.go @@ -14,9 +14,9 @@ import ( "github.com/go-logr/logr" "github.com/spf13/viper" "github.com/stretchr/testify/assert" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" - "github.com/vshn/appcat/pkg" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" + "github.com/vshn/appcat/v4/pkg" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/maintenance/redis.go b/pkg/maintenance/redis.go index f15c9bd82b..24871fb568 100644 --- a/pkg/maintenance/redis.go +++ b/pkg/maintenance/redis.go @@ -8,7 +8,7 @@ import ( "github.com/crossplane-contrib/provider-helm/apis/release/v1beta1" "github.com/go-logr/logr" "github.com/spf13/viper" - "github.com/vshn/appcat/pkg/controller/postgres" + "github.com/vshn/appcat/v4/pkg/controller/postgres" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" "net/http" diff --git a/pkg/maintenance/redis_test.go b/pkg/maintenance/redis_test.go index f3d79cd152..4910e37b23 100644 --- a/pkg/maintenance/redis_test.go +++ b/pkg/maintenance/redis_test.go @@ -8,7 +8,7 @@ import ( "github.com/go-logr/logr" "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/vshn/appcat/pkg" + "github.com/vshn/appcat/v4/pkg" 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/scheme.go b/pkg/scheme.go index add91f3248..1379c5b2a1 100644 --- a/pkg/scheme.go +++ b/pkg/scheme.go @@ -5,9 +5,9 @@ import ( xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1" k8upv1 "github.com/k8up-io/k8up/v2/api/v1" - stackgresv1 "github.com/vshn/appcat/apis/stackgres/v1" - appcatv1 "github.com/vshn/appcat/apis/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + stackgresv1 "github.com/vshn/appcat/v4/apis/stackgres/v1" + appcatv1 "github.com/vshn/appcat/v4/apis/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/sliexporter/vshnpostgresql_controller.go b/pkg/sliexporter/vshnpostgresql_controller.go index ddb076597e..e5794ba847 100644 --- a/pkg/sliexporter/vshnpostgresql_controller.go +++ b/pkg/sliexporter/vshnpostgresql_controller.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/vshn/appcat/pkg/sliexporter/probes" + "github.com/vshn/appcat/v4/pkg/sliexporter/probes" "github.com/jackc/pgx/v5/pgxpool" corev1 "k8s.io/api/core/v1" @@ -32,7 +32,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" ) var vshnpostgresqlsServiceKey = "VSHNPostgreSQL" diff --git a/pkg/sliexporter/vshnpostgresql_controller_test.go b/pkg/sliexporter/vshnpostgresql_controller_test.go index 9cb4c90b0c..1fae2b203d 100644 --- a/pkg/sliexporter/vshnpostgresql_controller_test.go +++ b/pkg/sliexporter/vshnpostgresql_controller_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/vshn/appcat/pkg/sliexporter/probes" + "github.com/vshn/appcat/v4/pkg/sliexporter/probes" "github.com/jackc/pgx/v5/pgxpool" "github.com/stretchr/testify/assert" @@ -19,8 +19,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - v1 "github.com/vshn/appcat/apis/v1" - vshnv1 "github.com/vshn/appcat/apis/vshn/v1" + v1 "github.com/vshn/appcat/v4/apis/v1" + vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1" ) func TestVSHNPostgreSQL_StartStop(t *testing.T) { diff --git a/test/mocks/mock_sgbackups.go b/test/mocks/mock_sgbackups.go index ef90f1b87b..8909320ed8 100644 --- a/test/mocks/mock_sgbackups.go +++ b/test/mocks/mock_sgbackups.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1 "github.com/vshn/appcat/apis/appcat/v1" + v1 "github.com/vshn/appcat/v4/apis/appcat/v1" internalversion "k8s.io/apimachinery/pkg/apis/meta/internalversion" watch "k8s.io/apimachinery/pkg/watch" ) diff --git a/test/mocks/mock_vshnpostgresqls.go b/test/mocks/mock_vshnpostgresqls.go index 7fed5775c6..a589af8ddd 100644 --- a/test/mocks/mock_vshnpostgresqls.go +++ b/test/mocks/mock_vshnpostgresqls.go @@ -9,7 +9,7 @@ import ( reflect "reflect" gomock "github.com/golang/mock/gomock" - v1 "github.com/vshn/appcat/apis/vshn/v1" + v1 "github.com/vshn/appcat/v4/apis/vshn/v1" ) // MockvshnPostgresqlProvider is a mock of vshnPostgresqlProvider interface.