Skip to content

Commit 17fcb79

Browse files
Remove methods for setting alternate RC file readers
Authored-by: Owen Nelson <[email protected]>
1 parent 2e35dfa commit 17fcb79

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

talismanrc/rc_file.go

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ var (
2020
currentRCFileName = DefaultRCFileName
2121
)
2222

23-
func readConfigFromRCFile(fileReader func(string) ([]byte, error)) (*TalismanRC, error) {
24-
fileContents, err := fileReader(currentRCFileName)
23+
func Load() (*TalismanRC, error) {
24+
fileContents, err := afero.ReadFile(fs, currentRCFileName)
2525
if err != nil {
26-
panic(err)
26+
// File does not exist or is not readable, proceed as if there is no .talismanrc
27+
fileContents = []byte{}
2728
}
2829
return newPersistedRC(fileContents)
2930
}
@@ -49,15 +50,3 @@ func SetFs__(_fs afero.Fs) {
4950
func SetRcFilename__(rcFileName string) {
5051
currentRCFileName = rcFileName
5152
}
52-
53-
type RepoFileReader func(string) ([]byte, error)
54-
55-
var repoFileReader = func() RepoFileReader {
56-
return func(path string) ([]byte, error) {
57-
data, err := afero.ReadFile(fs, currentRCFileName)
58-
if err != nil {
59-
return []byte{}, nil
60-
}
61-
return data, nil
62-
}
63-
}

talismanrc/talismanrc.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,3 @@ func (tRC *TalismanRC) effectiveRules(detectorName string) []string {
151151

152152
return result
153153
}
154-
155-
func Load() (*TalismanRC, error) {
156-
return readConfigFromRCFile(repoFileReader())
157-
}

0 commit comments

Comments
 (0)