Merge branch 'main' into fix-versions

.buildkite/bk.integration.pipeline.yml

@@ -61,6 +61,41 @@ steps:
         matrix:
           - default
 
+      - label: "Win2025:sudo:{{matrix}}"
+        command: |
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          .buildkite/scripts/integration-tests.ps1 {{matrix}} true
+        artifact_paths:
+          - build/**
+          - build/diagnostics/**
+        agents:
+          provider: "gcp"
+          machineType: "n1-standard-8"
+          image: "family/platform-ingest-elastic-agent-windows-2025"
+        matrix:
+          - default
+          - fleet
+          - fleet-endpoint-security
+          - fleet-privileged
+          - standalone-upgrade
+          - upgrade
+          - upgrade-flavor
+          - install-uninstall
+
+      - label: "Win2025:non-sudo:{{matrix}}"
+        command: |
+          buildkite-agent artifact download build/distributions/** . --step 'packaging-windows' --build ${BUILDKITE_TRIGGERED_FROM_BUILD_ID}
+          .buildkite/scripts/integration-tests.ps1 {{matrix}} false
+        artifact_paths:
+          - build/**
+          - build/diagnostics/**
+        agents:
+          provider: "gcp"
+          machineType: "n1-standard-8"
+          image: "family/platform-ingest-elastic-agent-windows-2025"
+        matrix:
+          - default
+
   - group: "Stateful:Ubuntu"
     key: integration-tests-ubuntu
     depends_on:

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

@@ -79,11 +79,14 @@ steps:
         agents:
           provider: "aws"
           instanceType: "t4g.2xlarge"
-          imagePrefix: "core-ubuntu-2004-aarch64"
+          imagePrefix: "core-ubuntu-2204-aarch64"
         env:
           PLATFORMS: "linux/arm64"
           PACKAGES: "docker"
         command: |
+          echo "Add support for multiarch"
+          docker run --privileged --rm tonistiigi/binfmt:master --install all
+
           if [[ -z "$${MANIFEST_URL}" ]]; then
             export MANIFEST_URL=$(buildkite-agent meta-data get MANIFEST_URL --default "")
             if [[ -z "$${MANIFEST_URL}" ]]; then
@@ -110,10 +113,10 @@ steps:
       DRA_PROJECT_ARTIFACT_ID: "agent-package"
     command: |
       echo "+++ Restoring Artifacts"
-      buildkite-agent artifact download "build/**/*" . 
+      buildkite-agent artifact download "build/**/*" .
 
-      echo "+++ Changing permissions for the release manager"      
-      sudo chmod -R a+r build/distributions/ 
+      echo "+++ Changing permissions for the release manager"
+      sudo chmod -R a+r build/distributions/
       sudo chown -R :1000 build/distributions/
       ls -lahR build/
 

.buildkite/pipeline.yml

@@ -196,7 +196,7 @@ steps:
     artifact_paths:
       - "build/TEST-go-unit.cov"
     agents:
-      image: "golang:1.22.6"
+      image: "golang:1.23.6"
     depends_on:
       - unit-tests
       - extended-windows
@@ -288,6 +288,7 @@ steps:
                 - main.go
 
                 - .buildkite/integration.pipeline.yml
+                - .buildkite/bk.integration.pipeline.yml
                 - .buildkite/pipeline.yml
                 - .buildkite/scripts/
                 - .buildkite/hooks/

.github/workflows/bump-agent-versions.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.21
+          go-version-file: 'go.mod'
 
       - name: Set git config
         run: |

.github/workflows/bump-golang.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@4aca518a70708e38063453d8de9c551af7f48ac3 # 2.75.0
+        uses: updatecli/updatecli-action@d2e5d2667ba67a8599e636531baef731f54858bc # 2.78.1
 
       - name: Run Updatecli in Apply mode
         run: updatecli apply --config .ci/updatecli/updatecli-bump-golang.yml --values .ci/updatecli/values.d/scm.yml

.go-version

@@ -1 +1 @@
-1.22.12
+1.23.6

.golangci.yml

@@ -128,10 +128,6 @@ linters-settings:
       - github.com/fsnotify/fsnotify
       - github.com/openshift/api
 
-  gosimple:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.12"
-
   nolintlint:
     # Enable to ensure that nolint directives are all used. Default is true.
     allow-unused: false
@@ -145,19 +141,11 @@ linters-settings:
     require-specific: false
 
   staticcheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.12"
     checks: ["all"]
 
   stylecheck:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.12"
     checks: ["all"]
 
-  unused:
-    # Select the Go version to target. The default is '1.13'.
-    go: "1.22.12"
-
   gosec:
     excludes:
     - G306 # Expect WriteFile permissions to be 0600 or less

.tool-versions

@@ -1,3 +1,3 @@
 mage 1.14.0
-golang 1.22.9
-terraform 1.9.3
+golang 1.23.6
+terraform 1.9.3

Dockerfile

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22.12
+ARG GO_VERSION=1.23.6
 FROM circleci/golang:${GO_VERSION}
 
 
@@ -7,7 +7,6 @@ ARG TEST_RESULTS=/tmp/test-results
 RUN mkdir -p ${TEST_RESULTS} && mkdir -p ./code
 RUN go get github.com/magefile/mage
 
-ENV GO111MODULE=on
 WORKDIR ./code
 #COPY --chown=circleci:circleci . .
 COPY . .

Dockerfile.skaffold

@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22.12
+ARG GO_VERSION=1.23.6
 ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
 ARG AGENT_VERSION=8.9.0-SNAPSHOT
 ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"

Makefile

@@ -51,7 +51,7 @@ check:
 ## check-go: download and run the go linter.
 .PHONY: check-go
 check-go: ## - Run golangci-lint
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.55.2
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.60.1
 	@./bin/golangci-lint run -v
 
 ## check-no-changes : Check there is no local changes.