Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: 🧾 Checkout
uses: actions/checkout@v5
uses: actions/checkout@v6

- name: 🔧 Setup Go
uses: actions/setup-go@v5
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.DS_Store
.claude
.vscode
6 changes: 6 additions & 0 deletions cmd/clickbom/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,12 @@ func handleMergeMode(ctx context.Context, cfg *config.Config, s3Client *storage.
for _, file := range downloadedFiles {
filename := filepath.Base(file)

// Skip previously merged SBOMs to prevent re-merging
if strings.HasPrefix(filename, "merged_") {
logger.Debug("Skipping previously merged SBOM: %s", filename)
continue
}

// Apply include/exclude filters
if !sbom.ShouldIncludeFile(filename, cfg.Include, cfg.Exclude) {
logger.Debug("Skipping %s due to include/exclude filters", filename)
Expand Down
30 changes: 30 additions & 0 deletions license-mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
"@clickhouse/client": "Apache-2.0",
"@clickhouse/client-common": "Apache-2.0",
"@faker-js/faker": "MIT",
"@hyperdx/common-utils-0.0.0-use.local.tgz": "MIT",
"@hyperdx/common-utils-0.7.2.tgz": "MIT",
"@hyperdx/passport-local-mongoose-9.0.1.tgz": "MIT",
"@istanbuljs/nyc-config-typescript": "ISC",
"@shikijs/core": "MIT",
"@shikijs/engine-javascript": "MIT",
"@types/hyperdx__lucene-2.1.7.tgz": "MIT",
"@types/jasmine": "MIT",
"@types/jsonwebtoken": "MIT",
"@types/node": "MIT",
Expand All @@ -32,8 +36,10 @@
"actions/setup-node": "MIT",
"actions/setup-python": "MIT",
"actions/upload-artifact": "MIT",
"aiohappyeyeballs-2.6.1-py3-none-any.whl": "PSF-2.0",
"anthropic": "MIT",
"anthropics/claude-code-action": "MIT",
"anyio-4.10.0-py3-none-any.whl": "MIT",
"apache-arrow": "Apache-2.0",
"arduino/setup-protoc": "GPL-3.0",
"arduino/setup-task": "GPL-3.0",
Expand All @@ -50,6 +56,7 @@
"boto3": "Apache-2.0",
"cel.dev/expr": "Apache-2.0",
"certifi": "MPL-2.0",
"cffi-2.0.0-cp311-cp311-macosx_11_0_arm64.whl": "MIT",
"clechasseur/rs-cargo": "MIT",
"cloud.google.com/go": "Apache-2.0",
"cloud.google.com/go/artifactregistry": "Apache-2.0",
Expand Down Expand Up @@ -236,6 +243,7 @@
"github.com/chzyer/readline": "MIT",
"github.com/cihub/seelog": "BSD-3-Clause",
"github.com/cilium/cilium": "Apache-2.0",
"github.com/cilium/cilium-v1.16.1": "Apache-2.0",
"github.com/cilium/ebpf": "MIT",
"github.com/cilium/hive": "Apache-2.0",
"github.com/cilium/proxy": "Apache-2.0",
Expand Down Expand Up @@ -558,6 +566,7 @@
"github.com/kisielk/errcheck": "MIT",
"github.com/kkHAIKE/contextcheck": "Apache-2.0",
"github.com/klauspost/compress": "BSD-3-Clause",
"github.com/KlausPost/compress-v1.18.0": "BSD-3-Clause",
"github.com/klauspost/cpuid/v2": "MIT",
"github.com/knadh/koanf/maps": "MIT",
"github.com/knadh/koanf/providers/confmap": "MIT",
Expand Down Expand Up @@ -887,6 +896,7 @@
"github/codeql-action/autobuild": "MIT",
"github/codeql-action/init": "MIT",
"github/codeql-action/upload-sarif": "MIT",
"go.mongodb.org/mongo-driver-v1.16.0": "Apache-2.0",
"go.opentelemetry.io/auto/sdk": "Apache-2.0",
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp": "Apache-2.0",
"go.opentelemetry.io/otel": "Apache-2.0",
Expand All @@ -904,6 +914,7 @@
"jasmine": "MIT",
"jasmine-core": "MIT",
"jasmine-expect": "MIT",
"jiter-0.10.0-cp310-cp310-macosx_10_12_x86_64.whl": "MIT",
"jsonwebtoken": "MIT",
"karma": "MIT",
"karma-chrome-launcher": "MIT",
Expand All @@ -915,35 +926,54 @@
"karma-webpack": "MIT",
"lint-staged": "MIT",
"lz4": "BSD-3-Clause",
"lz4-4.4.5-cp311-cp311-macosx_11_0_arm64.whl": "BSD-3-Clause",
"mypy_extensions-1.1.0-py3-none-any.whl": "MIT",
"numpy": "BSD-3-Clause",
"nyc": "ISC",
"ossf/scorecard-action": "Apache-2.0",
"pandas": "BSD-3-Clause",
"pino-http-11.0.0.tgz": "MIT",
"pip-25.3-py3-none-any.whl": "MIT",
"pyarrow": "Apache-2.0",
"pypa/cibuildwheel": "BSD-2-Clause",
"pyproj-3.7.2-cp311-cp311-macosx_14_0_arm64.whl": "MIT",
"pytest": "MIT",
"pytest-asyncio": "MIT",
"pytest-cov": "MIT",
"pytest-dotenv": "MIT",
"pytest-mock": "MIT",
"pytest_xdist-3.8.0-py3-none-any.whl": "MIT",
"pytz": "MIT",
"set-interval-async": "MIT",
"setuptools": "MIT",
"setuptools-78.1.1-py3-none-any.whl": "MIT",
"setuptools-80.9.0-py3-none-any.whl": "MIT",
"sigs.k8s.io/yaml-v1.4.0": "MIT",
"sinon": "BSD-3-Clause",
"source-map-support": "MIT",
"split2": "ISC",
"sqlalchemy": "MIT",
"string-width-cjs-4.2.3.tgz": "ISC",
"strip-ansi-cjs-6.0.1.tgz": "ISC",
"RoryCrispin/gh-action-bump-version": "MIT",
"terser-webpack-plugin": "MIT",
"ts-loader": "MIT",
"ts-node": "MIT",
"tsconfig-paths": "MIT",
"tsconfig-paths-webpack-plugin": "MIT",
"typescript": "Apache-2.0",
"typing_extensions-4.14.0-py3-none-any.whl": "PSF-2.0",
"typing_extensions-4.15.0-py3-none-any.whl": "PSF-2.0",
"use-ssr-1.0.25.tgz": "MIT",
"uuid": "MIT",
"urllib3": "MIT",
"webpack": "MIT",
"webpack-cli": "MIT",
"webpack-merge": "MIT",
"websocket_client-1.8.0-py3-none-any.whl": "Apache-2.0",
"wheel-0.46.1-py3-none-any.whl": "MIT",
"wrap-ansi-cjs-7.0.0.tgz": "ISC",
"wrapt-1.17.3-cp311-cp311-macosx_11_0_arm64.whl": "BSD-2-Clause",
"zipp-3.23.0-py3-none-any.whl": "MIT",
"zstandard": "BSD-3-Clause"
}
Loading