Skip to content

Improve secret handling by logging missing secrets and deduplicating … #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slimslenderslacks merged 2 commits into from
Aug 23, 2025
Merged

Improve secret handling by logging missing secrets and deduplicating … #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76516d6
Improve secret handling by logging missing secrets and deduplicating …
Aug 18, 2025
09fe7d3
Refactor secret deduplication to use struct for improved memory effic…
Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/docker-mcp/internal/gateway/clientpool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,7 @@ func (cp *clientPool) argsAndEnv(serverConfig *catalog.ServerConfig, readOnly *b
if ok {
env = append(env, fmt.Sprintf("%s=%s", s.Env, secretValue))
} else {
logf("Warning: Secret '%s' not found for server '%s', setting %s=<UNKNOWN>", s.Name, serverConfig.Name, s.Env)
env = append(env, fmt.Sprintf("%s=%s", s.Env, "<UNKNOWN>"))
}
}
Expand Down
14 changes: 11 additions & 3 deletions cmd/docker-mcp/internal/gateway/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,9 @@ func (c *FileBasedConfiguration) readToolsConfig(ctx context.Context) (config.To
}

func (c *FileBasedConfiguration) readDockerDesktopSecrets(ctx context.Context, servers map[string]catalog.Server, serverNames []string) (map[string]string, error) {
var secretNames []string
// Use a map to deduplicate secret names
uniqueSecretNames := make(map[string]struct{})

for _, serverName := range serverNames {
serverName := strings.TrimSpace(serverName)

Expand All @@ -402,14 +404,20 @@ func (c *FileBasedConfiguration) readDockerDesktopSecrets(ctx context.Context, s
}

for _, s := range serverSpec.Secrets {
secretNames = append(secretNames, s.Name)
uniqueSecretNames[s.Name] = struct{}{}
}
}

if len(secretNames) == 0 {
if len(uniqueSecretNames) == 0 {
return map[string]string{}, nil
}

// Convert map keys to slice
var secretNames []string
for name := range uniqueSecretNames {
secretNames = append(secretNames, name)
Comment on lines +417 to +418
Copy link
Contributor

@kgprs kgprs Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this can be just secretNames := maps.Keys(uniqueSecretNames)

Copy link
Author

@roman-y-wu roman-y-wu Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the comments. It has been updated.

Copy link
Contributor

@kgprs kgprs Aug 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, I think you missed this comment where we can replace the for-loop though secretNames := maps.Keys(uniqueSecretNames) or maybe forgot to push it

}

log(" - Reading secrets", secretNames)
secretsByName, err := c.docker.ReadSecrets(ctx, secretNames, true)
if err != nil {
Expand Down
Loading