From 9c5731baa2e38f548e0294b913e8be094776234a Mon Sep 17 00:00:00 2001 From: Itxaka <itxaka.garcia@spectrocloud.com> Date: Mon, 10 Jul 2023 14:39:48 +0200 Subject: [PATCH] Rename go module kairos-agent (#81) --- .goreleaser.yaml | 2 +- Earthfile | 2 +- go.mod | 2 +- internal/agent/agent.go | 6 +++--- 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 | 6 +++--- internal/agent/install.go | 16 ++++++++-------- internal/agent/install_test.go | 12 ++++++------ internal/agent/interactive_install.go | 8 ++++---- internal/agent/notify.go | 4 ++-- internal/agent/recovery.go | 4 ++-- internal/agent/reset.go | 12 ++++++------ internal/agent/upgrade.go | 12 ++++++------ internal/cmd/utils.go | 2 +- internal/webui/webui.go | 4 ++-- main.go | 16 ++++++++-------- pkg/action/common.go | 4 ++-- pkg/action/install.go | 8 ++++---- pkg/action/install_test.go | 12 ++++++------ pkg/action/reset.go | 8 ++++---- pkg/action/reset_test.go | 12 ++++++------ pkg/action/upgrade.go | 8 ++++---- pkg/action/upgrade_test.go | 12 ++++++------ pkg/cloudinit/cloudinit.go | 2 +- pkg/cloudinit/cloudinit_test.go | 10 +++++----- pkg/cloudinit/console.go | 2 +- pkg/config/config_test.go | 2 +- pkg/elemental/elemental.go | 8 ++++---- pkg/elemental/elemental_test.go | 14 +++++++------- pkg/elementalConfig/config.go | 12 ++++++------ pkg/elementalConfig/config_test.go | 10 +++++----- pkg/github/releases_test.go | 2 +- pkg/http/client.go | 4 ++-- pkg/http/client_test.go | 4 ++-- pkg/partitioner/disk.go | 4 ++-- pkg/partitioner/mkfs.go | 2 +- pkg/partitioner/options.go | 2 +- pkg/partitioner/parted.go | 4 ++-- pkg/partitioner/partitioner_test.go | 8 ++++---- pkg/types/v1/common_test.go | 2 +- pkg/types/v1/config.go | 2 +- pkg/types/v1/config_test.go | 12 ++++++------ pkg/types/v1/logger_test.go | 2 +- pkg/types/v1/platform.go | 2 +- pkg/types/v1/runner_test.go | 4 ++-- pkg/types/v1/syscall_test.go | 4 ++-- pkg/utils/chroot.go | 4 ++-- pkg/utils/common.go | 4 ++-- pkg/utils/fs.go | 2 +- pkg/utils/getpartitions.go | 2 +- pkg/utils/grub.go | 6 +++--- pkg/utils/runstage.go | 4 ++-- pkg/utils/runstage_test.go | 10 +++++----- pkg/utils/utils_test.go | 10 +++++----- tests/mocks/extractor_mock.go | 2 +- tests/mocks/http_mock.go | 2 +- tests/mocks/runner_mock.go | 2 +- 64 files changed, 178 insertions(+), 178 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 7a41c06..332ea75 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -2,7 +2,7 @@ project_name: kairos-agent builds: - ldflags: - - -w -s -X "github.com/kairos-io/kairos/v2/internal/common.VERSION={{.Tag}}" + - -w -s -X "github.com/kairos-io/kairos-agent/v2/internal/common.VERSION={{.Tag}}" env: - CGO_ENABLED=0 goos: diff --git a/Earthfile b/Earthfile index c2a9f9d..22f37c4 100644 --- a/Earthfile +++ b/Earthfile @@ -49,7 +49,7 @@ build-kairos-agent: ARG VERSION=$(cat VERSION) ARG COMMIT=$(cat COMMIT) RUN --no-cache echo "Building Version: ${VERSION} and Commit: ${COMMIT}" - ARG LDFLAGS="-s -w -X github.com/kairos-io/kairos/v2/internal/common.VERSION=${VERSION} -X github.com/kairos-io/kairos/v2/internal/common.gitCommit=$COMMIT" + ARG LDFLAGS="-s -w -X github.com/kairos-io/kairos-agent/v2/internal/common.VERSION=${VERSION} -X github.com/kairos-io/kairos-agent/v2/internal/common.gitCommit=$COMMIT" ENV CGO_ENABLED=${CGO_ENABLED} RUN go build -o kairos-agent -ldflags "${LDFLAGS}" main.go && upx kairos-agent SAVE ARTIFACT kairos-agent kairos-agent AS LOCAL build/kairos-agent diff --git a/go.mod b/go.mod index 0f99c17..bc78513 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kairos-io/kairos/v2 +module github.com/kairos-io/kairos-agent/v2 go 1.20 diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 68e04d3..5ff5bba 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -9,9 +9,9 @@ import ( "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - 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" + hook "github.com/kairos-io/kairos-agent/v2/internal/agent/hooks" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + config "github.com/kairos-io/kairos-agent/v2/pkg/config" "github.com/nxadm/tail" ) diff --git a/internal/agent/agent_test.go b/internal/agent/agent_test.go index 54d76b2..f74b822 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/v2/internal/agent" - "github.com/kairos-io/kairos/v2/internal/bus" + . "github.com/kairos-io/kairos-agent/v2/internal/agent" + "github.com/kairos-io/kairos-agent/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 6bda33f..535c2f0 100644 --- a/internal/agent/config.go +++ b/internal/agent/config.go @@ -3,7 +3,7 @@ package agent import ( "os" - "github.com/kairos-io/kairos/v2/internal/kairos" + "github.com/kairos-io/kairos-agent/v2/internal/kairos" "gopkg.in/yaml.v2" ) diff --git a/internal/agent/hooks/bundles.go b/internal/agent/hooks/bundles.go index a888b1c..b58e914 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/v2/pkg/config" + config "github.com/kairos-io/kairos-agent/v2/pkg/config" ) type BundleOption struct{} diff --git a/internal/agent/hooks/gruboptions.go b/internal/agent/hooks/gruboptions.go index bb3f2b3..0f7769a 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/v2/pkg/config" + config "github.com/kairos-io/kairos-agent/v2/pkg/config" ) type GrubOptions struct{} diff --git a/internal/agent/hooks/hook.go b/internal/agent/hooks/hook.go index f9a6479..236c84d 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/v2/pkg/config" + config "github.com/kairos-io/kairos-agent/v2/pkg/config" ) type Interface interface { diff --git a/internal/agent/hooks/kcrypt.go b/internal/agent/hooks/kcrypt.go index 88e5bf9..6a37587 100644 --- a/internal/agent/hooks/kcrypt.go +++ b/internal/agent/hooks/kcrypt.go @@ -6,7 +6,7 @@ import ( "time" "github.com/kairos-io/kairos-sdk/utils" - "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/config" ) type Kcrypt struct{} diff --git a/internal/agent/hooks/lifecycle.go b/internal/agent/hooks/lifecycle.go index 04d6b48..c684a26 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/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/config" ) type Lifecycle struct{} diff --git a/internal/agent/hooks/mounts.go b/internal/agent/hooks/mounts.go index 4b4e782..e3d5623 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/v2/pkg/config" + config "github.com/kairos-io/kairos-agent/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 05f9719..6c2708b 100644 --- a/internal/agent/hooks/runstage.go +++ b/internal/agent/hooks/runstage.go @@ -1,9 +1,9 @@ package hook import ( - "github.com/kairos-io/kairos/v2/pkg/config" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - "github.com/kairos-io/kairos/v2/pkg/utils" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" events "github.com/kairos-io/kairos-sdk/bus" ) diff --git a/internal/agent/install.go b/internal/agent/install.go index 08ee320..ffc52a0 100644 --- a/internal/agent/install.go +++ b/internal/agent/install.go @@ -15,14 +15,14 @@ import ( "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - 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/action" - "github.com/kairos-io/kairos/v2/pkg/config" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - elementalUtils "github.com/kairos-io/kairos/v2/pkg/utils" + hook "github.com/kairos-io/kairos-agent/v2/internal/agent/hooks" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/v2/internal/cmd" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + elementalUtils "github.com/kairos-io/kairos-agent/v2/pkg/utils" 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 d0e18b9..41bdab9 100644 --- a/internal/agent/install_test.go +++ b/internal/agent/install_test.go @@ -5,15 +5,15 @@ import ( "context" "fmt" "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/constants" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - "github.com/kairos-io/kairos/v2/pkg/utils" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" "os" "path/filepath" - "github.com/kairos-io/kairos/v2/pkg/config" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" "github.com/twpayne/go-vfs" "github.com/twpayne/go-vfs/vfst" "gopkg.in/yaml.v3" diff --git a/internal/agent/interactive_install.go b/internal/agent/interactive_install.go index 4829c49..d1a82bb 100644 --- a/internal/agent/interactive_install.go +++ b/internal/agent/interactive_install.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "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/elementalConfig" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/v2/internal/cmd" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" 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 1edc4d6..dfe3a22 100644 --- a/internal/agent/notify.go +++ b/internal/agent/notify.go @@ -5,8 +5,8 @@ import ( events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/collector" - "github.com/kairos-io/kairos/v2/internal/bus" - "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/v2/pkg/config" "github.com/mudler/go-pluggable" ) diff --git a/internal/agent/recovery.go b/internal/agent/recovery.go index 55aa0c5..c041579 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/v2/internal/bus" - "github.com/kairos-io/kairos/v2/internal/cmd" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/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 fc5f5cd..40bf622 100644 --- a/internal/agent/reset.go +++ b/internal/agent/reset.go @@ -13,12 +13,12 @@ import ( "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/utils" - 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/action" - "github.com/kairos-io/kairos/v2/pkg/config" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" + hook "github.com/kairos-io/kairos-agent/v2/internal/agent/hooks" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/v2/internal/cmd" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" "github.com/mudler/go-pluggable" "github.com/pterm/pterm" diff --git a/internal/agent/upgrade.go b/internal/agent/upgrade.go index 458a788..2e4b45e 100644 --- a/internal/agent/upgrade.go +++ b/internal/agent/upgrade.go @@ -9,12 +9,12 @@ import ( events "github.com/kairos-io/kairos-sdk/bus" "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/utils" - "github.com/kairos-io/kairos/v2/internal/bus" - "github.com/kairos-io/kairos/v2/pkg/action" - "github.com/kairos-io/kairos/v2/pkg/config" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - "github.com/kairos-io/kairos/v2/pkg/github" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + "github.com/kairos-io/kairos-agent/v2/pkg/github" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" "github.com/mudler/go-pluggable" "github.com/sanity-io/litter" log "github.com/sirupsen/logrus" diff --git a/internal/cmd/utils.go b/internal/cmd/utils.go index 2c4143d..1654b6c 100644 --- a/internal/cmd/utils.go +++ b/internal/cmd/utils.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/kairos-io/kairos/v2/internal/kairos" + "github.com/kairos-io/kairos-agent/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 58057bf..b8f0473 100644 --- a/internal/webui/webui.go +++ b/internal/webui/webui.go @@ -13,8 +13,8 @@ import ( "time" "github.com/kairos-io/kairos-sdk/schema" - "github.com/kairos-io/kairos/v2/internal/agent" - "github.com/kairos-io/kairos/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/internal/agent" + "github.com/kairos-io/kairos-agent/v2/pkg/config" "github.com/labstack/echo/v4" process "github.com/mudler/go-processmanager" "github.com/nxadm/tail" diff --git a/main.go b/main.go index 7c971b6..f8675e1 100644 --- a/main.go +++ b/main.go @@ -10,19 +10,19 @@ import ( "runtime" "strings" + "github.com/kairos-io/kairos-agent/v2/internal/agent" + "github.com/kairos-io/kairos-agent/v2/internal/bus" + "github.com/kairos-io/kairos-agent/v2/internal/common" + "github.com/kairos-io/kairos-agent/v2/internal/webui" + "github.com/kairos-io/kairos-agent/v2/pkg/config" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" "github.com/kairos-io/kairos-sdk/bundles" "github.com/kairos-io/kairos-sdk/collector" "github.com/kairos-io/kairos-sdk/machine" "github.com/kairos-io/kairos-sdk/schema" "github.com/kairos-io/kairos-sdk/state" - "github.com/kairos-io/kairos/v2/internal/agent" - "github.com/kairos-io/kairos/v2/internal/bus" - "github.com/kairos-io/kairos/v2/internal/common" - "github.com/kairos-io/kairos/v2/internal/webui" - "github.com/kairos-io/kairos/v2/pkg/config" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" "github.com/sirupsen/logrus" "github.com/Masterminds/semver/v3" diff --git a/pkg/action/common.go b/pkg/action/common.go index 12b9883..ba6f0b2 100644 --- a/pkg/action/common.go +++ b/pkg/action/common.go @@ -17,8 +17,8 @@ limitations under the License. package action import ( - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" "github.com/sirupsen/logrus" ) diff --git a/pkg/action/install.go b/pkg/action/install.go index f704cb3..7f83e06 100644 --- a/pkg/action/install.go +++ b/pkg/action/install.go @@ -21,10 +21,10 @@ import ( "path/filepath" "time" - cnst "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/elemental" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/elemental" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" ) func (i *InstallAction) installHook(hook string, chroot bool) error { diff --git a/pkg/action/install_test.go b/pkg/action/install_test.go index abe5de2..d4e1f11 100644 --- a/pkg/action/install_test.go +++ b/pkg/action/install_test.go @@ -24,12 +24,12 @@ import ( "regexp" "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/action" - "github.com/kairos-io/kairos/v2/pkg/constants" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs" diff --git a/pkg/action/reset.go b/pkg/action/reset.go index 08c11b2..23ab583 100644 --- a/pkg/action/reset.go +++ b/pkg/action/reset.go @@ -21,10 +21,10 @@ import ( "path/filepath" "time" - cnst "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/elemental" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/elemental" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" ) func (r *ResetAction) resetHook(hook string, chroot bool) error { diff --git a/pkg/action/reset_test.go b/pkg/action/reset_test.go index a51c4cb..067d2f9 100644 --- a/pkg/action/reset_test.go +++ b/pkg/action/reset_test.go @@ -24,12 +24,12 @@ import ( "regexp" "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/action" - "github.com/kairos-io/kairos/v2/pkg/constants" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs" diff --git a/pkg/action/upgrade.go b/pkg/action/upgrade.go index e954cba..3741863 100644 --- a/pkg/action/upgrade.go +++ b/pkg/action/upgrade.go @@ -21,10 +21,10 @@ import ( "path/filepath" "time" - "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/elemental" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/elemental" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" ) // UpgradeAction represents the struct that will run the upgrade from start to finish diff --git a/pkg/action/upgrade_test.go b/pkg/action/upgrade_test.go index 61fb9b3..de97dc1 100644 --- a/pkg/action/upgrade_test.go +++ b/pkg/action/upgrade_test.go @@ -22,12 +22,12 @@ import ( "path/filepath" "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/action" - "github.com/kairos-io/kairos/v2/pkg/constants" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/action" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/sirupsen/logrus" diff --git a/pkg/cloudinit/cloudinit.go b/pkg/cloudinit/cloudinit.go index f37a66f..4184b3d 100644 --- a/pkg/cloudinit/cloudinit.go +++ b/pkg/cloudinit/cloudinit.go @@ -17,7 +17,7 @@ limitations under the License. package cloudinit import ( - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" "github.com/mudler/yip/pkg/executor" "github.com/mudler/yip/pkg/plugins" "github.com/mudler/yip/pkg/schema" diff --git a/pkg/cloudinit/cloudinit_test.go b/pkg/cloudinit/cloudinit_test.go index 62959da..2e37bfd 100644 --- a/pkg/cloudinit/cloudinit_test.go +++ b/pkg/cloudinit/cloudinit_test.go @@ -26,11 +26,11 @@ import ( "github.com/jaypipes/ghw/pkg/block" - . "github.com/kairos-io/kairos/v2/pkg/cloudinit" - "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + . "github.com/kairos-io/kairos-agent/v2/pkg/cloudinit" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" "github.com/twpayne/go-vfs/vfst" . "github.com/onsi/ginkgo/v2" diff --git a/pkg/cloudinit/console.go b/pkg/cloudinit/console.go index 113b3cd..35daffc 100644 --- a/pkg/cloudinit/console.go +++ b/pkg/cloudinit/console.go @@ -21,7 +21,7 @@ import ( "os/exec" "github.com/hashicorp/go-multierror" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) // cloudInitConsole represents a yip's Console implementations using diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index c192c1e..20884b1 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -22,7 +22,7 @@ import ( "strings" . "github.com/kairos-io/kairos-sdk/schema" - . "github.com/kairos-io/kairos/v2/pkg/config" + . "github.com/kairos-io/kairos-agent/v2/pkg/config" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/elemental/elemental.go b/pkg/elemental/elemental.go index 7d4aa4e..2df15ee 100644 --- a/pkg/elemental/elemental.go +++ b/pkg/elemental/elemental.go @@ -22,10 +22,10 @@ import ( "path/filepath" "strings" - cnst "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/partitioner" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/partitioner" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" ) // Elemental is the struct meant to self-contain most utils and actions related to Elemental, like installing or applying selinux diff --git a/pkg/elemental/elemental_test.go b/pkg/elemental/elemental_test.go index 88e2d88..b5cced9 100644 --- a/pkg/elemental/elemental_test.go +++ b/pkg/elemental/elemental_test.go @@ -25,13 +25,13 @@ import ( "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/constants" - cnst "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/elemental" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/elemental" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs/vfst" diff --git a/pkg/elementalConfig/config.go b/pkg/elementalConfig/config.go index 871b4af..2a1c585 100644 --- a/pkg/elementalConfig/config.go +++ b/pkg/elementalConfig/config.go @@ -26,12 +26,12 @@ import ( "runtime" "strings" - "github.com/kairos-io/kairos/v2/internal/common" - "github.com/kairos-io/kairos/v2/pkg/cloudinit" - "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/http" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + "github.com/kairos-io/kairos-agent/v2/internal/common" + "github.com/kairos-io/kairos-agent/v2/pkg/cloudinit" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/http" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" "github.com/mitchellh/mapstructure" "github.com/sanity-io/litter" "github.com/sirupsen/logrus" diff --git a/pkg/elementalConfig/config_test.go b/pkg/elementalConfig/config_test.go index 1765126..ea08bdc 100644 --- a/pkg/elementalConfig/config_test.go +++ b/pkg/elementalConfig/config_test.go @@ -21,11 +21,11 @@ import ( "path/filepath" "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs/vfst" diff --git a/pkg/github/releases_test.go b/pkg/github/releases_test.go index 68b0df5..8279836 100644 --- a/pkg/github/releases_test.go +++ b/pkg/github/releases_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/kairos-io/kairos/v2/pkg/github" + "github.com/kairos-io/kairos-agent/v2/pkg/github" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/http/client.go b/pkg/http/client.go index 3422df5..4cd78fb 100644 --- a/pkg/http/client.go +++ b/pkg/http/client.go @@ -21,8 +21,8 @@ import ( "time" "github.com/cavaliergopher/grab/v3" - "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) type Client struct { diff --git a/pkg/http/client_test.go b/pkg/http/client_test.go index 0259517..c401e68 100644 --- a/pkg/http/client_test.go +++ b/pkg/http/client_test.go @@ -20,8 +20,8 @@ import ( "os" "path/filepath" - "github.com/kairos-io/kairos/v2/pkg/http" - "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/http" + "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" diff --git a/pkg/partitioner/disk.go b/pkg/partitioner/disk.go index c1e9e41..74619f1 100644 --- a/pkg/partitioner/disk.go +++ b/pkg/partitioner/disk.go @@ -24,8 +24,8 @@ import ( "strings" "time" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" "github.com/twpayne/go-vfs" ) diff --git a/pkg/partitioner/mkfs.go b/pkg/partitioner/mkfs.go index 348cc43..b901fe2 100644 --- a/pkg/partitioner/mkfs.go +++ b/pkg/partitioner/mkfs.go @@ -20,7 +20,7 @@ import ( "fmt" "regexp" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) type MkfsCall struct { diff --git a/pkg/partitioner/options.go b/pkg/partitioner/options.go index 4a95253..62e40f3 100644 --- a/pkg/partitioner/options.go +++ b/pkg/partitioner/options.go @@ -17,7 +17,7 @@ limitations under the License. package partitioner import ( - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) type DiskOptions func(d *Disk) error diff --git a/pkg/partitioner/parted.go b/pkg/partitioner/parted.go index fdf8dc8..9def7f5 100644 --- a/pkg/partitioner/parted.go +++ b/pkg/partitioner/parted.go @@ -24,8 +24,8 @@ import ( "strconv" "strings" - "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) type PartedCall struct { diff --git a/pkg/partitioner/partitioner_test.go b/pkg/partitioner/partitioner_test.go index d18b1ab..176fc13 100644 --- a/pkg/partitioner/partitioner_test.go +++ b/pkg/partitioner/partitioner_test.go @@ -22,10 +22,10 @@ import ( "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/constants" - part "github.com/kairos-io/kairos/v2/pkg/partitioner" - "github.com/kairos-io/kairos/v2/pkg/utils" - mocks "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + part "github.com/kairos-io/kairos-agent/v2/pkg/partitioner" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + mocks "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs" diff --git a/pkg/types/v1/common_test.go b/pkg/types/v1/common_test.go index 5be6f12..e2a6aa5 100644 --- a/pkg/types/v1/common_test.go +++ b/pkg/types/v1/common_test.go @@ -17,7 +17,7 @@ limitations under the License. package v1_test import ( - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/types/v1/config.go b/pkg/types/v1/config.go index dfb71d8..9ced774 100644 --- a/pkg/types/v1/config.go +++ b/pkg/types/v1/config.go @@ -22,7 +22,7 @@ import ( "runtime" "sort" - "github.com/kairos-io/kairos/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" "gopkg.in/yaml.v3" "k8s.io/mount-utils" ) diff --git a/pkg/types/v1/config_test.go b/pkg/types/v1/config_test.go index 3be67f1..a41dda4 100644 --- a/pkg/types/v1/config_test.go +++ b/pkg/types/v1/config_test.go @@ -19,12 +19,12 @@ package v1_test import ( "path/filepath" - "github.com/kairos-io/kairos/v2/pkg/constants" - "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mocks "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mocks "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs" diff --git a/pkg/types/v1/logger_test.go b/pkg/types/v1/logger_test.go index be71e0e..4a9a851 100644 --- a/pkg/types/v1/logger_test.go +++ b/pkg/types/v1/logger_test.go @@ -18,7 +18,7 @@ package v1_test import ( "bytes" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/sirupsen/logrus" diff --git a/pkg/types/v1/platform.go b/pkg/types/v1/platform.go index 3ad0ca0..2a6371a 100644 --- a/pkg/types/v1/platform.go +++ b/pkg/types/v1/platform.go @@ -23,7 +23,7 @@ import ( registry "github.com/google/go-containerregistry/pkg/v1" "gopkg.in/yaml.v3" - "github.com/kairos-io/kairos/v2/pkg/constants" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" ) type Platform struct { diff --git a/pkg/types/v1/runner_test.go b/pkg/types/v1/runner_test.go index 4dd003e..8c6cadd 100644 --- a/pkg/types/v1/runner_test.go +++ b/pkg/types/v1/runner_test.go @@ -18,8 +18,8 @@ package v1_test import ( "bytes" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/sirupsen/logrus" diff --git a/pkg/types/v1/syscall_test.go b/pkg/types/v1/syscall_test.go index 11abadb..6696084 100644 --- a/pkg/types/v1/syscall_test.go +++ b/pkg/types/v1/syscall_test.go @@ -17,8 +17,8 @@ limitations under the License. package v1_test import ( - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/utils/chroot.go b/pkg/utils/chroot.go index e789068..84170c5 100644 --- a/pkg/utils/chroot.go +++ b/pkg/utils/chroot.go @@ -23,8 +23,8 @@ import ( "sort" "strings" - "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) // Chroot represents the struct that will allow us to run commands inside a given chroot diff --git a/pkg/utils/common.go b/pkg/utils/common.go index bbab461..e5349a3 100644 --- a/pkg/utils/common.go +++ b/pkg/utils/common.go @@ -32,8 +32,8 @@ import ( "github.com/distribution/distribution/reference" "github.com/joho/godotenv" - cnst "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" "github.com/twpayne/go-vfs" ) diff --git a/pkg/utils/fs.go b/pkg/utils/fs.go index 8d19829..052e705 100644 --- a/pkg/utils/fs.go +++ b/pkg/utils/fs.go @@ -30,7 +30,7 @@ import ( "syscall" "time" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" "github.com/twpayne/go-vfs" "github.com/twpayne/go-vfs/vfst" ) diff --git a/pkg/utils/getpartitions.go b/pkg/utils/getpartitions.go index 74288b1..1b18248 100644 --- a/pkg/utils/getpartitions.go +++ b/pkg/utils/getpartitions.go @@ -27,7 +27,7 @@ import ( "github.com/jaypipes/ghw/pkg/context" "github.com/jaypipes/ghw/pkg/linuxpath" ghwUtil "github.com/jaypipes/ghw/pkg/util" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" log "github.com/sirupsen/logrus" ) diff --git a/pkg/utils/grub.go b/pkg/utils/grub.go index fcd6f89..80a83f9 100644 --- a/pkg/utils/grub.go +++ b/pkg/utils/grub.go @@ -22,9 +22,9 @@ import ( "path/filepath" "strings" - "github.com/kairos-io/kairos/v2/pkg/constants" - cnst "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + cnst "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) // Grub is the struct that will allow us to install grub to the target device diff --git a/pkg/utils/runstage.go b/pkg/utils/runstage.go index 37942b6..2b95246 100644 --- a/pkg/utils/runstage.go +++ b/pkg/utils/runstage.go @@ -21,8 +21,8 @@ import ( "strings" "github.com/hashicorp/go-multierror" - "github.com/kairos-io/kairos/v2/pkg/constants" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" "github.com/mudler/yip/pkg/schema" "gopkg.in/yaml.v3" ) diff --git a/pkg/utils/runstage_test.go b/pkg/utils/runstage_test.go index 9167016..eab3308 100644 --- a/pkg/utils/runstage_test.go +++ b/pkg/utils/runstage_test.go @@ -21,11 +21,11 @@ import ( "fmt" "os" - "github.com/kairos-io/kairos/v2/pkg/cloudinit" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/cloudinit" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" log "github.com/sirupsen/logrus" diff --git a/pkg/utils/utils_test.go b/pkg/utils/utils_test.go index 0473874..f5bb781 100644 --- a/pkg/utils/utils_test.go +++ b/pkg/utils/utils_test.go @@ -27,11 +27,11 @@ import ( "github.com/jaypipes/ghw/pkg/block" - "github.com/kairos-io/kairos/v2/pkg/constants" - conf "github.com/kairos-io/kairos/v2/pkg/elementalConfig" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" - "github.com/kairos-io/kairos/v2/pkg/utils" - v1mock "github.com/kairos-io/kairos/v2/tests/mocks" + "github.com/kairos-io/kairos-agent/v2/pkg/constants" + conf "github.com/kairos-io/kairos-agent/v2/pkg/elementalConfig" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" + "github.com/kairos-io/kairos-agent/v2/pkg/utils" + v1mock "github.com/kairos-io/kairos-agent/v2/tests/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/twpayne/go-vfs" diff --git a/tests/mocks/extractor_mock.go b/tests/mocks/extractor_mock.go index 71849ee..58dde76 100644 --- a/tests/mocks/extractor_mock.go +++ b/tests/mocks/extractor_mock.go @@ -16,7 +16,7 @@ limitations under the License. package mocks -import v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" +import v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" type FakeImageExtractor struct { Logger v1.Logger diff --git a/tests/mocks/http_mock.go b/tests/mocks/http_mock.go index db6cf7d..d3fe982 100644 --- a/tests/mocks/http_mock.go +++ b/tests/mocks/http_mock.go @@ -19,7 +19,7 @@ package mocks import ( "errors" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) // FakeHTTPClient is an implementation of HTTPClient interface used for testing diff --git a/tests/mocks/runner_mock.go b/tests/mocks/runner_mock.go index 3f22c6f..83197fa 100644 --- a/tests/mocks/runner_mock.go +++ b/tests/mocks/runner_mock.go @@ -21,7 +21,7 @@ import ( "os/exec" "strings" - v1 "github.com/kairos-io/kairos/v2/pkg/types/v1" + v1 "github.com/kairos-io/kairos-agent/v2/pkg/types/v1" ) type FakeRunner struct {