Skip to content

feat: Enable Custom Validators #654

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
merged 7 commits into from
Feb 7, 2023
Merged

feat: Enable Custom Validators #654

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffa2a0c
Update testing.go
bbernays Feb 1, 2023
e28ae40
Update testing.go
bbernays Feb 1, 2023
8275f56
Update testing.go
bbernays Feb 6, 2023
805d884
Update testing.go
bbernays Feb 7, 2023
80be260
Update testing.go
bbernays Feb 7, 2023
12959a1
Merge remote-tracking branch 'upstream/main' into custom-validators
bbernays Feb 7, 2023
5902ff1
Update testing.go
bbernays Feb 7, 2023
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
32 changes: 26 additions & 6 deletions plugins/source/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ import (
"github.com/cloudquery/plugin-sdk/specs"
)

type Validator func(t *testing.T, plugin *Plugin, resources []*schema.Resource)

func TestPluginSync(t *testing.T, plugin *Plugin, spec specs.Source, opts ...TestPluginOption) {
t.Helper()

o := &testPluginOptions{
parallel: true,
parallel: true,
validators: []Validator{validatePlugin},
}
for _, opt := range opts {
opt(o)
Expand Down Expand Up @@ -40,8 +43,9 @@ func TestPluginSync(t *testing.T, plugin *Plugin, spec specs.Source, opts ...Tes
if syncErr != nil {
t.Fatal(syncErr)
}

validateTables(t, plugin.Tables(), syncedResources)
for _, validator := range o.validators {
validator(t, plugin, syncedResources)
}
}

type TestPluginOption func(*testPluginOptions)
Expand All @@ -52,8 +56,15 @@ func WithTestPluginNoParallel() TestPluginOption {
}
}

func WithTestPluginAdditionalValidators(v Validator) TestPluginOption {
return func(f *testPluginOptions) {
f.validators = append(f.validators, v)
}
}

type testPluginOptions struct {
parallel bool
parallel bool
validators []Validator
}

func getTableResources(t *testing.T, table *schema.Table, resources []*schema.Resource) []*schema.Resource {
Expand All @@ -80,14 +91,23 @@ func validateTable(t *testing.T, table *schema.Table, resources []*schema.Resour
validateResources(t, tableResources)
}

func validateTables(t *testing.T, tables schema.Tables, resources []*schema.Resource) {
func validatePlugin(t *testing.T, plugin *Plugin, resources []*schema.Resource) {
t.Helper()
tables := extractTables(plugin.tables)
for _, table := range tables {
validateTable(t, table, resources)
validateTables(t, table.Relations, resources)
}
}

func extractTables(tables schema.Tables) []*schema.Table {
result := make([]*schema.Table, 0)
for _, table := range tables {
result = append(result, table)
result = append(result, extractTables(table.Relations)...)
}
return result
}

// Validates that every column has at least one non-nil value.
// Also does some additional validations.
func validateResources(t *testing.T, resources []*schema.Resource) {
Expand Down