tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reduce code complexity with sub-functions 

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2021-04-30 09:35:09 +02:00
parent 98187b2f62
commit deecf76421
No known key found for this signature in database
GPG Key ID: 9858809D6F8F6E7E
2 changed files with 55 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local/compose/create.go
View File

@ -938,7 +938,7 @@ func (s *composeService) ensureNetwork(ctx context.Context, n types.NetworkConfi
return nil
}
func (s *composeService) ensureNetworkDown(ctx context.Context, networkID string, networkName string) error {
func (s *composeService) removeNetwork(ctx context.Context, networkID string, networkName string) error {
w := progress.ContextWriter(ctx)
eventName := fmt.Sprintf("Network %s", networkName)
w.Event(progress.RemovingEvent(eventName))

81
local/compose/down.go
View File

@ -33,6 +33,8 @@ import (
"github.com/docker/compose-cli/api/progress"
)
type downOp func() error
func (s *composeService) Down(ctx context.Context, projectName string, options compose.DownOptions) error {
w := progress.ContextWriter(ctx)
resourceToRemove := false
@ -73,51 +75,76 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c
}
}
networks, err := s.apiClient.NetworkList(ctx, moby.NetworkListOptions{Filters: filters.NewArgs(projectFilter(projectName))})
ops, err := s.ensureNetwoksDown(ctx, projectName)
if err != nil {
return err
}
eg, _ := errgroup.WithContext(ctx)
for _, n := range networks {
resourceToRemove = true
networkID := n.ID
networkName := n.Name
eg.Go(func() error {
return s.ensureNetworkDown(ctx, networkID, networkName)
})
}
if options.Images != "" {
for image := range s.getServiceImages(options, projectName) {
image := image
eg.Go(func() error {
resourceToRemove = true
return s.removeImage(ctx, image, w)
})
}
ops = append(ops, s.ensureImagesDown(ctx, projectName, options, w)...)
}
if options.Volumes {
networks, err := s.apiClient.VolumeList(ctx, filters.NewArgs(projectFilter(projectName)))
rm, err := s.ensureVolumesDown(ctx, projectName, w)
if err != nil {
return err
}
for _, vol := range networks.Volumes {
id := vol.Name
eg.Go(func() error {
resourceToRemove = true
return s.removeVolume(ctx, id, w)
})
}
ops = append(ops, rm...)
}
if !resourceToRemove {
if !resourceToRemove && len(ops) == 0 {
w.Event(progress.NewEvent(projectName, progress.Done, "Warning: No resource found to remove"))
}
eg, _ := errgroup.WithContext(ctx)
for _, op := range ops {
eg.Go(op)
}
return eg.Wait()
}
func (s *composeService) ensureVolumesDown(ctx context.Context, projectName string, w progress.Writer) ([]downOp, error) {
var ops []downOp
volumes, err := s.apiClient.VolumeList(ctx, filters.NewArgs(projectFilter(projectName)))
if err != nil {
return ops, err
}
for _, vol := range volumes.Volumes {
id := vol.Name
ops = append(ops, func() error {
return s.removeVolume(ctx, id, w)
})
}
return ops, nil
}
func (s *composeService) ensureImagesDown(ctx context.Context, projectName string, options compose.DownOptions, w progress.Writer) []downOp {
var ops []downOp
for image := range s.getServiceImages(options, projectName) {
image := image
ops = append(ops, func() error {
return s.removeImage(ctx, image, w)
})
}
return ops
}
func (s *composeService) ensureNetwoksDown(ctx context.Context, projectName string) ([]downOp, error) {
var ops []downOp
networks, err := s.apiClient.NetworkList(ctx, moby.NetworkListOptions{Filters: filters.NewArgs(projectFilter(projectName))})
if err != nil {
return ops, err
}
for _, n := range networks {
networkID := n.ID
networkName := n.Name
ops = append(ops, func() error {
return s.removeNetwork(ctx, networkID, networkName)
})
}
return ops, nil
}
func (s *composeService) getServiceImages(options compose.DownOptions, projectName string) map[string]struct{} {
images := map[string]struct{}{}
for _, service := range options.Project.Services {