1
0
Эх сурвалжийг харах

Don’t use context for scan suggest message, use cliconfig.Dir() as in scan plugin

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 4 жил өмнө
parent
commit
5d2e8754df

+ 2 - 2
local/compose/build.go

@@ -50,7 +50,7 @@ func (s *composeService) Build(ctx context.Context, project *types.Project, opti
 
 
 	err := s.build(ctx, project, opts, options.Progress)
 	err := s.build(ctx, project, opts, options.Progress)
 	if err == nil {
 	if err == nil {
-		displayScanSuggestMsg(ctx, imagesToBuild)
+		displayScanSuggestMsg(imagesToBuild)
 	}
 	}
 
 
 	return err
 	return err
@@ -100,7 +100,7 @@ func (s *composeService) ensureImagesExists(ctx context.Context, project *types.
 
 
 	err := s.build(ctx, project, opts, "auto")
 	err := s.build(ctx, project, opts, "auto")
 	if err == nil {
 	if err == nil {
-		displayScanSuggestMsg(ctx, imagesToBuild)
+		displayScanSuggestMsg(imagesToBuild)
 	}
 	}
 	return err
 	return err
 }
 }

+ 5 - 7
local/compose/scan_suggest.go

@@ -17,7 +17,6 @@
 package compose
 package compose
 
 
 import (
 import (
-	"context"
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
 	"io/ioutil"
 	"io/ioutil"
@@ -26,25 +25,24 @@ import (
 
 
 	pluginmanager "github.com/docker/cli/cli-plugins/manager"
 	pluginmanager "github.com/docker/cli/cli-plugins/manager"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose-cli/api/config"
+	cliConfig "github.com/docker/cli/cli/config"
 )
 )
 
 
-func displayScanSuggestMsg(ctx context.Context, builtImages []string) {
+func displayScanSuggestMsg(builtImages []string) {
 	if len(builtImages) <= 0 {
 	if len(builtImages) <= 0 {
 		return
 		return
 	}
 	}
 	if os.Getenv("DOCKER_SCAN_SUGGEST") == "false" {
 	if os.Getenv("DOCKER_SCAN_SUGGEST") == "false" {
 		return
 		return
 	}
 	}
-	if !scanAvailable() || scanAlreadyInvoked(ctx) {
+	if !scanAvailable() || scanAlreadyInvoked() {
 		return
 		return
 	}
 	}
 	fmt.Println("Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them")
 	fmt.Println("Use 'docker scan' to run Snyk tests against images to find vulnerabilities and learn how to fix them")
 }
 }
 
 
-func scanAlreadyInvoked(ctx context.Context) bool {
-	configDir := config.Dir(ctx)
-	filename := filepath.Join(configDir, "scan", "config.json")
+func scanAlreadyInvoked() bool {
+	filename := filepath.Join(cliConfig.Dir(), "scan", "config.json")
 	f, err := os.Stat(filename)
 	f, err := os.Stat(filename)
 	if os.IsNotExist(err) {
 	if os.IsNotExist(err) {
 		return false
 		return false