Skip to content

use synced aptly #50403

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

Draft
brycekahle wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

use synced aptly #50403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions LICENSE-3rdparty.csv
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion deps/go.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ use_repo(
"com_github_alecthomas_participle",
"com_github_alecthomas_units",
"com_github_alessio_shellescape",
"com_github_aptly_dev_aptly",
"com_github_aquasecurity_trivy",
"com_github_aquasecurity_trivy_db",
"com_github_avast_retry_go_v4",
Expand Down Expand Up @@ -88,7 +89,6 @@ use_repo(
"com_github_cyphar_filepath_securejoin",
"com_github_data_dog_go_sqlmock",
"com_github_datadog_agent_payload_v5",
"com_github_datadog_aptly",
"com_github_datadog_datadog_agent_comp_api_api_def",
"com_github_datadog_datadog_agent_comp_core_agenttelemetry_def",
"com_github_datadog_datadog_agent_comp_core_agenttelemetry_fx",
Expand Down
14 changes: 6 additions & 8 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ require (
github.com/Microsoft/go-winio v0.6.2
github.com/Microsoft/hcsshim v0.13.0
github.com/NVIDIA/go-nvml v0.13.0-1.0.20260414000254-c617db04ef8e
github.com/ProtonMail/go-crypto v1.3.0
github.com/ProtonMail/go-crypto v1.4.0
github.com/acobaugh/osrelease v0.1.0
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b
github.com/aquasecurity/trivy v0.63.0
Expand Down Expand Up @@ -465,7 +465,6 @@ require (
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
github.com/BurntSushi/toml v1.6.0 // indirect
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect
github.com/DataDog/aptly v1.5.3
github.com/DataDog/datadog-agent/comp/core/agenttelemetry/impl v0.0.0 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets/impl v0.70.0
github.com/DataDog/datadog-agent/comp/core/secrets/utils v0.72.0-devel
Expand Down Expand Up @@ -633,7 +632,7 @@ require (
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jaegertracing/jaeger-idl v0.6.0 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jlaffaye/ftp v0.1.0 // indirect
github.com/jlaffaye/ftp v0.2.0 // indirect
github.com/jonboulle/clockwork v0.5.0
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
Expand Down Expand Up @@ -753,7 +752,6 @@ require (
github.com/outcaste-io/ristretto v0.2.3 // indirect
github.com/ovh/go-ovh v1.9.0 // indirect
github.com/package-url/packageurl-go v0.1.3 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/philhofer/fwd v1.2.0 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
Expand Down Expand Up @@ -964,6 +962,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver/common/namespace v0.77.0-devel.0.20260211235139-a5361978c2b6
github.com/DataDog/ddtrivy v0.0.0-20260115083325-07614fb0b8d5
github.com/DataDog/rshell v0.0.14
github.com/aptly-dev/aptly v0.0.0-00010101000000-000000000000
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.6
github.com/aws/aws-sdk-go-v2/service/ssm v1.68.5
github.com/aymerick/raymond v2.0.2+incompatible
Expand Down Expand Up @@ -1191,6 +1190,7 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/saracen/walker v0.1.2 // indirect
github.com/sasha-s/go-deadlock v0.3.5 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/segmentio/encoding v0.5.4 // indirect
Expand Down Expand Up @@ -1242,10 +1242,8 @@ replace github.com/aquasecurity/trivy => github.com/DataDog/trivy v0.0.0-2026040
// Pin to the 28.x branch head which includes the backported security fixes (not yet tagged).
replace github.com/docker/docker => github.com/docker/docker v28.5.3-0.20260325154711-31a1689cb0a1+incompatible

// Prevent dependencies to be bumped by Trivy
// github.com/DataDog/aptly@v1.5.3 depends on gopenpgp/v2, so we use latest version of go-crypto before the move to gopenpgp/v3
// Updated to v1.3.0 for secret-generic-connector gopenpgp/v3 compatibility
replace github.com/ProtonMail/go-crypto => github.com/ProtonMail/go-crypto v1.3.0
// use our fork of aptly that doesn't have the module renamed. It has significant allocation improvements.
replace github.com/aptly-dev/aptly => github.com/DataDog/aptly v1.4.1-0.20260505224622-46dbc052df7f

// Prevent a false-positive detection by the Google and Ikarus security vendors on VirusTotal
exclude go.opentelemetry.io/proto/otlp v1.1.0
Expand Down
97 changes: 14 additions & 83 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ require (
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/MirrexOne/unqueryvet v1.5.3 // indirect
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
github.com/ProtonMail/go-crypto v1.3.0 // indirect
github.com/ProtonMail/go-crypto v1.4.0 // indirect
github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect
github.com/alecthomas/chroma/v2 v2.23.1 // indirect
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions internal/tools/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions pkg/util/kernel/headers/download/apt/apt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import (
"path/filepath"
"strings"

"github.com/DataDog/aptly/aptly"
"github.com/DataDog/aptly/deb"
"github.com/DataDog/aptly/http"
"github.com/DataDog/aptly/pgp"
"github.com/aptly-dev/aptly/aptly"
"github.com/aptly-dev/aptly/deb"
"github.com/aptly-dev/aptly/http"
"github.com/aptly-dev/aptly/pgp"
"github.com/xor-gate/ar"

"github.com/DataDog/datadog-agent/pkg/util/kernel/headers/download/extract"
Expand Down Expand Up @@ -70,7 +70,7 @@ func (b *Backend) downloadPackage(downloader aptly.Downloader, verifier pgp.Veri
stanza := make(deb.Stanza, 32)

for _, repoInfo := range b.repoCollection {
repo, err := deb.NewRemoteRepo(repoInfo.repoID, repoInfo.uri, repoInfo.distribution, repoInfo.components, []string{repoInfo.arch}, false, false, false)
repo, err := deb.NewRemoteRepo(repoInfo.repoID, repoInfo.uri, repoInfo.distribution, repoInfo.components, []string{repoInfo.arch}, false, false, false, false)
if err != nil {
b.logger.Errorf("Failed to create remote repo: %s", err)
continue
Expand All @@ -80,7 +80,7 @@ func (b *Backend) downloadPackage(downloader aptly.Downloader, verifier pgp.Veri
repo.SkipComponentCheck = true

stanza.Clear()
if err := repo.FetchBuffered(stanza, downloader, verifier); err != nil {
if err := repo.FetchBuffered(stanza, downloader, verifier, false); err != nil {
b.logger.Debugf("Error fetching repo: %s", err)
// not every repo has to be successful
continue
Expand All @@ -89,7 +89,7 @@ func (b *Backend) downloadPackage(downloader aptly.Downloader, verifier pgp.Veri
b.logger.Debug("Downloading package indexes")
// factory is not used by DownloadPackageIndexes so we can use nil here
var factory *deb.CollectionFactory
if err := repo.DownloadPackageIndexes(nil, downloader, nil, factory, false); err != nil {
if err := repo.DownloadPackageIndexes(nil, downloader, nil, factory, false, false); err != nil {
b.logger.Debugf("Failed to download package indexes: %s", err)
// not every repo has to be successful
continue
Expand Down Expand Up @@ -168,7 +168,7 @@ func (b *Backend) createGpgVerifier() (*pgp.GoVerifier, error) {
}
}

if err := gpgVerifier.InitKeyring(); err != nil {
if err := gpgVerifier.InitKeyring(false); err != nil {
return nil, err
}
return gpgVerifier, nil
Expand Down
8 changes: 4 additions & 4 deletions test/e2e-framework/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/ecr v1.45.1
github.com/aws/aws-sdk-go-v2/service/ecs v1.77.0
github.com/aws/aws-sdk-go-v2/service/eks v1.77.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3
github.com/aws/aws-sdk-go-v2/service/ssm v1.68.5
github.com/aws/session-manager-plugin v0.0.0-20241119210807-82dc72922492
github.com/cenkalti/backoff/v5 v5.0.3
Expand Down Expand Up @@ -78,7 +78,7 @@ require (
github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.3.0 // indirect
github.com/ProtonMail/go-crypto v1.4.0 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
Expand All @@ -90,9 +90,9 @@ require (
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.23 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.8 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.22 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.10 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.16 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.20 // indirect
Expand Down
16 changes: 8 additions & 8 deletions test/e2e-framework/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions test/new-e2e/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ require (
github.com/DataDog/zstd_0 v0.0.0-20210310093942-586c1286621f // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProtonMail/go-crypto v1.3.0 // indirect
github.com/ProtonMail/go-crypto v1.4.0 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
Expand All @@ -64,9 +64,9 @@ require (
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ecs v1.77.0
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.8 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.12 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.13 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.22 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.20 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.21 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.16 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.20 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.42.0 // indirect
Expand Down Expand Up @@ -214,7 +214,7 @@ require (
github.com/DataDog/dd-trace-go/v2 v2.7.4
github.com/DataDog/orchestrion v1.4.0
github.com/avast/retry-go/v4 v4.7.0
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.2
github.com/aws/aws-sdk-go-v2/service/s3 v1.97.3
github.com/digitalocean/go-libvirt v0.0.0-20240812180835-9c6c0a310c6c
github.com/go-jose/go-jose/v4 v4.1.4
github.com/go-viper/mapstructure/v2 v2.5.0
Expand Down
16 changes: 8 additions & 8 deletions test/new-e2e/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading