Skip to content

ROX-30576: Copy repo 2 cpe to bundle root #2074

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 4 commits into from
Aug 26, 2025
+18 −0
Merged

ROX-30576: Copy repo 2 cpe to bundle root #2074

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
62e6981
create copy of repo 2 cpe in genesis and diff
dcaravel Aug 20, 2025
1e176ba
empty commit to trigger CI
dcaravel Aug 21, 2025
ff6c105
try diff way to copy file in diff dump
dcaravel Aug 21, 2025
4ee64fd
empty commit to trigger CI
dcaravel Aug 25, 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
5 changes: 5 additions & 0 deletions cmd/updater/diffdumps/rhelv2_diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ func generateRHELv2VulnsDiff(cfg config, outputDir string, baseLastModifiedTime
if err := generateRHELv2RepoToCPE(filepath.Join(outputDir, repoToCPEFile), headF); err != nil {
return errors.Wrapf(err, "generating %s", repo2cpe.RHELv2CPERepoName)
}

// additional copy of repo to cpe JSON at bundle root (due to ROX-30576)
if err := generateRHELv2RepoToCPE(filepath.Join(outputDir, repo2cpe.RHELv2CPERepoName), headF); err != nil {
return errors.Wrapf(err, "generating %s at bundle root", repo2cpe.RHELv2CPERepoName)
}
}

// Only look at JSON files in the vulns/ folder.
Expand Down
11 changes: 11 additions & 0 deletions pkg/rhelv2/rhelv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,5 +245,16 @@ func updateRepoToCPE(outputDir string) (*repo2cpe.RHELv2MappingFile, error) {
return nil, errors.Wrapf(err, "encoding mapping")
}

// Also create copy at bundle root (due to ROX-30576)
outFRoot, err := os.Create(filepath.Join(outputDir, repo2cpe.RHELv2CPERepoName))
if err != nil {
return nil, errors.Wrapf(err, "failed to create file %q at bundle root", repo2cpe.RHELv2CPERepoName)
}
defer utils.IgnoreError(outFRoot.Close)

if err := json.NewEncoder(outFRoot).Encode(&mapping); err != nil {
return nil, errors.Wrapf(err, "encoding mapping at bundle root")
}

return &mapping, nil
}
2 changes: 2 additions & 0 deletions pkg/vulndump/write.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/mholt/archiver/v3"
"github.com/pkg/errors"
"github.com/stackrox/scanner/database"
"github.com/stackrox/scanner/pkg/repo2cpe"
)

// WriteZip takes the given files and creates the vuln dump zip.
Expand All @@ -25,6 +26,7 @@ func WriteZip(inputDir, outFile string, ignoreKubernetesVulns, ignoreRHELv2Vulns
}
if !ignoreRHELv2Vulns {
sources = append(sources, filepath.Join(inputDir, RHELv2DirName))
sources = append(sources, filepath.Join(inputDir, repo2cpe.RHELv2CPERepoName))
}
if !ignoreIstioVulns {
sources = append(sources, filepath.Join(inputDir, IstioDirName))
Expand Down
Loading