From e7807dd66cecb5a39ce3a27ba8777525e2dba03f Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Thu, 30 Mar 2023 14:18:53 +0300 Subject: [PATCH] Change module path according to Go docs (#1220) https://go.dev/doc/modules/major-version This way we can bump the kairos dependency on the provider-kairos repo which otherwise produced the error: ``` ~/workspace/kairos/provider-kairos (main)*$ go get -u github.com/kairos-io/kairos@v2.0.0-alpha3 go: github.com/kairos-io/kairos@v2.0.0-alpha3: invalid version: module contains a go.mod file, so module path must match major version ("github.com/kairos-io/kairos/v2") ``` Signed-off-by: Dimitris Karakasilis Co-authored-by: Itxaka --- internal/agent/agent.go | 8 ++++---- internal/agent/agent_test.go | 4 ++-- internal/agent/config.go | 2 +- internal/agent/hooks/bundles.go | 2 +- internal/agent/hooks/gruboptions.go | 2 +- internal/agent/hooks/hook.go | 2 +- internal/agent/hooks/kcrypt.go | 2 +- internal/agent/hooks/lifecycle.go | 2 +- internal/agent/hooks/mounts.go | 2 +- internal/agent/hooks/runstage.go | 2 +- internal/agent/install.go | 10 +++++----- internal/agent/install_test.go | 2 +- internal/agent/interactive_install.go | 6 +++--- internal/agent/notify.go | 6 +++--- internal/agent/recovery.go | 4 ++-- internal/agent/reset.go | 10 +++++----- internal/agent/upgrade.go | 8 ++++---- internal/agent/validate.go | 2 +- internal/agent/validate_test.go | 2 +- internal/cmd/utils.go | 2 +- internal/webui/webui.go | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 32f10a5..3f262b3 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -8,10 +8,10 @@ import ( events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - hook "github.com/kairos-io/kairos/internal/agent/hooks" - "github.com/kairos-io/kairos/internal/bus" - config "github.com/kairos-io/kairos/pkg/config" - "github.com/kairos-io/kairos/pkg/config/collector" + hook "github.com/kairos-io/kairos/v2/internal/agent/hooks" + "github.com/kairos-io/kairos/v2/internal/bus" + config "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config/collector" "github.com/nxadm/tail" ) diff --git a/internal/agent/agent_test.go b/internal/agent/agent_test.go index 9ee6815..54d76b2 100644 --- a/internal/agent/agent_test.go +++ b/internal/agent/agent_test.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - . "github.com/kairos-io/kairos/internal/agent" - "github.com/kairos-io/kairos/internal/bus" + . "github.com/kairos-io/kairos/v2/internal/agent" + "github.com/kairos-io/kairos/v2/internal/bus" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/agent/config.go b/internal/agent/config.go index 616c878..6bda33f 100644 --- a/internal/agent/config.go +++ b/internal/agent/config.go @@ -3,7 +3,7 @@ package agent import ( "os" - "github.com/kairos-io/kairos/internal/kairos" + "github.com/kairos-io/kairos/v2/internal/kairos" "gopkg.in/yaml.v2" ) diff --git a/internal/agent/hooks/bundles.go b/internal/agent/hooks/bundles.go index 7ab3f66..a888b1c 100644 --- a/internal/agent/hooks/bundles.go +++ b/internal/agent/hooks/bundles.go @@ -3,7 +3,7 @@ package hook import ( "github.com/kairos-io/kairos-sdk/bundles" "github.com/kairos-io/kairos-sdk/machine" - config "github.com/kairos-io/kairos/pkg/config" + config "github.com/kairos-io/kairos/v2/pkg/config" ) type BundleOption struct{} diff --git a/internal/agent/hooks/gruboptions.go b/internal/agent/hooks/gruboptions.go index 3d2c4d3..bb3f2b3 100644 --- a/internal/agent/hooks/gruboptions.go +++ b/internal/agent/hooks/gruboptions.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/kairos-io/kairos-sdk/system" - config "github.com/kairos-io/kairos/pkg/config" + config "github.com/kairos-io/kairos/v2/pkg/config" ) type GrubOptions struct{} diff --git a/internal/agent/hooks/hook.go b/internal/agent/hooks/hook.go index 253b128..f9a6479 100644 --- a/internal/agent/hooks/hook.go +++ b/internal/agent/hooks/hook.go @@ -1,7 +1,7 @@ package hook import ( - config "github.com/kairos-io/kairos/pkg/config" + config "github.com/kairos-io/kairos/v2/pkg/config" ) type Interface interface { diff --git a/internal/agent/hooks/kcrypt.go b/internal/agent/hooks/kcrypt.go index 74978dc..d0350b4 100644 --- a/internal/agent/hooks/kcrypt.go +++ b/internal/agent/hooks/kcrypt.go @@ -7,7 +7,7 @@ import ( "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - config "github.com/kairos-io/kairos/pkg/config" + config "github.com/kairos-io/kairos/v2/pkg/config" kcryptconfig "github.com/kairos-io/kcrypt/pkg/config" ) diff --git a/internal/agent/hooks/lifecycle.go b/internal/agent/hooks/lifecycle.go index 2638a03..04d6b48 100644 --- a/internal/agent/hooks/lifecycle.go +++ b/internal/agent/hooks/lifecycle.go @@ -2,7 +2,7 @@ package hook import ( "github.com/kairos-io/kairos-sdk/utils" - "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config" ) type Lifecycle struct{} diff --git a/internal/agent/hooks/mounts.go b/internal/agent/hooks/mounts.go index 29e7775..4b4e782 100644 --- a/internal/agent/hooks/mounts.go +++ b/internal/agent/hooks/mounts.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/kairos-io/kairos-sdk/machine" - config "github.com/kairos-io/kairos/pkg/config" + config "github.com/kairos-io/kairos/v2/pkg/config" "github.com/mudler/yip/pkg/schema" yip "github.com/mudler/yip/pkg/schema" "gopkg.in/yaml.v1" diff --git a/internal/agent/hooks/runstage.go b/internal/agent/hooks/runstage.go index 1686148..d47c7e9 100644 --- a/internal/agent/hooks/runstage.go +++ b/internal/agent/hooks/runstage.go @@ -2,7 +2,7 @@ package hook import ( "github.com/kairos-io/kairos-sdk/utils" - config "github.com/kairos-io/kairos/pkg/config" + config "github.com/kairos-io/kairos/v2/pkg/config" events "github.com/kairos-io/kairos-sdk/bus" ) diff --git a/internal/agent/install.go b/internal/agent/install.go index 9cac6e6..4626b8c 100644 --- a/internal/agent/install.go +++ b/internal/agent/install.go @@ -15,11 +15,11 @@ import ( events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - hook "github.com/kairos-io/kairos/internal/agent/hooks" - "github.com/kairos-io/kairos/internal/bus" - "github.com/kairos-io/kairos/internal/cmd" - config "github.com/kairos-io/kairos/pkg/config" - "github.com/kairos-io/kairos/pkg/config/collector" + hook "github.com/kairos-io/kairos/v2/internal/agent/hooks" + "github.com/kairos-io/kairos/v2/internal/bus" + "github.com/kairos-io/kairos/v2/internal/cmd" + config "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config/collector" qr "github.com/mudler/go-nodepair/qrcode" "github.com/mudler/go-pluggable" "github.com/pterm/pterm" diff --git a/internal/agent/install_test.go b/internal/agent/install_test.go index ecf7ec1..f9349e9 100644 --- a/internal/agent/install_test.go +++ b/internal/agent/install_test.go @@ -4,7 +4,7 @@ import ( "context" "os" - "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config" "gopkg.in/yaml.v3" . "github.com/onsi/ginkgo/v2" diff --git a/internal/agent/interactive_install.go b/internal/agent/interactive_install.go index 21babab..5548e9f 100644 --- a/internal/agent/interactive_install.go +++ b/internal/agent/interactive_install.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" - "github.com/kairos-io/kairos/internal/bus" - "github.com/kairos-io/kairos/internal/cmd" - config "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/v2/internal/bus" + "github.com/kairos-io/kairos/v2/internal/cmd" + config "github.com/kairos-io/kairos/v2/pkg/config" events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/unstructured" diff --git a/internal/agent/notify.go b/internal/agent/notify.go index ce91705..15728d0 100644 --- a/internal/agent/notify.go +++ b/internal/agent/notify.go @@ -4,9 +4,9 @@ import ( "fmt" events "github.com/kairos-io/kairos-sdk/bus" - "github.com/kairos-io/kairos/internal/bus" - "github.com/kairos-io/kairos/pkg/config" - "github.com/kairos-io/kairos/pkg/config/collector" + "github.com/kairos-io/kairos/v2/internal/bus" + "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config/collector" "github.com/mudler/go-pluggable" ) diff --git a/internal/agent/recovery.go b/internal/agent/recovery.go index 25e9d00..55aa0c5 100644 --- a/internal/agent/recovery.go +++ b/internal/agent/recovery.go @@ -7,8 +7,8 @@ import ( events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - "github.com/kairos-io/kairos/internal/bus" - "github.com/kairos-io/kairos/internal/cmd" + "github.com/kairos-io/kairos/v2/internal/bus" + "github.com/kairos-io/kairos/v2/internal/cmd" qr "github.com/mudler/go-nodepair/qrcode" "github.com/mudler/go-pluggable" "github.com/pterm/pterm" diff --git a/internal/agent/reset.go b/internal/agent/reset.go index 440d106..5516183 100644 --- a/internal/agent/reset.go +++ b/internal/agent/reset.go @@ -11,11 +11,11 @@ import ( sdk "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - hook "github.com/kairos-io/kairos/internal/agent/hooks" - "github.com/kairos-io/kairos/internal/bus" - "github.com/kairos-io/kairos/internal/cmd" - "github.com/kairos-io/kairos/pkg/config" - "github.com/kairos-io/kairos/pkg/config/collector" + hook "github.com/kairos-io/kairos/v2/internal/agent/hooks" + "github.com/kairos-io/kairos/v2/internal/bus" + "github.com/kairos-io/kairos/v2/internal/cmd" + "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config/collector" "github.com/mudler/go-pluggable" "github.com/pterm/pterm" diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go index 8f31c1e..f9285b5 100644 --- a/internal/agent/upgrade.go +++ b/internal/agent/upgrade.go @@ -9,12 +9,12 @@ import ( "strings" events "github.com/kairos-io/kairos-sdk/bus" - "github.com/kairos-io/kairos/pkg/config" - "github.com/kairos-io/kairos/pkg/config/collector" + "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos/v2/pkg/config/collector" "github.com/kairos-io/kairos-sdk/utils" - "github.com/kairos-io/kairos/internal/bus" - "github.com/kairos-io/kairos/pkg/github" + "github.com/kairos-io/kairos/v2/internal/bus" + "github.com/kairos-io/kairos/v2/pkg/github" "github.com/mudler/go-pluggable" ) diff --git a/internal/agent/validate.go b/internal/agent/validate.go index 4d704e8..156493a 100644 --- a/internal/agent/validate.go +++ b/internal/agent/validate.go @@ -7,7 +7,7 @@ import ( "os" "strings" - sc "github.com/kairos-io/kairos/pkg/config/schemas" + sc "github.com/kairos-io/kairos/v2/pkg/config/schemas" ) // JSONSchema builds a JSON Schema based on the Root Schema and the given version diff --git a/internal/agent/validate_test.go b/internal/agent/validate_test.go index 5b1c793..2df5348 100644 --- a/internal/agent/validate_test.go +++ b/internal/agent/validate_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - . "github.com/kairos-io/kairos/internal/agent" + . "github.com/kairos-io/kairos/v2/internal/agent" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go index 07066df..2c4143d 100644 --- a/internal/cmd/utils.go +++ b/internal/cmd/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/kairos-io/kairos/internal/kairos" + "github.com/kairos-io/kairos/v2/internal/kairos" "github.com/kairos-io/kairos-sdk/utils" "github.com/pterm/pterm" diff --git a/internal/webui/webui.go b/internal/webui/webui.go index ee5fb7b..cedf566 100644 --- a/internal/webui/webui.go +++ b/internal/webui/webui.go @@ -13,8 +13,8 @@ import ( "text/template" "time" - "github.com/kairos-io/kairos/internal/agent" - "github.com/kairos-io/kairos/pkg/config" + "github.com/kairos-io/kairos/v2/internal/agent" + "github.com/kairos-io/kairos/v2/pkg/config" "github.com/labstack/echo/v4" process "github.com/mudler/go-processmanager" "github.com/nxadm/tail"