Skip to content

Commit

Permalink
refactor: use os.ReadFile instead of os.Open + io.ReadAll (#1254)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandear committed Aug 23, 2023
1 parent 163ec21 commit 963a697
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions detect/baseline.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@ package detect
import (
"encoding/json"
"fmt"
"io"
"os"

"github.com/rs/zerolog/log"

"github.com/zricethezav/gitleaks/v8/report"
)

Expand Down Expand Up @@ -39,23 +36,12 @@ func IsNew(finding report.Finding, baseline []report.Finding) bool {
}

func LoadBaseline(baselinePath string) ([]report.Finding, error) {
var previousFindings []report.Finding
jsonFile, err := os.Open(baselinePath)
bytes, err := os.ReadFile(baselinePath)
if err != nil {
return nil, fmt.Errorf("could not open %s", baselinePath)
}

defer func() {
if cerr := jsonFile.Close(); cerr != nil {
log.Warn().Err(cerr).Msg("problem closing jsonFile handle")
}
}()

bytes, err := io.ReadAll(jsonFile)
if err != nil {
return nil, fmt.Errorf("could not read data from the file %s", baselinePath)
}

var previousFindings []report.Finding
err = json.Unmarshal(bytes, &previousFindings)
if err != nil {
return nil, fmt.Errorf("the format of the file %s is not supported", baselinePath)
Expand Down

0 comments on commit 963a697

Please sign in to comment.