diff --git a/.goreleaser.yml b/.goreleaser.yml index 10b5770a..639ec0d8 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -6,7 +6,8 @@ release: owner: future-architect name: vuls builds: -- goos: +- id: vuls + goos: - linux goarch: - amd64 @@ -15,8 +16,50 @@ builds: - -a ldflags: -s -w -X main.version={{.Version}} -X main.revision={{.Commit}} binary: vuls + +- id: trivy-to-vuls + goos: + - linux + goarch: + - amd64 + main: ./contrib/trivy/cmd/main.go + binary: trivy-to-vuls + +- id: future-vuls + goos: + - linux + goarch: + - amd64 + main: ./contrib/future-vuls/cmd/main.go + binary: future-vuls archives: -- name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' + +- id: vuls + name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' + builds: + - vuls + format: tar.gz + files: + - LICENSE + - NOTICE + - README* + - CHANGELOG.md + +- id: trivy-to-vuls + name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' + builds: + - trivy-to-vuls + format: tar.gz + files: + - LICENSE + - NOTICE + - README* + - CHANGELOG.md +- id: future-vuls + name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' + builds: + + - future-vuls format: tar.gz files: - LICENSE diff --git a/contrib/future-vuls/cmd/main.go b/contrib/future-vuls/cmd/main.go index 1b4b233a..52fe857d 100644 --- a/contrib/future-vuls/cmd/main.go +++ b/contrib/future-vuls/cmd/main.go @@ -58,12 +58,14 @@ func main() { scanResultJSON = buf.Bytes() } else { fmt.Println("use --stdin option") + os.Exit(1) return } var scanResult models.ScanResult if err = json.Unmarshal(scanResultJSON, &scanResult); err != nil { fmt.Println("Failed to parse json", err) + os.Exit(1) return } scanResult.ServerUUID = serverUUID @@ -72,7 +74,8 @@ func main() { config.Conf.Saas.Token = token config.Conf.Saas.URL = url if err = (report.SaasWriter{}).Write(scanResult); err != nil { - fmt.Println("Failed to create json", err) + fmt.Println(err) + os.Exit(1) return } return diff --git a/contrib/trivy/cmd/main.go b/contrib/trivy/cmd/main.go index 3c075c42..357cc0b4 100644 --- a/contrib/trivy/cmd/main.go +++ b/contrib/trivy/cmd/main.go @@ -34,12 +34,14 @@ func main() { reader := bufio.NewReader(os.Stdin) buf := new(bytes.Buffer) if _, err = buf.ReadFrom(reader); err != nil { + os.Exit(1) return } trivyJSON = buf.Bytes() } else { if trivyJSON, err = ioutil.ReadFile(jsonFilePath); err != nil { fmt.Println("Failed to read file", err) + os.Exit(1) return } } @@ -50,11 +52,13 @@ func main() { } if scanResult, err = parser.Parse(trivyJSON, scanResult); err != nil { fmt.Println("Failed to execute command", err) + os.Exit(1) return } var resultJSON []byte if resultJSON, err = json.MarshalIndent(scanResult, "", " "); err != nil { fmt.Println("Failed to create json", err) + os.Exit(1) return } fmt.Println(string(resultJSON)) @@ -69,5 +73,6 @@ func main() { rootCmd.AddCommand(cmdTrivyToVuls) if err = rootCmd.Execute(); err != nil { fmt.Println("Failed to execute command", err) + os.Exit(1) } }