Skip to content

Commit 7d9ae63

Browse files
swiatekmswiatekm
committed
Merge branch 'main' into isolation/move_edot_in_a_separate_package
2 parents 81e97fc + 988105a commit 7d9ae63

File tree

84 files changed

+3784
-881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+3784
-881
lines changed

‎.buildkite/bk.integration-fips.pipeline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ env:
44
ASDF_MAGE_VERSION: 1.14.0
55
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
66

7-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1760749288"
8-
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1760749288"
9-
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1760749288"
7+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1761958868"
8+
IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1761958868"
9+
IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1761958868"
1010
ASDF_TERRAFORM_VERSION: 1.9.2
1111

1212
# This section is used to define the plugins that will be used in the pipeline.

‎.buildkite/bk.integration.pipeline.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1760749288"
10-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1760749288"
11-
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1760749288"
12-
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1760749288"
13-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1760749288"
14-
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1760749288"
9+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1761958868"
10+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1761958868"
11+
IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1761958868"
12+
IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1761958868"
13+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1761958868"
14+
IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1761958868"
1515
ASDF_TERRAFORM_VERSION: 1.9.2
1616

1717
# This section is used to define the plugins that will be used in the pipeline.

‎.buildkite/integration.pipeline.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ env:
66

77
# The following images are defined here and their values will be updated by updatecli
88
# Please do not change them manually.
9-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1760749288"
10-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1760749288"
9+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1761958868"
10+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1761958868"
1111

1212
common:
1313
- vault_docker_login: &vault_docker_login

‎.buildkite/pipeline.elastic-agent-binary-dra.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ env:
99

1010
# The following images are defined here and their values will be updated by updatecli
1111
# Please do not change them manually.
12-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1760749288"
13-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1760749288"
12+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1761958868"
13+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1761958868"
1414

1515
# This section is used to define the plugins that will be used in the pipeline.
1616
# See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins

‎.buildkite/pipeline.elastic-agent-package.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ env:
77

88
# The following images are defined here and their values will be updated by updatecli
99
# Please do not change them manually.
10-
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1760749288"
11-
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1760749288"
10+
IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1761958868"
11+
IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1761958868"
1212

1313
steps:
1414
- input: "Build parameters"

‎.buildkite/pipeline.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ env:
55

66
# The following images are defined here and their values will be updated by updatecli
77
# Please do not change them manually.
8-
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1760749288"
9-
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1760749288"
10-
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1760749288"
11-
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1760749288"
12-
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1760749288"
13-
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1760749288"
8+
IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1761958868"
9+
IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1761958868"
10+
IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1761958868"
11+
IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1761958868"
12+
IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1761958868"
13+
IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1761958868"
1414

1515
steps:
1616
- label: "check-ci"
@@ -66,10 +66,12 @@ steps:
6666

6767
- label: "Unit tests - fips140=only Ubuntu 22.04"
6868
key: "unit-tests-2204-fips140-only"
69-
command: ".buildkite/scripts/steps/unit-tests.sh"
69+
# Note: The GODEBUG=fips140=only environment variable must be set in the command itself (as opposed to
70+
# in the env block) so that it is applied *only* to the 'go' command invoked by the script, and
71+
# not to any other Go code executed as part of the Buildkite agent itself.
72+
command: 'GODEBUG="fips140=only" .buildkite/scripts/steps/unit-tests.sh'
7073
env:
7174
FIPS: "true"
72-
GODEBUG: "fips140=only"
7375
artifact_paths:
7476
- "build/TEST-*.html"
7577
- "build/TEST-*.xml"

‎.mockery.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ filename: mocks.go
55
template-data:
66
unroll-variadic: true
77
packages:
8+
github.com/elastic/elastic-agent/internal/pkg/agent/application:
9+
interfaces:
10+
rollbacksSource: {}
811
github.com/elastic/elastic-agent/internal/pkg/agent/application/actions/handlers:
912
interfaces:
1013
Uploader: {}

‎.package-version‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"version": "9.3.0-SNAPSHOT",
3-
"build_id": "9.3.0-5f715419",
4-
"manifest_url": "https://snapshots.elastic.co/9.3.0-5f715419/manifest-9.3.0-SNAPSHOT.json",
5-
"summary_url": "https://snapshots.elastic.co/9.3.0-5f715419/summary-9.3.0-SNAPSHOT.html",
3+
"build_id": "9.3.0-6f40f4f1",
4+
"manifest_url": "https://snapshots.elastic.co/9.3.0-6f40f4f1/manifest-9.3.0-SNAPSHOT.json",
5+
"summary_url": "https://snapshots.elastic.co/9.3.0-6f40f4f1/summary-9.3.0-SNAPSHOT.html",
66
"core_version": "9.3.0",
7-
"stack_build_id": "9.3.0-5f715419-SNAPSHOT"
7+
"stack_build_id": "9.3.0-6f40f4f1-SNAPSHOT"
88
}

‎NOTICE-fips.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20251029082016-ed6848fefe22
790+
Version: v7.0.0-alpha2.0.20251104195902-4ded660aa9fc
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20251029082016-ed6848fefe22/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20251104195902-4ded660aa9fc/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -1254,11 +1254,11 @@ SOFTWARE
12541254

12551255
--------------------------------------------------------------------------------
12561256
Dependency : github.com/elastic/elastic-agent-libs
1257-
Version: v0.25.0
1257+
Version: v0.26.0
12581258
Licence type (autodetected): Apache-2.0
12591259
--------------------------------------------------------------------------------
12601260

1261-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.25.0/LICENSE:
1261+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.26.0/LICENSE:
12621262

12631263
Apache License
12641264
Version 2.0, January 2004

‎NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
787787

788788
--------------------------------------------------------------------------------
789789
Dependency : github.com/elastic/beats/v7
790-
Version: v7.0.0-alpha2.0.20251029082016-ed6848fefe22
790+
Version: v7.0.0-alpha2.0.20251104195902-4ded660aa9fc
791791
Licence type (autodetected): Elastic
792792
--------------------------------------------------------------------------------
793793

794-
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20251029082016-ed6848fefe22/LICENSE.txt:
794+
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20251104195902-4ded660aa9fc/LICENSE.txt:
795795

796796
Source code in this repository is variously licensed under the Apache License
797797
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -1254,11 +1254,11 @@ SOFTWARE
12541254

12551255
--------------------------------------------------------------------------------
12561256
Dependency : github.com/elastic/elastic-agent-libs
1257-
Version: v0.25.0
1257+
Version: v0.26.0
12581258
Licence type (autodetected): Apache-2.0
12591259
--------------------------------------------------------------------------------
12601260

1261-
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.25.0/LICENSE:
1261+
Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.26.0/LICENSE:
12621262

12631263
Apache License
12641264
Version 2.0, January 2004

0 commit comments

Comments
 (0)