style: apply gofmt

Signed-off-by: Yves Brissaud <yves.brissaud@docker.com>

Author: eunomie

Taskfile.yaml

@@ -25,7 +25,7 @@ tasks:
 
   go:fmt:
     cmds:
-      - goimports -w .
+      - goimports -w -local github.com/atomist-skills,github.com/docker,github.com/docker/index-cli-plugin .
       - gofmt -w .
       #- go mod tidy
 

commands/cmd.go

@@ -24,18 +24,20 @@ import (
 	"os"
 	"strings"
 
+	"github.com/moby/term"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+
 	"github.com/atomist-skills/go-skill"
+
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/index-cli-plugin/format"
 	"github.com/docker/index-cli-plugin/query"
 	"github.com/docker/index-cli-plugin/sbom"
 	"github.com/docker/index-cli-plugin/types"
-	"github.com/moby/term"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/spf13/cobra"
 )
 
 func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Command {
@@ -129,7 +131,7 @@ func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Comman
 				return err
 			}
 			if output != "" {
-				_ = os.WriteFile(output, js, 0644)
+				_ = os.WriteFile(output, js, 0o644)
 				skill.Log.Infof("SBOM written to %s", output)
 			} else {
 				fmt.Println(string(js))

format/cve.go

@@ -35,7 +35,7 @@ func Cves(cve string, cves *[]types.Cve, sb *types.Sbom, remediate bool, dockerC
 				continue
 			}
 
-			var remediation = make([]string, 0)
+			remediation := make([]string, 0)
 			layerIndex := -1
 			for _, p := range sb.Artifacts {
 				if p.Purl == c.Purl {

format/format.go

@@ -21,10 +21,11 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/index-cli-plugin/internal"
-	"github.com/docker/index-cli-plugin/types"
 	"github.com/gookit/color"
 	"github.com/xeonx/timeago"
+
+	"github.com/docker/index-cli-plugin/internal"
+	"github.com/docker/index-cli-plugin/types"
 )
 
 type colors struct {

internal/spinner.go

@@ -21,10 +21,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/atomist-skills/go-skill"
 	"github.com/briandowns/spinner"
 	"github.com/gookit/color"
 	"github.com/sirupsen/logrus"
+
+	"github.com/atomist-skills/go-skill"
 )
 
 type Fields map[string]interface{}

main.go

@@ -21,6 +21,7 @@ import (
 	"os"
 
 	"github.com/atomist-skills/go-skill"
+
 	"github.com/docker/cli/cli-plugins/manager"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"

query/async.go

@@ -20,6 +20,7 @@ import (
 	"sync"
 
 	"github.com/atomist-skills/go-skill"
+
 	"github.com/docker/index-cli-plugin/types"
 )
 

query/base.go

@@ -26,14 +26,16 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/atomist-skills/go-skill"
-	"github.com/docker/index-cli-plugin/types"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/hasura/go-graphql-client"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/identity"
 	"github.com/pkg/errors"
 	"olympos.io/encoding/edn"
+
+	"github.com/atomist-skills/go-skill"
+
+	"github.com/docker/index-cli-plugin/types"
 )
 
 type ImageQueryResult struct {
@@ -117,7 +119,7 @@ func ForBaseImageInIndex(digest digest.Digest, workspace string, apiKey string)
 		}
 		repository, err := ForRepositoryInDb(manifestList[0].Name, workspace, apiKey)
 		if err != nil {
-			return nil, errors.Wrapf(err, "failed to query for respository")
+			return nil, errors.Wrapf(err, "failed to query for repository")
 		}
 		image := types.Image{
 			Digest:     ii.Digest,
@@ -252,8 +254,8 @@ func ForBaseImageInGraphQL(cfg *v1.ConfigFile) (*types.BaseImagesByDiffIdsQuery,
 		return nil, errors.Wrapf(err, "failed to run query")
 	}
 	count := 0
-	for ii, _ := range q.ImagesByDiffIds {
-		for bi, _ := range q.ImagesByDiffIds[ii].Images {
+	for ii := range q.ImagesByDiffIds {
+		for bi := range q.ImagesByDiffIds[ii].Images {
 			count++
 			q.ImagesByDiffIds[ii].Images[bi].Repository = normalizeRepository(&q.ImagesByDiffIds[ii].Images[bi]).Repository
 		}

query/query.go

@@ -23,13 +23,15 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/hasura/go-graphql-client"
+
 	"github.com/docker/index-cli-plugin/internal"
 	"github.com/docker/index-cli-plugin/types"
-	"github.com/hasura/go-graphql-client"
 
-	"github.com/atomist-skills/go-skill"
 	"github.com/pkg/errors"
 	"olympos.io/encoding/edn"
+
+	"github.com/atomist-skills/go-skill"
 )
 
 type CveResult struct {
@@ -101,7 +103,6 @@ func QueryCves(sb *types.Sbom, cve string, workspace string, apiKey string) (*[]
 			}
 		})
 		return &fcves, nil
-
 	} else {
 		return nil, nil
 	}
@@ -111,7 +112,6 @@ func query(query string, name string, workspace string, apiKey string) (*http.Re
 	url := fmt.Sprintf("https://api.dso.docker.com/datalog/team/%s/queries", workspace)
 	if workspace == "" || apiKey == "" {
 		url = "https://api.dso.docker.com/datalog/shared-vulnerability/queries"
-
 	}
 	query = fmt.Sprintf(`{:queries [{:name "query" :query %s}]}`, query)
 	skill.Log.Debugf("Query %s", query)

registry/read.go

@@ -19,9 +19,10 @@ package registry
 import (
 	stereoscopeimage "github.com/anchore/stereoscope/pkg/image"
 	"github.com/anchore/syft/syft/source"
-	"github.com/atomist-skills/go-skill"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
 	"github.com/pkg/errors"
+
+	"github.com/atomist-skills/go-skill"
 )
 
 func ReadImage(name string, path string) (*ImageCache, error) {