Merge branch 'main' of github.com:docker/scan-cli-plugin

Author: djs55

.github/workflows/build-pr.yml

@@ -8,15 +8,17 @@ jobs:
     env:
       GO111MODULE: "on"
     steps:
+      - name: Checkout code into the Go module directory
+        uses: actions/checkout@v2
+
       - name: Set up Go 1.17
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version-file: go.mod
+          check-latest: true
+          cache: true
         id: go
 
-      - name: Checkout code into the Go module directory
-        uses: actions/checkout@v2
-
       - name: Check license headers
         run: make validate
 
@@ -38,22 +40,16 @@ jobs:
       - name: Docker version
         run: docker version
 
-      - name: Set up Go 1.17
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.17
-        id: go
-
       - name: Checkout code into the Go module directory
         uses: actions/checkout@v2
 
-      - name: Golang cache
-        uses: actions/cache@v1
+      - name: Set up Go 1.17
+        uses: actions/setup-go@v3
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version-file: go.mod
+          check-latest: true
+          cache: true
+        id: go
 
       - name: Download binaries
         run: make -f builder.Makefile download

.github/workflows/release-weekly-build.yml

@@ -53,32 +53,54 @@ jobs:
         # Only the CLI is needed to run docker-scan e2e
         run: brew install docker
 
-      - name: Set up Go 1.17
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-        id: go
-
       - name: Checkout code into the Go module directory
         uses: actions/checkout@v2
         with:
           ref: ${{ github.event.inputs.branch }}
 
+      - name: Set up Go 1.17
+        uses: actions/setup-go@v3
+        with:
+          go-version-file: go.mod
+          check-latest: true
+          cache: true
+        id: go
+
       - name: Download binaries
         run: make -f builder.Makefile download
 
-      - name: Build binary and run tests
+      - name: Build binary
+        env:
+          E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
+          E2E_HUB_URL: ${{ secrets.E2E_HUB_URL }}
+          E2E_HUB_USERNAME: ${{ secrets.E2E_HUB_USERNAME }}
+          E2E_HUB_TOKEN: ${{ secrets.E2E_HUB_TOKEN }}
+        run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile build
+
+      - name: E2E
         env:
           E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
           E2E_HUB_URL: ${{ secrets.E2E_HUB_URL }}
           E2E_HUB_USERNAME: ${{ secrets.E2E_HUB_USERNAME }}
           E2E_HUB_TOKEN: ${{ secrets.E2E_HUB_TOKEN }}
-        run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile build test-unit e2e
+        run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile e2e
+
+      - name: Unit test
+        env:
+          E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
+          E2E_HUB_URL: ${{ secrets.E2E_HUB_URL }}
+          E2E_HUB_USERNAME: ${{ secrets.E2E_HUB_USERNAME }}
+          E2E_HUB_TOKEN: ${{ secrets.E2E_HUB_TOKEN }}
+        run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile test-unit
 
       - name: Build Mac arm64 binary
         if: ${{ matrix.os == 'macos-latest' }}
         run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile build-mac-arm64
 
+      - name: Build Linux arm64 binary
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: make TAG_NAME=${{ github.event.inputs.tag }} -f builder.Makefile build-linux-arm64
+
       - name: Upload binary artifact
         if: ${{ github.event.inputs.tag != '' }} # don't push artifacts if no tag is specified
         uses: actions/upload-artifact@v2

Makefile

@@ -73,9 +73,9 @@ lint: ## Run the go linter
 
 .PHONY: validate-headers
 validate-headers: ## Validate files license header
-	docker run --rm -v $(CURDIR):/work -w /work \
+	docker run --rm -v $(CURDIR):/work -w /work -e LTAG_VERSION=$(LTAG_VERSION) \
 	 golang:${GO_VERSION} \
-	 bash -c 'go get -u github.com/kunalkushwaha/ltag && ./scripts/validate/fileheader'
+	 bash -c 'go install github.com/kunalkushwaha/ltag@$(LTAG_VERSION) && ./scripts/validate/fileheader'
 
 .PHONY: validate-go-mod
 validate-go-mod: ## Validate go.mod and go.sum are up-to-date

builder.Makefile

@@ -25,7 +25,7 @@ PWD:=$(shell pwd)
 ifeq ($(GOOS),windows)
 	SNYK_DOWNLOAD_NAME:=snyk-win.exe
 	SNYK_BINARY=snyk.exe
-	PWD=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+	PWD=$(subst \,/,$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))))
 endif
 ifeq ($(GOOS),darwin)
 	SNYK_DOWNLOAD_NAME:=snyk-macos
@@ -61,6 +61,7 @@ test-unit:
 
 cross:
 	GOOS=linux   GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_linux_amd64 ./cmd/docker-scan
+	GOOS=linux   GOARCH=arm64 $(GO_BUILD) -o dist/docker-scan_linux_arm64 ./cmd/docker-scan
 	GOOS=darwin  GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_darwin_amd64 ./cmd/docker-scan
 	GOOS=darwin  GOARCH=arm64 $(GO_BUILD) -o dist/docker-scan_darwin_arm64 ./cmd/docker-scan
 	GOOS=windows GOARCH=amd64 $(GO_BUILD) -o dist/docker-scan_windows_amd64.exe ./cmd/docker-scan
@@ -69,6 +70,10 @@ build-mac-arm64:
 	mkdir -p bin
 	GOOS=darwin GOARCH=arm64 $(GO_BUILD) -o bin/docker-scan_darwin_arm64 ./cmd/docker-scan
 
+build-linux-arm64:
+	mkdir -p bin
+	GOOS=linux GOARCH=arm64 $(GO_BUILD) -o bin/docker-scan_linux_arm64 ./cmd/docker-scan
+
 .PHONY: build
 build:
 	mkdir -p bin
@@ -89,4 +94,4 @@ download:
 	curl https://github.com/snyk/snyk/releases/download/v${SNYK_DESKTOP_VERSION}/${SNYK_DOWNLOAD_NAME} -L -s -S -o docker-config/snyk-desktop/${SNYK_BINARY}
 	chmod +x docker-config/snyk-desktop/${SNYK_BINARY}
 
-	GO111MODULE=on go get gotest.tools/gotestsum@v${GOTESTSUM_VERSION}
+	GO111MODULE=on go install gotest.tools/gotestsum@v${GOTESTSUM_VERSION}

e2e/plugin_test.go

@@ -62,9 +62,15 @@ sleep 1000`), 0700))
 
 	// Add mock snyk binary to the $PATH
 	path := os.Getenv("PATH")
-	defer env.Patch(t, "PATH", fmt.Sprintf(pathFormat(), configDir+"/scan", path))()
+	path = fmt.Sprintf(pathFormat(), configDir+"/scan", path)
+	env.Patch(t, "PATH", path)()
+	// force the env variable on command side on Windows
+	if runtime.GOOS == "windows" {
+		cmd.Env = append(cmd.Env, fmt.Sprintf("PATH=%s", path))
+	}
 
 	cmd.Command = dockerCli.Command("scan", "--version")
+
 	icmd.StartCmd(cmd)
 	time.Sleep(1 * time.Second)
 

go.mod

@@ -4,27 +4,27 @@ go 1.17
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/docker/cli v20.10.9+incompatible
-	github.com/docker/docker v20.10.9+incompatible
+	github.com/docker/cli v20.10.17+incompatible
+	github.com/docker/docker v20.10.17+incompatible
 	github.com/google/uuid v1.3.0
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-ps v1.0.0
-	github.com/opencontainers/image-spec v1.0.2
+	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.2.1
+	github.com/spf13/cobra v1.5.0
 	gopkg.in/square/go-jose.v2 v2.6.0
 	gotest.tools/v3 v3.0.3
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/Microsoft/hcsshim v0.9.2 // indirect
+	github.com/Microsoft/hcsshim v0.9.4 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/containerd/cgroups v1.0.3 // indirect
-	github.com/containerd/containerd v1.6.0 // indirect
-	github.com/docker/distribution v2.8.0+incompatible // indirect
+	github.com/containerd/cgroups v1.0.4 // indirect
+	github.com/containerd/containerd v1.6.6 // indirect
+	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/docker-credential-helpers v0.6.4 // indirect
 	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
@@ -34,30 +34,28 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/miekg/pkcs11 v1.0.3 // indirect
-	github.com/moby/sys/mount v0.2.0 // indirect
-	github.com/moby/sys/mountinfo v0.6.0 // indirect
+	github.com/miekg/pkcs11 v1.1.1 // indirect
+	github.com/moby/sys/mount v0.3.3 // indirect
+	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/runc v1.1.0 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/opencontainers/runc v1.1.3 // indirect
+	github.com/prometheus/client_golang v1.12.2 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.30.0 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/theupdateframework/notary v0.7.0 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	google.golang.org/genproto v0.0.0-20220228195345-15d65a4533f7 // indirect
-	google.golang.org/grpc v1.44.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/net v0.0.0-20220802222814-0bcc04d9c69b // indirect
+	golang.org/x/sys v0.0.0-20220803195053-6e608f9ce704 // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )