From d7fc1ee026fca1ed9bbdf90ef72dad1f65b14658 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 --- pkg/config/collector/collector_test.go | 2 +- pkg/config/config.go | 4 ++-- pkg/config/config_test.go | 2 +- pkg/config/schemas/install_schema_test.go | 2 +- pkg/config/schemas/p2p_schema_test.go | 2 +- pkg/config/schemas/root_schema_test.go | 4 ++-- pkg/config/schemas/users_schema_test.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/config/collector/collector_test.go b/pkg/config/collector/collector_test.go index b054c2c..7047ef5 100644 --- a/pkg/config/collector/collector_test.go +++ b/pkg/config/collector/collector_test.go @@ -6,7 +6,7 @@ import ( "path" "path/filepath" - . "github.com/kairos-io/kairos/pkg/config/collector" + . "github.com/kairos-io/kairos/v2/pkg/config/collector" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "gopkg.in/yaml.v1" diff --git a/pkg/config/config.go b/pkg/config/config.go index 462927a..6b11251 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,8 +8,8 @@ import ( "unicode" "github.com/kairos-io/kairos-sdk/bundles" - "github.com/kairos-io/kairos/pkg/config/collector" - schema "github.com/kairos-io/kairos/pkg/config/schemas" + "github.com/kairos-io/kairos/v2/pkg/config/collector" + schema "github.com/kairos-io/kairos/v2/pkg/config/schemas" yip "github.com/mudler/yip/pkg/schema" "gopkg.in/yaml.v3" diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index afaab78..5a122ed 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -18,7 +18,7 @@ package config_test import ( "os" - // . "github.com/kairos-io/kairos/pkg/config" + // . "github.com/kairos-io/kairos/v2/pkg/config" . "github.com/onsi/ginkgo/v2" // . "github.com/onsi/gomega" ) diff --git a/pkg/config/schemas/install_schema_test.go b/pkg/config/schemas/install_schema_test.go index 0cce16e..966b145 100644 --- a/pkg/config/schemas/install_schema_test.go +++ b/pkg/config/schemas/install_schema_test.go @@ -3,7 +3,7 @@ package config_test import ( "strings" - . "github.com/kairos-io/kairos/pkg/config/schemas" + . "github.com/kairos-io/kairos/v2/pkg/config/schemas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/config/schemas/p2p_schema_test.go b/pkg/config/schemas/p2p_schema_test.go index b861a55..69b421d 100644 --- a/pkg/config/schemas/p2p_schema_test.go +++ b/pkg/config/schemas/p2p_schema_test.go @@ -3,7 +3,7 @@ package config_test import ( "strings" - . "github.com/kairos-io/kairos/pkg/config/schemas" + . "github.com/kairos-io/kairos/v2/pkg/config/schemas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/config/schemas/root_schema_test.go b/pkg/config/schemas/root_schema_test.go index 126aa64..ce398c5 100644 --- a/pkg/config/schemas/root_schema_test.go +++ b/pkg/config/schemas/root_schema_test.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" - . "github.com/kairos-io/kairos/pkg/config" - . "github.com/kairos-io/kairos/pkg/config/schemas" + . "github.com/kairos-io/kairos/v2/pkg/config" + . "github.com/kairos-io/kairos/v2/pkg/config/schemas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/config/schemas/users_schema_test.go b/pkg/config/schemas/users_schema_test.go index 457540f..2182f42 100644 --- a/pkg/config/schemas/users_schema_test.go +++ b/pkg/config/schemas/users_schema_test.go @@ -3,7 +3,7 @@ package config_test import ( "strings" - . "github.com/kairos-io/kairos/pkg/config/schemas" + . "github.com/kairos-io/kairos/v2/pkg/config/schemas" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" )