Use a sqlite database for working sets. Add import/export commands.

Author: cmrigney

cmd/docker-mcp/commands/workingset.go

@@ -1,8 +1,7 @@
 package commands
 
 import (
-	"fmt"
-
+	"github.com/docker/mcp-gateway/pkg/db"
 	"github.com/docker/mcp-gateway/pkg/workingset"
 	"github.com/spf13/cobra"
 )
@@ -13,57 +12,36 @@ func workingSetCommand() *cobra.Command {
 		Short: "Manage working sets",
 	}
 
-	// TODO clean these up
-	cmd.AddCommand(testWriteWorkingSetCommand())
-	cmd.AddCommand(testReadWorkingSetCommand())
+	cmd.AddCommand(exportWorkingSetCommand())
+	cmd.AddCommand(importWorkingSetCommand())
 
 	return cmd
 }
 
-func testWriteWorkingSetCommand() *cobra.Command {
+func exportWorkingSetCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:   "test-write",
-		Short: "Test write working set",
+		Use:   "export <working-set-id> <output-file>",
+		Short: "Export working set",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return workingset.Write(workingset.WorkingSet{
-				ID:   "test",
-				Name: "My working set",
-				Servers: []workingset.Server{
-					{
-						Type:   "registry",
-						Source: "https://example-registry.com/v0/servers/312e45a4-2216-4b21-b9a8-0f1a51425073",
-						Config: map[string]interface{}{
-							"username": "bobbarker",
-						},
-						Secrets: "default",
-					},
-					{
-						Type:  "image",
-						Image: "mcp/notion:v0.1.0",
-						Tools: []string{"do_something"},
-					},
-				},
-				Secrets: map[string]workingset.Secret{
-					"default": {
-						Provider: "docker-desktop-store",
-					},
-				},
-			})
+			dao, err := db.New()
+			if err != nil {
+				return err
+			}
+			return workingset.Export(cmd.Context(), dao, args[0], args[1])
 		},
 	}
 }
 
-func testReadWorkingSetCommand() *cobra.Command {
+func importWorkingSetCommand() *cobra.Command {
 	return &cobra.Command{
-		Use:   "test-read",
-		Short: "Test read working set",
+		Use:   "import <input-file>",
+		Short: "Import working set",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			ws, err := workingset.Read("test")
+			dao, err := db.New()
 			if err != nil {
 				return err
 			}
-			fmt.Println(ws)
-			return nil
+			return workingset.Import(cmd.Context(), dao, args[0])
 		},
 	}
 }

go.mod

@@ -9,12 +9,14 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli v28.2.2+incompatible
 	github.com/docker/cli-docs-tool v0.10.0
-	github.com/docker/docker v28.2.2+incompatible
+	github.com/docker/docker v28.3.3+incompatible
 	github.com/docker/docker-credential-helpers v0.9.3
 	github.com/fsnotify/fsnotify v1.9.0
+	github.com/golang-migrate/migrate/v4 v4.19.0
 	github.com/google/go-containerregistry v0.20.6
 	github.com/google/jsonschema-go v0.3.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
+	github.com/jmoiron/sqlx v1.4.0
 	github.com/mikefarah/yq/v4 v4.45.4
 	github.com/modelcontextprotocol/go-sdk v1.0.0
 	github.com/opencontainers/go-digest v1.0.0
@@ -25,14 +27,25 @@ require (
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
 	github.com/stretchr/testify v1.10.0
-	go.opentelemetry.io/otel v1.36.0
-	go.opentelemetry.io/otel/metric v1.36.0
+	go.opentelemetry.io/otel v1.37.0
+	go.opentelemetry.io/otel/metric v1.37.0
 	go.opentelemetry.io/otel/sdk v1.36.0
 	go.opentelemetry.io/otel/sdk/metric v1.36.0
-	go.opentelemetry.io/otel/trace v1.36.0
-	golang.org/x/sync v0.15.0
+	go.opentelemetry.io/otel/trace v1.37.0
+	golang.org/x/sync v0.16.0
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 	gopkg.in/yaml.v3 v3.0.1
+	modernc.org/sqlite v1.39.1
+)
+
+require (
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	modernc.org/libc v1.66.10 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.11.0 // indirect
 )
 
 require (
@@ -116,7 +129,7 @@ require (
 	github.com/onsi/gomega v1.37.0 // indirect
 	github.com/open-policy-agent/opa v1.5.1 // indirect
 	github.com/opentracing/opentracing-go v1.2.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
@@ -157,13 +170,13 @@ require (
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.39.0 // indirect
-	golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
-	golang.org/x/mod v0.25.0 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/term v0.32.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
+	golang.org/x/crypto v0.41.0 // indirect
+	golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
+	golang.org/x/mod v0.27.0 // indirect
+	golang.org/x/net v0.43.0 // indirect
+	golang.org/x/sys v0.36.0 // indirect
+	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/grpc v1.73.0 // indirect