Skip to content

Commit

Permalink
Spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
@coreyogburn
coreyogburn committed Aug 8, 2024
1 parent 4bcc291 commit 342c71c
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion server/detectionengine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type DetectionEngine interface {
GetState() *model.EngineState
GenerateUnusedPublicId(ctx context.Context) (string, error)
ApplyFilters(detect *model.Detection) (didFilterAct bool, err error)
MergeAuxilleryData(detect *model.Detection) error
MergeAuxiliaryData(detect *model.Detection) error
}

type SyncStatus struct {
Expand Down
4 changes: 2 additions & 2 deletions server/detectionhandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ func (h *DetectionHandler) getDetection(w http.ResponseWriter, r *http.Request)
"detectionPublicId": detectId,
}).Error("retrieved detection with unsupported engine")
} else {
err = eng.MergeAuxilleryData(detect)
err = eng.MergeAuxiliaryData(detect)
if err != nil {
log.WithError(err).WithFields(log.Fields{
"detectionEngine": detect.Engine,
"detectionPublicId": detectId,
}).Error("unable to merge auxillery data into detection")
}).Error("unable to merge auxiliary data into detection")
}
}

Expand Down
4 changes: 2 additions & 2 deletions server/modules/detections/ai_summary.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var aiRepoMutex = sync.RWMutex{}
var lastSuccessfulAiUpdate time.Time

type AiLoader interface {
LoadAuxilleryData(summaries []*model.AiSummary) error
LoadAuxiliaryData(summaries []*model.AiSummary) error
}

//go:generate mockgen -destination mock/mock_ailoader.go -package mock . AiLoader
Expand Down Expand Up @@ -48,7 +48,7 @@ func RefreshAiSummaries(eng AiLoader, lang model.SigLanguage, isRunning *bool, a
if err != nil {
logger.WithError(err).WithField("repoPath", repoPath).Error("unable to read AI summaries")
} else {
err = eng.LoadAuxilleryData(sums)
err = eng.LoadAuxiliaryData(sums)
if err != nil {
logger.WithError(err).Error("unable to load AI summaries")
} else {
Expand Down
2 changes: 1 addition & 1 deletion server/modules/detections/ai_summary_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func TestRefreshAiSummaries(t *testing.T) {
iom.EXPECT().ReadDir("baseRepoFolder").Return([]fs.DirEntry{}, nil)
iom.EXPECT().CloneRepo(gomock.Any(), "baseRepoFolder/repo1", repo, &branch).Return(nil)
iom.EXPECT().ReadFile("baseRepoFolder/repo1/detections-ai/sigma_summaries.yaml").Return([]byte(summaries), nil)
loader.EXPECT().LoadAuxilleryData([]*model.AiSummary{
loader.EXPECT().LoadAuxiliaryData([]*model.AiSummary{
{
PublicId: "87e55c67-46f0-4a7b-a3c6-d473ab7e8392",
Summary: "ai text goes here",
Expand Down
12 changes: 6 additions & 6 deletions server/modules/detections/mock/mock_ailoader.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions server/modules/elastalert/elastalert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1473,7 +1473,7 @@ func (e *ElastAlertEngine) DuplicateDetection(ctx context.Context, detection *mo
return det, nil
}

func (e *ElastAlertEngine) LoadAuxilleryData(summaries []*model.AiSummary) error {
func (e *ElastAlertEngine) LoadAuxiliaryData(summaries []*model.AiSummary) error {
sum := &sync.Map{}
for _, summary := range summaries {
sum.Store(summary.PublicId, summary)
Expand All @@ -1489,7 +1489,7 @@ func (e *ElastAlertEngine) LoadAuxilleryData(summaries []*model.AiSummary) error
return nil
}

func (e *ElastAlertEngine) MergeAuxilleryData(detect *model.Detection) error {
func (e *ElastAlertEngine) MergeAuxiliaryData(detect *model.Detection) error {
if e.showAiSummaries {
obj, ok := e.aiSummaries.Load(detect.PublicID)
if ok {
Expand Down
10 changes: 5 additions & 5 deletions server/modules/elastalert/elastalert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@ func TestSyncChanges(t *testing.T) {
assert.Equal(t, []string{"abc", "", "deleteme"}, workDocIds) // update has an id, create does not, delete does
}

func TestLoadAndMergeAuxilleryData(t *testing.T) {
func TestLoadAndMergeAuxiliaryData(t *testing.T) {
tests := []struct {
Name string
PublicId string
Expand All @@ -1376,7 +1376,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
ExpectedStale bool
}{
{
Name: "No Auxillery Data",
Name: "No Auxiliary Data",
PublicId: "bd82a1a6-7bac-401e-afcf-5adf07c0c035",
ExpectedAiFields: false,
},
Expand All @@ -1403,7 +1403,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
e := ElastAlertEngine{
showAiSummaries: true,
}
err := e.LoadAuxilleryData([]*model.AiSummary{
err := e.LoadAuxiliaryData([]*model.AiSummary{
{
PublicId: "83b3a29f-3009-4884-86c6-b6c3973788fa",
Summary: "Summary for 83b3a29f-3009-4884-86c6-b6c3973788fa",
Expand All @@ -1428,7 +1428,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
}

e.showAiSummaries = true
err := e.MergeAuxilleryData(det)
err := e.MergeAuxiliaryData(det)
assert.NoError(t, err)
if test.ExpectedAiFields {
assert.NotNil(t, det.AiFields)
Expand All @@ -1442,7 +1442,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
e.showAiSummaries = false
det.AiFields = nil

err = e.MergeAuxilleryData(det)
err = e.MergeAuxiliaryData(det)
assert.NoError(t, err)
assert.Nil(t, det.AiFields)
})
Expand Down
4 changes: 2 additions & 2 deletions server/modules/strelka/strelka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@ func (e *StrelkaEngine) DuplicateDetection(ctx context.Context, detection *model
return det, nil
}

func (e *StrelkaEngine) LoadAuxilleryData(summaries []*model.AiSummary) error {
func (e *StrelkaEngine) LoadAuxiliaryData(summaries []*model.AiSummary) error {
sum := &sync.Map{}
for _, summary := range summaries {
sum.Store(summary.PublicId, summary)
Expand All @@ -1148,7 +1148,7 @@ func (e *StrelkaEngine) LoadAuxilleryData(summaries []*model.AiSummary) error {
return nil
}

func (e *StrelkaEngine) MergeAuxilleryData(detect *model.Detection) error {
func (e *StrelkaEngine) MergeAuxiliaryData(detect *model.Detection) error {
if e.showAiSummaries {
obj, ok := e.aiSummaries.Load(detect.PublicID)
if ok {
Expand Down
10 changes: 5 additions & 5 deletions server/modules/strelka/strelka_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ func TestSyncChanges(t *testing.T) {
assert.Equal(t, []string{"abc", "", "deleteme"}, workDocIds) // update has an id, create does not, delete does
}

func TestLoadAndMergeAuxilleryData(t *testing.T) {
func TestLoadAndMergeAuxiliaryData(t *testing.T) {
tests := []struct {
Name string
PublicId string
Expand All @@ -1265,7 +1265,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
ExpectedStale bool
}{
{
Name: "No Auxillery Data",
Name: "No Auxiliary Data",
PublicId: "Webshell_FOPO_Obfuscation_APT_ON_Nov17_1",
ExpectedAiFields: false,
},
Expand All @@ -1291,7 +1291,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
e := StrelkaEngine{
showAiSummaries: true,
}
err := e.LoadAuxilleryData([]*model.AiSummary{
err := e.LoadAuxiliaryData([]*model.AiSummary{
{
PublicId: "_root_040_zip_Folder_deploy",
Summary: "Summary for _root_040_zip_Folder_deploy",
Expand All @@ -1316,7 +1316,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
}

e.showAiSummaries = true
err := e.MergeAuxilleryData(det)
err := e.MergeAuxiliaryData(det)
assert.NoError(t, err)
if test.ExpectedAiFields {
assert.NotNil(t, det.AiFields)
Expand All @@ -1330,7 +1330,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
e.showAiSummaries = false
det.AiFields = nil

err = e.MergeAuxilleryData(det)
err = e.MergeAuxiliaryData(det)
assert.NoError(t, err)
assert.Nil(t, det.AiFields)
})
Expand Down
4 changes: 2 additions & 2 deletions server/modules/suricata/suricata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@ func (e *SuricataEngine) DuplicateDetection(ctx context.Context, detection *mode
return det, nil
}

func (e *SuricataEngine) LoadAuxilleryData(summaries []*model.AiSummary) error {
func (e *SuricataEngine) LoadAuxiliaryData(summaries []*model.AiSummary) error {
sum := &sync.Map{}
for _, summary := range summaries {
sum.Store(summary.PublicId, summary)
Expand All @@ -1757,7 +1757,7 @@ func (e *SuricataEngine) LoadAuxilleryData(summaries []*model.AiSummary) error {
return nil
}

func (e *SuricataEngine) MergeAuxilleryData(detect *model.Detection) error {
func (e *SuricataEngine) MergeAuxiliaryData(detect *model.Detection) error {
if e.showAiSummaries {
obj, ok := e.aiSummaries.Load(detect.PublicID)
if ok {
Expand Down
10 changes: 5 additions & 5 deletions server/modules/suricata/suricata_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2501,7 +2501,7 @@ func toRegex(s ...string) []*regexp.Regexp {
return r
}

func TestLoadAndMergeAuxilleryData(t *testing.T) {
func TestLoadAndMergeAuxiliaryData(t *testing.T) {
tests := []struct {
Name string
PublicId string
Expand All @@ -2512,7 +2512,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
ExpectedStale bool
}{
{
Name: "No Auxillery Data",
Name: "No Auxiliary Data",
PublicId: "100000",
Content: "alert",
ExpectedAiFields: false,
Expand All @@ -2539,7 +2539,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
e := SuricataEngine{
showAiSummaries: true,
}
err := e.LoadAuxilleryData([]*model.AiSummary{
err := e.LoadAuxiliaryData([]*model.AiSummary{
{
PublicId: "100001",
Summary: "Summary for 100001",
Expand All @@ -2564,7 +2564,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
}

e.showAiSummaries = true
err := e.MergeAuxilleryData(det)
err := e.MergeAuxiliaryData(det)
assert.NoError(t, err)
if test.ExpectedAiFields {
assert.NotNil(t, det.AiFields)
Expand All @@ -2578,7 +2578,7 @@ func TestLoadAndMergeAuxilleryData(t *testing.T) {
e.showAiSummaries = false
det.AiFields = nil

err = e.MergeAuxilleryData(det)
err = e.MergeAuxiliaryData(det)
assert.NoError(t, err)
assert.Nil(t, det.AiFields)
})
Expand Down

0 comments on commit 342c71c

Please sign in to comment.