refactor: move commands to cmd/

cmd/container.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"fmt"

cmd/db.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"database/sql"

cmd/debug.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"errors"

cmd/distro.go

@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"context"

cmd/gen.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"fmt"

cmd/globals.go

@@ -0,0 +1,15 @@
+package cmd
+
+import (
+	"net/url"
+
+	"code.dumpstack.io/tools/out-of-tree/config"
+)
+
+type Globals struct {
+	Config config.OutOfTree `help:"path to out-of-tree configuration" default:"~/.out-of-tree/out-of-tree.toml"`
+
+	WorkDir string `help:"path to work directory" default:"./" type:"path"`
+
+	CacheURL url.URL
+}

cmd/images.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"errors"

cmd/kernel.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"errors"

cmd/log.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"database/sql"

cmd/pack.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"fmt"

cmd/pew.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"bufio"
@@ -30,6 +30,22 @@ import (
 	"code.dumpstack.io/tools/out-of-tree/qemu"
 )
 
+type LevelWriter struct {
+	io.Writer
+	Level zerolog.Level
+}
+
+func (lw *LevelWriter) WriteLevel(l zerolog.Level, p []byte) (n int, err error) {
+	if l >= lw.Level {
+		return lw.Writer.Write(p)
+	}
+	return len(p), nil
+}
+
+var ConsoleWriter, FileWriter LevelWriter
+
+var LogLevel zerolog.Level
+
 type PewCmd struct {
 	Max     int64         `help:"test no more than X kernels" default:"100500"`
 	Runs    int64         `help:"runs per each kernel" default:"1"`
@@ -649,8 +665,8 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
 	defer f.Close()
 
 	slog := zerolog.New(zerolog.MultiLevelWriter(
-		&consoleWriter,
+		&ConsoleWriter,
-		&fileWriter,
+		&FileWriter,
 		&zerolog.ConsoleWriter{
 			Out: f,
 			FieldsExclude: []string{
@@ -662,7 +678,7 @@ func (cmd PewCmd) testArtifact(swg *sizedwaitgroup.SizedWaitGroup,
 		},
 	))
 
-	switch loglevel {
+	switch LogLevel {
 	case zerolog.TraceLevel, zerolog.DebugLevel:
 		slog = slog.With().Caller().Logger()
 	}

cmd/preload.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a AGPLv3 license
 // (or later) that can be found in the LICENSE file.
 
-package main
+package cmd
 
 import (
 	"crypto/sha1"

main.go

@@ -6,9 +6,7 @@ package main
 
 import (
 	"fmt"
-	"io"
 	"math/rand"
-	"net/url"
 	"os"
 	"os/exec"
 	"runtime/debug"
@@ -28,31 +26,24 @@ import (
 	_ "code.dumpstack.io/tools/out-of-tree/distro/ubuntu"
 
 	"code.dumpstack.io/tools/out-of-tree/cache"
+	"code.dumpstack.io/tools/out-of-tree/cmd"
 	"code.dumpstack.io/tools/out-of-tree/config"
 	"code.dumpstack.io/tools/out-of-tree/container"
 	"code.dumpstack.io/tools/out-of-tree/fs"
 )
 
-type Globals struct {
-	Config config.OutOfTree `help:"path to out-of-tree configuration" default:"~/.out-of-tree/out-of-tree.toml"`
-
-	WorkDir string `help:"path to work directory" default:"./" type:"path"`
-
-	CacheURL url.URL
-}
-
 type CLI struct {
-	Globals
+	cmd.Globals
 
-	Pew       PewCmd       `cmd:"" help:"build, run, and test module/exploit"`
+	Pew       cmd.PewCmd       `cmd:"" help:"build, run, and test module/exploit"`
-	Kernel    KernelCmd    `cmd:"" help:"manipulate kernels"`
+	Kernel    cmd.KernelCmd    `cmd:"" help:"manipulate kernels"`
-	Debug     DebugCmd     `cmd:"" help:"debug environment"`
+	Debug     cmd.DebugCmd     `cmd:"" help:"debug environment"`
-	Log       LogCmd       `cmd:"" help:"query logs"`
+	Log       cmd.LogCmd       `cmd:"" help:"query logs"`
-	Pack      PackCmd      `cmd:"" help:"exploit pack test"`
+	Pack      cmd.PackCmd      `cmd:"" help:"exploit pack test"`
-	Gen       GenCmd       `cmd:"" help:"generate .out-of-tree.toml skeleton"`
+	Gen       cmd.GenCmd       `cmd:"" help:"generate .out-of-tree.toml skeleton"`
-	Image     ImageCmd     `cmd:"" help:"manage images"`
+	Image     cmd.ImageCmd     `cmd:"" help:"manage images"`
-	Container ContainerCmd `cmd:"" help:"manage containers"`
+	Container cmd.ContainerCmd `cmd:"" help:"manage containers"`
-	Distro    DistroCmd    `cmd:"" help:"distro-related helpers"`
+	Distro    cmd.DistroCmd    `cmd:"" help:"distro-related helpers"`
 
 	Version VersionFlag `name:"version" help:"print version information and quit"`
 
@@ -92,22 +83,6 @@ func (v VersionFlag) BeforeApply(app *kong.Kong, vars kong.Vars) error {
 	return nil
 }
 
-type LevelWriter struct {
-	io.Writer
-	Level zerolog.Level
-}
-
-func (lw *LevelWriter) WriteLevel(l zerolog.Level, p []byte) (n int, err error) {
-	if l >= lw.Level {
-		return lw.Writer.Write(p)
-	}
-	return len(p), nil
-}
-
-var consoleWriter, fileWriter LevelWriter
-
-var loglevel zerolog.Level
-
 func main() {
 	rand.Seed(time.Now().UnixNano())
 
@@ -126,34 +101,34 @@ func main() {
 
 	switch cli.LogLevel {
 	case "trace":
-		loglevel = zerolog.TraceLevel
+		cmd.LogLevel = zerolog.TraceLevel
 	case "debug":
-		loglevel = zerolog.DebugLevel
+		cmd.LogLevel = zerolog.DebugLevel
 	case "info":
-		loglevel = zerolog.InfoLevel
+		cmd.LogLevel = zerolog.InfoLevel
 	case "warn":
-		loglevel = zerolog.WarnLevel
+		cmd.LogLevel = zerolog.WarnLevel
 	case "error":
-		loglevel = zerolog.ErrorLevel
+		cmd.LogLevel = zerolog.ErrorLevel
 	}
 
-	consoleWriter = LevelWriter{Writer: zerolog.NewConsoleWriter(
+	cmd.ConsoleWriter = cmd.LevelWriter{Writer: zerolog.NewConsoleWriter(
 		func(w *zerolog.ConsoleWriter) {
 			w.Out = os.Stderr
 		},
 	),
-		Level: loglevel,
+		Level: cmd.LogLevel,
 	}
 
-	fileWriter = LevelWriter{Writer: &lumberjack.Logger{
+	cmd.FileWriter = cmd.LevelWriter{Writer: &lumberjack.Logger{
 		Filename: config.File("logs/out-of-tree.log"),
 	},
 		Level: zerolog.TraceLevel,
 	}
 
 	log.Logger = log.Output(zerolog.MultiLevelWriter(
-		&consoleWriter,
+		&cmd.ConsoleWriter,
-		&fileWriter,
+		&cmd.FileWriter,
 	))
 
 	log.Trace().Msg("start out-of-tree")