Skip to content

Commit

Permalink
remove redundant type declarations or global vars
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmetc
mmetc committed Nov 7, 2023
1 parent 6cc33ec commit b143477
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 39 deletions.
22 changes: 8 additions & 14 deletions pkg/hubtest/hubtest_item.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ const (
BucketPourResultFileName = "bucketpour-dump.yaml"
)

var crowdsecPatternsFolder = csconfig.DefaultConfigPath("patterns")

func NewTest(name string, hubTest *HubTest) (*HubTestItem, error) {
testPath := filepath.Join(hubTest.HubTestPath, name)
runtimeFolder := filepath.Join(testPath, "runtime")
Expand Down Expand Up @@ -148,8 +146,6 @@ func (t *HubTestItem) InstallHub() error {
continue
}

var parserDirDest string

if hubParser, ok := t.HubIndex.Items[cwhub.PARSERS][parser]; ok {
parserSource, err := filepath.Abs(filepath.Join(t.HubPath, hubParser.RemotePath))
if err != nil {
Expand All @@ -162,7 +158,7 @@ func (t *HubTestItem) InstallHub() error {
hubDirParserDest := filepath.Join(t.RuntimeHubPath, filepath.Dir(hubParser.RemotePath))

// runtime/parsers/s00-raw/
parserDirDest = fmt.Sprintf("%s/parsers/%s/", t.RuntimePath, hubParser.Stage)
parserDirDest := fmt.Sprintf("%s/parsers/%s/", t.RuntimePath, hubParser.Stage)

if err := os.MkdirAll(hubDirParserDest, os.ModePerm); err != nil {
return fmt.Errorf("unable to create folder '%s': %s", hubDirParserDest, err)
Expand Down Expand Up @@ -208,7 +204,7 @@ func (t *HubTestItem) InstallHub() error {
//return fmt.Errorf("stage '%s' extracted from '%s' doesn't exist in the hub", customParserStage, hubStagePath)
}

parserDirDest = fmt.Sprintf("%s/parsers/%s/", t.RuntimePath, customParserStage)
parserDirDest := fmt.Sprintf("%s/parsers/%s/", t.RuntimePath, customParserStage)
if err := os.MkdirAll(parserDirDest, os.ModePerm); err != nil {
continue
//return fmt.Errorf("unable to create folder '%s': %s", parserDirDest, err)
Expand Down Expand Up @@ -236,8 +232,6 @@ func (t *HubTestItem) InstallHub() error {
continue
}

var scenarioDirDest string

if hubScenario, ok := t.HubIndex.Items[cwhub.SCENARIOS][scenario]; ok {
scenarioSource, err := filepath.Abs(filepath.Join(t.HubPath, hubScenario.RemotePath))
if err != nil {
Expand All @@ -250,7 +244,7 @@ func (t *HubTestItem) InstallHub() error {
hubDirScenarioDest := filepath.Join(t.RuntimeHubPath, filepath.Dir(hubScenario.RemotePath))

// runtime/parsers/scenarios/
scenarioDirDest = fmt.Sprintf("%s/scenarios/", t.RuntimePath)
scenarioDirDest := fmt.Sprintf("%s/scenarios/", t.RuntimePath)

if err := os.MkdirAll(hubDirScenarioDest, os.ModePerm); err != nil {
return fmt.Errorf("unable to create folder '%s': %s", hubDirScenarioDest, err)
Expand Down Expand Up @@ -283,7 +277,7 @@ func (t *HubTestItem) InstallHub() error {
//return fmt.Errorf("scenarios '%s' doesn't exist in the hub and doesn't appear to be a custom one.", scenario)
}

scenarioDirDest = fmt.Sprintf("%s/scenarios/", t.RuntimePath)
scenarioDirDest := fmt.Sprintf("%s/scenarios/", t.RuntimePath)
if err := os.MkdirAll(scenarioDirDest, os.ModePerm); err != nil {
return fmt.Errorf("unable to create folder '%s': %s", scenarioDirDest, err)
}
Expand All @@ -309,8 +303,6 @@ func (t *HubTestItem) InstallHub() error {
continue
}

var postoverflowDirDest string

if hubPostOverflow, ok := t.HubIndex.Items[cwhub.POSTOVERFLOWS][postoverflow]; ok {
postoverflowSource, err := filepath.Abs(filepath.Join(t.HubPath, hubPostOverflow.RemotePath))
if err != nil {
Expand All @@ -323,7 +315,7 @@ func (t *HubTestItem) InstallHub() error {
hubDirPostoverflowDest := filepath.Join(t.RuntimeHubPath, filepath.Dir(hubPostOverflow.RemotePath))

// runtime/postoverflows/s00-enrich
postoverflowDirDest = fmt.Sprintf("%s/postoverflows/%s/", t.RuntimePath, hubPostOverflow.Stage)
postoverflowDirDest := fmt.Sprintf("%s/postoverflows/%s/", t.RuntimePath, hubPostOverflow.Stage)

if err := os.MkdirAll(hubDirPostoverflowDest, os.ModePerm); err != nil {
return fmt.Errorf("unable to create folder '%s': %s", hubDirPostoverflowDest, err)
Expand Down Expand Up @@ -369,7 +361,7 @@ func (t *HubTestItem) InstallHub() error {
//return fmt.Errorf("stage '%s' from extracted '%s' doesn't exist in the hub", customPostoverflowStage, hubStagePath)
}

postoverflowDirDest = fmt.Sprintf("%s/postoverflows/%s/", t.RuntimePath, customPostoverflowStage)
postoverflowDirDest := fmt.Sprintf("%s/postoverflows/%s/", t.RuntimePath, customPostoverflowStage)
if err := os.MkdirAll(postoverflowDirDest, os.ModePerm); err != nil {
continue
//return fmt.Errorf("unable to create folder '%s': %s", postoverflowDirDest, err)
Expand Down Expand Up @@ -510,6 +502,8 @@ func (t *HubTestItem) Run() error {
return fmt.Errorf("unable to copy '%s' to '%s': %v", t.TemplateSimulationPath, t.RuntimeSimulationFilePath, err)
}

crowdsecPatternsFolder := csconfig.DefaultConfigPath("patterns")

// copy template patterns folder to runtime folder
if err = CopyDir(crowdsecPatternsFolder, t.RuntimePatternsPath); err != nil {
return fmt.Errorf("unable to copy 'patterns' from '%s' to '%s': %s", crowdsecPatternsFolder, t.RuntimePatternsPath, err)
Expand Down
18 changes: 5 additions & 13 deletions pkg/hubtest/parser_assert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"time"

"github.com/antonmedv/expr"
"github.com/antonmedv/expr/vm"
"github.com/enescakir/emoji"
"github.com/fatih/color"
diff "github.com/r3labs/diff/v2"
Expand Down Expand Up @@ -70,9 +69,7 @@ func (p *ParserAssert) AutoGenFromFile(filename string) (string, error) {
}

func (p *ParserAssert) LoadTest(filename string) error {
var err error
parserDump, err := LoadParserDump(filename)

if err != nil {
return fmt.Errorf("loading parser dump file: %+v", err)
}
Expand Down Expand Up @@ -165,17 +162,14 @@ func (p *ParserAssert) AssertFile(testFile string) error {
}

func (p *ParserAssert) RunExpression(expression string) (interface{}, error) {
var err error
//debug doesn't make much sense with the ability to evaluate "on the fly"
//var debugFilter *exprhelpers.ExprDebugger

var runtimeFilter *vm.Program

var output interface{}

env := map[string]interface{}{"results": *p.TestData}

if runtimeFilter, err = expr.Compile(expression, exprhelpers.GetExprOptions(env)...); err != nil {
runtimeFilter, err := expr.Compile(expression, exprhelpers.GetExprOptions(env)...)
if err != nil {
log.Errorf("failed to compile '%s' : %s", expression, err)
return output, err
}
Expand Down Expand Up @@ -232,9 +226,7 @@ func Escape(val string) string {

func (p *ParserAssert) AutoGenParserAssert() string {
//attempt to autogen parser asserts
var ret string

ret += fmt.Sprintf("len(results) == %d\n", len(*p.TestData))
ret := fmt.Sprintf("len(results) == %d\n", len(*p.TestData))

//sort map keys for consistent order
stages := sortedMapKeys(*p.TestData)
Expand Down Expand Up @@ -338,8 +330,6 @@ func (p *ParserAssert) buildUnmarshaledAssert(ekey string, eval interface{}) []s
}

func LoadParserDump(filepath string) (*ParserResults, error) {
var pdump ParserResults

dumpData, err := os.Open(filepath)
if err != nil {
return nil, err
Expand All @@ -351,6 +341,8 @@ func LoadParserDump(filepath string) (*ParserResults, error) {
return nil, err
}

pdump := ParserResults{}

if err := yaml.Unmarshal(results, &pdump); err != nil {
return nil, err
}
Expand Down
20 changes: 8 additions & 12 deletions pkg/hubtest/scenario_assert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"strings"

"github.com/antonmedv/expr"
"github.com/antonmedv/expr/vm"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"

Expand Down Expand Up @@ -158,16 +157,14 @@ func (s *ScenarioAssert) AssertFile(testFile string) error {
}

func (s *ScenarioAssert) RunExpression(expression string) (interface{}, error) {
var err error
//debug doesn't make much sense with the ability to evaluate "on the fly"
//var debugFilter *exprhelpers.ExprDebugger
var runtimeFilter *vm.Program

var output interface{}

env := map[string]interface{}{"results": *s.TestData}

if runtimeFilter, err = expr.Compile(expression, exprhelpers.GetExprOptions(env)...); err != nil {
runtimeFilter, err := expr.Compile(expression, exprhelpers.GetExprOptions(env)...)
if err != nil {
return nil, err
}
// if debugFilter, err = exprhelpers.NewDebugger(assert, expr.Env(env)); err != nil {
Expand Down Expand Up @@ -217,9 +214,8 @@ func (s *ScenarioAssert) Run(assert string) (bool, error) {
}

func (s *ScenarioAssert) AutoGenScenarioAssert() string {
// attempt to autogen parser asserts
var ret string
ret += fmt.Sprintf(`len(results) == %d`+"\n", len(*s.TestData))
// attempt to autogen scenario asserts
ret := fmt.Sprintf(`len(results) == %d`+"\n", len(*s.TestData))

for eventIndex, event := range *s.TestData {
for ipSrc, source := range event.Overflow.Sources {
Expand Down Expand Up @@ -257,8 +253,6 @@ func (b BucketResults) Swap(i, j int) {
}

func LoadBucketPourDump(filepath string) (*BucketPourInfo, error) {
var bucketDump BucketPourInfo

dumpData, err := os.Open(filepath)
if err != nil {
return nil, err
Expand All @@ -270,6 +264,8 @@ func LoadBucketPourDump(filepath string) (*BucketPourInfo, error) {
return nil, err
}

var bucketDump BucketPourInfo

if err := yaml.Unmarshal(results, &bucketDump); err != nil {
return nil, err
}
Expand All @@ -278,8 +274,6 @@ func LoadBucketPourDump(filepath string) (*BucketPourInfo, error) {
}

func LoadScenarioDump(filepath string) (*BucketResults, error) {
var bucketDump BucketResults

dumpData, err := os.Open(filepath)
if err != nil {
return nil, err
Expand All @@ -291,6 +285,8 @@ func LoadScenarioDump(filepath string) (*BucketResults, error) {
return nil, err
}

var bucketDump BucketResults

if err := yaml.Unmarshal(results, &bucketDump); err != nil {
return nil, err
}
Expand Down

0 comments on commit b143477

Please sign in to comment.