Merge pull request #108 from glours/little-flags-fixes

Little flags fixes

Author: silvin-lubecki

cmd/docker-scan/main.go

@@ -183,15 +183,15 @@ func runAuthentication(ctx context.Context, dockerCli command.Streams, flags opt
 }
 
 func runScan(ctx context.Context, cmd *cobra.Command, dockerCli command.Cli, flags options, args []string) error {
+	scanProvider, err := configureProvider(ctx, dockerCli, flags, provider.WithAuthConfig(func(hub *registry.IndexInfo) types.AuthConfig {
+		return command.ResolveAuthConfig(context.Background(), dockerCli, hub)
+	}))
 	if len(args) != 1 {
 		if err := cmd.Usage(); err != nil {
 			return err
 		}
 		return fmt.Errorf(`"docker scan" requires exactly 1 argument`)
 	}
-	scanProvider, err := configureProvider(ctx, dockerCli, flags, provider.WithAuthConfig(func(hub *registry.IndexInfo) types.AuthConfig {
-		return command.ResolveAuthConfig(context.Background(), dockerCli, hub)
-	}))
 	if err != nil {
 		return err
 	}

internal/provider/snyk.go

@@ -131,16 +131,15 @@ func (s *snykProvider) Authenticate(token string) error {
 
 func (s *snykProvider) Scan(image string) error {
 	// check snyk token
-	var token string
+	cmd := s.newCommand(append(s.flags, image)...)
 	if authenticated, err := isAuthenticatedOnSnyk(); !authenticated || err != nil {
 		var err error
-		token, err = s.getToken()
+		token, err := s.getToken()
 		if err != nil {
 			return fmt.Errorf("failed to get DockerScanID: %s", err)
 		}
+		cmd.Env = append(os.Environ(), fmt.Sprintf("SNYK_DOCKER_TOKEN=%s", token))
 	}
-	cmd := s.newCommand(append(s.flags, image)...)
-	cmd.Env = append(os.Environ(), fmt.Sprintf("SNYK_DOCKER_TOKEN=%s", token))
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	return checkCommandErr(cmd.Run())