From bd955e4d4c680984fd3e61bd3d32d35558ee1773 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 15 Jul 2025 18:27:00 +0900 Subject: [PATCH] go.mod: github.com/lima-vm/lima/v2 The major version is now updated to highlight the introduction of the pluggable VM driver framework. See issue 3712 Signed-off-by: Akihiro Suda --- .golangci.yml | 2 +- Makefile | 2 +- cmd/lima-driver-qemu/main.go | 4 +-- cmd/lima-driver-vz/main_darwin.go | 4 +-- cmd/lima-driver-wsl2/main_windows.go | 4 +-- cmd/lima-guestagent/daemon_linux.go | 8 ++--- cmd/lima-guestagent/install_systemd_linux.go | 2 +- cmd/lima-guestagent/main_linux.go | 4 +-- cmd/limactl/clone.go | 14 ++++---- cmd/limactl/completion.go | 6 ++-- cmd/limactl/copy.go | 6 ++-- cmd/limactl/debug.go | 2 +- cmd/limactl/delete.go | 8 ++--- cmd/limactl/disk.go | 6 ++-- cmd/limactl/edit.go | 18 +++++----- cmd/limactl/factory-reset.go | 8 ++--- cmd/limactl/genschema.go | 4 +-- cmd/limactl/hostagent.go | 4 +-- cmd/limactl/info.go | 2 +- cmd/limactl/list.go | 2 +- cmd/limactl/main.go | 12 +++---- cmd/limactl/main_darwin.go | 2 +- cmd/limactl/main_qemu.go | 2 +- cmd/limactl/main_windows.go | 2 +- cmd/limactl/network.go | 4 +-- cmd/limactl/protect.go | 2 +- cmd/limactl/prune.go | 8 ++--- cmd/limactl/restart.go | 4 +-- cmd/limactl/shell.go | 12 +++---- cmd/limactl/show-ssh.go | 8 ++--- cmd/limactl/snapshot.go | 4 +-- cmd/limactl/start-at-login_unix.go | 4 +-- cmd/limactl/start.go | 24 ++++++------- cmd/limactl/stop.go | 6 ++-- cmd/limactl/sudoers.go | 2 +- cmd/limactl/sudoers_darwin.go | 2 +- cmd/limactl/template.go | 8 ++--- cmd/limactl/tunnel.go | 6 ++-- cmd/limactl/unprotect.go | 2 +- cmd/limactl/usernet.go | 2 +- go.mod | 2 +- hack/oss-fuzz-build.sh | 16 ++++----- pkg/autostart/autostart.go | 2 +- pkg/cidata/cidata.go | 20 +++++------ pkg/cidata/cidata_test.go | 2 +- pkg/cidata/fuzz_test.go | 2 +- pkg/cidata/template.go | 6 ++-- pkg/downloader/downloader.go | 8 ++--- pkg/driver/driver.go | 2 +- pkg/driver/external/client/client.go | 2 +- pkg/driver/external/client/methods.go | 6 ++-- pkg/driver/external/driver.proto | 4 +-- pkg/driver/external/server/methods.go | 8 ++--- pkg/driver/external/server/server.go | 12 +++---- .../qemu/entitlementutil/entitlementutil.go | 2 +- pkg/driver/qemu/qemu.go | 18 +++++----- pkg/driver/qemu/qemu_driver.go | 16 ++++----- pkg/driver/qemu/register.go | 2 +- pkg/driver/vz/disk.go | 8 ++--- pkg/driver/vz/register.go | 2 +- .../vz/rosetta_directory_share_arm64.go | 2 +- pkg/driver/vz/vm_darwin.go | 16 ++++----- pkg/driver/vz/vz_driver_darwin.go | 10 +++--- pkg/driver/wsl2/fs.go | 6 ++-- pkg/driver/wsl2/register.go | 2 +- pkg/driver/wsl2/vm_windows.go | 8 ++--- pkg/driver/wsl2/wsl_driver_windows.go | 12 +++---- pkg/driverutil/instance.go | 8 ++--- pkg/editutil/editutil.go | 6 ++-- pkg/executil/command.go | 2 +- pkg/fileutils/download.go | 4 +-- pkg/freeport/freeport_windows.go | 2 +- pkg/guestagent/api/client/client.go | 2 +- pkg/guestagent/api/guestservice.pb.desc | 4 +-- pkg/guestagent/api/guestservice.pb.go | 8 ++--- pkg/guestagent/api/guestservice.proto | 2 +- pkg/guestagent/api/guestservice_grpc.pb.go | 2 +- pkg/guestagent/api/server/server.go | 6 ++-- pkg/guestagent/guestagent.go | 2 +- pkg/guestagent/guestagent_linux.go | 10 +++--- pkg/hostagent/api/client/client.go | 4 +-- pkg/hostagent/api/server/server.go | 4 +-- pkg/hostagent/events/watcher.go | 2 +- pkg/hostagent/hostagent.go | 34 +++++++++---------- pkg/hostagent/inotify.go | 2 +- pkg/hostagent/mount.go | 4 +-- pkg/hostagent/port.go | 4 +-- pkg/hostagent/port_darwin.go | 4 +-- pkg/hostagent/requirements.go | 2 +- pkg/httpclientutil/httpclientutil.go | 2 +- pkg/imgutil/nativeimgutil/nativeimgutil.go | 2 +- pkg/imgutil/proxyimgutil/proxyimgutil.go | 6 ++-- pkg/instance/ansible.go | 6 ++-- pkg/instance/clone.go | 6 ++-- pkg/instance/create.go | 14 ++++---- pkg/instance/delete.go | 4 +-- pkg/instance/hostname/hostname_test.go | 2 +- pkg/instance/restart.go | 4 +-- pkg/instance/start.go | 26 +++++++------- pkg/instance/stop.go | 8 ++--- pkg/limainfo/limainfo.go | 12 +++---- pkg/limatmpl/embed.go | 10 +++--- pkg/limatmpl/embed_test.go | 2 +- pkg/limatmpl/locator.go | 8 ++--- pkg/limatmpl/locator_test.go | 4 +-- pkg/limatmpl/template.go | 2 +- pkg/limayaml/defaults.go | 22 ++++++------ pkg/limayaml/defaults_test.go | 10 +++--- pkg/limayaml/load.go | 4 +-- pkg/limayaml/marshal.go | 2 +- pkg/limayaml/marshal_test.go | 2 +- pkg/limayaml/validate.go | 12 +++---- pkg/limayaml/validate_test.go | 2 +- pkg/networks/commands.go | 4 +-- pkg/networks/commands_test.go | 2 +- pkg/networks/config.go | 6 ++-- pkg/networks/reconcile/reconcile.go | 10 +++--- pkg/networks/usernet/client.go | 8 ++--- pkg/networks/usernet/config.go | 6 ++-- pkg/networks/usernet/config_test.go | 2 +- pkg/networks/usernet/recoincile.go | 8 ++--- pkg/networks/validate.go | 2 +- pkg/osutil/dns_darwin.go | 2 +- pkg/osutil/user.go | 4 +-- pkg/portfwd/client.go | 4 +-- pkg/portfwd/forward.go | 6 ++-- pkg/portfwd/listener.go | 2 +- pkg/portfwdserver/server.go | 4 +-- pkg/registry/registry.go | 6 ++-- pkg/snapshot/snapshot.go | 4 +-- pkg/sshutil/format.go | 2 +- pkg/sshutil/sshutil.go | 10 +++--- pkg/store/dirnames/dirnames.go | 2 +- pkg/store/disk.go | 2 +- pkg/store/fuzz_test.go | 2 +- pkg/store/instance.go | 14 ++++---- pkg/store/instance_test.go | 2 +- pkg/store/instance_unix.go | 2 +- pkg/store/instance_windows.go | 4 +-- pkg/store/store.go | 8 ++--- pkg/templatestore/templatestore.go | 4 +-- pkg/usrlocalsharelima/usrlocalsharelima.go | 4 +-- 142 files changed, 424 insertions(+), 424 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 991e6939eec..368c7a4e852 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -90,7 +90,7 @@ linters: - name: dot-imports arguments: - allowedPackages: - - github.com/lima-vm/lima/pkg/must + - github.com/lima-vm/lima/v2/pkg/must - name: empty-block - name: error-naming - name: error-return diff --git a/Makefile b/Makefile index b2035b7532e..249e02f21c6 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ endif endif endif -PACKAGE := github.com/lima-vm/lima +PACKAGE := github.com/lima-vm/lima/v2 VERSION := $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags) VERSION_TRIMMED := $(VERSION:v%=%) diff --git a/cmd/lima-driver-qemu/main.go b/cmd/lima-driver-qemu/main.go index e7ef0e7713e..cce2a346437 100644 --- a/cmd/lima-driver-qemu/main.go +++ b/cmd/lima-driver-qemu/main.go @@ -4,8 +4,8 @@ package main import ( - "github.com/lima-vm/lima/pkg/driver/external/server" - "github.com/lima-vm/lima/pkg/driver/qemu" + "github.com/lima-vm/lima/v2/pkg/driver/external/server" + "github.com/lima-vm/lima/v2/pkg/driver/qemu" ) // To be used as an external driver for Lima. diff --git a/cmd/lima-driver-vz/main_darwin.go b/cmd/lima-driver-vz/main_darwin.go index 4b5c7baf35a..83c61d183cb 100644 --- a/cmd/lima-driver-vz/main_darwin.go +++ b/cmd/lima-driver-vz/main_darwin.go @@ -4,8 +4,8 @@ package main import ( - "github.com/lima-vm/lima/pkg/driver/external/server" - "github.com/lima-vm/lima/pkg/driver/vz" + "github.com/lima-vm/lima/v2/pkg/driver/external/server" + "github.com/lima-vm/lima/v2/pkg/driver/vz" ) // To be used as an external driver for Lima. diff --git a/cmd/lima-driver-wsl2/main_windows.go b/cmd/lima-driver-wsl2/main_windows.go index 867a1e94e14..9e1d9b66a1b 100644 --- a/cmd/lima-driver-wsl2/main_windows.go +++ b/cmd/lima-driver-wsl2/main_windows.go @@ -4,8 +4,8 @@ package main import ( - "github.com/lima-vm/lima/pkg/driver/external/server" - "github.com/lima-vm/lima/pkg/driver/wsl2" + "github.com/lima-vm/lima/v2/pkg/driver/external/server" + "github.com/lima-vm/lima/v2/pkg/driver/wsl2" ) // To be used as an external driver for Lima. diff --git a/cmd/lima-guestagent/daemon_linux.go b/cmd/lima-guestagent/daemon_linux.go index 919edb19a53..1002a3cb63e 100644 --- a/cmd/lima-guestagent/daemon_linux.go +++ b/cmd/lima-guestagent/daemon_linux.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/guestagent" - "github.com/lima-vm/lima/pkg/guestagent/api/server" - "github.com/lima-vm/lima/pkg/guestagent/serialport" - "github.com/lima-vm/lima/pkg/portfwdserver" + "github.com/lima-vm/lima/v2/pkg/guestagent" + "github.com/lima-vm/lima/v2/pkg/guestagent/api/server" + "github.com/lima-vm/lima/v2/pkg/guestagent/serialport" + "github.com/lima-vm/lima/v2/pkg/portfwdserver" ) func newDaemonCommand() *cobra.Command { diff --git a/cmd/lima-guestagent/install_systemd_linux.go b/cmd/lima-guestagent/install_systemd_linux.go index 53cbb5d3ae9..b57e6f727ea 100644 --- a/cmd/lima-guestagent/install_systemd_linux.go +++ b/cmd/lima-guestagent/install_systemd_linux.go @@ -15,7 +15,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/textutil" + "github.com/lima-vm/lima/v2/pkg/textutil" ) func newInstallSystemdCommand() *cobra.Command { diff --git a/cmd/lima-guestagent/main_linux.go b/cmd/lima-guestagent/main_linux.go index ac73b743ea4..875880a60c1 100644 --- a/cmd/lima-guestagent/main_linux.go +++ b/cmd/lima-guestagent/main_linux.go @@ -9,8 +9,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/debugutil" - "github.com/lima-vm/lima/pkg/version" + "github.com/lima-vm/lima/v2/pkg/debugutil" + "github.com/lima-vm/lima/v2/pkg/version" ) func main() { diff --git a/cmd/limactl/clone.go b/cmd/limactl/clone.go index 694c3488a6a..4aa226c159b 100644 --- a/cmd/limactl/clone.go +++ b/cmd/limactl/clone.go @@ -11,13 +11,13 @@ import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/cmd/limactl/editflags" - "github.com/lima-vm/lima/pkg/instance" - "github.com/lima-vm/lima/pkg/limayaml" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/cmd/limactl/editflags" + "github.com/lima-vm/lima/v2/pkg/instance" + "github.com/lima-vm/lima/v2/pkg/limayaml" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) func newCloneCommand() *cobra.Command { diff --git a/cmd/limactl/completion.go b/cmd/limactl/completion.go index f68f463b5cc..9e5b949db6a 100644 --- a/cmd/limactl/completion.go +++ b/cmd/limactl/completion.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/templatestore" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/templatestore" ) func bashCompleteInstanceNames(_ *cobra.Command) ([]string, cobra.ShellCompDirective) { diff --git a/cmd/limactl/copy.go b/cmd/limactl/copy.go index 832c3fdb0a6..6204d158969 100644 --- a/cmd/limactl/copy.go +++ b/cmd/limactl/copy.go @@ -16,9 +16,9 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/sshutil" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/sshutil" + "github.com/lima-vm/lima/v2/pkg/store" ) const copyHelp = `Copy files between host and guest diff --git a/cmd/limactl/debug.go b/cmd/limactl/debug.go index 21bfef65987..67b86ffad08 100644 --- a/cmd/limactl/debug.go +++ b/cmd/limactl/debug.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/hostagent/dns" + "github.com/lima-vm/lima/v2/pkg/hostagent/dns" ) func newDebugCommand() *cobra.Command { diff --git a/cmd/limactl/delete.go b/cmd/limactl/delete.go index 407803566d4..53ab1ed661d 100644 --- a/cmd/limactl/delete.go +++ b/cmd/limactl/delete.go @@ -12,10 +12,10 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/autostart" - "github.com/lima-vm/lima/pkg/instance" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/autostart" + "github.com/lima-vm/lima/v2/pkg/instance" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/store" ) func newDeleteCommand() *cobra.Command { diff --git a/cmd/limactl/disk.go b/cmd/limactl/disk.go index f6b035b11d7..7b6423d9dd7 100644 --- a/cmd/limactl/disk.go +++ b/cmd/limactl/disk.go @@ -18,9 +18,9 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/imgutil/proxyimgutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/imgutil/proxyimgutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func newDiskCommand() *cobra.Command { diff --git a/cmd/limactl/edit.go b/cmd/limactl/edit.go index 0265e0ad5e3..83455f6e10e 100644 --- a/cmd/limactl/edit.go +++ b/cmd/limactl/edit.go @@ -13,15 +13,15 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/cmd/limactl/editflags" - "github.com/lima-vm/lima/pkg/editutil" - "github.com/lima-vm/lima/pkg/instance" - "github.com/lima-vm/lima/pkg/limayaml" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/uiutil" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/cmd/limactl/editflags" + "github.com/lima-vm/lima/v2/pkg/editutil" + "github.com/lima-vm/lima/v2/pkg/instance" + "github.com/lima-vm/lima/v2/pkg/limayaml" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/uiutil" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) func newEditCommand() *cobra.Command { diff --git a/cmd/limactl/factory-reset.go b/cmd/limactl/factory-reset.go index 9d0add8f75b..a3c4faab825 100644 --- a/cmd/limactl/factory-reset.go +++ b/cmd/limactl/factory-reset.go @@ -12,10 +12,10 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/cidata" - "github.com/lima-vm/lima/pkg/instance" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/cidata" + "github.com/lima-vm/lima/v2/pkg/instance" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func newFactoryResetCommand() *cobra.Command { diff --git a/cmd/limactl/genschema.go b/cmd/limactl/genschema.go index bb7f2236600..0739023eab9 100644 --- a/cmd/limactl/genschema.go +++ b/cmd/limactl/genschema.go @@ -14,8 +14,8 @@ import ( "github.com/spf13/cobra" orderedmap "github.com/wk8/go-ordered-map/v2" - "github.com/lima-vm/lima/pkg/jsonschemautil" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/jsonschemautil" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) func newGenSchemaCommand() *cobra.Command { diff --git a/cmd/limactl/hostagent.go b/cmd/limactl/hostagent.go index d850655500c..0233a53341c 100644 --- a/cmd/limactl/hostagent.go +++ b/cmd/limactl/hostagent.go @@ -18,8 +18,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/hostagent" - "github.com/lima-vm/lima/pkg/hostagent/api/server" + "github.com/lima-vm/lima/v2/pkg/hostagent" + "github.com/lima-vm/lima/v2/pkg/hostagent/api/server" ) func newHostagentCommand() *cobra.Command { diff --git a/cmd/limactl/info.go b/cmd/limactl/info.go index 8ece9ab86ea..98649dad652 100644 --- a/cmd/limactl/info.go +++ b/cmd/limactl/info.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/limainfo" + "github.com/lima-vm/lima/v2/pkg/limainfo" ) func newInfoCommand() *cobra.Command { diff --git a/cmd/limactl/list.go b/cmd/limactl/list.go index 20706ad9874..da4aa10fe1d 100644 --- a/cmd/limactl/list.go +++ b/cmd/limactl/list.go @@ -16,7 +16,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store" ) func fieldNames() []string { diff --git a/cmd/limactl/main.go b/cmd/limactl/main.go index d12b7813b65..6ee01a0347e 100644 --- a/cmd/limactl/main.go +++ b/cmd/limactl/main.go @@ -15,12 +15,12 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/debugutil" - "github.com/lima-vm/lima/pkg/driver/external/server" - "github.com/lima-vm/lima/pkg/fsutil" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/version" + "github.com/lima-vm/lima/v2/pkg/debugutil" + "github.com/lima-vm/lima/v2/pkg/driver/external/server" + "github.com/lima-vm/lima/v2/pkg/fsutil" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/version" ) const ( diff --git a/cmd/limactl/main_darwin.go b/cmd/limactl/main_darwin.go index 013961969ec..e57f045ffc3 100644 --- a/cmd/limactl/main_darwin.go +++ b/cmd/limactl/main_darwin.go @@ -6,4 +6,4 @@ package main // Import vz driver to register it in the registry on darwin. -import _ "github.com/lima-vm/lima/pkg/driver/vz" +import _ "github.com/lima-vm/lima/v2/pkg/driver/vz" diff --git a/cmd/limactl/main_qemu.go b/cmd/limactl/main_qemu.go index ae2dab08f10..73e156671a9 100644 --- a/cmd/limactl/main_qemu.go +++ b/cmd/limactl/main_qemu.go @@ -6,4 +6,4 @@ package main // Import qemu driver to register it in the registry on all platforms. -import _ "github.com/lima-vm/lima/pkg/driver/qemu" +import _ "github.com/lima-vm/lima/v2/pkg/driver/qemu" diff --git a/cmd/limactl/main_windows.go b/cmd/limactl/main_windows.go index 698362e082b..3438cdbc300 100644 --- a/cmd/limactl/main_windows.go +++ b/cmd/limactl/main_windows.go @@ -6,4 +6,4 @@ package main // Import wsl2 driver to register it in the registry on windows. -import _ "github.com/lima-vm/lima/pkg/driver/wsl2" +import _ "github.com/lima-vm/lima/v2/pkg/driver/wsl2" diff --git a/cmd/limactl/network.go b/cmd/limactl/network.go index 7fd32ff293a..6a782134fe7 100644 --- a/cmd/limactl/network.go +++ b/cmd/limactl/network.go @@ -17,8 +17,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) const networkCreateExample = ` Create a network: diff --git a/cmd/limactl/protect.go b/cmd/limactl/protect.go index 47e3e0a95c2..5ba3348e959 100644 --- a/cmd/limactl/protect.go +++ b/cmd/limactl/protect.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store" ) func newProtectCommand() *cobra.Command { diff --git a/cmd/limactl/prune.go b/cmd/limactl/prune.go index 76266aa07a2..8fa2e7ddc93 100644 --- a/cmd/limactl/prune.go +++ b/cmd/limactl/prune.go @@ -10,10 +10,10 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/downloader" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/templatestore" + "github.com/lima-vm/lima/v2/pkg/downloader" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/templatestore" ) func newPruneCommand() *cobra.Command { diff --git a/cmd/limactl/restart.go b/cmd/limactl/restart.go index f281aff9da1..67e862082a0 100644 --- a/cmd/limactl/restart.go +++ b/cmd/limactl/restart.go @@ -6,8 +6,8 @@ package main import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/instance" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/instance" + "github.com/lima-vm/lima/v2/pkg/store" ) func newRestartCommand() *cobra.Command { diff --git a/cmd/limactl/shell.go b/cmd/limactl/shell.go index 2c7498d6acc..a49fe072aa9 100644 --- a/cmd/limactl/shell.go +++ b/cmd/limactl/shell.go @@ -19,12 +19,12 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/instance" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/limayaml" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/sshutil" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/instance" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/limayaml" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/sshutil" + "github.com/lima-vm/lima/v2/pkg/store" ) const shellHelp = `Execute shell in Lima diff --git a/cmd/limactl/show-ssh.go b/cmd/limactl/show-ssh.go index eb2a1de4b03..eac462ae1f7 100644 --- a/cmd/limactl/show-ssh.go +++ b/cmd/limactl/show-ssh.go @@ -13,10 +13,10 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/sshutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/sshutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) const showSSHExample = ` diff --git a/cmd/limactl/snapshot.go b/cmd/limactl/snapshot.go index 6f7e198cb53..aabd11d0bbe 100644 --- a/cmd/limactl/snapshot.go +++ b/cmd/limactl/snapshot.go @@ -11,8 +11,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/snapshot" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/snapshot" + "github.com/lima-vm/lima/v2/pkg/store" ) func newSnapshotCommand() *cobra.Command { diff --git a/cmd/limactl/start-at-login_unix.go b/cmd/limactl/start-at-login_unix.go index e127caa368f..55d59ca4f1e 100644 --- a/cmd/limactl/start-at-login_unix.go +++ b/cmd/limactl/start-at-login_unix.go @@ -13,8 +13,8 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/autostart" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/autostart" + "github.com/lima-vm/lima/v2/pkg/store" ) func startAtLoginAction(cmd *cobra.Command, args []string) error { diff --git a/cmd/limactl/start.go b/cmd/limactl/start.go index 008f9ec640d..46237eb6569 100644 --- a/cmd/limactl/start.go +++ b/cmd/limactl/start.go @@ -15,18 +15,18 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/cmd/limactl/editflags" - "github.com/lima-vm/lima/pkg/editutil" - "github.com/lima-vm/lima/pkg/instance" - "github.com/lima-vm/lima/pkg/limatmpl" - "github.com/lima-vm/lima/pkg/limayaml" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/registry" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/templatestore" - "github.com/lima-vm/lima/pkg/uiutil" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/cmd/limactl/editflags" + "github.com/lima-vm/lima/v2/pkg/editutil" + "github.com/lima-vm/lima/v2/pkg/instance" + "github.com/lima-vm/lima/v2/pkg/limatmpl" + "github.com/lima-vm/lima/v2/pkg/limayaml" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/registry" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/templatestore" + "github.com/lima-vm/lima/v2/pkg/uiutil" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) func registerCreateFlags(cmd *cobra.Command, commentPrefix string) { diff --git a/cmd/limactl/stop.go b/cmd/limactl/stop.go index 3f1ee6d2504..d4414daff01 100644 --- a/cmd/limactl/stop.go +++ b/cmd/limactl/stop.go @@ -6,9 +6,9 @@ package main import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/instance" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/instance" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/store" ) func newStopCommand() *cobra.Command { diff --git a/cmd/limactl/sudoers.go b/cmd/limactl/sudoers.go index 49e28cc2d99..7a33bb05596 100644 --- a/cmd/limactl/sudoers.go +++ b/cmd/limactl/sudoers.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks" ) const socketVMNetURL = "https://lima-vm.io/docs/config/network/vmnet/#socket_vmnet" diff --git a/cmd/limactl/sudoers_darwin.go b/cmd/limactl/sudoers_darwin.go index af26cb7aba0..cfa5f464620 100644 --- a/cmd/limactl/sudoers_darwin.go +++ b/cmd/limactl/sudoers_darwin.go @@ -11,7 +11,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks" ) func sudoersAction(cmd *cobra.Command, args []string) error { diff --git a/cmd/limactl/template.go b/cmd/limactl/template.go index fbbb945ccb0..b05a3f11cd2 100644 --- a/cmd/limactl/template.go +++ b/cmd/limactl/template.go @@ -12,10 +12,10 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/limatmpl" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/pkg/limatmpl" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) func newTemplateCommand() *cobra.Command { diff --git a/cmd/limactl/tunnel.go b/cmd/limactl/tunnel.go index 80c155546e6..189e8f61b8f 100644 --- a/cmd/limactl/tunnel.go +++ b/cmd/limactl/tunnel.go @@ -14,9 +14,9 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/freeport" - "github.com/lima-vm/lima/pkg/sshutil" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/freeport" + "github.com/lima-vm/lima/v2/pkg/sshutil" + "github.com/lima-vm/lima/v2/pkg/store" ) const tunnelHelp = `Create a tunnel for Lima diff --git a/cmd/limactl/unprotect.go b/cmd/limactl/unprotect.go index 72629678e36..dc8258f9aa9 100644 --- a/cmd/limactl/unprotect.go +++ b/cmd/limactl/unprotect.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store" ) func newUnprotectCommand() *cobra.Command { diff --git a/cmd/limactl/usernet.go b/cmd/limactl/usernet.go index 8a6854a76bb..37777de65d7 100644 --- a/cmd/limactl/usernet.go +++ b/cmd/limactl/usernet.go @@ -11,7 +11,7 @@ import ( "github.com/spf13/cobra" - "github.com/lima-vm/lima/pkg/networks/usernet" + "github.com/lima-vm/lima/v2/pkg/networks/usernet" ) func newUsernetCommand() *cobra.Command { diff --git a/go.mod b/go.mod index 0b05d9545a1..42d9c34f74a 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ // gomodjail:confined -module github.com/lima-vm/lima +module github.com/lima-vm/lima/v2 go 1.23.0 diff --git a/hack/oss-fuzz-build.sh b/hack/oss-fuzz-build.sh index 1334554d4a5..e2e50d856b4 100755 --- a/hack/oss-fuzz-build.sh +++ b/hack/oss-fuzz-build.sh @@ -8,11 +8,11 @@ # Modify https://github.com/google/oss-fuzz/blob/master/projects/lima/project.yaml for access management to Limas OSS-Fuzz crashes. printf "package store\nimport _ \"github.com/AdamKorcz/go-118-fuzz-build/testing\"\n" >"$SRC"/lima/pkg/store/register.go go mod tidy -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/store FuzzLoadYAMLByFilePath FuzzLoadYAMLByFilePath -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/store FuzzInspect FuzzInspect -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/nativeimgutil FuzzConvertToRaw FuzzConvertToRaw -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/cidata FuzzSetupEnv FuzzSetupEnv -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/iso9660util FuzzIsISO9660 FuzzIsISO9660 -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/guestagent/procnettcp FuzzParse FuzzParse -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/yqutil FuzzEvaluateExpression FuzzEvaluateExpression -compile_native_go_fuzzer github.com/lima-vm/lima/pkg/downloader FuzzDownload FuzzDownload +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/store FuzzLoadYAMLByFilePath FuzzLoadYAMLByFilePath +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/store FuzzInspect FuzzInspect +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/nativeimgutil FuzzConvertToRaw FuzzConvertToRaw +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/cidata FuzzSetupEnv FuzzSetupEnv +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/iso9660util FuzzIsISO9660 FuzzIsISO9660 +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/guestagent/procnettcp FuzzParse FuzzParse +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/yqutil FuzzEvaluateExpression FuzzEvaluateExpression +compile_native_go_fuzzer github.com/lima-vm/lima/v2/pkg/downloader FuzzDownload FuzzDownload diff --git a/pkg/autostart/autostart.go b/pkg/autostart/autostart.go index 038b2035b1b..b8c3a7ac8f1 100644 --- a/pkg/autostart/autostart.go +++ b/pkg/autostart/autostart.go @@ -15,7 +15,7 @@ import ( "strconv" "strings" - "github.com/lima-vm/lima/pkg/textutil" + "github.com/lima-vm/lima/v2/pkg/textutil" ) //go:embed lima-vm@INSTANCE.service diff --git a/pkg/cidata/cidata.go b/pkg/cidata/cidata.go index 8439ca022f9..0bf39d3f9a1 100644 --- a/pkg/cidata/cidata.go +++ b/pkg/cidata/cidata.go @@ -22,16 +22,16 @@ import ( "github.com/docker/go-units" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/debugutil" - "github.com/lima-vm/lima/pkg/instance/hostname" - "github.com/lima-vm/lima/pkg/iso9660util" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/localpathutil" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/networks/usernet" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/sshutil" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/debugutil" + "github.com/lima-vm/lima/v2/pkg/instance/hostname" + "github.com/lima-vm/lima/v2/pkg/iso9660util" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/localpathutil" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks/usernet" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/sshutil" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) var netLookupIP = func(host string) []net.IP { diff --git a/pkg/cidata/cidata_test.go b/pkg/cidata/cidata_test.go index 499456529e2..404be239656 100644 --- a/pkg/cidata/cidata_test.go +++ b/pkg/cidata/cidata_test.go @@ -11,7 +11,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks" ) func fakeLookupIP(_ string) []net.IP { diff --git a/pkg/cidata/fuzz_test.go b/pkg/cidata/fuzz_test.go index 4305b13a780..256680c0602 100644 --- a/pkg/cidata/fuzz_test.go +++ b/pkg/cidata/fuzz_test.go @@ -6,7 +6,7 @@ package cidata import ( "testing" - "github.com/lima-vm/lima/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks" ) func FuzzSetupEnv(f *testing.F) { diff --git a/pkg/cidata/template.go b/pkg/cidata/template.go index 80622def553..33825b3ba18 100644 --- a/pkg/cidata/template.go +++ b/pkg/cidata/template.go @@ -11,9 +11,9 @@ import ( "io/fs" "path" - "github.com/lima-vm/lima/pkg/identifiers" - "github.com/lima-vm/lima/pkg/iso9660util" - "github.com/lima-vm/lima/pkg/textutil" + "github.com/lima-vm/lima/v2/pkg/identifiers" + "github.com/lima-vm/lima/v2/pkg/iso9660util" + "github.com/lima-vm/lima/v2/pkg/textutil" ) //go:embed cidata.TEMPLATE.d diff --git a/pkg/downloader/downloader.go b/pkg/downloader/downloader.go index ce136d653c1..289f47c9629 100644 --- a/pkg/downloader/downloader.go +++ b/pkg/downloader/downloader.go @@ -24,10 +24,10 @@ import ( "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/httpclientutil" - "github.com/lima-vm/lima/pkg/localpathutil" - "github.com/lima-vm/lima/pkg/lockutil" - "github.com/lima-vm/lima/pkg/progressbar" + "github.com/lima-vm/lima/v2/pkg/httpclientutil" + "github.com/lima-vm/lima/v2/pkg/localpathutil" + "github.com/lima-vm/lima/v2/pkg/lockutil" + "github.com/lima-vm/lima/v2/pkg/progressbar" ) // HideProgress is used only for testing. diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go index e0a4759c25f..eeb8bf7ca0d 100644 --- a/pkg/driver/driver.go +++ b/pkg/driver/driver.go @@ -7,7 +7,7 @@ import ( "context" "net" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store" ) // Lifecycle defines basic lifecycle operations. diff --git a/pkg/driver/external/client/client.go b/pkg/driver/external/client/client.go index ea4420d894a..94b616ff9a4 100644 --- a/pkg/driver/external/client/client.go +++ b/pkg/driver/external/client/client.go @@ -11,7 +11,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - pb "github.com/lima-vm/lima/pkg/driver/external" + pb "github.com/lima-vm/lima/v2/pkg/driver/external" ) type DriverClient struct { diff --git a/pkg/driver/external/client/methods.go b/pkg/driver/external/client/methods.go index c2269d82b01..5bd4dfb6319 100644 --- a/pkg/driver/external/client/methods.go +++ b/pkg/driver/external/client/methods.go @@ -12,9 +12,9 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/lima-vm/lima/pkg/driver" - pb "github.com/lima-vm/lima/pkg/driver/external" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/driver" + pb "github.com/lima-vm/lima/v2/pkg/driver/external" + "github.com/lima-vm/lima/v2/pkg/store" ) func (d *DriverClient) Validate() error { diff --git a/pkg/driver/external/driver.proto b/pkg/driver/external/driver.proto index 82c77feec64..16bab1c84c7 100644 --- a/pkg/driver/external/driver.proto +++ b/pkg/driver/external/driver.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/lima-vm/lima/pkg/driver/external"; +option go_package = "github.com/lima-vm/lima/v2/pkg/driver/external"; import "google/protobuf/empty.proto"; @@ -71,4 +71,4 @@ message ListSnapshotsResponse { message ForwardGuestAgentResponse { bool should_forward = 1; -} \ No newline at end of file +} diff --git a/pkg/driver/external/server/methods.go b/pkg/driver/external/server/methods.go index 4b31a076f95..5c773c8753b 100644 --- a/pkg/driver/external/server/methods.go +++ b/pkg/driver/external/server/methods.go @@ -14,10 +14,10 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - "github.com/lima-vm/lima/pkg/bicopy" - pb "github.com/lima-vm/lima/pkg/driver/external" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/bicopy" + pb "github.com/lima-vm/lima/v2/pkg/driver/external" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func (s *DriverServer) Start(_ *emptypb.Empty, stream pb.Driver_StartServer) error { diff --git a/pkg/driver/external/server/server.go b/pkg/driver/external/server/server.go index f8138b3a19f..b0c4140a4e5 100644 --- a/pkg/driver/external/server/server.go +++ b/pkg/driver/external/server/server.go @@ -21,12 +21,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "github.com/lima-vm/lima/pkg/driver" - pb "github.com/lima-vm/lima/pkg/driver/external" - "github.com/lima-vm/lima/pkg/driver/external/client" - "github.com/lima-vm/lima/pkg/registry" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/driver" + pb "github.com/lima-vm/lima/v2/pkg/driver/external" + "github.com/lima-vm/lima/v2/pkg/driver/external/client" + "github.com/lima-vm/lima/v2/pkg/registry" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) type DriverServer struct { diff --git a/pkg/driver/qemu/entitlementutil/entitlementutil.go b/pkg/driver/qemu/entitlementutil/entitlementutil.go index 6555095dcc9..cae06f571b8 100644 --- a/pkg/driver/qemu/entitlementutil/entitlementutil.go +++ b/pkg/driver/qemu/entitlementutil/entitlementutil.go @@ -13,7 +13,7 @@ import ( "github.com/mattn/go-isatty" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/uiutil" + "github.com/lima-vm/lima/v2/pkg/uiutil" ) // IsSigned returns an error if the binary is not signed, or the sign is invalid, diff --git a/pkg/driver/qemu/qemu.go b/pkg/driver/qemu/qemu.go index b1986d4358e..e74d4a59a88 100644 --- a/pkg/driver/qemu/qemu.go +++ b/pkg/driver/qemu/qemu.go @@ -27,15 +27,15 @@ import ( "github.com/mattn/go-shellwords" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/fileutils" - "github.com/lima-vm/lima/pkg/iso9660util" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/networks/usernet" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/qemuimgutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/fileutils" + "github.com/lima-vm/lima/v2/pkg/iso9660util" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks/usernet" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/qemuimgutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) type Config struct { diff --git a/pkg/driver/qemu/qemu_driver.go b/pkg/driver/qemu/qemu_driver.go index 187509c4b90..2d2c2e43ee1 100644 --- a/pkg/driver/qemu/qemu_driver.go +++ b/pkg/driver/qemu/qemu_driver.go @@ -26,14 +26,14 @@ import ( "github.com/digitalocean/go-qemu/qmp/raw" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/driver/qemu/entitlementutil" - "github.com/lima-vm/lima/pkg/executil" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/networks/usernet" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/driver/qemu/entitlementutil" + "github.com/lima-vm/lima/v2/pkg/executil" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/networks/usernet" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) type LimaQemuDriver struct { diff --git a/pkg/driver/qemu/register.go b/pkg/driver/qemu/register.go index 6b73d2c624c..8efca9d2c98 100644 --- a/pkg/driver/qemu/register.go +++ b/pkg/driver/qemu/register.go @@ -5,7 +5,7 @@ package qemu -import "github.com/lima-vm/lima/pkg/registry" +import "github.com/lima-vm/lima/v2/pkg/registry" func init() { registry.Register(New()) diff --git a/pkg/driver/vz/disk.go b/pkg/driver/vz/disk.go index f98cf2290c8..138e67dd079 100644 --- a/pkg/driver/vz/disk.go +++ b/pkg/driver/vz/disk.go @@ -12,10 +12,10 @@ import ( "github.com/docker/go-units" - "github.com/lima-vm/lima/pkg/imgutil/proxyimgutil" - "github.com/lima-vm/lima/pkg/iso9660util" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/imgutil/proxyimgutil" + "github.com/lima-vm/lima/v2/pkg/iso9660util" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func EnsureDisk(_ context.Context, inst *store.Instance) error { diff --git a/pkg/driver/vz/register.go b/pkg/driver/vz/register.go index 26997debcaa..41ac32a5dd2 100644 --- a/pkg/driver/vz/register.go +++ b/pkg/driver/vz/register.go @@ -5,7 +5,7 @@ package vz -import "github.com/lima-vm/lima/pkg/registry" +import "github.com/lima-vm/lima/v2/pkg/registry" func init() { registry.Register(New()) diff --git a/pkg/driver/vz/rosetta_directory_share_arm64.go b/pkg/driver/vz/rosetta_directory_share_arm64.go index 6e7fdbfe2e7..d2ff803d85a 100644 --- a/pkg/driver/vz/rosetta_directory_share_arm64.go +++ b/pkg/driver/vz/rosetta_directory_share_arm64.go @@ -12,7 +12,7 @@ import ( "github.com/coreos/go-semver/semver" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/osutil" ) func createRosettaDirectoryShareConfiguration() (*vz.VirtioFileSystemDeviceConfiguration, error) { diff --git a/pkg/driver/vz/vm_darwin.go b/pkg/driver/vz/vm_darwin.go index 2f1351dfb62..0889c29dc92 100644 --- a/pkg/driver/vz/vm_darwin.go +++ b/pkg/driver/vz/vm_darwin.go @@ -25,14 +25,14 @@ import ( "github.com/lima-vm/go-qcow2reader/image/raw" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/imgutil/proxyimgutil" - "github.com/lima-vm/lima/pkg/iso9660util" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/networks/usernet" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/imgutil/proxyimgutil" + "github.com/lima-vm/lima/v2/pkg/iso9660util" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks/usernet" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) // diskImageCachingMode is set to DiskImageCachingModeCached so as to avoid disk corruption on ARM: diff --git a/pkg/driver/vz/vz_driver_darwin.go b/pkg/driver/vz/vz_driver_darwin.go index d34441354b9..e28f082f471 100644 --- a/pkg/driver/vz/vz_driver_darwin.go +++ b/pkg/driver/vz/vz_driver_darwin.go @@ -18,11 +18,11 @@ import ( "github.com/coreos/go-semver/semver" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/reflectutil" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/reflectutil" + "github.com/lima-vm/lima/v2/pkg/store" ) var knownYamlProperties = []string{ diff --git a/pkg/driver/wsl2/fs.go b/pkg/driver/wsl2/fs.go index 53823a7fb06..ddbc0bbde69 100644 --- a/pkg/driver/wsl2/fs.go +++ b/pkg/driver/wsl2/fs.go @@ -11,9 +11,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/fileutils" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/fileutils" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) // EnsureFs downloads the root fs. diff --git a/pkg/driver/wsl2/register.go b/pkg/driver/wsl2/register.go index cf990e91990..e824d064580 100644 --- a/pkg/driver/wsl2/register.go +++ b/pkg/driver/wsl2/register.go @@ -5,7 +5,7 @@ package wsl2 -import "github.com/lima-vm/lima/pkg/registry" +import "github.com/lima-vm/lima/v2/pkg/registry" func init() { registry.Register(New()) diff --git a/pkg/driver/wsl2/vm_windows.go b/pkg/driver/wsl2/vm_windows.go index 0ee09bcae33..7add196d35b 100644 --- a/pkg/driver/wsl2/vm_windows.go +++ b/pkg/driver/wsl2/vm_windows.go @@ -15,10 +15,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/executil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/textutil" + "github.com/lima-vm/lima/v2/pkg/executil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/textutil" ) // startVM calls WSL to start a VM. diff --git a/pkg/driver/wsl2/wsl_driver_windows.go b/pkg/driver/wsl2/wsl_driver_windows.go index 1c93ee3422d..1f2d6393a88 100644 --- a/pkg/driver/wsl2/wsl_driver_windows.go +++ b/pkg/driver/wsl2/wsl_driver_windows.go @@ -13,12 +13,12 @@ import ( "github.com/Microsoft/go-winio/pkg/guid" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/freeport" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/reflectutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/windows" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/freeport" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/reflectutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/windows" ) var knownYamlProperties = []string{ diff --git a/pkg/driverutil/instance.go b/pkg/driverutil/instance.go index 969cf10c375..f135cc8f61b 100644 --- a/pkg/driverutil/instance.go +++ b/pkg/driverutil/instance.go @@ -8,10 +8,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/driver/external/server" - "github.com/lima-vm/lima/pkg/registry" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/driver/external/server" + "github.com/lima-vm/lima/v2/pkg/registry" + "github.com/lima-vm/lima/v2/pkg/store" ) // CreateConfiguredDriver creates a driver.ConfiguredDriver for the given instance. diff --git a/pkg/editutil/editutil.go b/pkg/editutil/editutil.go index ffef4dfe027..9c396a51315 100644 --- a/pkg/editutil/editutil.go +++ b/pkg/editutil/editutil.go @@ -13,9 +13,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/editutil/editorcmd" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/editutil/editorcmd" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func fileWarning(filename string) string { diff --git a/pkg/executil/command.go b/pkg/executil/command.go index 22f374d04a8..36aea3e8a01 100644 --- a/pkg/executil/command.go +++ b/pkg/executil/command.go @@ -9,7 +9,7 @@ import ( "fmt" "os/exec" - "github.com/lima-vm/lima/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/ioutilx" ) type options struct { diff --git a/pkg/fileutils/download.go b/pkg/fileutils/download.go index a2f4077759f..7bf3fea5372 100644 --- a/pkg/fileutils/download.go +++ b/pkg/fileutils/download.go @@ -11,8 +11,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/downloader" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/downloader" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) // ErrSkipped is returned when the downloader did not attempt to download the specified file. diff --git a/pkg/freeport/freeport_windows.go b/pkg/freeport/freeport_windows.go index 6fdbf8f085c..f00d2957767 100644 --- a/pkg/freeport/freeport_windows.go +++ b/pkg/freeport/freeport_windows.go @@ -3,7 +3,7 @@ package freeport -import "github.com/lima-vm/lima/pkg/windows" +import "github.com/lima-vm/lima/v2/pkg/windows" func VSock() (int, error) { return windows.GetRandomFreeVSockPort(0, 2147483647) diff --git a/pkg/guestagent/api/client/client.go b/pkg/guestagent/api/client/client.go index 544123a5fb9..8b4cd079f79 100644 --- a/pkg/guestagent/api/client/client.go +++ b/pkg/guestagent/api/client/client.go @@ -12,7 +12,7 @@ import ( "google.golang.org/grpc/resolver" "google.golang.org/protobuf/types/known/emptypb" - "github.com/lima-vm/lima/pkg/guestagent/api" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" ) type GuestAgentClient struct { diff --git a/pkg/guestagent/api/guestservice.pb.desc b/pkg/guestagent/api/guestservice.pb.desc index 2155145e47d..3a73342c8e4 100644 --- a/pkg/guestagent/api/guestservice.pb.desc +++ b/pkg/guestagent/api/guestservice.pb.desc @@ -1,5 +1,5 @@ -ô +÷ guestservice.protogoogle/protobuf/empty.protogoogle/protobuf/timestamp.proto"0 Info( local_ports ( 2.IPPortR @@ -27,4 +27,4 @@ mount_path ( R mountPath. GetInfo.google.protobuf.Empty.Info- GetEvents.google.protobuf.Empty.Event01 PostInotify.Inotify.google.protobuf.Empty(, -Tunnel.TunnelMessage.TunnelMessage(0B!Zgithub.com/lima-vm/lima/pkg/apibproto3 \ No newline at end of file +Tunnel.TunnelMessage.TunnelMessage(0B$Z"github.com/lima-vm/lima/v2/pkg/apibproto3 \ No newline at end of file diff --git a/pkg/guestagent/api/guestservice.pb.go b/pkg/guestagent/api/guestservice.pb.go index 27bb5983dee..d20c7aa340a 100644 --- a/pkg/guestagent/api/guestservice.pb.go +++ b/pkg/guestagent/api/guestservice.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v5.27.1 +// protoc v5.29.3 // source: guestservice.proto package api @@ -392,10 +392,10 @@ var file_guestservice_proto_rawDesc = []byte{ 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x28, 0x01, 0x12, 0x2c, 0x0a, 0x06, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x0e, 0x2e, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x0e, 0x2e, 0x54, 0x75, 0x6e, 0x6e, 0x65, 0x6c, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x21, 0x5a, 0x1f, 0x67, 0x69, 0x74, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x28, 0x01, 0x30, 0x01, 0x42, 0x24, 0x5a, 0x22, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6c, 0x69, 0x6d, 0x61, 0x2d, 0x76, 0x6d, 0x2f, - 0x6c, 0x69, 0x6d, 0x61, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x69, 0x6d, 0x61, 0x2f, 0x76, 0x32, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x61, 0x70, 0x69, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/guestagent/api/guestservice.proto b/pkg/guestagent/api/guestservice.proto index 377cf053ef7..20a0ba5902c 100644 --- a/pkg/guestagent/api/guestservice.proto +++ b/pkg/guestagent/api/guestservice.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -option go_package = "github.com/lima-vm/lima/pkg/api"; +option go_package = "github.com/lima-vm/lima/v2/pkg/api"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; diff --git a/pkg/guestagent/api/guestservice_grpc.pb.go b/pkg/guestagent/api/guestservice_grpc.pb.go index 9b9fd1f6baa..ff38b4a6e3f 100644 --- a/pkg/guestagent/api/guestservice_grpc.pb.go +++ b/pkg/guestagent/api/guestservice_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v5.27.1 +// - protoc v5.29.3 // source: guestservice.proto package api diff --git a/pkg/guestagent/api/server/server.go b/pkg/guestagent/api/server/server.go index b8f6e249dde..296d7c9ec78 100644 --- a/pkg/guestagent/api/server/server.go +++ b/pkg/guestagent/api/server/server.go @@ -10,9 +10,9 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/lima-vm/lima/pkg/guestagent" - "github.com/lima-vm/lima/pkg/guestagent/api" - "github.com/lima-vm/lima/pkg/portfwdserver" + "github.com/lima-vm/lima/v2/pkg/guestagent" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" + "github.com/lima-vm/lima/v2/pkg/portfwdserver" ) func StartServer(lis net.Listener, guest *GuestServer) error { diff --git a/pkg/guestagent/guestagent.go b/pkg/guestagent/guestagent.go index b63f6e00b85..eebacd39a88 100644 --- a/pkg/guestagent/guestagent.go +++ b/pkg/guestagent/guestagent.go @@ -6,7 +6,7 @@ package guestagent import ( "context" - "github.com/lima-vm/lima/pkg/guestagent/api" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" ) type Agent interface { diff --git a/pkg/guestagent/guestagent_linux.go b/pkg/guestagent/guestagent_linux.go index 6a665be146c..3d52c4c4f70 100644 --- a/pkg/guestagent/guestagent_linux.go +++ b/pkg/guestagent/guestagent_linux.go @@ -17,11 +17,11 @@ import ( "github.com/sirupsen/logrus" "google.golang.org/protobuf/types/known/timestamppb" - "github.com/lima-vm/lima/pkg/guestagent/api" - "github.com/lima-vm/lima/pkg/guestagent/iptables" - "github.com/lima-vm/lima/pkg/guestagent/kubernetesservice" - "github.com/lima-vm/lima/pkg/guestagent/procnettcp" - "github.com/lima-vm/lima/pkg/guestagent/timesync" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" + "github.com/lima-vm/lima/v2/pkg/guestagent/iptables" + "github.com/lima-vm/lima/v2/pkg/guestagent/kubernetesservice" + "github.com/lima-vm/lima/v2/pkg/guestagent/procnettcp" + "github.com/lima-vm/lima/v2/pkg/guestagent/timesync" ) func New(newTicker func() (<-chan time.Time, func()), iptablesIdle time.Duration) (Agent, error) { diff --git a/pkg/hostagent/api/client/client.go b/pkg/hostagent/api/client/client.go index 118c52904eb..a71d25a99b3 100644 --- a/pkg/hostagent/api/client/client.go +++ b/pkg/hostagent/api/client/client.go @@ -12,8 +12,8 @@ import ( "fmt" "net/http" - "github.com/lima-vm/lima/pkg/hostagent/api" - "github.com/lima-vm/lima/pkg/httpclientutil" + "github.com/lima-vm/lima/v2/pkg/hostagent/api" + "github.com/lima-vm/lima/v2/pkg/httpclientutil" ) type HostAgentClient interface { diff --git a/pkg/hostagent/api/server/server.go b/pkg/hostagent/api/server/server.go index b75c527f5b6..26da65976a6 100644 --- a/pkg/hostagent/api/server/server.go +++ b/pkg/hostagent/api/server/server.go @@ -8,8 +8,8 @@ import ( "encoding/json" "net/http" - "github.com/lima-vm/lima/pkg/hostagent" - "github.com/lima-vm/lima/pkg/httputil" + "github.com/lima-vm/lima/v2/pkg/hostagent" + "github.com/lima-vm/lima/v2/pkg/httputil" ) type Backend struct { diff --git a/pkg/hostagent/events/watcher.go b/pkg/hostagent/events/watcher.go index 303afe2b081..3bd1107a128 100644 --- a/pkg/hostagent/events/watcher.go +++ b/pkg/hostagent/events/watcher.go @@ -12,7 +12,7 @@ import ( "github.com/nxadm/tail" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/logrusutil" + "github.com/lima-vm/lima/v2/pkg/logrusutil" ) func Watch(ctx context.Context, haStdoutPath, haStderrPath string, begin time.Time, onEvent func(Event) bool) error { diff --git a/pkg/hostagent/hostagent.go b/pkg/hostagent/hostagent.go index d1528859513..98d0922a0bd 100644 --- a/pkg/hostagent/hostagent.go +++ b/pkg/hostagent/hostagent.go @@ -25,23 +25,23 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/lima-vm/lima/pkg/cidata" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/driverutil" - "github.com/lima-vm/lima/pkg/freeport" - guestagentapi "github.com/lima-vm/lima/pkg/guestagent/api" - guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client" - hostagentapi "github.com/lima-vm/lima/pkg/hostagent/api" - "github.com/lima-vm/lima/pkg/hostagent/dns" - "github.com/lima-vm/lima/pkg/hostagent/events" - "github.com/lima-vm/lima/pkg/instance/hostname" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/portfwd" - "github.com/lima-vm/lima/pkg/sshutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/cidata" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/driverutil" + "github.com/lima-vm/lima/v2/pkg/freeport" + guestagentapi "github.com/lima-vm/lima/v2/pkg/guestagent/api" + guestagentclient "github.com/lima-vm/lima/v2/pkg/guestagent/api/client" + hostagentapi "github.com/lima-vm/lima/v2/pkg/hostagent/api" + "github.com/lima-vm/lima/v2/pkg/hostagent/dns" + "github.com/lima-vm/lima/v2/pkg/hostagent/events" + "github.com/lima-vm/lima/v2/pkg/instance/hostname" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/portfwd" + "github.com/lima-vm/lima/v2/pkg/sshutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) type HostAgent struct { diff --git a/pkg/hostagent/inotify.go b/pkg/hostagent/inotify.go index 10bb2a4b3c0..4a9fec00b95 100644 --- a/pkg/hostagent/inotify.go +++ b/pkg/hostagent/inotify.go @@ -14,7 +14,7 @@ import ( "github.com/sirupsen/logrus" "google.golang.org/protobuf/types/known/timestamppb" - guestagentapi "github.com/lima-vm/lima/pkg/guestagent/api" + guestagentapi "github.com/lima-vm/lima/v2/pkg/guestagent/api" ) const CacheSize = 10000 diff --git a/pkg/hostagent/mount.go b/pkg/hostagent/mount.go index 5992a510fdd..575ff236966 100644 --- a/pkg/hostagent/mount.go +++ b/pkg/hostagent/mount.go @@ -12,8 +12,8 @@ import ( "github.com/lima-vm/sshocker/pkg/reversesshfs" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) type mount struct { diff --git a/pkg/hostagent/port.go b/pkg/hostagent/port.go index 805e9cbd76d..3e3c2f2d188 100644 --- a/pkg/hostagent/port.go +++ b/pkg/hostagent/port.go @@ -10,8 +10,8 @@ import ( "github.com/lima-vm/sshocker/pkg/ssh" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/guestagent/api" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) type portForwarder struct { diff --git a/pkg/hostagent/port_darwin.go b/pkg/hostagent/port_darwin.go index 87bdb271f96..71737ee71f1 100644 --- a/pkg/hostagent/port_darwin.go +++ b/pkg/hostagent/port_darwin.go @@ -15,8 +15,8 @@ import ( "github.com/lima-vm/sshocker/pkg/ssh" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/bicopy" - "github.com/lima-vm/lima/pkg/portfwd" + "github.com/lima-vm/lima/v2/pkg/bicopy" + "github.com/lima-vm/lima/v2/pkg/portfwd" ) // forwardTCP is not thread-safe. diff --git a/pkg/hostagent/requirements.go b/pkg/hostagent/requirements.go index f57e495e7c6..1c09b42bf83 100644 --- a/pkg/hostagent/requirements.go +++ b/pkg/hostagent/requirements.go @@ -12,7 +12,7 @@ import ( "github.com/lima-vm/sshocker/pkg/ssh" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) func (a *HostAgent) waitForRequirements(label string, requirements []requirement) error { diff --git a/pkg/httpclientutil/httpclientutil.go b/pkg/httpclientutil/httpclientutil.go index f2092d91331..c98f9281118 100644 --- a/pkg/httpclientutil/httpclientutil.go +++ b/pkg/httpclientutil/httpclientutil.go @@ -15,7 +15,7 @@ import ( "net" "net/http" - "github.com/lima-vm/lima/pkg/httputil" + "github.com/lima-vm/lima/v2/pkg/httputil" ) // Get calls HTTP GET and verifies that the status code is 2XX . diff --git a/pkg/imgutil/nativeimgutil/nativeimgutil.go b/pkg/imgutil/nativeimgutil/nativeimgutil.go index 3008ff376a0..64185b1cd78 100644 --- a/pkg/imgutil/nativeimgutil/nativeimgutil.go +++ b/pkg/imgutil/nativeimgutil/nativeimgutil.go @@ -20,7 +20,7 @@ import ( "github.com/lima-vm/go-qcow2reader/image/raw" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/progressbar" + "github.com/lima-vm/lima/v2/pkg/progressbar" ) // Disk image size must be aligned to sector size. Qemu block layer is rounding diff --git a/pkg/imgutil/proxyimgutil/proxyimgutil.go b/pkg/imgutil/proxyimgutil/proxyimgutil.go index 0c56ca82a45..735fb0bce3f 100644 --- a/pkg/imgutil/proxyimgutil/proxyimgutil.go +++ b/pkg/imgutil/proxyimgutil/proxyimgutil.go @@ -8,9 +8,9 @@ import ( "os" "os/exec" - "github.com/lima-vm/lima/pkg/imgutil" - "github.com/lima-vm/lima/pkg/imgutil/nativeimgutil" - "github.com/lima-vm/lima/pkg/qemuimgutil" + "github.com/lima-vm/lima/v2/pkg/imgutil" + "github.com/lima-vm/lima/v2/pkg/imgutil/nativeimgutil" + "github.com/lima-vm/lima/v2/pkg/qemuimgutil" ) // ImageDiskManager is a proxy implementation of imgutil.ImageDiskManager that uses both QEMU and native image utilities. diff --git a/pkg/instance/ansible.go b/pkg/instance/ansible.go index 36af0f8c75e..c0f9b0f1773 100644 --- a/pkg/instance/ansible.go +++ b/pkg/instance/ansible.go @@ -13,9 +13,9 @@ import ( "github.com/goccy/go-yaml" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func runAnsibleProvision(ctx context.Context, inst *store.Instance) error { diff --git a/pkg/instance/clone.go b/pkg/instance/clone.go index b41a7ed614c..0e02197c28e 100644 --- a/pkg/instance/clone.go +++ b/pkg/instance/clone.go @@ -15,9 +15,9 @@ import ( continuityfs "github.com/containerd/continuity/fs" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func Clone(_ context.Context, oldInst *store.Instance, newInstName string) (*store.Instance, error) { diff --git a/pkg/instance/create.go b/pkg/instance/create.go index 5bb0912ae99..377f86382f4 100644 --- a/pkg/instance/create.go +++ b/pkg/instance/create.go @@ -10,13 +10,13 @@ import ( "os" "path/filepath" - "github.com/lima-vm/lima/pkg/cidata" - "github.com/lima-vm/lima/pkg/driverutil" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/version" + "github.com/lima-vm/lima/v2/pkg/cidata" + "github.com/lima-vm/lima/v2/pkg/driverutil" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/version" ) func Create(ctx context.Context, instName string, instConfig []byte, saveBrokenYAML bool) (*store.Instance, error) { diff --git a/pkg/instance/delete.go b/pkg/instance/delete.go index 9dc55f3bd1e..7c53fdf1c46 100644 --- a/pkg/instance/delete.go +++ b/pkg/instance/delete.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "github.com/lima-vm/lima/pkg/driverutil" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/driverutil" + "github.com/lima-vm/lima/v2/pkg/store" ) func Delete(ctx context.Context, inst *store.Instance, force bool) error { diff --git a/pkg/instance/hostname/hostname_test.go b/pkg/instance/hostname/hostname_test.go index e702167e11f..54729e8b98a 100644 --- a/pkg/instance/hostname/hostname_test.go +++ b/pkg/instance/hostname/hostname_test.go @@ -8,7 +8,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/instance/hostname" + "github.com/lima-vm/lima/v2/pkg/instance/hostname" ) func TestFromInstName(t *testing.T) { diff --git a/pkg/instance/restart.go b/pkg/instance/restart.go index c63c2e40487..91716a17f59 100644 --- a/pkg/instance/restart.go +++ b/pkg/instance/restart.go @@ -8,8 +8,8 @@ import ( "github.com/sirupsen/logrus" - networks "github.com/lima-vm/lima/pkg/networks/reconcile" - "github.com/lima-vm/lima/pkg/store" + networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile" + "github.com/lima-vm/lima/v2/pkg/store" ) const launchHostAgentForeground = false diff --git a/pkg/instance/start.go b/pkg/instance/start.go index ec3b81bdf45..e544a1e2e98 100644 --- a/pkg/instance/start.go +++ b/pkg/instance/start.go @@ -21,19 +21,19 @@ import ( "github.com/mattn/go-isatty" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/downloader" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/driverutil" - "github.com/lima-vm/lima/pkg/executil" - "github.com/lima-vm/lima/pkg/fileutils" - hostagentevents "github.com/lima-vm/lima/pkg/hostagent/events" - "github.com/lima-vm/lima/pkg/imgutil/proxyimgutil" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/registry" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/usrlocalsharelima" + "github.com/lima-vm/lima/v2/pkg/downloader" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/driverutil" + "github.com/lima-vm/lima/v2/pkg/executil" + "github.com/lima-vm/lima/v2/pkg/fileutils" + hostagentevents "github.com/lima-vm/lima/v2/pkg/hostagent/events" + "github.com/lima-vm/lima/v2/pkg/imgutil/proxyimgutil" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/registry" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/usrlocalsharelima" ) // DefaultWatchHostAgentEventsTimeout is the duration to wait for the instance diff --git a/pkg/instance/stop.go b/pkg/instance/stop.go index a2704a0f944..2cc36c75beb 100644 --- a/pkg/instance/stop.go +++ b/pkg/instance/stop.go @@ -14,10 +14,10 @@ import ( "github.com/sirupsen/logrus" - hostagentevents "github.com/lima-vm/lima/pkg/hostagent/events" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/filenames" + hostagentevents "github.com/lima-vm/lima/v2/pkg/hostagent/events" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func StopGracefully(ctx context.Context, inst *store.Instance, isRestart bool) error { diff --git a/pkg/limainfo/limainfo.go b/pkg/limainfo/limainfo.go index bd21e8d1210..9f8fdfc9bc2 100644 --- a/pkg/limainfo/limainfo.go +++ b/pkg/limainfo/limainfo.go @@ -9,12 +9,12 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/registry" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/templatestore" - "github.com/lima-vm/lima/pkg/usrlocalsharelima" - "github.com/lima-vm/lima/pkg/version" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/registry" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/templatestore" + "github.com/lima-vm/lima/v2/pkg/usrlocalsharelima" + "github.com/lima-vm/lima/v2/pkg/version" ) type LimaInfo struct { diff --git a/pkg/limatmpl/embed.go b/pkg/limatmpl/embed.go index 1a0d9d8915d..6c2a7b91e1e 100644 --- a/pkg/limatmpl/embed.go +++ b/pkg/limatmpl/embed.go @@ -18,11 +18,11 @@ import ( "github.com/coreos/go-semver/semver" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/version/versionutil" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/version/versionutil" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) // Embed will recursively resolve all "base" dependencies and update the diff --git a/pkg/limatmpl/embed_test.go b/pkg/limatmpl/embed_test.go index 4fa2db58b60..16f7ad638c2 100644 --- a/pkg/limatmpl/embed_test.go +++ b/pkg/limatmpl/embed_test.go @@ -15,7 +15,7 @@ import ( "gotest.tools/v3/assert" "gotest.tools/v3/assert/cmp" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) type embedTestCase struct { diff --git a/pkg/limatmpl/locator.go b/pkg/limatmpl/locator.go index 328b79b3dda..7940e16405a 100644 --- a/pkg/limatmpl/locator.go +++ b/pkg/limatmpl/locator.go @@ -18,10 +18,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/identifiers" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/templatestore" + "github.com/lima-vm/lima/v2/pkg/identifiers" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/templatestore" ) const yBytesLimit = 4 * 1024 * 1024 // 4MiB diff --git a/pkg/limatmpl/locator_test.go b/pkg/limatmpl/locator_test.go index 7f6b16dc4bb..b3cf8bdada1 100644 --- a/pkg/limatmpl/locator_test.go +++ b/pkg/limatmpl/locator_test.go @@ -10,8 +10,8 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/limatmpl" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/limatmpl" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) func TestInstNameFromImageURL(t *testing.T) { diff --git a/pkg/limatmpl/template.go b/pkg/limatmpl/template.go index b6398a50f8b..1ca56a3c338 100644 --- a/pkg/limatmpl/template.go +++ b/pkg/limatmpl/template.go @@ -6,7 +6,7 @@ package limatmpl import ( "strings" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) type Template struct { diff --git a/pkg/limayaml/defaults.go b/pkg/limayaml/defaults.go index 629cbcc3f97..bfd795a95d6 100644 --- a/pkg/limayaml/defaults.go +++ b/pkg/limayaml/defaults.go @@ -28,17 +28,17 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sys/cpu" - "github.com/lima-vm/lima/pkg/instance/hostname" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/localpathutil" - . "github.com/lima-vm/lima/pkg/must" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/ptr" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/version" - "github.com/lima-vm/lima/pkg/version/versionutil" + "github.com/lima-vm/lima/v2/pkg/instance/hostname" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/localpathutil" + . "github.com/lima-vm/lima/v2/pkg/must" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/ptr" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/version" + "github.com/lima-vm/lima/v2/pkg/version/versionutil" ) const ( diff --git a/pkg/limayaml/defaults_test.go b/pkg/limayaml/defaults_test.go index 70f6810c855..5385ede1f7d 100644 --- a/pkg/limayaml/defaults_test.go +++ b/pkg/limayaml/defaults_test.go @@ -19,11 +19,11 @@ import ( "github.com/sirupsen/logrus" "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/ptr" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/ptr" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func TestFillDefault(t *testing.T) { diff --git a/pkg/limayaml/load.go b/pkg/limayaml/load.go index 3929d7bac8a..f6d7914b6b9 100644 --- a/pkg/limayaml/load.go +++ b/pkg/limayaml/load.go @@ -11,8 +11,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) // Load loads the yaml and fulfills unspecified fields with the default values. diff --git a/pkg/limayaml/marshal.go b/pkg/limayaml/marshal.go index 22c42f02373..efa8553087f 100644 --- a/pkg/limayaml/marshal.go +++ b/pkg/limayaml/marshal.go @@ -9,7 +9,7 @@ import ( "github.com/goccy/go-yaml" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/yqutil" + "github.com/lima-vm/lima/v2/pkg/yqutil" ) const ( diff --git a/pkg/limayaml/marshal_test.go b/pkg/limayaml/marshal_test.go index a8682bfa9cb..7e778ae0602 100644 --- a/pkg/limayaml/marshal_test.go +++ b/pkg/limayaml/marshal_test.go @@ -8,7 +8,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/ptr" + "github.com/lima-vm/lima/v2/pkg/ptr" ) func TestMarshalEmpty(t *testing.T) { diff --git a/pkg/limayaml/validate.go b/pkg/limayaml/validate.go index 9b959f25d1a..dddcaa9acbf 100644 --- a/pkg/limayaml/validate.go +++ b/pkg/limayaml/validate.go @@ -21,12 +21,12 @@ import ( "github.com/docker/go-units" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/identifiers" - "github.com/lima-vm/lima/pkg/localpathutil" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/version" - "github.com/lima-vm/lima/pkg/version/versionutil" + "github.com/lima-vm/lima/v2/pkg/identifiers" + "github.com/lima-vm/lima/v2/pkg/localpathutil" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/version" + "github.com/lima-vm/lima/v2/pkg/version/versionutil" ) func Validate(y *LimaYAML, warn bool) error { diff --git a/pkg/limayaml/validate_test.go b/pkg/limayaml/validate_test.go index e3cd4315562..4d89d47c7eb 100644 --- a/pkg/limayaml/validate_test.go +++ b/pkg/limayaml/validate_test.go @@ -9,7 +9,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/version" + "github.com/lima-vm/lima/v2/pkg/version" ) func TestValidateEmpty(t *testing.T) { diff --git a/pkg/networks/commands.go b/pkg/networks/commands.go index c5bccc5f883..98dbb1075fe 100644 --- a/pkg/networks/commands.go +++ b/pkg/networks/commands.go @@ -10,8 +10,8 @@ import ( "os/exec" "path/filepath" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" ) const ( diff --git a/pkg/networks/commands_test.go b/pkg/networks/commands_test.go index 45bf0094ae6..2f9877e633c 100644 --- a/pkg/networks/commands_test.go +++ b/pkg/networks/commands_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" ) func TestCheck(t *testing.T) { diff --git a/pkg/networks/config.go b/pkg/networks/config.go index 033231c9dc7..34b5f2260f3 100644 --- a/pkg/networks/config.go +++ b/pkg/networks/config.go @@ -15,9 +15,9 @@ import ( "github.com/goccy/go-yaml" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/textutil" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/textutil" ) //go:embed networks.TEMPLATE.yaml diff --git a/pkg/networks/reconcile/reconcile.go b/pkg/networks/reconcile/reconcile.go index f0f383a0128..020e261166a 100644 --- a/pkg/networks/reconcile/reconcile.go +++ b/pkg/networks/reconcile/reconcile.go @@ -16,11 +16,11 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/networks/usernet" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks/usernet" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" ) func Reconcile(ctx context.Context, newInst string) error { diff --git a/pkg/networks/usernet/client.go b/pkg/networks/usernet/client.go index 4ed790321e0..53333c2f19a 100644 --- a/pkg/networks/usernet/client.go +++ b/pkg/networks/usernet/client.go @@ -17,10 +17,10 @@ import ( gvproxyclient "github.com/containers/gvisor-tap-vsock/pkg/client" "github.com/containers/gvisor-tap-vsock/pkg/types" - "github.com/lima-vm/lima/pkg/httpclientutil" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/networks/usernet/dnshosts" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/httpclientutil" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/networks/usernet/dnshosts" + "github.com/lima-vm/lima/v2/pkg/store" ) type Client struct { diff --git a/pkg/networks/usernet/config.go b/pkg/networks/usernet/config.go index fe97232db16..e8304deea0f 100644 --- a/pkg/networks/usernet/config.go +++ b/pkg/networks/usernet/config.go @@ -10,9 +10,9 @@ import ( "github.com/apparentlymart/go-cidr/cidr" - "github.com/lima-vm/lima/pkg/networks" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" ) type SockType = string diff --git a/pkg/networks/usernet/config_test.go b/pkg/networks/usernet/config_test.go index dc92d59fd5c..da1359cfe71 100644 --- a/pkg/networks/usernet/config_test.go +++ b/pkg/networks/usernet/config_test.go @@ -9,7 +9,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/networks" + "github.com/lima-vm/lima/v2/pkg/networks" ) func TestUsernetConfig(t *testing.T) { diff --git a/pkg/networks/usernet/recoincile.go b/pkg/networks/usernet/recoincile.go index a85bc81c8c7..2ce920e3578 100644 --- a/pkg/networks/usernet/recoincile.go +++ b/pkg/networks/usernet/recoincile.go @@ -18,10 +18,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/executil" - "github.com/lima-vm/lima/pkg/lockutil" - "github.com/lima-vm/lima/pkg/store" - "github.com/lima-vm/lima/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/executil" + "github.com/lima-vm/lima/v2/pkg/lockutil" + "github.com/lima-vm/lima/v2/pkg/store" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" ) // Start starts a instance a usernet network with the given name. diff --git a/pkg/networks/validate.go b/pkg/networks/validate.go index a2bbe38ae72..4fd5f9dda41 100644 --- a/pkg/networks/validate.go +++ b/pkg/networks/validate.go @@ -13,7 +13,7 @@ import ( "runtime" "strings" - "github.com/lima-vm/lima/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/osutil" ) func (c *Config) Validate() error { diff --git a/pkg/osutil/dns_darwin.go b/pkg/osutil/dns_darwin.go index 01358be6285..20d2f9431ef 100644 --- a/pkg/osutil/dns_darwin.go +++ b/pkg/osutil/dns_darwin.go @@ -8,7 +8,7 @@ import ( "net" "strings" - "github.com/lima-vm/lima/pkg/sysprof" + "github.com/lima-vm/lima/v2/pkg/sysprof" ) func DNSAddresses() ([]string, error) { diff --git a/pkg/osutil/user.go b/pkg/osutil/user.go index 1ff1c02a1e8..819388660cb 100644 --- a/pkg/osutil/user.go +++ b/pkg/osutil/user.go @@ -15,8 +15,8 @@ import ( "github.com/sirupsen/logrus" - . "github.com/lima-vm/lima/pkg/must" - "github.com/lima-vm/lima/pkg/version/versionutil" + . "github.com/lima-vm/lima/v2/pkg/must" + "github.com/lima-vm/lima/v2/pkg/version/versionutil" ) type User struct { diff --git a/pkg/portfwd/client.go b/pkg/portfwd/client.go index 81c5c21e17b..61cf14fe296 100644 --- a/pkg/portfwd/client.go +++ b/pkg/portfwd/client.go @@ -13,8 +13,8 @@ import ( "github.com/containers/gvisor-tap-vsock/pkg/tcpproxy" "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/guestagent/api" - guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" + guestagentclient "github.com/lima-vm/lima/v2/pkg/guestagent/api/client" ) func HandleTCPConnection(ctx context.Context, client *guestagentclient.GuestAgentClient, conn net.Conn, guestAddr string) { diff --git a/pkg/portfwd/forward.go b/pkg/portfwd/forward.go index 7d6c001c5c4..4597d9af136 100644 --- a/pkg/portfwd/forward.go +++ b/pkg/portfwd/forward.go @@ -10,9 +10,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/guestagent/api" - guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" + guestagentclient "github.com/lima-vm/lima/v2/pkg/guestagent/api/client" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) var IPv4loopback1 = limayaml.IPv4loopback1 diff --git a/pkg/portfwd/listener.go b/pkg/portfwd/listener.go index e4b250dd882..d3c3dadebe7 100644 --- a/pkg/portfwd/listener.go +++ b/pkg/portfwd/listener.go @@ -12,7 +12,7 @@ import ( "github.com/sirupsen/logrus" - guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client" + guestagentclient "github.com/lima-vm/lima/v2/pkg/guestagent/api/client" ) type ClosableListeners struct { diff --git a/pkg/portfwdserver/server.go b/pkg/portfwdserver/server.go index 3ded422b45a..1406b8fbfec 100644 --- a/pkg/portfwdserver/server.go +++ b/pkg/portfwdserver/server.go @@ -14,8 +14,8 @@ import ( "github.com/containers/gvisor-tap-vsock/pkg/tcpproxy" - "github.com/lima-vm/lima/pkg/bicopy" - "github.com/lima-vm/lima/pkg/guestagent/api" + "github.com/lima-vm/lima/v2/pkg/bicopy" + "github.com/lima-vm/lima/v2/pkg/guestagent/api" ) type TunnelServer struct{} diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index 7d8582d1e32..c08c67e005e 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -14,9 +14,9 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/driver" - "github.com/lima-vm/lima/pkg/driver/external/client" - "github.com/lima-vm/lima/pkg/usrlocalsharelima" + "github.com/lima-vm/lima/v2/pkg/driver" + "github.com/lima-vm/lima/v2/pkg/driver/external/client" + "github.com/lima-vm/lima/v2/pkg/usrlocalsharelima" ) const ( diff --git a/pkg/snapshot/snapshot.go b/pkg/snapshot/snapshot.go index 14f7f24c30f..530363f8d81 100644 --- a/pkg/snapshot/snapshot.go +++ b/pkg/snapshot/snapshot.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/lima-vm/lima/pkg/driverutil" - "github.com/lima-vm/lima/pkg/store" + "github.com/lima-vm/lima/v2/pkg/driverutil" + "github.com/lima-vm/lima/v2/pkg/store" ) func Del(ctx context.Context, inst *store.Instance, tag string) error { diff --git a/pkg/sshutil/format.go b/pkg/sshutil/format.go index 0856965050d..6d169d7cf8a 100644 --- a/pkg/sshutil/format.go +++ b/pkg/sshutil/format.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "github.com/lima-vm/lima/pkg/instance/hostname" + "github.com/lima-vm/lima/v2/pkg/instance/hostname" ) // FormatT specifies the format type. diff --git a/pkg/sshutil/sshutil.go b/pkg/sshutil/sshutil.go index fa5370a422d..302c9a5035f 100644 --- a/pkg/sshutil/sshutil.go +++ b/pkg/sshutil/sshutil.go @@ -24,11 +24,11 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sys/cpu" - "github.com/lima-vm/lima/pkg/ioutilx" - "github.com/lima-vm/lima/pkg/lockutil" - "github.com/lima-vm/lima/pkg/osutil" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/ioutilx" + "github.com/lima-vm/lima/v2/pkg/lockutil" + "github.com/lima-vm/lima/v2/pkg/osutil" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) // Environment variable that allows configuring the command (alias) to execute diff --git a/pkg/store/dirnames/dirnames.go b/pkg/store/dirnames/dirnames.go index 3d03a318c25..43607f9a012 100644 --- a/pkg/store/dirnames/dirnames.go +++ b/pkg/store/dirnames/dirnames.go @@ -9,7 +9,7 @@ import ( "os" "path/filepath" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) // DotLima is a directory that appears under the home directory. diff --git a/pkg/store/disk.go b/pkg/store/disk.go index 0b5b1224da6..5df18fbcea5 100644 --- a/pkg/store/disk.go +++ b/pkg/store/disk.go @@ -12,7 +12,7 @@ import ( "github.com/lima-vm/go-qcow2reader" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) type Disk struct { diff --git a/pkg/store/fuzz_test.go b/pkg/store/fuzz_test.go index 4654a3d3b88..9d2c4930d10 100644 --- a/pkg/store/fuzz_test.go +++ b/pkg/store/fuzz_test.go @@ -10,7 +10,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) func FuzzLoadYAMLByFilePath(f *testing.F) { diff --git a/pkg/store/instance.go b/pkg/store/instance.go index 5031b1c145c..beb82697017 100644 --- a/pkg/store/instance.go +++ b/pkg/store/instance.go @@ -22,13 +22,13 @@ import ( "github.com/docker/go-units" "github.com/sirupsen/logrus" - hostagentclient "github.com/lima-vm/lima/pkg/hostagent/api/client" - "github.com/lima-vm/lima/pkg/instance/hostname" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" - "github.com/lima-vm/lima/pkg/textutil" - "github.com/lima-vm/lima/pkg/version/versionutil" + hostagentclient "github.com/lima-vm/lima/v2/pkg/hostagent/api/client" + "github.com/lima-vm/lima/v2/pkg/instance/hostname" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/textutil" + "github.com/lima-vm/lima/v2/pkg/version/versionutil" ) type Status = string diff --git a/pkg/store/instance_test.go b/pkg/store/instance_test.go index 5991679cea2..55b7e57bf2a 100644 --- a/pkg/store/instance_test.go +++ b/pkg/store/instance_test.go @@ -13,7 +13,7 @@ import ( "gotest.tools/v3/assert" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) const separator = string(filepath.Separator) diff --git a/pkg/store/instance_unix.go b/pkg/store/instance_unix.go index 4f509be3750..41ded92c368 100644 --- a/pkg/store/instance_unix.go +++ b/pkg/store/instance_unix.go @@ -5,7 +5,7 @@ package store -import "github.com/lima-vm/lima/pkg/limayaml" +import "github.com/lima-vm/lima/v2/pkg/limayaml" func inspectStatus(instDir string, inst *Instance, y *limayaml.LimaYAML) { inspectStatusWithPIDFiles(instDir, inst, y) diff --git a/pkg/store/instance_windows.go b/pkg/store/instance_windows.go index 084c44876ee..136d6a85490 100644 --- a/pkg/store/instance_windows.go +++ b/pkg/store/instance_windows.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" - "github.com/lima-vm/lima/pkg/executil" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/executil" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) func inspectStatus(instDir string, inst *Instance, y *limayaml.LimaYAML) { diff --git a/pkg/store/store.go b/pkg/store/store.go index fd3d160a159..24816d30286 100644 --- a/pkg/store/store.go +++ b/pkg/store/store.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "github.com/lima-vm/lima/pkg/identifiers" - "github.com/lima-vm/lima/pkg/limayaml" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/store/filenames" + "github.com/lima-vm/lima/v2/pkg/identifiers" + "github.com/lima-vm/lima/v2/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/store/filenames" ) // Directory returns the LimaDir. diff --git a/pkg/templatestore/templatestore.go b/pkg/templatestore/templatestore.go index f91f2c44301..a61eeb2c808 100644 --- a/pkg/templatestore/templatestore.go +++ b/pkg/templatestore/templatestore.go @@ -14,8 +14,8 @@ import ( "strings" "unicode" - "github.com/lima-vm/lima/pkg/store/dirnames" - "github.com/lima-vm/lima/pkg/usrlocalsharelima" + "github.com/lima-vm/lima/v2/pkg/store/dirnames" + "github.com/lima-vm/lima/v2/pkg/usrlocalsharelima" ) type Template struct { diff --git a/pkg/usrlocalsharelima/usrlocalsharelima.go b/pkg/usrlocalsharelima/usrlocalsharelima.go index b218fb31095..e22052ce54e 100644 --- a/pkg/usrlocalsharelima/usrlocalsharelima.go +++ b/pkg/usrlocalsharelima/usrlocalsharelima.go @@ -15,8 +15,8 @@ import ( "github.com/sirupsen/logrus" - "github.com/lima-vm/lima/pkg/debugutil" - "github.com/lima-vm/lima/pkg/limayaml" + "github.com/lima-vm/lima/v2/pkg/debugutil" + "github.com/lima-vm/lima/v2/pkg/limayaml" ) // executableViaArgs0 returns the absolute path to the executable used to start this process.