Skip to content

Commit

Permalink
Remove commented out lines
Browse files Browse the repository at this point in the history
  • Loading branch information
lebauce committed Dec 23, 2024
1 parent aa87ba3 commit 1f98c1d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
6 changes: 0 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -1085,17 +1085,11 @@ replace (
// Maps to Trivy fork https://github.com/DataDog/trivy/commits/use-fs-main-dd/
github.com/aquasecurity/trivy => github.com/DataDog/trivy v0.0.0-20241220173447-f7eb37266f2f
github.com/saracen/walker => github.com/DataDog/walker v0.0.0-20230418153152-7f29bb2dc950
// testcontainers-go has a bug with versions v0.25.0 and v0.26.0
// ref: https://github.com/testcontainers/testcontainers-go/issues/1782
// github.com/testcontainers/testcontainers-go => github.com/testcontainers/testcontainers-go v0.23.0
)

// Fixes CVE-2023-1732, imported by nikos
replace github.com/cloudflare/circl => github.com/cloudflare/circl v1.3.7

// Fixes CVE-2023-26054, imported by trivy
// replace github.com/moby/buildkit => github.com/moby/buildkit v0.13.0

// Exclude specific versions of knadh/koanf to fix building with a `go.work`, following
// https://github.com/open-telemetry/opentelemetry-collector/issues/8127
exclude (
Expand Down
4 changes: 2 additions & 2 deletions pkg/sbom/collectors/host/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package host
import (
"os"

"github.com/DataDog/datadog-agent/pkg/config/env"
"github.com/DataDog/datadog-agent/pkg/sbom/types"
)

Expand All @@ -25,8 +26,7 @@ func NewScanRequest(path string) types.ScanRequest {
// NewHostScanRequest creates a new scan request for the root filesystem
func NewHostScanRequest() types.ScanRequest {
scanPath := "/"
if hostRoot := os.Getenv("HOST_ROOT"); hostRoot != "" {
// if hostRoot := os.Getenv("HOST_ROOT"); env.IsContainerized() && hostRoot != "" {
if hostRoot := os.Getenv("HOST_ROOT"); env.IsContainerized() && hostRoot != "" {
scanPath = hostRoot
}
return NewScanRequest(scanPath)
Expand Down
9 changes: 0 additions & 9 deletions pkg/util/trivy/container.go

This file was deleted.

0 comments on commit 1f98c1d

Please sign in to comment.