Skip to content
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

[Backport 6.53.x] Bump go-git to latest version #32739

Merged
merged 6 commits into from
Jan 10, 2025
+386 −398
Merged

[Backport 6.53.x] Bump go-git to latest version #32739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a8aa519
[Backport 6.53.x] Bump go-git to latest version
chouetz Jan 7, 2025
47d9bd0
Update the license
chouetz Jan 7, 2025
8bce55a
bump testify
chouetz Jan 8, 2025
2b7921b
fix test
chouetz Jan 9, 2025
1c28cef
force license
chouetz Jan 10, 2025
2074f78
add the release note
chouetz Jan 10, 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
61 changes: 31 additions & 30 deletions LICENSE-3rdparty.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ core,github.com/sijms/go-ora/v2/network/security,MIT,Copyright (c) 2020 Samy Sul
core,github.com/sijms/go-ora/v2/network/security/md4,MIT,Copyright (c) 2020 Samy Sultan
core,github.com/sijms/go-ora/v2/trace,MIT,Copyright (c) 2020 Samy Sultan
core,github.com/sirupsen/logrus,MIT,Copyright (c) 2014 Simon Eskildsen
core,github.com/skeema/knownhosts,Apache-2.0,Copyright 2023 Skeema LLC and the Skeema Knownhosts authors | copyright 2023 Skeema LLC and the Skeema Knownhosts authors**
core,github.com/skeema/knownhosts,Apache-2.0,Copyright 2024 Skeema LLC and the Skeema Knownhosts authors | copyright 2024 Skeema LLC and the Skeema Knownhosts authors**
core,github.com/skydive-project/go-debouncer,Apache-2.0,"Copyright (C) 2018 Red Hat, Inc."
core,github.com/smira/go-ftp-protocol/protocol,MIT,Copyright (c) 2014 Andrey Smirnov
core,github.com/smira/go-xz,MIT,Copyright (c) 2015 Andrey Smirnov
Expand Down Expand Up @@ -1525,6 +1525,7 @@ core,github.com/stormcat24/protodep/pkg/logger,Apache-2.0,Copyright Akinori Yama
core,github.com/streadway/amqp,BSD-2-Clause,"Copyright (c) 2012-2019, Sean Treadway, SoundCloud Ltd"
core,github.com/stretchr/objx,MIT,"Copyright (c) 2014 Stretchr, Inc | Copyright (c) 2017-2018 objx contributors"
core,github.com/stretchr/testify/assert,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/assert/yaml,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/mock,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/require,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
core,github.com/stretchr/testify/suite,MIT,"Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors"
Expand Down Expand Up @@ -1962,37 +1963,37 @@ core,golang.org/x/crypto/ssh,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/crypto/ssh/agent,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/crypto/ssh/internal/bcrypt_pbkdf,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/crypto/ssh/knownhosts,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/constraints,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/maps,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/mmap,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slices,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slog,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slog/internal,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/slog/internal/buffer,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/typeparams,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/exp/constraints,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/maps,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/mmap,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slices,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slog,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slog/internal,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/slog/internal/buffer,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/exp/typeparams,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved | Copyright 2009 The Go Authors
core,golang.org/x/lint,BSD-3-Clause,Copyright (c) 2013 The Go Authors. All rights reserved
core,golang.org/x/lint/golint,BSD-3-Clause,Copyright (c) 2013 The Go Authors. All rights reserved
core,golang.org/x/net/bpf,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/context,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/html,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/html/atom,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/html/charset,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http/httpguts,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http/httpproxy,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http2,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http2/h2c,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/http2/hpack,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/icmp,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/idna,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/iana,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/socket,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/socks,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/internal/timeseries,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/ipv4,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/ipv6,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/proxy,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/trace,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/websocket,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/net/bpf,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/context,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/html,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/html/atom,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/html/charset,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http/httpguts,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http/httpproxy,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http2,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http2/h2c,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/http2/hpack,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/icmp,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/idna,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/iana,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/socket,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/socks,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/internal/timeseries,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/ipv4,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/ipv6,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/proxy,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/trace,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/net/websocket,BSD-3-Clause,Copyright 2009 The Go Authors
core,golang.org/x/oauth2,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/oauth2/authhandler,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
core,golang.org/x/oauth2/clientcredentials,BSD-3-Clause,Copyright (c) 2009 The Go Authors. All rights reserved
Expand Down
4 changes: 2 additions & 2 deletions cmd/agent/common/path/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/config/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5
github.com/DataDog/viper v1.13.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.18.2
)

Expand Down
4 changes: 2 additions & 2 deletions comp/core/config/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/hostname/hostnameinterface/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util

require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.18.2
)

Expand Down
4 changes: 2 additions & 2 deletions comp/core/hostname/hostnameinterface/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/log/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
github.com/DataDog/datadog-agent/pkg/util/log v0.53.1-rc.5
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // v2.6
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.18.2
)

Expand Down
4 changes: 2 additions & 2 deletions comp/core/log/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/secrets/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.53.1-rc.5
github.com/DataDog/datadog-agent/pkg/util/winutil v0.53.1-rc.5
github.com/benbjohnson/clock v1.3.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.18.2
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611
golang.org/x/sys v0.28.0
Expand Down
4 changes: 2 additions & 2 deletions comp/core/secrets/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/status/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.21.9
require (
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.16.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.18.2
golang.org/x/text v0.21.0
)
Expand Down
4 changes: 2 additions & 2 deletions comp/core/status/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/status/statusimpl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/flavor v0.53.1-rc.5
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
github.com/DataDog/datadog-agent/pkg/version v0.53.1-rc.5
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/fx v1.18.2
golang.org/x/text v0.21.0
)
Expand Down
4 changes: 2 additions & 2 deletions comp/core/status/statusimpl/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/core/telemetry/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.53.1-rc.5
github.com/prometheus/client_golang v1.17.0
github.com/prometheus/client_model v0.5.0
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/otel/exporters/prometheus v0.42.0
go.opentelemetry.io/otel/metric v1.20.0
go.opentelemetry.io/otel/sdk/metric v1.20.0
Expand Down
4 changes: 2 additions & 2 deletions comp/core/telemetry/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/forwarder/defaultforwarder/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ require (
github.com/DataDog/datadog-agent/pkg/version v0.53.1-rc.5
github.com/golang/protobuf v1.5.3
github.com/hashicorp/go-multierror v1.1.1
github.com/stretchr/testify v1.9.0
github.com/stretchr/testify v1.10.0
go.uber.org/atomic v1.11.0
go.uber.org/fx v1.18.2
golang.org/x/text v0.21.0
Expand Down
4 changes: 2 additions & 2 deletions comp/forwarder/defaultforwarder/go.sum
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion comp/forwarder/orchestrator/orchestratorinterface/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/stretchr/testify v1.10.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
Expand Down
Loading
Loading