refactor: rename container domain to docker

cmd/agent_helpers.go

@@ -46,7 +46,7 @@ func setupAgent(
 	b := connectNATSBundle(ctx, log, connCfg, kvBucket, namespace, streamName)
 
 	providerFactory := agent.NewProviderFactory(log)
-	hostProvider, diskProvider, memProvider, loadProvider, dnsProvider, pingProvider, netinfoProvider, commandProvider, containerProvider := providerFactory.CreateProviders()
+	hostProvider, diskProvider, memProvider, loadProvider, dnsProvider, pingProvider, netinfoProvider, commandProvider, dockerProvider := providerFactory.CreateProviders()
 
 	// Create file provider if Object Store and file-state KV are configured
 	hostname, _ := job.GetAgentHostname(appConfig.Agent.Hostname)
@@ -67,7 +67,7 @@ func setupAgent(
 		netinfoProvider,
 		commandProvider,
 		fileProvider,
-		containerProvider,
+		dockerProvider,
 		b.registryKV,
 		b.factsKV,
 	)

cmd/api_helpers.go

@@ -63,8 +63,8 @@ type ServerManager interface {
 	GetMetricsHandler(metricsHandler http.Handler, path string) []func(e *echo.Echo)
 	// GetAuditHandler returns audit handler for registration.
 	GetAuditHandler(store audit.Store) []func(e *echo.Echo)
-	// GetContainerHandler returns container handler for registration.
-	GetContainerHandler(jobClient jobclient.JobClient) []func(e *echo.Echo)
+	// GetDockerHandler returns Docker handler for registration.
+	GetDockerHandler(jobClient jobclient.JobClient) []func(e *echo.Echo)
 	// GetFileHandler returns file handler for registration.
 	GetFileHandler(objStore file.ObjectStoreManager) []func(e *echo.Echo)
 	// RegisterHandlers registers a list of handlers with the Echo instance.
@@ -482,7 +482,7 @@ func registerAPIHandlers(
 	handlers = append(
 		handlers,
 		sm.GetHealthHandler(checker, startTime, "0.1.0", metricsProvider)...)
-	handlers = append(handlers, sm.GetContainerHandler(jc)...)
+	handlers = append(handlers, sm.GetDockerHandler(jc)...)
 	handlers = append(handlers, sm.GetMetricsHandler(metricsHandler, metricsPath)...)
 	if auditStore != nil {
 		handlers = append(handlers, sm.GetAuditHandler(auditStore)...)

cmd/client_container.go

@@ -22,11 +22,11 @@ package cmd
 
 import "github.com/spf13/cobra"
 
-// clientContainerCmd represents the clientContainer command.
+// clientContainerCmd represents the container parent command.
 var clientContainerCmd = &cobra.Command{
 	Use:   "container",
-	Short: "Container management operations",
-	Long:  `Manage containers on target nodes.`,
+	Short: "Container runtime management",
+	Long:  `Manage containers using runtime-specific subcommands.`,
 }
 
 func init() {

internal/provider/container/runtime/mocks/generate.go → cmd/client_container_docker.go

@@ -18,7 +18,17 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// Package mocks provides mock implementations for testing.
-package mocks
+package cmd
 
-//go:generate go tool github.com/golang/mock/mockgen -source=../driver.go -destination=driver.gen.go -package=mocks
+import "github.com/spf13/cobra"
+
+// clientContainerDockerCmd represents the docker subcommand under container.
+var clientContainerDockerCmd = &cobra.Command{
+	Use:   "docker",
+	Short: "Docker container operations",
+	Long:  `Manage Docker containers on target nodes.`,
+}
+
+func init() {
+	clientContainerCmd.AddCommand(clientContainerDockerCmd)
+}

cmd/client_container_create.go → cmd/client_container_docker_create.go

@@ -29,8 +29,8 @@ import (
 	"github.com/retr0h/osapi/pkg/sdk/client/gen"
 )
 
-// clientContainerCreateCmd represents the clientContainerCreate command.
-var clientContainerCreateCmd = &cobra.Command{
+// clientContainerDockerCreateCmd represents the clientContainerDockerCreate command.
+var clientContainerDockerCreateCmd = &cobra.Command{
 	Use:   "create",
 	Short: "Create a new container",
 	Long:  `Create a new container on the target node from the specified image.`,
@@ -44,7 +44,7 @@ var clientContainerCreateCmd = &cobra.Command{
 		volumeFlags, _ := cmd.Flags().GetStringSlice("volume")
 		autoStart, _ := cmd.Flags().GetBool("auto-start")
 
-		body := gen.ContainerCreateRequest{
+		body := gen.DockerCreateRequest{
 			Image:     image,
 			AutoStart: &autoStart,
 		}
@@ -62,7 +62,7 @@ var clientContainerCreateCmd = &cobra.Command{
 			body.Volumes = &volumeFlags
 		}
 
-		resp, err := sdkClient.Container.Create(ctx, host, body)
+		resp, err := sdkClient.Docker.Create(ctx, host, body)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -98,20 +98,20 @@ var clientContainerCreateCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerCreateCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerCreateCmd)
 
-	clientContainerCreateCmd.PersistentFlags().
+	clientContainerDockerCreateCmd.PersistentFlags().
 		String("image", "", "Container image reference (required)")
-	clientContainerCreateCmd.PersistentFlags().
+	clientContainerDockerCreateCmd.PersistentFlags().
 		String("name", "", "Optional name for the container")
-	clientContainerCreateCmd.PersistentFlags().
+	clientContainerDockerCreateCmd.PersistentFlags().
 		StringSlice("env", []string{}, "Environment variable in KEY=VALUE format (repeatable)")
-	clientContainerCreateCmd.PersistentFlags().
+	clientContainerDockerCreateCmd.PersistentFlags().
 		StringSlice("port", []string{}, "Port mapping in host:container format (repeatable)")
-	clientContainerCreateCmd.PersistentFlags().
+	clientContainerDockerCreateCmd.PersistentFlags().
 		StringSlice("volume", []string{}, "Volume mount in host:container format (repeatable)")
-	clientContainerCreateCmd.PersistentFlags().
+	clientContainerDockerCreateCmd.PersistentFlags().
 		Bool("auto-start", true, "Start the container immediately after creation")
 
-	_ = clientContainerCreateCmd.MarkPersistentFlagRequired("image")
+	_ = clientContainerDockerCreateCmd.MarkPersistentFlagRequired("image")
 }

cmd/client_container_exec.go → cmd/client_container_docker_exec.go

@@ -30,8 +30,8 @@ import (
 	"github.com/retr0h/osapi/pkg/sdk/client/gen"
 )
 
-// clientContainerExecCmd represents the clientContainerExec command.
-var clientContainerExecCmd = &cobra.Command{
+// clientContainerDockerExecCmd represents the clientContainerDockerExec command.
+var clientContainerDockerExecCmd = &cobra.Command{
 	Use:   "exec",
 	Short: "Execute a command in a container",
 	Long:  `Execute a command inside a running container on the target node.`,
@@ -43,7 +43,7 @@ var clientContainerExecCmd = &cobra.Command{
 		envFlags, _ := cmd.Flags().GetStringSlice("env")
 		workingDir, _ := cmd.Flags().GetString("working-dir")
 
-		body := gen.ContainerExecRequest{
+		body := gen.DockerExecRequest{
 			Command: command,
 		}
 
@@ -54,7 +54,7 @@ var clientContainerExecCmd = &cobra.Command{
 			body.WorkingDir = &workingDir
 		}
 
-		resp, err := sdkClient.Container.Exec(ctx, host, id, body)
+		resp, err := sdkClient.Docker.Exec(ctx, host, id, body)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -89,17 +89,17 @@ var clientContainerExecCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerExecCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerExecCmd)
 
-	clientContainerExecCmd.PersistentFlags().
+	clientContainerDockerExecCmd.PersistentFlags().
 		String("id", "", "Container ID to exec in (required)")
-	clientContainerExecCmd.PersistentFlags().
+	clientContainerDockerExecCmd.PersistentFlags().
 		StringSlice("command", []string{}, "Command to execute (required, comma-separated)")
-	clientContainerExecCmd.PersistentFlags().
+	clientContainerDockerExecCmd.PersistentFlags().
 		StringSlice("env", []string{}, "Environment variable in KEY=VALUE format (repeatable)")
-	clientContainerExecCmd.PersistentFlags().
+	clientContainerDockerExecCmd.PersistentFlags().
 		String("working-dir", "", "Working directory inside the container")
 
-	_ = clientContainerExecCmd.MarkPersistentFlagRequired("id")
-	_ = clientContainerExecCmd.MarkPersistentFlagRequired("command")
+	_ = clientContainerDockerExecCmd.MarkPersistentFlagRequired("id")
+	_ = clientContainerDockerExecCmd.MarkPersistentFlagRequired("command")
 }

cmd/client_container_inspect.go → cmd/client_container_docker_inspect.go

@@ -29,8 +29,8 @@ import (
 	"github.com/retr0h/osapi/internal/cli"
 )
 
-// clientContainerInspectCmd represents the clientContainerInspect command.
-var clientContainerInspectCmd = &cobra.Command{
+// clientContainerDockerInspectCmd represents the clientContainerDockerInspect command.
+var clientContainerDockerInspectCmd = &cobra.Command{
 	Use:   "inspect",
 	Short: "Inspect a container",
 	Long:  `Retrieve detailed information about a specific container on the target node.`,
@@ -39,7 +39,7 @@ var clientContainerInspectCmd = &cobra.Command{
 		host, _ := cmd.Flags().GetString("target")
 		id, _ := cmd.Flags().GetString("id")
 
-		resp, err := sdkClient.Container.Inspect(ctx, host, id)
+		resp, err := sdkClient.Docker.Inspect(ctx, host, id)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -97,10 +97,10 @@ var clientContainerInspectCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerInspectCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerInspectCmd)
 
-	clientContainerInspectCmd.PersistentFlags().
+	clientContainerDockerInspectCmd.PersistentFlags().
 		String("id", "", "Container ID to inspect (required)")
 
-	_ = clientContainerInspectCmd.MarkPersistentFlagRequired("id")
+	_ = clientContainerDockerInspectCmd.MarkPersistentFlagRequired("id")
 }

cmd/client_container_list.go → cmd/client_container_docker_list.go

@@ -29,8 +29,8 @@ import (
 	"github.com/retr0h/osapi/pkg/sdk/client/gen"
 )
 
-// clientContainerListCmd represents the clientContainerList command.
-var clientContainerListCmd = &cobra.Command{
+// clientContainerDockerListCmd represents the clientContainerDockerList command.
+var clientContainerDockerListCmd = &cobra.Command{
 	Use:   "list",
 	Short: "List containers on target node",
 	Long:  `List containers on the target node, optionally filtered by state.`,
@@ -40,17 +40,17 @@ var clientContainerListCmd = &cobra.Command{
 		stateFlag, _ := cmd.Flags().GetString("state")
 		limit, _ := cmd.Flags().GetInt("limit")
 
-		params := &gen.GetNodeContainerParams{}
+		params := &gen.GetNodeContainerDockerParams{}
 
 		if stateFlag != "" {
-			state := gen.GetNodeContainerParamsState(stateFlag)
+			state := gen.GetNodeContainerDockerParamsState(stateFlag)
 			params.State = &state
 		}
 		if limit > 0 {
 			params.Limit = &limit
 		}
 
-		resp, err := sdkClient.Container.List(ctx, host, params)
+		resp, err := sdkClient.Docker.List(ctx, host, params)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -98,10 +98,10 @@ var clientContainerListCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerListCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerListCmd)
 
-	clientContainerListCmd.PersistentFlags().
+	clientContainerDockerListCmd.PersistentFlags().
 		String("state", "running", "Filter by state: running, stopped, all")
-	clientContainerListCmd.PersistentFlags().
+	clientContainerDockerListCmd.PersistentFlags().
 		Int("limit", 0, "Maximum number of containers to return")
 }

cmd/client_container_pull.go → cmd/client_container_docker_pull.go

@@ -29,8 +29,8 @@ import (
 	"github.com/retr0h/osapi/pkg/sdk/client/gen"
 )
 
-// clientContainerPullCmd represents the clientContainerPull command.
-var clientContainerPullCmd = &cobra.Command{
+// clientContainerDockerPullCmd represents the clientContainerDockerPull command.
+var clientContainerDockerPullCmd = &cobra.Command{
 	Use:   "pull",
 	Short: "Pull a container image",
 	Long:  `Pull a container image on the target node.`,
@@ -39,11 +39,11 @@ var clientContainerPullCmd = &cobra.Command{
 		host, _ := cmd.Flags().GetString("target")
 		image, _ := cmd.Flags().GetString("image")
 
-		body := gen.ContainerPullRequest{
+		body := gen.DockerPullRequest{
 			Image: image,
 		}
 
-		resp, err := sdkClient.Container.Pull(ctx, host, body)
+		resp, err := sdkClient.Docker.Pull(ctx, host, body)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -73,10 +73,10 @@ var clientContainerPullCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerPullCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerPullCmd)
 
-	clientContainerPullCmd.PersistentFlags().
+	clientContainerDockerPullCmd.PersistentFlags().
 		String("image", "", "Image reference to pull (required)")
 
-	_ = clientContainerPullCmd.MarkPersistentFlagRequired("image")
+	_ = clientContainerDockerPullCmd.MarkPersistentFlagRequired("image")
 }

cmd/client_container_remove.go → cmd/client_container_docker_remove.go

@@ -29,8 +29,8 @@ import (
 	"github.com/retr0h/osapi/pkg/sdk/client/gen"
 )
 
-// clientContainerRemoveCmd represents the clientContainerRemove command.
-var clientContainerRemoveCmd = &cobra.Command{
+// clientContainerDockerRemoveCmd represents the clientContainerDockerRemove command.
+var clientContainerDockerRemoveCmd = &cobra.Command{
 	Use:   "remove",
 	Short: "Remove a container",
 	Long:  `Remove a container from the target node.`,
@@ -40,12 +40,12 @@ var clientContainerRemoveCmd = &cobra.Command{
 		id, _ := cmd.Flags().GetString("id")
 		force, _ := cmd.Flags().GetBool("force")
 
-		params := &gen.DeleteNodeContainerByIDParams{}
+		params := &gen.DeleteNodeContainerDockerByIDParams{}
 		if force {
 			params.Force = &force
 		}
 
-		resp, err := sdkClient.Container.Remove(ctx, host, id, params)
+		resp, err := sdkClient.Docker.Remove(ctx, host, id, params)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -74,12 +74,12 @@ var clientContainerRemoveCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerRemoveCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerRemoveCmd)
 
-	clientContainerRemoveCmd.PersistentFlags().
+	clientContainerDockerRemoveCmd.PersistentFlags().
 		String("id", "", "Container ID to remove (required)")
-	clientContainerRemoveCmd.PersistentFlags().
+	clientContainerDockerRemoveCmd.PersistentFlags().
 		Bool("force", false, "Force removal of a running container")
 
-	_ = clientContainerRemoveCmd.MarkPersistentFlagRequired("id")
+	_ = clientContainerDockerRemoveCmd.MarkPersistentFlagRequired("id")
 }

cmd/client_container_start.go → cmd/client_container_docker_start.go

@@ -28,8 +28,8 @@ import (
 	"github.com/retr0h/osapi/internal/cli"
 )
 
-// clientContainerStartCmd represents the clientContainerStart command.
-var clientContainerStartCmd = &cobra.Command{
+// clientContainerDockerStartCmd represents the clientContainerDockerStart command.
+var clientContainerDockerStartCmd = &cobra.Command{
 	Use:   "start",
 	Short: "Start a stopped container",
 	Long:  `Start a stopped container on the target node.`,
@@ -38,7 +38,7 @@ var clientContainerStartCmd = &cobra.Command{
 		host, _ := cmd.Flags().GetString("target")
 		id, _ := cmd.Flags().GetString("id")
 
-		resp, err := sdkClient.Container.Start(ctx, host, id)
+		resp, err := sdkClient.Docker.Start(ctx, host, id)
 		if err != nil {
 			cli.HandleError(err, logger)
 			return
@@ -67,10 +67,10 @@ var clientContainerStartCmd = &cobra.Command{
 }
 
 func init() {
-	clientContainerCmd.AddCommand(clientContainerStartCmd)
+	clientContainerDockerCmd.AddCommand(clientContainerDockerStartCmd)
 
-	clientContainerStartCmd.PersistentFlags().
+	clientContainerDockerStartCmd.PersistentFlags().
 		String("id", "", "Container ID to start (required)")
 
-	_ = clientContainerStartCmd.MarkPersistentFlagRequired("id")
+	_ = clientContainerDockerStartCmd.MarkPersistentFlagRequired("id")
 }