diff --git a/.goreleaser.yml b/.goreleaser.yml index de46cb3..7ece263 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -15,7 +15,7 @@ builds: - goos: windows goarch: arm64 ldflags: - - -s -X "github.com/sky-uk/osprey/cmd.version={{.Version}}" -X "github.com/sky-uk/osprey/cmd.buildTime={{.Date}})" + - -s -X "github.com/sky-uk/osprey/v2/cmd.version={{.Version}}" -X "github.com/sky-uk/osprey/v2/cmd.buildTime={{.Date}})" archives: - replacements: darwin: Darwin diff --git a/Makefile b/Makefile index 25bb0a3..ee78450 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ latest_git_tag := $(shell git for-each-ref --format="%(tag)" --sort=-taggerdate latest_git_rev := $(shell git rev-list --abbrev-commit -n 1 $(latest_git_tag)) version := $(if $(git_tag),$(git_tag),dev-$(git_rev)) build_time := $(shell date -u) -ldflags := -X "github.com/sky-uk/osprey/cmd.version=$(version)" -X "github.com/sky-uk/osprey/cmd.buildTime=$(build_time)" +ldflags := -X "github.com/sky-uk/osprey/v2/cmd.version=$(version)" -X "github.com/sky-uk/osprey/v2/cmd.buildTime=$(build_time)" cwd= $(shell pwd) build_dir := $(cwd)/build/bin diff --git a/client/azure.go b/client/azure.go index dbfd20d..21535af 100644 --- a/client/azure.go +++ b/client/azure.go @@ -11,9 +11,9 @@ import ( "time" "github.com/SermoDigital/jose/jws" - "github.com/sky-uk/osprey/client/oidc" - "github.com/sky-uk/osprey/common/pb" - "github.com/sky-uk/osprey/common/web" + "github.com/sky-uk/osprey/v2/client/oidc" + "github.com/sky-uk/osprey/v2/common/pb" + "github.com/sky-uk/osprey/v2/common/web" "golang.org/x/oauth2" "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/client/config.go b/client/config.go index f371c54..d1f04b9 100644 --- a/client/config.go +++ b/client/config.go @@ -8,7 +8,7 @@ import ( "github.com/mitchellh/go-homedir" log "github.com/sirupsen/logrus" - "github.com/sky-uk/osprey/common/web" + "github.com/sky-uk/osprey/v2/common/web" "gopkg.in/yaml.v2" ) diff --git a/client/credentials.go b/client/credentials.go index 9f97620..57f1460 100644 --- a/client/credentials.go +++ b/client/credentials.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - "github.com/sky-uk/osprey/common" + "github.com/sky-uk/osprey/v2/common" "golang.org/x/crypto/ssh/terminal" ) diff --git a/client/kubeconfig/config.go b/client/kubeconfig/config.go index bf7ccd7..eecf90a 100644 --- a/client/kubeconfig/config.go +++ b/client/kubeconfig/config.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/sky-uk/osprey/client" + "github.com/sky-uk/osprey/v2/client" kubectl "k8s.io/client-go/tools/clientcmd" clientgo "k8s.io/client-go/tools/clientcmd/api" diff --git a/client/osprey.go b/client/osprey.go index 7eab005..a451dde 100644 --- a/client/osprey.go +++ b/client/osprey.go @@ -8,8 +8,8 @@ import ( "github.com/SermoDigital/jose/jws" log "github.com/sirupsen/logrus" - "github.com/sky-uk/osprey/common/pb" - webClient "github.com/sky-uk/osprey/common/web" + "github.com/sky-uk/osprey/v2/common/pb" + webClient "github.com/sky-uk/osprey/v2/common/web" "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/cmd/auth.go b/cmd/auth.go index e67814a..26da2d2 100644 --- a/cmd/auth.go +++ b/cmd/auth.go @@ -1,12 +1,12 @@ package cmd import ( - "github.com/sky-uk/osprey/server/osprey" + "github.com/sky-uk/osprey/v2/server/osprey" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" - webClient "github.com/sky-uk/osprey/common/web" - webServer "github.com/sky-uk/osprey/server/web" + webClient "github.com/sky-uk/osprey/v2/common/web" + webServer "github.com/sky-uk/osprey/v2/server/web" ) var authCmd = &cobra.Command{ diff --git a/cmd/cluster-info.go b/cmd/cluster-info.go index 3fae48a..c87b79c 100644 --- a/cmd/cluster-info.go +++ b/cmd/cluster-info.go @@ -1,11 +1,11 @@ package cmd import ( - "github.com/sky-uk/osprey/server/osprey" + "github.com/sky-uk/osprey/v2/server/osprey" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" - webServer "github.com/sky-uk/osprey/server/web" + webServer "github.com/sky-uk/osprey/v2/server/web" ) var clusterInfoCmd = &cobra.Command{ diff --git a/cmd/login.go b/cmd/login.go index c06067b..2c4cdc2 100644 --- a/cmd/login.go +++ b/cmd/login.go @@ -3,8 +3,8 @@ package cmd import ( "time" - "github.com/sky-uk/osprey/client" - "github.com/sky-uk/osprey/client/kubeconfig" + "github.com/sky-uk/osprey/v2/client" + "github.com/sky-uk/osprey/v2/client/kubeconfig" "github.com/spf13/cobra" "fmt" diff --git a/cmd/logout.go b/cmd/logout.go index 206f96d..46c104b 100644 --- a/cmd/logout.go +++ b/cmd/logout.go @@ -1,8 +1,8 @@ package cmd import ( - "github.com/sky-uk/osprey/client" - "github.com/sky-uk/osprey/client/kubeconfig" + "github.com/sky-uk/osprey/v2/client" + "github.com/sky-uk/osprey/v2/client/kubeconfig" "github.com/spf13/cobra" "os" diff --git a/cmd/targets.go b/cmd/targets.go index b96c142..4874614 100644 --- a/cmd/targets.go +++ b/cmd/targets.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/sky-uk/osprey/client" + "github.com/sky-uk/osprey/v2/client" "github.com/spf13/cobra" "fmt" diff --git a/cmd/user.go b/cmd/user.go index 49f56d4..dafdc9b 100644 --- a/cmd/user.go +++ b/cmd/user.go @@ -3,8 +3,8 @@ package cmd import ( "path/filepath" - "github.com/sky-uk/osprey/client" - "github.com/sky-uk/osprey/client/kubeconfig" + "github.com/sky-uk/osprey/v2/client" + "github.com/sky-uk/osprey/v2/client/kubeconfig" "github.com/spf13/cobra" "os" diff --git a/e2e/dextest/server.go b/e2e/dextest/server.go index 024aed5..5548268 100644 --- a/e2e/dextest/server.go +++ b/e2e/dextest/server.go @@ -19,9 +19,9 @@ import ( dex_memory "github.com/dexidp/dex/storage/memory" log "github.com/sirupsen/logrus" - "github.com/sky-uk/osprey/e2e/ldaptest" - "github.com/sky-uk/osprey/e2e/ssltest" - "github.com/sky-uk/osprey/e2e/util" + "github.com/sky-uk/osprey/v2/e2e/ldaptest" + "github.com/sky-uk/osprey/v2/e2e/ssltest" + "github.com/sky-uk/osprey/v2/e2e/util" ) var logger = log.New() diff --git a/e2e/e2e_suite_test.go b/e2e/e2e_suite_test.go index b964a45..3499141 100644 --- a/e2e/e2e_suite_test.go +++ b/e2e/e2e_suite_test.go @@ -5,16 +5,16 @@ import ( "os" "testing" - "github.com/sky-uk/osprey/e2e/apiservertest" + "github.com/sky-uk/osprey/v2/e2e/apiservertest" - "github.com/sky-uk/osprey/e2e/oidctest" + "github.com/sky-uk/osprey/v2/e2e/oidctest" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sky-uk/osprey/e2e/dextest" - "github.com/sky-uk/osprey/e2e/ldaptest" - "github.com/sky-uk/osprey/e2e/ospreytest" - "github.com/sky-uk/osprey/e2e/util" + "github.com/sky-uk/osprey/v2/e2e/dextest" + "github.com/sky-uk/osprey/v2/e2e/ldaptest" + "github.com/sky-uk/osprey/v2/e2e/ospreytest" + "github.com/sky-uk/osprey/v2/e2e/util" ) func TestOspreySuite(t *testing.T) { diff --git a/e2e/ldaptest/server.go b/e2e/ldaptest/server.go index 13637bc..01a05b9 100644 --- a/e2e/ldaptest/server.go +++ b/e2e/ldaptest/server.go @@ -10,9 +10,9 @@ import ( "time" dex_ldap "github.com/dexidp/dex/connector/ldap" - "github.com/sky-uk/osprey/e2e/clitest" - "github.com/sky-uk/osprey/e2e/ssltest" - "github.com/sky-uk/osprey/e2e/util" + "github.com/sky-uk/osprey/v2/e2e/clitest" + "github.com/sky-uk/osprey/v2/e2e/ssltest" + "github.com/sky-uk/osprey/v2/e2e/util" ) const ( diff --git a/e2e/login_test.go b/e2e/login_test.go index c76cea8..d26afaf 100644 --- a/e2e/login_test.go +++ b/e2e/login_test.go @@ -6,9 +6,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sky-uk/osprey/client/kubeconfig" - "github.com/sky-uk/osprey/e2e/clitest" - . "github.com/sky-uk/osprey/e2e/ospreytest" + "github.com/sky-uk/osprey/v2/client/kubeconfig" + "github.com/sky-uk/osprey/v2/e2e/clitest" + . "github.com/sky-uk/osprey/v2/e2e/ospreytest" clientgo "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/e2e/logout_test.go b/e2e/logout_test.go index e60906c..0b79d29 100644 --- a/e2e/logout_test.go +++ b/e2e/logout_test.go @@ -3,12 +3,12 @@ package e2e import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - . "github.com/sky-uk/osprey/e2e/ospreytest" + . "github.com/sky-uk/osprey/v2/e2e/ospreytest" "os" - "github.com/sky-uk/osprey/client/kubeconfig" - "github.com/sky-uk/osprey/e2e/clitest" + "github.com/sky-uk/osprey/v2/client/kubeconfig" + "github.com/sky-uk/osprey/v2/e2e/clitest" ) var _ = Describe("Logout", func() { diff --git a/e2e/oidc_login_test.go b/e2e/oidc_login_test.go index 0b8e255..ea77c41 100644 --- a/e2e/oidc_login_test.go +++ b/e2e/oidc_login_test.go @@ -8,14 +8,14 @@ import ( "strings" "time" - "github.com/sky-uk/osprey/e2e/apiservertest" + "github.com/sky-uk/osprey/v2/e2e/apiservertest" - "github.com/sky-uk/osprey/client/kubeconfig" + "github.com/sky-uk/osprey/v2/client/kubeconfig" "k8s.io/client-go/tools/clientcmd/api" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sky-uk/osprey/e2e/clitest" + "github.com/sky-uk/osprey/v2/e2e/clitest" ) const ( diff --git a/e2e/oidctest/server.go b/e2e/oidctest/server.go index 03e5584..f0dbd45 100644 --- a/e2e/oidctest/server.go +++ b/e2e/oidctest/server.go @@ -12,7 +12,7 @@ import ( "github.com/golang-jwt/jwt" log "github.com/sirupsen/logrus" - "github.com/sky-uk/osprey/client/oidc" + "github.com/sky-uk/osprey/v2/client/oidc" "golang.org/x/oauth2" ) diff --git a/e2e/ospreytest/fixtures.go b/e2e/ospreytest/fixtures.go index 4e106df..8c45a4c 100644 --- a/e2e/ospreytest/fixtures.go +++ b/e2e/ospreytest/fixtures.go @@ -9,8 +9,8 @@ import ( "github.com/SermoDigital/jose/jws" "github.com/SermoDigital/jose/jwt" - "github.com/sky-uk/osprey/common/web" - "github.com/sky-uk/osprey/server/osprey" + "github.com/sky-uk/osprey/v2/common/web" + "github.com/sky-uk/osprey/v2/server/osprey" "k8s.io/client-go/tools/clientcmd" clientgo "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/e2e/ospreytest/server.go b/e2e/ospreytest/server.go index 69272ef..e3bbb23 100644 --- a/e2e/ospreytest/server.go +++ b/e2e/ospreytest/server.go @@ -4,14 +4,14 @@ import ( "fmt" "path/filepath" - "github.com/sky-uk/osprey/client" + "github.com/sky-uk/osprey/v2/client" "github.com/onsi/ginkgo" - "github.com/sky-uk/osprey/common/web" - "github.com/sky-uk/osprey/e2e/clitest" - "github.com/sky-uk/osprey/e2e/dextest" - "github.com/sky-uk/osprey/e2e/ssltest" - "github.com/sky-uk/osprey/e2e/util" + "github.com/sky-uk/osprey/v2/common/web" + "github.com/sky-uk/osprey/v2/e2e/clitest" + "github.com/sky-uk/osprey/v2/e2e/dextest" + "github.com/sky-uk/osprey/v2/e2e/ssltest" + "github.com/sky-uk/osprey/v2/e2e/util" ) const ospreyBinary = "osprey" diff --git a/e2e/server_test.go b/e2e/server_test.go index f5a16cd..fcc393c 100644 --- a/e2e/server_test.go +++ b/e2e/server_test.go @@ -7,8 +7,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sky-uk/osprey/e2e/dextest" - "github.com/sky-uk/osprey/e2e/ospreytest" + "github.com/sky-uk/osprey/v2/e2e/dextest" + "github.com/sky-uk/osprey/v2/e2e/ospreytest" ) var _ = Describe("Server", func() { diff --git a/e2e/shared_output_test.go b/e2e/shared_output_test.go index 93a1e29..ff1e715 100644 --- a/e2e/shared_output_test.go +++ b/e2e/shared_output_test.go @@ -3,7 +3,7 @@ package e2e import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/sky-uk/osprey/e2e/clitest" + "github.com/sky-uk/osprey/v2/e2e/clitest" ) type commandFactory func() clitest.TestCommand diff --git a/e2e/targets_test.go b/e2e/targets_test.go index 993de2d..60d9acd 100644 --- a/e2e/targets_test.go +++ b/e2e/targets_test.go @@ -3,13 +3,13 @@ package e2e import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - . "github.com/sky-uk/osprey/e2e/ospreytest" + . "github.com/sky-uk/osprey/v2/e2e/ospreytest" "fmt" "strings" - "github.com/sky-uk/osprey/e2e/clitest" + "github.com/sky-uk/osprey/v2/e2e/clitest" ) var _ = Describe("Targets", func() { diff --git a/e2e/user_test.go b/e2e/user_test.go index 60a1a98..2d77b26 100644 --- a/e2e/user_test.go +++ b/e2e/user_test.go @@ -3,11 +3,11 @@ package e2e import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - . "github.com/sky-uk/osprey/e2e/ospreytest" + . "github.com/sky-uk/osprey/v2/e2e/ospreytest" "os" - "github.com/sky-uk/osprey/e2e/clitest" + "github.com/sky-uk/osprey/v2/e2e/clitest" ) var _ = Describe("User", func() { diff --git a/go.mod b/go.mod index 2918e41..4a3340a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/sky-uk/osprey +module github.com/sky-uk/osprey/v2 require ( github.com/SermoDigital/jose v0.9.1 diff --git a/main.go b/main.go index b87fff1..461e78d 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,6 @@ package main -import "github.com/sky-uk/osprey/cmd" +import "github.com/sky-uk/osprey/v2/cmd" func main() { cmd.Execute() diff --git a/server/osprey/server.go b/server/osprey/server.go index f0f8784..d58c2c5 100644 --- a/server/osprey/server.go +++ b/server/osprey/server.go @@ -13,7 +13,7 @@ import ( "github.com/coreos/go-oidc" "github.com/sirupsen/logrus" - "github.com/sky-uk/osprey/common/pb" + "github.com/sky-uk/osprey/v2/common/pb" "golang.org/x/oauth2" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/web/server.go b/server/web/server.go index 3ebb423..2b1152f 100644 --- a/server/web/server.go +++ b/server/web/server.go @@ -11,7 +11,7 @@ import ( "github.com/golang/protobuf/proto" log "github.com/sirupsen/logrus" - "github.com/sky-uk/osprey/server/osprey" + "github.com/sky-uk/osprey/v2/server/osprey" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" )