Skip to content

Add merge reports option in report command #10

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 16 commits into from
Sep 14, 2023
Merged

Add merge reports option in report command #10

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
83bd800
Add merge reports option in report command
AleksandarSavchev Sep 8, 2023
69b7ee1
Improve usage string
AleksandarSavchev Sep 11, 2023
498e790
Improve `Report` section in `README.md`
AleksandarSavchev Sep 11, 2023
cdf68e1
add new line
AleksandarSavchev Sep 11, 2023
258a088
Improve diki report documentation
AleksandarSavchev Sep 13, 2023
3b1256f
Imrprove error messages
AleksandarSavchev Sep 13, 2023
94701ad
Sort providers in merged report
AleksandarSavchev Sep 13, 2023
4dae979
Imrpove time string in merged report for runs
AleksandarSavchev Sep 13, 2023
c68f480
Use strings.Builder
AleksandarSavchev Sep 13, 2023
8a6c642
Small imrpovements
AleksandarSavchev Sep 13, 2023
2c53b66
Imrpove method comments for merged structs
AleksandarSavchev Sep 13, 2023
eb235b8
Add unit tests for MergeReport
AleksandarSavchev Sep 13, 2023
3c1e32f
Improve strings Builder usage
AleksandarSavchev Sep 14, 2023
a4f5365
Remove unused logger
AleksandarSavchev Sep 14, 2023
a5c6b62
Use slices.Sort
AleksandarSavchev Sep 14, 2023
14ffbae
Small gocritic improvement
AleksandarSavchev Sep 14, 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
11 changes: 9 additions & 2 deletions pkg/report/merged_report.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"errors"
"fmt"
"slices"
"sort"
"time"

"github.com/gardener/diki/pkg/rule"
Expand Down Expand Up @@ -131,11 +132,17 @@ func MergeReport(reports []*Report, distinctByAttrs map[string]string) (*MergedR
Providers: []MergedProvider{},
}

for selectedProvider, distinctBy := range distinctByAttrs {
distinctByAttrsProviders := []string{}
for key := range distinctByAttrs {
distinctByAttrsProviders = append(distinctByAttrsProviders, key)
}
sort.Strings(distinctByAttrsProviders)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use slices.Sort


for _, selectedProvider := range distinctByAttrsProviders {
mergedReport.Providers = append(mergedReport.Providers, MergedProvider{
ID: selectedProvider,
Name: "",
DistinctBy: distinctBy,
DistinctBy: distinctByAttrs[selectedProvider],
Metadata: map[string]map[string]string{},
Rulesets: []MergedRuleset{},
})
Expand Down