-
Notifications
You must be signed in to change notification settings - Fork 155
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.
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
Enhancement/5039 remove x crypto fips #7072
base: main
Are you sure you want to change the base?
Changes from all commits
4a13416
0bd348d
a13ee77
bfb4012
c719d55
457ad15
ecea4ae
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# Kind can be one of: | ||
# - breaking-change: a change to previously-documented behavior | ||
# - deprecation: functionality that is being removed in a later release | ||
# - bug-fix: fixes a problem in a previous version | ||
# - enhancement: extends functionality but does not break or fix existing behavior | ||
# - feature: new functionality | ||
# - known-issue: problems that we are aware of in a given version | ||
# - security: impacts on the security of a product or a user’s deployment. | ||
# - upgrade: important information for someone upgrading from a prior version | ||
# - other: does not fit into any of the other categories | ||
kind: enhancement | ||
|
||
# Change summary; a 80ish characters long description of the change. | ||
summary: Replaces x/crypto/pbkdf2 with the stdlib pbkdf2. Bumps go version to 1.24. Bumps beats version to commit cd883f511c3c | ||
|
||
# Long description; in case the summary is not enough to describe the change | ||
# this field accommodate a description without length limits. | ||
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. | ||
#description: | ||
|
||
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc. | ||
component: "elastic-agent" | ||
|
||
# PR URL; optional; the PR number that added the changeset. | ||
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. | ||
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. | ||
# Please provide it if you are adding a fragment for a different PR. | ||
pr: https://github.com/elastic/elastic-agent/pull/7072 | ||
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). | ||
# If not present is automatically filled by the tooling with the issue linked to the PR number. | ||
issue: https://github.com/elastic/ingest-dev/issues/5039 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,10 +13,10 @@ require ( | |
github.com/docker/docker v27.5.1+incompatible | ||
github.com/docker/go-units v0.5.0 | ||
github.com/dolmen-go/contextio v0.0.0-20200217195037-68fc5150bcd5 | ||
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250218044933-ef79280d53a2 | ||
github.com/elastic/beats/v7 v7.0.0-alpha2.0.20250305185131-1db044487726 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ah also, beats bump can't be backported (each branch targets a different branch). You might want to leave the bump out to make the PR easier to backport 🙂 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. makes sense, I'll move the beats version bump to another PR |
||
github.com/elastic/elastic-agent-autodiscover v0.9.0 | ||
github.com/elastic/elastic-agent-client/v7 v7.17.1 | ||
github.com/elastic/elastic-agent-libs v0.18.8 | ||
github.com/elastic/elastic-agent-libs v0.18.9-0.20250305191329-ed5e3c2bdf69 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 0.18.9 is out now, so we can use it here instead of a dev version. |
||
github.com/elastic/elastic-agent-system-metrics v0.11.8 | ||
github.com/elastic/elastic-transport-go/v8 v8.6.1 | ||
github.com/elastic/go-elasticsearch/v8 v8.17.1 | ||
|
@@ -28,18 +28,18 @@ require ( | |
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.13.0 | ||
github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor v0.3.0 | ||
github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.4.0 | ||
github.com/fatih/color v1.17.0 | ||
github.com/fatih/color v1.18.0 | ||
github.com/fsnotify/fsnotify v1.8.0 | ||
github.com/go-viper/mapstructure/v2 v2.2.1 | ||
github.com/gofrs/flock v0.12.1 | ||
github.com/gofrs/uuid/v5 v5.2.0 | ||
github.com/gofrs/uuid/v5 v5.3.1 | ||
github.com/google/go-cmp v0.6.0 | ||
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 | ||
github.com/gorilla/mux v1.8.1 | ||
github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 | ||
github.com/jaypipes/ghw v0.12.0 | ||
github.com/jedib0t/go-pretty/v6 v6.4.6 | ||
github.com/josephspurrier/goversioninfo v1.4.0 | ||
github.com/josephspurrier/goversioninfo v1.4.1 | ||
github.com/kardianos/service v1.2.1-0.20210728001519-a323c3813bc7 | ||
github.com/magefile/mage v1.15.0 | ||
github.com/oklog/ulid/v2 v2.1.0 | ||
|
@@ -71,25 +71,25 @@ require ( | |
go.elastic.co/apm/module/apmgorilla/v2 v2.6.0 | ||
go.elastic.co/apm/module/apmgrpc/v2 v2.6.0 | ||
go.elastic.co/apm/v2 v2.6.3 | ||
go.elastic.co/ecszap v1.0.2 | ||
go.elastic.co/ecszap v1.0.3 | ||
go.elastic.co/go-licence-detector v0.7.0 | ||
go.opentelemetry.io/collector/component/componentstatus v0.119.0 | ||
go.opentelemetry.io/collector/pipeline v0.119.0 | ||
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.119.0 | ||
go.opentelemetry.io/collector/receiver/nopreceiver v0.119.0 | ||
go.uber.org/zap v1.27.0 | ||
golang.org/x/crypto v0.32.0 | ||
golang.org/x/crypto v0.36.0 | ||
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 | ||
golang.org/x/net v0.34.0 | ||
golang.org/x/sync v0.10.0 | ||
golang.org/x/sys v0.29.0 | ||
golang.org/x/term v0.28.0 | ||
golang.org/x/text v0.21.0 | ||
golang.org/x/net v0.36.0 | ||
golang.org/x/sync v0.12.0 | ||
golang.org/x/sys v0.31.0 | ||
golang.org/x/term v0.30.0 | ||
golang.org/x/text v0.23.0 | ||
golang.org/x/time v0.8.0 | ||
golang.org/x/tools v0.25.0 | ||
golang.org/x/tools v0.30.0 | ||
google.golang.org/api v0.214.0 | ||
google.golang.org/grpc v1.70.0 | ||
google.golang.org/protobuf v1.36.4 | ||
google.golang.org/grpc v1.71.0 | ||
google.golang.org/protobuf v1.36.5 | ||
gopkg.in/ini.v1 v1.67.0 | ||
gopkg.in/yaml.v2 v2.4.0 | ||
gopkg.in/yaml.v3 v3.0.1 | ||
|
@@ -148,7 +148,7 @@ require ( | |
|
||
require ( | ||
aqwari.net/xml v0.0.0-20210331023308-d9421b293817 // indirect | ||
cel.dev/expr v0.19.0 // indirect | ||
cel.dev/expr v0.19.1 // indirect | ||
cloud.google.com/go v0.116.0 // indirect | ||
cloud.google.com/go/auth v0.13.0 // indirect | ||
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect | ||
|
@@ -166,16 +166,16 @@ require ( | |
github.com/Azure/azure-event-hubs-go/v3 v3.6.1 // indirect | ||
github.com/Azure/azure-pipeline-go v0.2.3 // indirect | ||
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.2.1 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs v1.3.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v4 v4.8.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 // indirect | ||
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0 // indirect | ||
github.com/Azure/azure-storage-blob-go v0.15.0 // indirect | ||
github.com/Azure/go-amqp v1.0.5 // indirect | ||
github.com/Azure/go-amqp v1.3.0 // indirect | ||
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect | ||
github.com/Azure/go-autorest v14.2.0+incompatible // indirect | ||
github.com/Azure/go-autorest/autorest v0.11.29 // indirect | ||
|
@@ -186,7 +186,7 @@ require ( | |
github.com/Azure/go-autorest/logger v0.2.1 // indirect | ||
github.com/Azure/go-autorest/tracing v0.6.0 // indirect | ||
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect | ||
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect | ||
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect | ||
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect | ||
github.com/Code-Hex/go-generics-cache v1.5.1 // indirect | ||
github.com/DataDog/zstd v1.4.5 // indirect | ||
|
@@ -245,12 +245,11 @@ require ( | |
github.com/axiomhq/hyperloglog v0.2.0 // indirect | ||
github.com/beorn7/perks v1.0.1 // indirect | ||
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect | ||
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect | ||
github.com/chai2010/gettext-go v1.0.2 // indirect | ||
github.com/cloudfoundry-community/go-cfclient v0.0.0-20190808214049-35bcce23fc5f // indirect | ||
github.com/cloudfoundry/noaa v2.1.0+incompatible // indirect | ||
github.com/cloudfoundry/sonde-go v0.0.0-20171206171820-b33733203bb4 // indirect | ||
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect | ||
github.com/cncf/xds/go v0.0.0-20241223141626-cff3c89139a3 // indirect | ||
github.com/cockroachdb/errors v1.11.3 // indirect | ||
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect | ||
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect | ||
|
@@ -272,15 +271,15 @@ require ( | |
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect | ||
github.com/digitalocean/go-libvirt v0.0.0-20240709142323-d8406205c752 // indirect | ||
github.com/digitalocean/godo v1.122.0 // indirect | ||
github.com/dlclark/regexp2 v1.4.0 // indirect | ||
github.com/dlclark/regexp2 v1.11.5 // indirect | ||
github.com/dnephin/pflag v1.0.7 // indirect | ||
github.com/docker/cli v25.0.1+incompatible // indirect | ||
github.com/docker/distribution v2.8.3+incompatible // indirect | ||
github.com/docker/docker-credential-helpers v0.7.0 // indirect | ||
github.com/docker/go-connections v0.5.0 // indirect | ||
github.com/docker/go-metrics v0.0.1 // indirect | ||
github.com/dop251/goja v0.0.0-20200831102558-9af81ddcf0e1 // indirect | ||
github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 // indirect | ||
github.com/dop251/goja v0.0.0-20250125213203-5ef83b82af17 // indirect | ||
github.com/dop251/goja_nodejs v0.0.0-20250217171036-ba90ff8d8790 // indirect | ||
github.com/dustin/go-humanize v1.0.1 // indirect | ||
github.com/eapache/go-resiliency v1.7.0 // indirect | ||
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect | ||
|
@@ -304,8 +303,8 @@ require ( | |
github.com/elastic/pkcs8 v1.0.0 // indirect | ||
github.com/elastic/sarama v1.19.1-0.20241120141909-c7eabfcee7e5 // indirect | ||
github.com/emicklei/go-restful/v3 v3.11.0 // indirect | ||
github.com/envoyproxy/go-control-plane v0.13.1 // indirect | ||
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect | ||
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect | ||
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect | ||
github.com/evanphx/json-patch v5.7.0+incompatible // indirect | ||
github.com/evanphx/json-patch/v5 v5.9.0 // indirect | ||
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect | ||
|
@@ -329,7 +328,7 @@ require ( | |
github.com/go-openapi/jsonreference v0.20.4 // indirect | ||
github.com/go-openapi/swag v0.22.9 // indirect | ||
github.com/go-resty/resty/v2 v2.13.1 // indirect | ||
github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect | ||
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect | ||
github.com/go-sql-driver/mysql v1.6.0 // indirect | ||
github.com/go-zookeeper/zk v1.0.3 // indirect | ||
github.com/gobwas/glob v0.2.3 // indirect | ||
|
@@ -421,7 +420,7 @@ require ( | |
github.com/linode/linodego v1.40.0 // indirect | ||
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect | ||
github.com/mailru/easyjson v0.7.7 // indirect | ||
github.com/mattn/go-colorable v0.1.13 // indirect | ||
github.com/mattn/go-colorable v0.1.14 // indirect | ||
github.com/mattn/go-ieproxy v0.0.1 // indirect | ||
github.com/mattn/go-isatty v0.0.20 // indirect | ||
github.com/mattn/go-runewidth v0.0.15 // indirect | ||
|
@@ -542,7 +541,7 @@ require ( | |
go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3 // indirect | ||
go.elastic.co/apm/module/apmhttp/v2 v2.6.3 // indirect | ||
go.elastic.co/apm/module/apmzap/v2 v2.6.3 // indirect | ||
go.elastic.co/fastjson v1.4.0 // indirect | ||
go.elastic.co/fastjson v1.5.0 // indirect | ||
go.etcd.io/bbolt v1.3.11 // indirect | ||
go.mongodb.org/mongo-driver v1.14.0 // indirect | ||
go.opencensus.io v0.24.0 // indirect | ||
|
@@ -561,7 +560,7 @@ require ( | |
go.opentelemetry.io/collector/config/configtls v1.25.0 // indirect | ||
go.opentelemetry.io/collector/connector/connectortest v0.119.0 // indirect | ||
go.opentelemetry.io/collector/connector/xconnector v0.119.0 // indirect | ||
go.opentelemetry.io/collector/consumer v1.25.0 // indirect | ||
go.opentelemetry.io/collector/consumer v1.27.0 // indirect | ||
go.opentelemetry.io/collector/consumer/consumererror v0.119.0 // indirect | ||
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.119.0 // indirect | ||
go.opentelemetry.io/collector/consumer/consumertest v0.119.0 // indirect | ||
|
@@ -577,7 +576,7 @@ require ( | |
go.opentelemetry.io/collector/internal/fanoutconsumer v0.119.0 // indirect | ||
go.opentelemetry.io/collector/internal/memorylimiter v0.119.0 // indirect | ||
go.opentelemetry.io/collector/internal/sharedcomponent v0.119.0 // indirect | ||
go.opentelemetry.io/collector/pdata v1.25.0 // indirect | ||
go.opentelemetry.io/collector/pdata v1.27.0 // indirect | ||
go.opentelemetry.io/collector/pdata/pprofile v0.119.0 // indirect | ||
go.opentelemetry.io/collector/pdata/testdata v0.119.0 // indirect | ||
go.opentelemetry.io/collector/pipeline/xpipeline v0.119.0 // indirect | ||
|
@@ -592,7 +591,7 @@ require ( | |
go.opentelemetry.io/collector/service v0.119.0 // indirect | ||
go.opentelemetry.io/contrib/bridges/otelzap v0.9.0 // indirect | ||
go.opentelemetry.io/contrib/config v0.14.0 // indirect | ||
go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect | ||
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect | ||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect | ||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect | ||
go.opentelemetry.io/contrib/propagators/b3 v1.34.0 // indirect | ||
|
@@ -618,13 +617,13 @@ require ( | |
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect | ||
go.uber.org/atomic v1.11.0 // indirect | ||
go.uber.org/multierr v1.11.0 // indirect | ||
golang.org/x/mod v0.21.0 // indirect | ||
golang.org/x/oauth2 v0.24.0 // indirect | ||
golang.org/x/mod v0.23.0 // indirect | ||
golang.org/x/oauth2 v0.25.0 // indirect | ||
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect | ||
gonum.org/v1/gonum v0.15.1 // indirect | ||
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect | ||
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect | ||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect | ||
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect | ||
gopkg.in/inf.v0 v0.9.1 // indirect | ||
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect | ||
|
@@ -652,6 +651,7 @@ require ( | |
|
||
replace ( | ||
github.com/dop251/goja => github.com/elastic/goja v0.0.0-20190128172624-dd2ac4456e20 | ||
github.com/dop251/goja_nodejs => github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6 | ||
// fsnotify and goja are required for beats import | ||
github.com/fsnotify/fsnotify => github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 | ||
// openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need a changelog ? This shouldn't be user-facing 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, added it without thinking, removing it right away