Skip to content

Commit

Permalink
Fix releaser (#988)
Browse files Browse the repository at this point in the history
* fix releaser

* fix releaser

* fix releaser

* fix releaser

* add 32 bit releaser and add exit code  in cmd

* delete 32 bit releaser

* fix
  • Loading branch information
sadayuki-matsuno authored Jun 5, 2020
1 parent b37df89 commit 4ae87cc
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 3 deletions.
47 changes: 45 additions & 2 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ release:
owner: future-architect
name: vuls
builds:
- goos:
- id: vuls
goos:
- linux
goarch:
- amd64
Expand All @@ -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
Expand Down
5 changes: 4 additions & 1 deletion contrib/future-vuls/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions contrib/trivy/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand All @@ -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))
Expand All @@ -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)
}
}

0 comments on commit 4ae87cc

Please sign in to comment.