Skip to content

Commit

Permalink
fix: Don't include other relation siblings if not specified in config (…
Browse files Browse the repository at this point in the history 
…#1720)

#### Summary

Fixes cloudquery/cloudquery#18206

- [ ] Read the [contribution guidelines](../blob/main/CONTRIBUTING.md) 🧑‍🎓
- [ ] Run `go fmt` to format your code 🖊
- [ ] Lint your changes via `golangci-lint run` 🚨 (install golangci-lint [here](https://golangci-lint.run/usage/install/#local-installation))
- [ ] Update or add tests 🧪
- [ ] Ensure the status checks below are successful ✅
  • Loading branch information
@erezrokah
erezrokah committed Jun 14, 2024
1 parent 0432092 commit f730ec5
Show file tree
Hide file tree
Showing 2 changed files with 172 additions and 2 deletions.
5 changes: 3 additions & 2 deletions schema/table.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,15 +425,16 @@ func (t *Table) filterDfs(parentMatched bool, include, exclude func(*Table) bool
matched = true
}
filteredRelations := make([]*Table, 0, len(t.Relations))
childMatched := false
for _, r := range t.Relations {
filteredChild := r.filterDfs(matched, include, exclude, skipDependentTables)
if filteredChild != nil {
matched = true
childMatched = true
filteredRelations = append(filteredRelations, r)
}
}
t.Relations = filteredRelations
if matched {
if matched || childMatched {
return t
}
return nil
Expand Down
169 changes: 169 additions & 0 deletions schema/table_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,175 @@ func TestTablesFilterDFS(t *testing.T) {
configurationSkipTables: []string{"sub_table_2"},
want: []string{"main_table", "sub_table_1"},
},
{
name: "when specifying a single child table, return only the parent and the specified child",
tables: []*Table{
{Name: "main_table", Relations: []*Table{
{Name: "sub_table_1", Parent: &Table{Name: "main_table"}},
{Name: "sub_table_2", Parent: &Table{Name: "main_table"}}}}},
configurationTables: []string{"sub_table_1"},
want: []string{"main_table", "sub_table_1"},
},
{
name: "when specifying a leaf table, return only the parents and the leaf",
tables: []*Table{
{Name: "0", Relations: []*Table{
{Name: "0_1", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_1_1", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_1_1", Parent: &Table{Name: "0_1_1"}},
{Name: "0_1_1_2", Parent: &Table{Name: "0_1_1"}, Relations: []*Table{
{Name: "0_1_1_2_1", Parent: &Table{Name: "0_1_1_2"}},
{Name: "0_1_1_2_2", Parent: &Table{Name: "0_1_1_2"}},
}},
{Name: "0_1_1_3", Parent: &Table{Name: "0_1_1"}},
}},
{Name: "0_1_2", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_2_1", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_2", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_3", Parent: &Table{Name: "0_1_2"}},
}},
{Name: "0_1_3", Parent: &Table{Name: "0_1"}},
}},
{Name: "0_2", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_2_1", Parent: &Table{Name: "0_2"}},
{Name: "0_2_2", Parent: &Table{Name: "0_2"}},
}},
{Name: "0_3", Parent: &Table{Name: "0"}},
}},
{Name: "1", Relations: []*Table{
{Name: "1_1", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_1_1", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_1_1", Parent: &Table{Name: "1_1_1"}},
{Name: "1_1_1_2", Parent: &Table{Name: "1_1_1"}, Relations: []*Table{
{Name: "1_1_1_2_1", Parent: &Table{Name: "1_1_1_2"}},
{Name: "1_1_1_2_2", Parent: &Table{Name: "1_1_1_2"}},
}},
{Name: "1_1_1_3", Parent: &Table{Name: "1_1_1"}},
}},
{Name: "1_1_2", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_2_1", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_2", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_3", Parent: &Table{Name: "1_1_2"}},
}},
{Name: "1_1_3", Parent: &Table{Name: "1_1"}},
}},
{Name: "1_2", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_2_1", Parent: &Table{Name: "1_2"}},
{Name: "1_2_2", Parent: &Table{Name: "1_2"}},
}},
{Name: "1_3", Parent: &Table{Name: "1"}},
}},
},
configurationTables: []string{"0_1_1_2_2", "0_1_2_3", "1_1_2_3"},
want: []string{"0", "0_1", "0_1_1", "0_1_1_2", "0_1_1_2_2", "0_1_2", "0_1_2_3", "1", "1_1", "1_1_2", "1_1_2_3"},
},
{
name: "when specifying a descendant table, return the parents, the specified descendant and all its descendant if skip_dependent_tables is false",
tables: []*Table{
{Name: "0", Relations: []*Table{
{Name: "0_1", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_1_1", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_1_1", Parent: &Table{Name: "0_1_1"}},
{Name: "0_1_1_2", Parent: &Table{Name: "0_1_1"}, Relations: []*Table{
{Name: "0_1_1_2_1", Parent: &Table{Name: "0_1_1_2"}},
{Name: "0_1_1_2_2", Parent: &Table{Name: "0_1_1_2"}},
}},
{Name: "0_1_1_3", Parent: &Table{Name: "0_1_1"}},
}},
{Name: "0_1_2", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_2_1", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_2", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_3", Parent: &Table{Name: "0_1_2"}},
}},
{Name: "0_1_3", Parent: &Table{Name: "0_1"}},
}},
{Name: "0_2", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_2_1", Parent: &Table{Name: "0_2"}},
{Name: "0_2_2", Parent: &Table{Name: "0_2"}},
}},
{Name: "0_3", Parent: &Table{Name: "0"}},
}},
{Name: "1", Relations: []*Table{
{Name: "1_1", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_1_1", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_1_1", Parent: &Table{Name: "1_1_1"}},
{Name: "1_1_1_2", Parent: &Table{Name: "1_1_1"}, Relations: []*Table{
{Name: "1_1_1_2_1", Parent: &Table{Name: "1_1_1_2"}},
{Name: "1_1_1_2_2", Parent: &Table{Name: "1_1_1_2"}},
}},
{Name: "1_1_1_3", Parent: &Table{Name: "1_1_1"}},
}},
{Name: "1_1_2", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_2_1", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_2", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_3", Parent: &Table{Name: "1_1_2"}},
}},
{Name: "1_1_3", Parent: &Table{Name: "1_1"}},
}},
{Name: "1_2", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_2_1", Parent: &Table{Name: "1_2"}},
{Name: "1_2_2", Parent: &Table{Name: "1_2"}},
}},
{Name: "1_3", Parent: &Table{Name: "1"}},
}},
},
configurationTables: []string{"1_1_1_2"},
want: []string{"1", "1_1", "1_1_1", "1_1_1_2", "1_1_1_2_1", "1_1_1_2_2"},
},
{
name: "when specifying a descendant table, return the parents and only the specified descendant if skip_dependent_tables is true",
tables: []*Table{
{Name: "0", Relations: []*Table{
{Name: "0_1", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_1_1", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_1_1", Parent: &Table{Name: "0_1_1"}},
{Name: "0_1_1_2", Parent: &Table{Name: "0_1_1"}, Relations: []*Table{
{Name: "0_1_1_2_1", Parent: &Table{Name: "0_1_1_2"}},
{Name: "0_1_1_2_2", Parent: &Table{Name: "0_1_1_2"}},
}},
{Name: "0_1_1_3", Parent: &Table{Name: "0_1_1"}},
}},
{Name: "0_1_2", Parent: &Table{Name: "0_1"}, Relations: []*Table{
{Name: "0_1_2_1", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_2", Parent: &Table{Name: "0_1_2"}},
{Name: "0_1_2_3", Parent: &Table{Name: "0_1_2"}},
}},
{Name: "0_1_3", Parent: &Table{Name: "0_1"}},
}},
{Name: "0_2", Parent: &Table{Name: "0"}, Relations: []*Table{
{Name: "0_2_1", Parent: &Table{Name: "0_2"}},
{Name: "0_2_2", Parent: &Table{Name: "0_2"}},
}},
{Name: "0_3", Parent: &Table{Name: "0"}},
}},
{Name: "1", Relations: []*Table{
{Name: "1_1", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_1_1", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_1_1", Parent: &Table{Name: "1_1_1"}},
{Name: "1_1_1_2", Parent: &Table{Name: "1_1_1"}, Relations: []*Table{
{Name: "1_1_1_2_1", Parent: &Table{Name: "1_1_1_2"}},
{Name: "1_1_1_2_2", Parent: &Table{Name: "1_1_1_2"}},
}},
{Name: "1_1_1_3", Parent: &Table{Name: "1_1_1"}},
}},
{Name: "1_1_2", Parent: &Table{Name: "1_1"}, Relations: []*Table{
{Name: "1_1_2_1", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_2", Parent: &Table{Name: "1_1_2"}},
{Name: "1_1_2_3", Parent: &Table{Name: "1_1_2"}},
}},
{Name: "1_1_3", Parent: &Table{Name: "1_1"}},
}},
{Name: "1_2", Parent: &Table{Name: "1"}, Relations: []*Table{
{Name: "1_2_1", Parent: &Table{Name: "1_2"}},
{Name: "1_2_2", Parent: &Table{Name: "1_2"}},
}},
{Name: "1_3", Parent: &Table{Name: "1"}},
}},
},
configurationTables: []string{"1_1_1_2"},
skipDependentTables: true,
want: []string{"1", "1_1", "1_1_1", "1_1_1_2"},
},
{
name: "skip child tables if skip_dependent_tables is true",
tables: []*Table{
Expand Down

0 comments on commit f730ec5

Please sign in to comment.