From 5a7bc000a0e0eefdd301d04fa91d838af312c1a9 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Mon, 15 Jul 2024 22:48:13 +0100 Subject: [PATCH] Refactor package locations Signed-off-by: Paulo Gomes --- internal/inception/inception.go | 2 +- internal/profiles/profiles.go | 8 ++++---- internal/qubesome/run.go | 6 +++--- internal/{ => runners}/docker/devices.go | 0 internal/{ => runners}/docker/run.go | 4 ++-- internal/{ => runners}/firecracker/deps.go | 0 internal/{ => runners}/firecracker/run.go | 0 internal/{ => runners}/firecracker/template.go | 0 internal/{ => util}/dbus/dbus.go | 0 internal/{ => util}/gpu/gpu.go | 0 internal/{ => util}/resolution/resolution.go | 0 internal/{ => util}/resolution/resolution_x11.go | 0 internal/{ => util}/xauth/xauth.go | 0 internal/{ => util}/xauth/xauth_test.go | 0 14 files changed, 10 insertions(+), 10 deletions(-) rename internal/{ => runners}/docker/devices.go (100%) rename internal/{ => runners}/docker/run.go (99%) rename internal/{ => runners}/firecracker/deps.go (100%) rename internal/{ => runners}/firecracker/run.go (100%) rename internal/{ => runners}/firecracker/template.go (100%) rename internal/{ => util}/dbus/dbus.go (100%) rename internal/{ => util}/gpu/gpu.go (100%) rename internal/{ => util}/resolution/resolution.go (100%) rename internal/{ => util}/resolution/resolution_x11.go (100%) rename internal/{ => util}/xauth/xauth.go (100%) rename internal/{ => util}/xauth/xauth_test.go (100%) diff --git a/internal/inception/inception.go b/internal/inception/inception.go index 667f680..51cfe8e 100644 --- a/internal/inception/inception.go +++ b/internal/inception/inception.go @@ -7,9 +7,9 @@ import ( "os" "strings" - "github.com/qubesome/cli/internal/dbus" "github.com/qubesome/cli/internal/files" "github.com/qubesome/cli/internal/types" + "github.com/qubesome/cli/internal/util/dbus" ) var ( diff --git a/internal/profiles/profiles.go b/internal/profiles/profiles.go index 8583cdf..6203b91 100644 --- a/internal/profiles/profiles.go +++ b/internal/profiles/profiles.go @@ -16,17 +16,17 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/ssh" "github.com/google/uuid" "github.com/qubesome/cli/internal/command" - "github.com/qubesome/cli/internal/dbus" "github.com/qubesome/cli/internal/drive" "github.com/qubesome/cli/internal/env" "github.com/qubesome/cli/internal/files" - "github.com/qubesome/cli/internal/gpu" "github.com/qubesome/cli/internal/images" "github.com/qubesome/cli/internal/inception" - "github.com/qubesome/cli/internal/resolution" "github.com/qubesome/cli/internal/socket" "github.com/qubesome/cli/internal/types" - "github.com/qubesome/cli/internal/xauth" + "github.com/qubesome/cli/internal/util/dbus" + "github.com/qubesome/cli/internal/util/gpu" + "github.com/qubesome/cli/internal/util/resolution" + "github.com/qubesome/cli/internal/util/xauth" "golang.org/x/sys/execabs" ) diff --git a/internal/qubesome/run.go b/internal/qubesome/run.go index b435fe2..8f5d74c 100644 --- a/internal/qubesome/run.go +++ b/internal/qubesome/run.go @@ -11,15 +11,15 @@ import ( securejoin "github.com/cyphar/filepath-securejoin" "github.com/qubesome/cli/internal/command" - "github.com/qubesome/cli/internal/dbus" - "github.com/qubesome/cli/internal/docker" "github.com/qubesome/cli/internal/drive" "github.com/qubesome/cli/internal/env" "github.com/qubesome/cli/internal/files" - "github.com/qubesome/cli/internal/firecracker" "github.com/qubesome/cli/internal/images" "github.com/qubesome/cli/internal/inception" + "github.com/qubesome/cli/internal/runners/docker" + "github.com/qubesome/cli/internal/runners/firecracker" "github.com/qubesome/cli/internal/types" + "github.com/qubesome/cli/internal/util/dbus" "gopkg.in/yaml.v3" ) diff --git a/internal/docker/devices.go b/internal/runners/docker/devices.go similarity index 100% rename from internal/docker/devices.go rename to internal/runners/docker/devices.go diff --git a/internal/docker/run.go b/internal/runners/docker/run.go similarity index 99% rename from internal/docker/run.go rename to internal/runners/docker/run.go index 5cc91f4..6daa350 100644 --- a/internal/docker/run.go +++ b/internal/runners/docker/run.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" - "github.com/qubesome/cli/internal/dbus" "github.com/qubesome/cli/internal/env" "github.com/qubesome/cli/internal/files" - "github.com/qubesome/cli/internal/gpu" "github.com/qubesome/cli/internal/types" + "github.com/qubesome/cli/internal/util/dbus" + "github.com/qubesome/cli/internal/util/gpu" "golang.org/x/sys/execabs" ) diff --git a/internal/firecracker/deps.go b/internal/runners/firecracker/deps.go similarity index 100% rename from internal/firecracker/deps.go rename to internal/runners/firecracker/deps.go diff --git a/internal/firecracker/run.go b/internal/runners/firecracker/run.go similarity index 100% rename from internal/firecracker/run.go rename to internal/runners/firecracker/run.go diff --git a/internal/firecracker/template.go b/internal/runners/firecracker/template.go similarity index 100% rename from internal/firecracker/template.go rename to internal/runners/firecracker/template.go diff --git a/internal/dbus/dbus.go b/internal/util/dbus/dbus.go similarity index 100% rename from internal/dbus/dbus.go rename to internal/util/dbus/dbus.go diff --git a/internal/gpu/gpu.go b/internal/util/gpu/gpu.go similarity index 100% rename from internal/gpu/gpu.go rename to internal/util/gpu/gpu.go diff --git a/internal/resolution/resolution.go b/internal/util/resolution/resolution.go similarity index 100% rename from internal/resolution/resolution.go rename to internal/util/resolution/resolution.go diff --git a/internal/resolution/resolution_x11.go b/internal/util/resolution/resolution_x11.go similarity index 100% rename from internal/resolution/resolution_x11.go rename to internal/util/resolution/resolution_x11.go diff --git a/internal/xauth/xauth.go b/internal/util/xauth/xauth.go similarity index 100% rename from internal/xauth/xauth.go rename to internal/util/xauth/xauth.go diff --git a/internal/xauth/xauth_test.go b/internal/util/xauth/xauth_test.go similarity index 100% rename from internal/xauth/xauth_test.go rename to internal/util/xauth/xauth_test.go