diff --git a/Makefile b/Makefile index c99aaf2c23d..8eb68d48712 100644 --- a/Makefile +++ b/Makefile @@ -713,37 +713,6 @@ conformance-%: $(TEST_ASSET_DIR)/conformance/conformance_test.go go test -mod=mod -ldflags='$(LDFLAGS)' -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(CONFORMANCE_ARGS) \ -run-test=$* -#---------------------------------------------------------------------------------- -# Security Scan -#---------------------------------------------------------------------------------- -# Locally run the Trivy security scan to generate result report as markdown - -SCAN_DIR ?= $(OUTPUT_DIR)/scans -SCAN_BUCKET ?= solo-gloo-security-scans -# The minimum version to scan with trivy -# ON_LTS_UPDATE - bump version -MIN_SCANNED_VERSION ?= v1.15.0 - -.PHONY: run-security-scans -run-security-scan: - MIN_SCANNED_VERSION=$(MIN_SCANNED_VERSION) GO111MODULE=on go run docs/cmd/generate_docs.go run-security-scan -r gloo -a github-issue-latest - MIN_SCANNED_VERSION=$(MIN_SCANNED_VERSION) GO111MODULE=on go run docs/cmd/generate_docs.go run-security-scan -r glooe -a github-issue-latest - -.PHONY: publish-security-scan -publish-security-scan: - # These directories are generated by the generated_docs.go script. They contain scan results for each image for each version - # of gloo and gloo enterprise. Do NOT change these directories without changing the corresponding output directories in - # generate_docs.go - gsutil cp -r $(SCAN_DIR)/gloo/markdown_results/** gs://$(SCAN_BUCKET)/gloo - gsutil cp -r $(SCAN_DIR)/solo-projects/markdown_results/** gs://$(SCAN_BUCKET)/solo-projects - -.PHONY: scan-version -scan-version: ## Scan all Gloo images with the tag matching {VERSION} env variable - PATH=$(DEPSGOBIN):$$PATH GO111MODULE=on go run github.com/solo-io/go-utils/securityscanutils/cli scan-version -v \ - -r $(IMAGE_REGISTRY)\ - -t $(VERSION)\ - --images kgateway,envoy-wrapper,sds - #---------------------------------------------------------------------------------- # Third Party License Management #----------------------------------------------------------------------------------