Skip to content

fix(opensearch-dashboards): SBOM: Only read the package.json of installed packages - #1670

Merged
dervoeti merged 2 commits into
mainfrom
fix/osd-sbom-exclude-test-fixtures
Sep 22, 2026
Merged

dervoeti merged 2 commits into
mainfrom
fix/osd-sbom-exclude-test-fixtures

Conversation

@dervoeti

Copy link
Copy Markdown
Member

Description

Follow-up to #1663. That made cdxgen walk the installed node_modules instead of the lockfiles, which is where the components should come from, but cdxgen reads every package.json below node_modules, which includes test fixtures and benchmarks in subpaths.

An installed package's manifest is always the direct child of a node_modules directory or of a scope directory below it. --include-regex '**/node_modules/{*,@*/*}/package.json' restricts the walk to exactly that.

I also fixed some PR numbers in the changelog that were wrong (from my previous PRs).

Definition of Done Checklist

Note

Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant.

Please make sure all these things are done and tick the boxes

  • Changes are OpenShift compatible
  • All added packages (via microdnf or otherwise) have a comment on why they are added
  • Things not downloaded from Red Hat repositories should be mirrored in the Stackable repository and downloaded from there
  • All packages should have (if available) signatures/hashes verified
  • Add an entry to the CHANGELOG.md file
  • Integration tests ran successfully
TIP: Running integration tests with a new product image

The image can be built and uploaded to the kind cluster with the following commands:

boil build <IMAGE> --image-version <RELEASE_VERSION> --strip-architecture --load
kind load docker-image <MANIFEST_URI> --name=<name-of-your-test-cluster>

See the output of boil to retrieve the image manifest URI for <MANIFEST_URI>.

@dervoeti dervoeti self-assigned this Sep 22, 2026
@dervoeti
dervoeti requested a review from StefanFl September 22, 2026 11:51
@dervoeti
dervoeti added this pull request to the merge queue Sep 22, 2026
Merged via the queue into main with commit bb60dac Sep 22, 2026
3 checks passed
@dervoeti
dervoeti deleted the fix/osd-sbom-exclude-test-fixtures branch September 22, 2026 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants