tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-26 15:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix the way we're checking if the provider metadata are empty or not

Browse Source 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
This commit is contained in:
Guillaume Lours 2025-07-03 17:48:14 +02:00 committed by Nicolas De loof
parent 60ee6adcd2
commit c626befee1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/compose/plugins.go
View File

@ -170,7 +170,7 @@ func (s *composeService) getPluginBinaryPath(provider string) (path string, err
} }
func (s *composeService) setupPluginCommand(ctx context.Context, project *types.Project, service types.ServiceConfig, path, command string) (*exec.Cmd, error) { func (s *composeService) setupPluginCommand(ctx context.Context, project *types.Project, service types.ServiceConfig, path, command string) (*exec.Cmd, error) {
cmdOptionsMetadata := s.getPluginMetadata(path, service.Provider.Type) cmdOptionsMetadata := s.getPluginMetadata(path, service.Provider.Type, project)
var currentCommandMetadata CommandMetadata var currentCommandMetadata CommandMetadata
switch command { switch command {
case "up": case "up":
@ -178,8 +178,9 @@ func (s *composeService) setupPluginCommand(ctx context.Context, project *types.
case "down": case "down":
currentCommandMetadata = cmdOptionsMetadata.Down currentCommandMetadata = cmdOptionsMetadata.Down
} }
commandMetadataIsEmpty := len(currentCommandMetadata.Parameters) == 0
provider := *service.Provider provider := *service.Provider
commandMetadataIsEmpty := cmdOptionsMetadata.IsEmpty()
if err := currentCommandMetadata.CheckRequiredParameters(provider); !commandMetadataIsEmpty && err != nil { if err := currentCommandMetadata.CheckRequiredParameters(provider); !commandMetadataIsEmpty && err != nil {
return nil, err return nil, err
} }
@ -203,8 +204,13 @@ func (s *composeService) setupPluginCommand(ctx context.Context, project *types.
return cmd, nil return cmd, nil
} }
func (s *composeService) getPluginMetadata(path, command string) ProviderMetadata { func (s *composeService) getPluginMetadata(path, command string, project *types.Project) ProviderMetadata {
cmd := exec.Command(path, "compose", "metadata") cmd := exec.Command(path, "compose", "metadata")
err := s.prepareShellOut(context.Background(), project, cmd)
if err != nil {
logrus.Debugf("failed to prepare plugin metadata command: %v", err)
return ProviderMetadata{}
}
stdout := &bytes.Buffer{} stdout := &bytes.Buffer{}
cmd.Stdout = stdout cmd.Stdout = stdout
@ -239,6 +245,10 @@ type ProviderMetadata struct {
Down CommandMetadata `json:"down"` Down CommandMetadata `json:"down"`
} }
func (p ProviderMetadata) IsEmpty() bool {
return p.Description == "" && p.Up.Parameters == nil && p.Down.Parameters == nil
}
type CommandMetadata struct { type CommandMetadata struct {
Parameters []ParameterMetadata `json:"parameters"` Parameters []ParameterMetadata `json:"parameters"`
} }