Stage/vuls
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #118 from future-architect/remove-json-marshall-indent

Browse Source 
Remove json marshall-indent
This commit is contained in:
Kota Kanbe
2016-07-03 11:17:46 +09:00
committed by GitHub
parent 79d2076e09 396eb5aec2
commit a7dcccbdf9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
report/json.go
View File

@@ -34,7 +34,7 @@ func (w JSONWriter) Write(scanResults []models.ScanResult) (err error) {
path, err := ensureResultDir()
var jsonBytes []byte
if jsonBytes, err = json.MarshalIndent(scanResults, "", " "); err != nil {
if jsonBytes, err = json.Marshal(scanResults); err != nil {
return fmt.Errorf("Failed to Marshal to JSON: %s", err)
}
all := filepath.Join(path, "all.json")
@@ -51,7 +51,7 @@ func (w JSONWriter) Write(scanResults []models.ScanResult) (err error) {
fmt.Sprintf("%s_%s.json", r.ServerName, r.Container.Name))
}
if jsonBytes, err = json.MarshalIndent(r, "", " "); err != nil {
if jsonBytes, err = json.Marshal(r); err != nil {
return fmt.Errorf("Failed to Marshal to JSON: %s", err)
}
if err := ioutil.WriteFile(jsonPath, jsonBytes, 0644); err != nil {

4
report/s3.go
View File

@@ -71,7 +71,7 @@ func CheckIfBucketExists() error {
func (w S3Writer) Write(scanResults []models.ScanResult) (err error) {
var jsonBytes []byte
if jsonBytes, err = json.MarshalIndent(scanResults, "", " "); err != nil {
if jsonBytes, err = json.Marshal(scanResults); err != nil {
return fmt.Errorf("Failed to Marshal to JSON: %s", err)
}
@@ -96,7 +96,7 @@ func (w S3Writer) Write(scanResults []models.ScanResult) (err error) {
key = fmt.Sprintf("%s/%s_%s.json", timestr, r.ServerName, r.Container.Name)
}
if jsonBytes, err = json.MarshalIndent(r, "", " "); err != nil {
if jsonBytes, err = json.Marshal(r); err != nil {
return fmt.Errorf("Failed to Marshal to JSON: %s", err)
}
_, err = svc.PutObject(&s3.PutObjectInput{