From 1dd5325de942bfa3d37a9980c93509b295c81bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:55:41 -0400 Subject: [PATCH 1/5] fuidshift: Move to cmd/fuidshift MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- {fuidshift => cmd/fuidshift}/main.go | 0 {fuidshift => cmd/fuidshift}/main_shift.go | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {fuidshift => cmd/fuidshift}/main.go (100%) rename {fuidshift => cmd/fuidshift}/main_shift.go (100%) diff --git a/fuidshift/main.go b/cmd/fuidshift/main.go similarity index 100% rename from fuidshift/main.go rename to cmd/fuidshift/main.go diff --git a/fuidshift/main_shift.go b/cmd/fuidshift/main_shift.go similarity index 100% rename from fuidshift/main_shift.go rename to cmd/fuidshift/main_shift.go From 2c14332400eefc3db84f7e6b7a83d02e785fb91a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:56:24 -0400 Subject: [PATCH 2/5] incus-migrate: Move to cmd/incus-migrate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- Makefile | 10 +++++----- {incus-migrate => cmd/incus-migrate}/cgo.go | 0 {incus-migrate => cmd/incus-migrate}/main.go | 0 {incus-migrate => cmd/incus-migrate}/main_migrate.go | 0 {incus-migrate => cmd/incus-migrate}/main_netcat.go | 0 {incus-migrate => cmd/incus-migrate}/transfer.go | 0 {incus-migrate => cmd/incus-migrate}/utils.go | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename {incus-migrate => cmd/incus-migrate}/cgo.go (100%) rename {incus-migrate => cmd/incus-migrate}/main.go (100%) rename {incus-migrate => cmd/incus-migrate}/main_migrate.go (100%) rename {incus-migrate => cmd/incus-migrate}/main_netcat.go (100%) rename {incus-migrate => cmd/incus-migrate}/transfer.go (100%) rename {incus-migrate => cmd/incus-migrate}/utils.go (100%) diff --git a/Makefile b/Makefile index 920b035cd24..11196921942 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ ifeq "$(TAG_SQLITE3)" "" endif CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./... - CGO_ENABLED=0 go install -v -tags netgo ./incus-migrate + CGO_ENABLED=0 go install -v -tags netgo ./cmd/incus-migrate CGO_ENABLED=0 go install -v -tags agent,netgo ./incus-agent @echo "Incus built successfully" @@ -47,7 +47,7 @@ incus-agent: .PHONY: incus-migrate incus-migrate: - CGO_ENABLED=0 go install -v -tags netgo ./incus-migrate + CGO_ENABLED=0 go install -v -tags netgo ./cmd/incus-migrate @echo "Incus migration tool built successfully" .PHONY: incus-doc @@ -158,7 +158,7 @@ ifeq "$(TAG_SQLITE3)" "" endif CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -v -tags "$(TAG_SQLITE3) logdebug" $(DEBUG) ./... - CGO_ENABLED=0 go install -v -tags "netgo,logdebug" ./incus-migrate + CGO_ENABLED=0 go install -v -tags "netgo,logdebug" ./cmd/incus-migrate CGO_ENABLED=0 go install -v -tags "agent,netgo,logdebug" ./incus-agent @echo "Incus built successfully" @@ -170,7 +170,7 @@ ifeq "$(TAG_SQLITE3)" "" endif CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -a -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./... - CGO_ENABLED=0 go install -a -v -tags netgo ./incus-migrate + CGO_ENABLED=0 go install -a -v -tags netgo ./cmd/incus-migrate CGO_ENABLED=0 go install -a -v -tags agent,netgo ./incus-agent @echo "Incus built successfully" @@ -181,7 +181,7 @@ ifeq "$(TAG_SQLITE3)" "" endif CC="$(CC)" CGO_LDFLAGS_ALLOW="$(CGO_LDFLAGS_ALLOW)" go install -race -v -tags "$(TAG_SQLITE3)" $(DEBUG) ./... - CGO_ENABLED=0 go install -v -tags netgo ./incus-migrate + CGO_ENABLED=0 go install -v -tags netgo ./cmd/incus-migrate CGO_ENABLED=0 go install -v -tags agent,netgo ./incus-agent @echo "Incus built successfully" diff --git a/incus-migrate/cgo.go b/cmd/incus-migrate/cgo.go similarity index 100% rename from incus-migrate/cgo.go rename to cmd/incus-migrate/cgo.go diff --git a/incus-migrate/main.go b/cmd/incus-migrate/main.go similarity index 100% rename from incus-migrate/main.go rename to cmd/incus-migrate/main.go diff --git a/incus-migrate/main_migrate.go b/cmd/incus-migrate/main_migrate.go similarity index 100% rename from incus-migrate/main_migrate.go rename to cmd/incus-migrate/main_migrate.go diff --git a/incus-migrate/main_netcat.go b/cmd/incus-migrate/main_netcat.go similarity index 100% rename from incus-migrate/main_netcat.go rename to cmd/incus-migrate/main_netcat.go diff --git a/incus-migrate/transfer.go b/cmd/incus-migrate/transfer.go similarity index 100% rename from incus-migrate/transfer.go rename to cmd/incus-migrate/transfer.go diff --git a/incus-migrate/utils.go b/cmd/incus-migrate/utils.go similarity index 100% rename from incus-migrate/utils.go rename to cmd/incus-migrate/utils.go From 29dd53001324489e9260658629b970fc45bf6f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:57:47 -0400 Subject: [PATCH 3/5] incus-user: Move to cmd/incus-user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- {incus-user => cmd/incus-user}/incus.go | 0 {incus-user => cmd/incus-user}/main.go | 0 {incus-user => cmd/incus-user}/main_daemon.go | 0 {incus-user => cmd/incus-user}/proxy.go | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {incus-user => cmd/incus-user}/incus.go (100%) rename {incus-user => cmd/incus-user}/main.go (100%) rename {incus-user => cmd/incus-user}/main_daemon.go (100%) rename {incus-user => cmd/incus-user}/proxy.go (100%) diff --git a/incus-user/incus.go b/cmd/incus-user/incus.go similarity index 100% rename from incus-user/incus.go rename to cmd/incus-user/incus.go diff --git a/incus-user/main.go b/cmd/incus-user/main.go similarity index 100% rename from incus-user/main.go rename to cmd/incus-user/main.go diff --git a/incus-user/main_daemon.go b/cmd/incus-user/main_daemon.go similarity index 100% rename from incus-user/main_daemon.go rename to cmd/incus-user/main_daemon.go diff --git a/incus-user/proxy.go b/cmd/incus-user/proxy.go similarity index 100% rename from incus-user/proxy.go rename to cmd/incus-user/proxy.go From 98cd60a22b0abb37ece9e1aa727d71b0ec10b033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 22:59:56 -0400 Subject: [PATCH 4/5] lxc-to-incus: Move to cmd/lxc-to-incus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- {lxc-to-incus => cmd/lxc-to-incus}/config.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/main.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/main_migrate.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/main_migrate_test.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/main_netcat.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/network.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/transfer.go | 0 {lxc-to-incus => cmd/lxc-to-incus}/utils.go | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename {lxc-to-incus => cmd/lxc-to-incus}/config.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/main.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/main_migrate.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/main_migrate_test.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/main_netcat.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/network.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/transfer.go (100%) rename {lxc-to-incus => cmd/lxc-to-incus}/utils.go (100%) diff --git a/lxc-to-incus/config.go b/cmd/lxc-to-incus/config.go similarity index 100% rename from lxc-to-incus/config.go rename to cmd/lxc-to-incus/config.go diff --git a/lxc-to-incus/main.go b/cmd/lxc-to-incus/main.go similarity index 100% rename from lxc-to-incus/main.go rename to cmd/lxc-to-incus/main.go diff --git a/lxc-to-incus/main_migrate.go b/cmd/lxc-to-incus/main_migrate.go similarity index 100% rename from lxc-to-incus/main_migrate.go rename to cmd/lxc-to-incus/main_migrate.go diff --git a/lxc-to-incus/main_migrate_test.go b/cmd/lxc-to-incus/main_migrate_test.go similarity index 100% rename from lxc-to-incus/main_migrate_test.go rename to cmd/lxc-to-incus/main_migrate_test.go diff --git a/lxc-to-incus/main_netcat.go b/cmd/lxc-to-incus/main_netcat.go similarity index 100% rename from lxc-to-incus/main_netcat.go rename to cmd/lxc-to-incus/main_netcat.go diff --git a/lxc-to-incus/network.go b/cmd/lxc-to-incus/network.go similarity index 100% rename from lxc-to-incus/network.go rename to cmd/lxc-to-incus/network.go diff --git a/lxc-to-incus/transfer.go b/cmd/lxc-to-incus/transfer.go similarity index 100% rename from lxc-to-incus/transfer.go rename to cmd/lxc-to-incus/transfer.go diff --git a/lxc-to-incus/utils.go b/cmd/lxc-to-incus/utils.go similarity index 100% rename from lxc-to-incus/utils.go rename to cmd/lxc-to-incus/utils.go From 1cdec892083412faaf924b14d086a6cafdb86a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Thu, 3 Aug 2023 23:26:00 -0400 Subject: [PATCH 5/5] github: Update for incus-migrate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dee9c59a211..6bcb7b97779 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -272,7 +272,7 @@ jobs: env: CGO_ENABLED: 0 run: | - go build -o bin ./incus-migrate + go build -o bin ./cmd/incus-migrate - name: Unit tests (client) env: