Skip to content

Refactor remote client read function #1041

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Refactor remote client read function #1041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dff1c85
Refactor Read function to replace deferred closure with break to label.
mbirbeck Jul 15, 2025
cb93a16
Merge branch 'main' into refactor-remote-client-read-function
mbirbeck Jul 17, 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: 27 additions & 37 deletions sdk/component/store/remote/findings-client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,55 +182,45 @@ func (c *client) Validate(finding *ocsf.VulnerabilityFinding) error {
}

// Read gets findings by instanceID.
func (c *client) Read(
ctx context.Context,
instanceID uuid.UUID,
queryOpts *store.QueryOpts,
) (vfs []*vf.VulnerabilityFinding, err error) {
func (c *client) Read(ctx context.Context, instanceID uuid.UUID, queryOpts *store.QueryOpts) ([]*vf.VulnerabilityFinding, error) {
findingBatches := [][]*v1.Finding{}

defer func() {
vfs = slices.Collect(
utils.MapSlice(
utils.CollectSlices(findingBatches),
func(finding *v1.Finding) *vf.VulnerabilityFinding {
return &vf.VulnerabilityFinding{
Finding: finding.GetDetails(),
ID: finding.GetId(),
}
},
),
)
}()

if queryOpts == nil {
// we impose our own paging in this case
// We impose our own paging in this case
pageLoop:
for page := uint32(0); ; page++ {
findingsPage, err := c.read(
ctx,
instanceID,
&store.QueryOpts{
Page: page,
PageSize: c.pageSize,
},
)
pageFindings, err := c.read(ctx, instanceID, &store.QueryOpts{
Page: page,
PageSize: c.pageSize,
})
switch {
case errors.Is(store.ErrNoFindingsFound, err) && page > 0:
return nil, nil
break pageLoop
case err != nil:
return nil, err
case len(findingsPage) < int(c.pageSize):
findingBatches = append(findingBatches, findingsPage)
return nil, nil
case len(pageFindings) < int(c.pageSize):
findingBatches = append(findingBatches, pageFindings)
break pageLoop
default:
findingBatches = append(findingBatches, findingsPage)
findingBatches = append(findingBatches, pageFindings)
}
}
} else {
pageFindings, err := c.read(ctx, instanceID, queryOpts)
if err != nil {
return nil, err
}
findingBatches = append(findingBatches, pageFindings)
}

findings, err := c.read(ctx, instanceID, queryOpts)
findingBatches = append(findingBatches, findings)
return nil, err
vfs := slices.Collect(utils.MapSlice(
utils.CollectSlices(findingBatches),
func(finding *v1.Finding) *vf.VulnerabilityFinding {
return &vf.VulnerabilityFinding{
Finding: finding.GetDetails(),
ID: finding.GetId(),
}
}))
return vfs, nil
}

func (c *client) read(
Expand Down
Loading