Skip to content

Commit 92a6b9a

Browse files
authored
Fix default redaction configs (#69)
1 parent b387df2 commit 92a6b9a

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

internal/clients/diffreviewer/circleci/circleci_service.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ func (s *Service) LoadConfig(nightfallConfigFileName string) (*nightfallconfig.C
119119
TokenExclusionList: nightfallConfig.TokenExclusionList,
120120
FileInclusionList: nightfallConfig.FileInclusionList,
121121
FileExclusionList: nightfallConfig.FileExclusionList,
122+
DefaultRedactionConfig: nightfallConfig.DefaultRedactionConfig,
122123
}, nil
123124
}
124125

internal/clients/diffreviewer/circleci/circleci_service_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,9 @@ func (c *circleCiTestSuite) TestLoadConfig() {
213213
TokenExclusionList: []string{excludedCreditCardRegex, excludedApiToken, excludedIPRegex},
214214
FileInclusionList: []string{"*"},
215215
FileExclusionList: []string{".nightfalldlp/config.json"},
216+
DefaultRedactionConfig: &nf.RedactionConfig{
217+
SubstitutionConfig: &nf.SubstitutionConfig{SubstitutionPhrase: "REDACTED"},
218+
},
216219
}
217220

218221
nightfallConfig, err := tp.cs.LoadConfig(testConfigFileName)
@@ -315,6 +318,12 @@ func (c *circleCiTestSuite) TestLoadEmptyConfig() {
315318
},
316319
},
317320
NightfallMaxNumberRoutines: nightfallconfig.DefaultMaxNumberRoutines,
321+
DefaultRedactionConfig: &nf.RedactionConfig{
322+
MaskConfig: &nf.MaskConfig{
323+
MaskingChar: "*",
324+
NumCharsToLeaveUnmasked: 2,
325+
},
326+
},
318327
}
319328

320329
nightfallConfig, err := tp.cs.LoadConfig(testEmptyConfigFileName)

internal/clients/diffreviewer/github/github_service.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ import (
2323
type Level string
2424

2525
const (
26-
InfoLevel Level = "info"
27-
WarningLevel Level = "warning"
28-
ErrorLevel Level = "error"
29-
3026
WorkspacePathEnvVar = "GITHUB_WORKSPACE"
3127
EventPathEnvVar = "GITHUB_EVENT_PATH"
3228
BaseRefEnvVar = "GITHUB_BASE_REF"
@@ -207,6 +203,7 @@ func (s *Service) LoadConfig(nightfallConfigFileName string) (*nightfallconfig.C
207203
TokenExclusionList: nightfallConfig.TokenExclusionList,
208204
FileInclusionList: nightfallConfig.FileInclusionList,
209205
FileExclusionList: nightfallConfig.FileExclusionList,
206+
DefaultRedactionConfig: nightfallConfig.DefaultRedactionConfig,
210207
}, nil
211208
}
212209

internal/clients/diffreviewer/github/github_service_test.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ func (g *githubTestSuite) TestLoadConfig() {
209209
TokenExclusionList: []string{excludedCreditCardRegex, excludedApiToken, excludedIPRegex},
210210
FileInclusionList: []string{"*"},
211211
FileExclusionList: []string{".nightfalldlp/config.json"},
212+
DefaultRedactionConfig: &nf.RedactionConfig{
213+
SubstitutionConfig: &nf.SubstitutionConfig{SubstitutionPhrase: "REDACTED"},
214+
},
212215
}
213216
expectedGithubCheckRequest := &CheckRequest{
214217
Owner: owner,
@@ -304,6 +307,12 @@ func (g *githubTestSuite) TestLoadEmptyConfig() {
304307
},
305308
},
306309
NightfallMaxNumberRoutines: nightfallconfig.DefaultMaxNumberRoutines,
310+
DefaultRedactionConfig: &nf.RedactionConfig{
311+
MaskConfig: &nf.MaskConfig{
312+
MaskingChar: "*",
313+
NumCharsToLeaveUnmasked: 2,
314+
},
315+
},
307316
}
308317
expectedGithubCheckRequest := &CheckRequest{
309318
Owner: owner,

0 commit comments

Comments
 (0)