Remove JFS references + secrets engine injection #247
+548
−949
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,9 @@ | ||
| package backup | ||
|
|
||
| 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"` | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,149 @@ | ||
| package commands | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "errors" | ||
| "fmt" | ||
| "slices" | ||
| "strings" | ||
|
|
||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/docker/mcp-gateway/cmd/docker-mcp/secret-management/formatting" | ||
| "github.com/docker/mcp-gateway/cmd/docker-mcp/secret-management/secret" | ||
| "github.com/docker/mcp-gateway/pkg/desktop" | ||
| ) | ||
|
|
||
| const setSecretExample = ` | ||
| ### Use secrets for postgres password with default policy | ||
|
|
||
| > docker mcp secret set postgres_password=my-secret-password | ||
|
|
||
| Inject the secret by querying by ID | ||
| > docker run -d -e POSTGRES_PASSWORD=se://docker/mcp/generic/postgres_password -p 5432 postgres | ||
|
|
||
| Another way to inject secrets would be to use a pattern. | ||
| > docker run -d -e POSTGRES_PASSWORD=se://**/postgres_password -p 5432 postgres | ||
|
|
||
| ### Pass the secret via STDIN | ||
|
|
||
| > echo my-secret-password > pwd.txt | ||
| > cat pwd.txt | docker mcp secret set POSTGRES_PASSWORD | ||
| ` | ||
|
|
||
| func secretCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "secret", | ||
| Short: "Manage secrets in the local OS Keychain", | ||
| Example: strings.Trim(setSecretExample, "\n"), | ||
| PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { | ||
|
||
| err := desktop.CheckHasDockerPass(cmd.Context()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
| cmd.AddCommand(rmSecretCommand()) | ||
| cmd.AddCommand(listSecretCommand()) | ||
| cmd.AddCommand(setSecretCommand()) | ||
| return cmd | ||
| } | ||
|
|
||
| func rmSecretCommand() *cobra.Command { | ||
| var all bool | ||
| cmd := &cobra.Command{ | ||
| Use: "rm name1 name2 ...", | ||
| Short: "Remove secrets from the local OS Keychain", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| if err := validateRmArgs(args, all); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| ids := slices.Clone(args) | ||
| if all { | ||
| var err error | ||
| ids, err = secret.List(cmd.Context()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| var errs []error | ||
| for _, s := range ids { | ||
| errs = append(errs, secret.DeleteSecret(cmd.Context(), s)) | ||
| } | ||
| return errors.Join(errs...) | ||
| }, | ||
| } | ||
| flags := cmd.Flags() | ||
| flags.BoolVar(&all, "all", false, "Remove all secrets") | ||
| return cmd | ||
| } | ||
|
|
||
| func validateRmArgs(args []string, all bool) error { | ||
| if len(args) == 0 && !all { | ||
| return errors.New("either provide a secret name or use --all to remove all secrets") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func listSecretCommand() *cobra.Command { | ||
| var outJSON bool | ||
| cmd := &cobra.Command{ | ||
| Use: "ls", | ||
| Short: "List all secrets from the local OS Keychain as well as any active Secrets Engine provider", | ||
| Args: cobra.NoArgs, | ||
| RunE: func(cmd *cobra.Command, _ []string) error { | ||
| // query the Secrets Engine instead to get all the secrets from | ||
| // all active providers. | ||
| l, err := secret.GetSecrets(cmd.Context()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if outJSON { | ||
| type secretListItem struct { | ||
| Name string `json:"name"` | ||
| Provider string `json:"provider,omitempty"` | ||
| } | ||
| output := make([]secretListItem, 0, len(l)) | ||
| for _, env := range l { | ||
| output = append(output, secretListItem{ | ||
| Name: secret.StripNamespace(env.ID), | ||
| Provider: env.Provider, | ||
| }) | ||
| } | ||
| if len(output) == 0 { | ||
| output = []secretListItem{} // Guarantee empty list (instead of displaying null) | ||
| } | ||
| jsonData, err := json.MarshalIndent(output, "", " ") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| fmt.Println(string(jsonData)) | ||
| return nil | ||
| } | ||
| var rows [][]string | ||
| for _, v := range l { | ||
| rows = append(rows, []string{v.ID, v.Provider}) | ||
| } | ||
| formatting.PrettyPrintTable(rows, []int{40, 120}) | ||
| return nil | ||
| }, | ||
| } | ||
| flags := cmd.Flags() | ||
| flags.BoolVar(&outJSON, "json", false, "Print as JSON.") | ||
| return cmd | ||
| } | ||
|
|
||
| func setSecretCommand() *cobra.Command { | ||
| opts := &secret.SetOpts{} | ||
| cmd := &cobra.Command{ | ||
| Use: "set key[=value]", | ||
| Short: "Set a secret in the local OS Keychain", | ||
| Example: strings.Trim(setSecretExample, "\n"), | ||
| Args: cobra.ExactArgs(1), | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| var s secret.Secret | ||
| if isNotImplicitReadFromStdinSyntax(args, *opts) { | ||
| va, err := secret.ParseArg(args[0], *opts) | ||
|
|
@@ -105,30 +163,10 @@ func setSecretCommand() *cobra.Command { | |
| } | ||
| flags := cmd.Flags() | ||
| flags.StringVar(&opts.Provider, "provider", "", "Supported: credstore, oauth/<provider>") | ||
| _ = flags.MarkDeprecated("provider", "all secrets now stored via docker pass in OS Keychain") | ||
| return cmd | ||
| } | ||
|
|
||
| func isNotImplicitReadFromStdinSyntax(args []string, _ secret.SetOpts) bool { | ||
| return strings.Contains(args[0], "=") || len(args) > 1 | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we get rid of the entire backup package. It's superseded by profiles and secrets and now that the policy dump and set commands are gone, can we verify whether this entire package can be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree, I think we are safe to remove it. Could be another PR though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sounds good, will address in a follow-up PR