Thanks to visit codestin.com
Credit goes to github.com

Skip to content

feat: feat configurable scanner #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ekristen merged 4 commits into from
Mar 22, 2025
Merged

feat: feat configurable scanner #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0baacee
feat(scanner)!: make scanner completely configurable
ekristen Mar 20, 2025
eebe262
test: fix tests for configurable scanner
ekristen Mar 20, 2025
4662c68
chore: golangci-lint run violation fix
ekristen Mar 20, 2025
4301583
fix(scanner): create const for DefaultQueueSize
ekristen Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 50 additions & 14 deletions pkg/nuke/nuke_filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,18 @@ func Test_NukeFiltersMatch(t *testing.T) {
SessionOne: "testing",
SecondResource: true,
}
newScanner := scanner.New("Owner", []string{TestResourceType2}, opts)

newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType2},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.NoError(t, err)
assert.Equal(t, 1, n.Queue.Total())
assert.Equal(t, 1, n.Queue.Count(queue.ItemStateFiltered))
Expand Down Expand Up @@ -106,12 +112,17 @@ func Test_NukeFiltersMatchGroups_Match(t *testing.T) {
SessionOne: "testing",
SecondResource: true,
}
newScanner := scanner.New("Owner", []string{TestResourceType2}, opts)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType2},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.NoError(t, err)
assert.Equal(t, 1, n.Queue.Total())
assert.Equal(t, 1, n.Queue.Count(queue.ItemStateFiltered))
Expand Down Expand Up @@ -146,12 +157,17 @@ func Test_NukeFiltersMatchGroups_NoMatch(t *testing.T) {
SessionOne: "testing",
SecondResource: true,
}
newScanner := scanner.New("Owner", []string{TestResourceType2}, opts)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType2},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.NoError(t, err)
assert.Equal(t, 1, n.Queue.Total())
assert.Equal(t, 0, n.Queue.Count(queue.ItemStateFiltered))
Expand Down Expand Up @@ -186,12 +202,17 @@ func Test_NukeFiltersMatchGroups_NoMatch_WithError(t *testing.T) {
SessionOne: "testing",
SecondResource: true,
}
newScanner := scanner.New("Owner", []string{TestResourceType2}, opts)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType2},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.Error(t, err)
assert.Equal(t, "error parsing regexp: missing closing ): `^(testing$`", err.Error())
}
Expand Down Expand Up @@ -219,12 +240,17 @@ func Test_NukeFiltersMatchInverted(t *testing.T) {
SessionOne: "testing",
SecondResource: true,
}
newScanner := scanner.New("Owner", []string{TestResourceType2}, opts)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType2},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.NoError(t, err)
assert.Equal(t, 1, n.Queue.Total())
assert.Equal(t, 0, n.Queue.Count(queue.ItemStateFiltered))
Expand Down Expand Up @@ -252,12 +278,17 @@ func Test_Nuke_Filters_NoMatch(t *testing.T) {
SessionOne: "testing",
SecondResource: true,
}
newScanner := scanner.New("Owner", []string{TestResourceType2}, opts)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType2},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.NoError(t, err)
assert.Equal(t, 1, n.Queue.Total())
assert.Equal(t, 0, n.Queue.Count(queue.ItemStateFiltered))
Expand All @@ -284,12 +315,17 @@ func Test_Nuke_Filters_ErrorCustomProps(t *testing.T) {
opts := TestOpts{
SessionOne: "testing",
}
newScanner := scanner.New("Owner", []string{TestResourceType}, opts)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{TestResourceType},
Opts: opts,
})
assert.NoError(t, err)

sErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, sErr)

err := n.Scan(context.TODO())
err = n.Scan(context.TODO())
assert.NoError(t, err)

assert.Equal(t, 1, n.Queue.Total())
Expand Down
92 changes: 81 additions & 11 deletions pkg/nuke/nuke_run_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,14 @@ func Test_Nuke_Run_Simple(t *testing.T) {
Lister: &TestResourceSuccessLister{},
})

scannerErr := n.RegisterScanner(testScope, scanner.New("Owner", []string{"TestResourceSuccess"}, nil))
s, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceSuccess"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, s)
assert.NoError(t, scannerErr)

runErr := n.Run(context.TODO())
Expand All @@ -112,7 +119,14 @@ func Test_Nuke_Run_ScanError(t *testing.T) {
Lister: &TestResourceSuccessLister{},
})

scannerErr := n.RegisterScanner(testScope, scanner.New("Owner", []string{"TestResourceSuccess"}, nil))
s, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceSuccess"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, s)
assert.NoError(t, scannerErr)

runErr := n.Run(ctx)
Expand Down Expand Up @@ -155,7 +169,14 @@ func Test_NukeRunSimpleWithSecondPromptError(t *testing.T) {
Lister: &TestResourceSuccessLister{},
})

scannerErr := n.RegisterScanner(testScope, scanner.New("Owner", []string{"TestResourceSuccess"}, nil))
s, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceSuccess"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, s)
assert.NoError(t, scannerErr)

runErr := n.Run(context.TODO())
Expand All @@ -175,7 +196,14 @@ func Test_Nuke_Run_SimpleWithNoDryRun(t *testing.T) {
Lister: &TestResourceSuccessLister{},
})

scannerErr := n.RegisterScanner(testScope, scanner.New("Owner", []string{"TestResourceSuccess"}, nil))
s, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceSuccess"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, s)
assert.NoError(t, scannerErr)

runErr := n.Run(context.TODO())
Expand All @@ -202,7 +230,13 @@ func Test_Nuke_Run_Failure(t *testing.T) {
Lister: &TestResourceFailureLister{},
})

newScanner := scanner.New("Owner", []string{"TestResourceSuccess", "TestResourceFailure"}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceSuccess", "TestResourceFailure"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand Down Expand Up @@ -232,7 +266,13 @@ func Test_NukeRunWithMaxWaitRetries(t *testing.T) {
Lister: &TestResourceWaitLister{},
})

newScanner := scanner.New("Owner", []string{"TestResourceSuccess"}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceSuccess"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand Down Expand Up @@ -326,7 +366,13 @@ func TestNuke_RunWithWaitOnDependencies(t *testing.T) {
},
})

newScanner := scanner.New("Owner", []string{"TestResourceAlpha", "TestResourceBeta"}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceAlpha", "TestResourceBeta"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand Down Expand Up @@ -355,7 +401,13 @@ func TestNuke_RunWithHandleWaitFail(t *testing.T) {
},
})

newScanner := scanner.New("Owner", []string{"TestResourceAlpha"}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceAlpha"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand All @@ -380,7 +432,13 @@ func TestNuke_RunNoResources(t *testing.T) {

registry.ClearRegistry()

newScanner := scanner.New("Owner", []string{}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand Down Expand Up @@ -409,7 +467,13 @@ func TestNuke_HandleWaitListError(t *testing.T) {
},
})

newScanner := scanner.New("Owner", []string{"TestResourceAlpha"}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceAlpha"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand Down Expand Up @@ -447,7 +511,13 @@ func TestNuke_SecondFilterFail(t *testing.T) {
Lister: &TestResourceBetaLister{},
})

newScanner := scanner.New("Owner", []string{"TestResourceBeta"}, nil)
newScanner, err := scanner.New(&scanner.Config{
Owner: "Owner",
ResourceTypes: []string{"TestResourceBeta"},
Opts: nil,
})
assert.NoError(t, err)

scannerErr := n.RegisterScanner(testScope, newScanner)
assert.NoError(t, scannerErr)

Expand Down
Loading