Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit ff3e6c6

Browse files
authored
Merge pull request #31 from docker/clean-main
Clean old PoC code
2 parents e04f215 + c3c409c commit ff3e6c6

3 files changed

Lines changed: 8 additions & 31 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ ARG SNYK_USER_VERSION=1.334.0
7777
RUN apk add -U --no-cache wget

7878
# install snyk desktop binary
7979
WORKDIR /root
80-
RUN wget https://github.com/snyk/snyk/releases/download/v${SNYK_DESKTOP_VERSION}/snyk-linux -O snyk-desktop
80+
RUN wget https://github.com/snyk/snyk/releases/download/v${SNYK_DESKTOP_VERSION}/snyk-linux -nv -O snyk-desktop
8181
# install snyk user binary
82-
RUN wget https://github.com/snyk/snyk/releases/download/v${SNYK_USER_VERSION}/snyk-linux -O snyk-user
82+
RUN wget https://github.com/snyk/snyk/releases/download/v${SNYK_USER_VERSION}/snyk-linux -nv -O snyk-user
8383

8484
####
8585
# E2E

e2e/testdata/plugin-usage.golden

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11

2-
Usage: docker scan [OPTIONS] IMAGE
2+
Usage: docker scan [OPTIONS]
33

44
A tool to scan your docker image
55

66
Options:
7-
--auth string Use snyk API token to authenticate on snyk.io
8-
--version Display version of scan plugin and snyk cli
7+
--version Display version of scan plugin and snyk cli

main.go

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package main
22

33
import (
44
"fmt"
5-
"os"
6-
"os/exec"
75

86
"github.com/docker/docker-scan/config"
97

@@ -27,13 +25,12 @@ func main() {
2725

2826
func newScanCmd(_ command.Cli) *cobra.Command {
2927
var (
30-
auth string
3128
showVersion bool
3229
)
3330
cmd := &cobra.Command{
3431
Short: "Docker Scan",
3532
Long: `A tool to scan your docker image`,
36-
Use: "scan [OPTIONS] IMAGE",
33+
Use: "scan [OPTIONS]",
3734
Annotations: map[string]string{},
3835
RunE: func(cmd *cobra.Command, args []string) error {
3936
conf, err := config.ReadConfigFile()
@@ -49,31 +46,12 @@ func newScanCmd(_ command.Cli) *cobra.Command {
4946
fmt.Println(version)
5047
return nil
5148
}
52-
if len(args) != 1 {
53-
//nolint:golint
54-
return fmt.Errorf(`"docker run" requires at least 1 argument.
55-
See 'docker scan --help'.`)
56-
}
57-
if auth != "" {
58-
fmt.Println("Authenticating to Snyk using", auth)
59-
c := exec.Command("snyk", "auth", auth)
60-
c.Stdin = os.Stdin
61-
c.Stdout = os.Stdout
62-
c.Stderr = os.Stderr
63-
if err := c.Run(); err != nil {
64-
return err
65-
}
66-
fmt.Println("Authenticated")
67-
fmt.Println()
49+
if err := cmd.Usage(); err != nil {
50+
return err
6851
}
69-
c := exec.Command("snyk", "test", "--docker", args[0])
70-
c.Stdin = os.Stdin
71-
c.Stdout = os.Stdout
72-
c.Stderr = os.Stderr
73-
return c.Run()
52+
return nil
7453
},
7554
}
76-
cmd.Flags().StringVar(&auth, "auth", "", "Use snyk API token to authenticate on snyk.io")
7755
cmd.Flags().BoolVar(&showVersion, "version", false, "Display version of scan plugin and snyk cli")
7856
return cmd
7957
}

0 commit comments

Comments
 (0)