Pārlūkot izejas kodu

lint: Fix linting errors

Signed-off-by: Chris Crone <[email protected]>
Chris Crone 4 gadi atpakaļ
vecāks
revīzija
a4a3a38dd8
3 mainītis faili ar 10 papildinājumiem un 12 dzēšanām
  1. 2 4
      cli/cmd/compose/down.go
  2. 1 0
      cli/cmd/compose/pull.go
  3. 7 8
      local/compose/down.go

+ 2 - 4
cli/cmd/compose/down.go

@@ -19,16 +19,14 @@ package compose
 import (
 	"context"
 	"fmt"
-	"github.com/docker/compose-cli/api/context/store"
 	"time"
 
 	"github.com/compose-spec/compose-go/types"
-
-	"github.com/docker/compose-cli/api/compose"
-
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/context/store"
 	"github.com/docker/compose-cli/api/progress"
 )
 

+ 1 - 0
cli/cmd/compose/pull.go

@@ -18,6 +18,7 @@ package compose
 
 import (
 	"context"
+
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose-cli/api/client"

+ 7 - 8
local/compose/down.go

@@ -19,20 +19,19 @@ package compose
 import (
 	"context"
 	"fmt"
-	"github.com/docker/docker/errdefs"
 	"path/filepath"
 	"strings"
 	"time"
 
-	"github.com/docker/compose-cli/api/compose"
-
-	"github.com/docker/compose-cli/api/progress"
-
 	"github.com/compose-spec/compose-go/cli"
 	"github.com/compose-spec/compose-go/types"
 	moby "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/errdefs"
 	"golang.org/x/sync/errgroup"
+
+	"github.com/docker/compose-cli/api/compose"
+	"github.com/docker/compose-cli/api/progress"
 )
 
 func (s *composeService) Down(ctx context.Context, projectName string, options compose.DownOptions) error {
@@ -96,7 +95,7 @@ func (s *composeService) Down(ctx context.Context, projectName string, options c
 			image := image
 			eg.Go(func() error {
 				resourceToRemove = true
-				return s.removeImage(image, w, err, ctx)
+				return s.removeImage(ctx, image, w)
 			})
 		}
 	}
@@ -122,10 +121,10 @@ func (s *composeService) getServiceImages(options compose.DownOptions, projectNa
 	return images
 }
 
-func (s *composeService) removeImage(image string, w progress.Writer, err error, ctx context.Context) error {
+func (s *composeService) removeImage(ctx context.Context, image string, w progress.Writer) error {
 	id := fmt.Sprintf("Image %s", image)
 	w.Event(progress.NewEvent(id, progress.Working, "Removing"))
-	_, err = s.apiClient.ImageRemove(ctx, image, moby.ImageRemoveOptions{})
+	_, err := s.apiClient.ImageRemove(ctx, image, moby.ImageRemoveOptions{})
 	if err == nil {
 		w.Event(progress.NewEvent(id, progress.Done, "Removed"))
 		return nil