all: faster builds by caching the build cache ⚡

.buildkite/pull-requests.json

@@ -15,6 +15,6 @@
             "skip_target_branches": [ ],
             "skip_ci_on_only_changed": [ ],
             "always_require_ci_on_changed": [ ]
-        }        
+        }
     ]
 }

.buildkite/x-pack/pipeline.xpack.agentbeat.yml

@@ -2,7 +2,6 @@ env:
   ASDF_MAGE_VERSION: 1.15.0
   GCP_HI_PERF_MACHINE_TYPE: "c2d-highcpu-16"
   IMAGE_UBUNTU_X86_64: "family/platform-ingest-beats-ubuntu-2204"
-
   IMAGE_BEATS_WITH_HOOKS_LATEST: "docker.elastic.co/ci-agent-images/platform-ingest/buildkite-agent-beats-ci-with-hooks:latest"
 
 steps:
@@ -40,6 +39,7 @@ steps:
           set -euo pipefail
           cd x-pack/agentbeat
           mage package
+
         artifact_paths:
           - x-pack/agentbeat/build/distributions/**/*
           - "x-pack/agentbeat/build/*.xml"
@@ -60,26 +60,17 @@ steps:
 
       - label: ":linux: Agentbeat/Integration tests Linux"
         key: "agentbeat-it-linux"
-        depends_on:
-          - agentbeat-package-linux
         env:
           ASDF_NODEJS_VERSION: 18.17.1
           PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64"
           SNAPSHOT: true
         command: |
           set -euo pipefail
-          echo "~~~ Downloading artifacts"
-          buildkite-agent artifact download x-pack/agentbeat/build/distributions/** . --step 'agentbeat-package-linux'
-          ls -lah x-pack/agentbeat/build/distributions/
           echo "~~~ Installing @elastic/synthetics with npm"
           npm install -g @elastic/synthetics
           echo "~~~ Running tests"
           cd x-pack/agentbeat
           mage goIntegTest
-        artifact_paths:
-          - x-pack/agentbeat/build/distributions/**/*
-          - "x-pack/agentbeat/build/*.xml"
-          - "x-pack/agentbeat/build/*.json"
         retry:
           automatic:
             - limit: 1

dev-tools/mage/build.go

@@ -21,7 +21,6 @@
 	"errors"
 	"fmt"
 	"go/build"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
@@ -124,8 +123,7 @@
 // environment.
 func GolangCrossBuild(params BuildArgs) error {
 	if os.Getenv("GOLANG_CROSSBUILD") != "1" {
-		return errors.New("Use the crossBuild target. golangCrossBuild can " +
-			"only be executed within the golang-crossbuild docker environment.")
+		return errors.New("use the crossBuild target. golangCrossBuild can only be executed within the golang-crossbuild docker environment")
 	}
 
 	defer DockerChown(filepath.Join(params.OutputDir, params.Name+binaryExtension(GOOS)))
@@ -206,15 +204,15 @@
 	}
 
 	if GOOS == "windows" && params.WinMetadata {
-		log.Println("Generating a .syso containing Windows file metadata.")
+		fmt.Println("Generating a .syso containing Windows file metadata.")
 		syso, err := MakeWindowsSysoFile()
 		if err != nil {
 			return fmt.Errorf("failed generating Windows .syso metadata file: %w", err)
 		}
 		defer os.Remove(syso)
 	}
 
-	log.Println("Adding build environment vars:", env)
+	fmt.Println("Adding build environment vars:", env)
 	return sh.RunWith(env, "go", args...)
 }
 
@@ -248,7 +246,7 @@
 		},
 		StringFileInfo: goversioninfo.StringFileInfo{
 			CompanyName:      BeatVendor,
 			ProductName:      strings.Title(BeatName),
 			ProductVersion:   version,
 			FileVersion:      version,
 			FileDescription:  BeatDescription,

dev-tools/mage/check.go

@@ -22,7 +22,6 @@
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -59,7 +58,7 @@
 
 	if len(changes) > 0 {
 		if mg.Verbose() {
-			GitDiff()
+			_ = GitDiff()
 		}
 
 		return fmt.Errorf("some files are not up-to-date. "+
@@ -229,7 +228,7 @@
 
 	hasErrors := false
 	for _, file := range dashboardFiles {
-		d, err := ioutil.ReadFile(file)
+		d, err := os.ReadFile(file)
 		if err != nil {
 			return fmt.Errorf("failed to read dashboard file %s: %w", file, err)
 		}
@@ -253,7 +252,7 @@
 	var dashboard DashboardObject
 	err := json.Unmarshal(d, &dashboard)
 	if err != nil {
-		fmt.Println(fmt.Sprintf("failed to parse dashboard from %s: %s", file, err))
+		fmt.Printf("failed to parse dashboard from %s: %s\n", file, err)
 		return true
 	}
 
@@ -321,11 +320,11 @@
 			return fmt.Errorf("empty description on dashboard '%s'", d.Attributes.Title)
 		}
 		if err := checkTitle(dashboardTitleRegexp, d.Attributes.Title, module); err != nil {
-			return fmt.Errorf("expected title with format '[%s Module] Some title', found '%s': %w", strings.Title(BeatName), d.Attributes.Title, err)
+			return fmt.Errorf("expected title with format '[%s Module] Some title', found '%s': %w", strings.Title(BeatName), d.Attributes.Title, err) // nolint:staticcheck // strings.Title is deprecated but we need it.
 		}
 	case "visualization":
 		if err := checkTitle(visualizationTitleRegexp, d.Attributes.Title, module); err != nil {
-			return fmt.Errorf("expected title with format 'Some title [%s Module]', found '%s': %w", strings.Title(BeatName), d.Attributes.Title, err)
+			return fmt.Errorf("expected title with format 'Some title [%s Module]', found '%s': %w", strings.Title(BeatName), d.Attributes.Title, err) // nolint:staticcheck // strings.Title is deprecated but we need it.
 		}
 	}
 
@@ -341,7 +340,7 @@
 	if len(match) < 3 {
 		return errors.New("title doesn't match pattern")
 	}
 	beatTitle := strings.Title(BeatName)
 	if match[1] != beatTitle {
 		return fmt.Errorf("expected: '%s', found: '%s'", beatTitle, match[1])
 	}

dev-tools/mage/clean.go

@@ -53,8 +53,7 @@ func Clean(pathLists ...[]string) error {
 			if err := sh.Rm(f); err != nil {
 				if errors.Is(err, os.ErrPermission) ||
 					strings.Contains(err.Error(), "permission denied") {
-					fmt.Printf("warn: cannot delete %q: %v, proceeding anyway\n",
-						f, err)
+					fmt.Printf("warn: cannot delete %q: %v, proceeding anyway\n", f, err)
 					continue
 				}
 				return err