Remove JFS references + secrets engine injection

cmd/docker-mcp/backup/dump.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/catalog"
 	"github.com/docker/mcp-gateway/pkg/config"
-	"github.com/docker/mcp-gateway/pkg/desktop"
 	"github.com/docker/mcp-gateway/pkg/docker"
 )
 
@@ -45,43 +44,12 @@ func Dump(ctx context.Context, docker docker.Client) ([]byte, error) {
 		catalogFiles[name] = string(catalogFileContent)
 	}
 
-	secretsClient := desktop.NewSecretsClient()
-	storedSecrets, err := secretsClient.ListJfsSecrets(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	var secretNames []string
-	for _, secret := range storedSecrets {
-		secretNames = append(secretNames, secret.Name)
-	}
-	secretValues, err := docker.ReadSecrets(ctx, secretNames, false)
-	if err != nil {
-		return nil, err
-	}
-
-	var secrets []desktop.Secret
-	for _, secret := range storedSecrets {
-		secrets = append(secrets, desktop.Secret{
-			Name:     secret.Name,
-			Provider: secret.Provider,
-			Value:    secretValues[secret.Name],
-		})
-	}
-
-	policy, err := secretsClient.GetJfsPolicy(ctx)
-	if err != nil {
-		return nil, err
-	}
-
 	backup := Backup{
 		Config:       string(configContent),
 		Registry:     string(registryContent),
 		Catalog:      string(catalogContent),
 		CatalogFiles: catalogFiles,
 		Tools:        string(toolsConfig),
-		Secrets:      secrets,
-		Policy:       policy,
 	}
 
 	return json.Marshal(backup)

cmd/docker-mcp/backup/restore.go

@@ -6,10 +6,9 @@ import (
 
 	"github.com/docker/mcp-gateway/cmd/docker-mcp/catalog"
 	"github.com/docker/mcp-gateway/pkg/config"
-	"github.com/docker/mcp-gateway/pkg/desktop"
 )
 
-func Restore(ctx context.Context, backupData []byte) error {
+func Restore(_ context.Context, backupData []byte) error {
 	var backup Backup
 	if err := json.Unmarshal(backupData, &backup); err != nil {
 		return err
@@ -50,36 +49,5 @@ func Restore(ctx context.Context, backupData []byte) error {
 		}
 	}
 
-	secretsClient := desktop.NewSecretsClient()
-
-	secretsBefore, err := secretsClient.ListJfsSecrets(ctx)
-	if err != nil {
-		return err
-	}
-
-	secretsKeep := map[string]bool{}
-	for _, secret := range backup.Secrets {
-		if err := secretsClient.SetJfsSecret(ctx, desktop.Secret{
-			Name:     secret.Name,
-			Value:    secret.Value,
-			Provider: secret.Provider,
-		}); err != nil {
-			return err
-		}
-		secretsKeep[secret.Name] = true
-	}
-
-	for _, secret := range secretsBefore {
-		if !secretsKeep[secret.Name] {
-			if err := secretsClient.DeleteJfsSecret(ctx, secret.Name); err != nil {
-				return err
-			}
-		}
-	}
-
-	if err := secretsClient.SetJfsPolicy(ctx, backup.Policy); err != nil {
-		return err
-	}
-
 	return nil
 }

cmd/docker-mcp/backup/types.go

@@ -1,13 +1,9 @@
 package backup
 
-import "github.com/docker/mcp-gateway/pkg/desktop"
-
 type Backup struct {
 	Config       string            `json:"config"`
 	Registry     string            `json:"registry"`
 	Catalog      string            `json:"catalog"`
 	CatalogFiles map[string]string `json:"catalogFiles"`
 	Tools        string            `json:"tools"`
-	Secrets      []desktop.Secret  `json:"secrets"`
-	Policy       string            `json:"policy"`
 }

cmd/docker-mcp/commands/root.go

@@ -40,7 +40,6 @@ func Root(ctx context.Context, cwd string, dockerCli command.Cli) *cobra.Command
 			HiddenDefaultCmd:  true,
 		},
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			cmd.SetContext(ctx)
 			if err := plugin.PersistentPreRunE(cmd, args); err != nil {
 				return err
 			}
@@ -60,6 +59,7 @@ func Root(ctx context.Context, cwd string, dockerCli command.Cli) *cobra.Command
 		},
 		Version: version.Version,
 	}
+	cmd.SetContext(ctx)
 	cmd.SetVersionTemplate("{{.Version}}\n")
 	cmd.Flags().BoolP("version", "v", false, "Print version information and quit")
 	cmd.SetHelpTemplate(helpTemplate)
@@ -80,7 +80,6 @@ func Root(ctx context.Context, cwd string, dockerCli command.Cli) *cobra.Command
 	cmd.AddCommand(featureCommand(dockerCli))
 	cmd.AddCommand(gatewayCommand(dockerClient, dockerCli))
 	cmd.AddCommand(oauthCommand())
-	cmd.AddCommand(policyCommand())
 	cmd.AddCommand(registryCommand())
 	cmd.AddCommand(secretCommand(dockerClient))
 	cmd.AddCommand(serverCommand(dockerClient, dockerCli))