feat: fetch precompiled xk6 extension from grafana/xk6-sm (#966)

* Dockerfiles: ADD sm-k6 from grafana/xk6-sm releases

* renovate: upgrade grafana/xk6-sm releases URLs

* make: add target to pull sm-k6 from grafana/xk6-sm repo

* renovate: update xk6-sm version in makefile

* scripts/package: source sm-k6 binary from current path

* xk6: remove source tree and make targets

* ci: call `make sm-k6` for workflows that need a k6 binary

* prober/multihttp: use k6 binary from dest repo for `make sm-k6`

.github/renovate.json5

@@ -19,13 +19,17 @@
   ],
   "customManagers": [
     {
-      // Update k6 version in Dockerfiles.
+      // Update xk6-sm
       "customType": "regex",
+      "depNameTemplate": "grafana/xk6-sm",
       "datasourceTemplate": "github-releases",
-      "depNameTemplate": "grafana/k6",
-      "fileMatch": [".*\\.mk"],
+      "versioningTemplate": "semver",
+      "fileMatch": [
+        "Dockerfile",
+        "scripts/make/sm-k6.mk"
+      ],
       "matchStrings": [
-        "(?:^|\\n)[ \\t]*K6_VERSION\\s*:=\\s*(?<currentValue>\\S+)[ \\t]*(?:$|\\n)"
+        "https://github.com/grafana/xk6-sm/releases/download/(?<currentValue>[^/]+)/"
       ]
     }
   ]

.github/workflows/build_and_publish.yaml

@@ -77,6 +77,9 @@ jobs:
       - name: build
         run: make build-native
 
+      - name: Download sm-k6
+        run: make sm-k6-native
+
       - name: lint
         run: make lint
 

.github/workflows/validate_pr.yaml

@@ -54,6 +54,9 @@ jobs:
       - name: build
         run: make build-native
 
+      - name: Download sm-k6
+        run: make sm-k6-native
+
       - name: lint
         run: make lint
 

Dockerfile

@@ -10,8 +10,8 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG HOST_DIST=$TARGETOS-$TARGETARCH
 
+ADD --chmod=0555 https://github.com/grafana/xk6-sm/releases/download/v0.0.3-pre/sm-k6-${TARGETOS}-${TARGETARCH} /usr/local/bin/sm-k6
 COPY dist/${HOST_DIST}/synthetic-monitoring-agent /usr/local/bin/synthetic-monitoring-agent
-COPY dist/${HOST_DIST}/k6 /usr/local/bin/sm-k6
 COPY scripts/pre-stop.sh /usr/local/lib/synthetic-monitoring-agent/pre-stop.sh
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 

Dockerfile.build

@@ -10,8 +10,8 @@ ARG TARGETOS
 ARG TARGETARCH
 ARG HOST_DIST=$TARGETOS-$TARGETARCH
 
+ADD --chmod=0555 https://github.com/grafana/xk6-sm/releases/download/v0.0.3-pre/sm-k6-${TARGETOS}-${TARGETARCH} /usr/local/bin/sm-k6
 COPY dist/${HOST_DIST}/synthetic-monitoring-agent /usr/local/bin/synthetic-monitoring-agent
-COPY dist/${HOST_DIST}/k6 /usr/local/bin/sm-k6
 COPY scripts/pre-stop.sh /usr/local/lib/synthetic-monitoring-agent/pre-stop.sh
 COPY --from=build /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 

Makefile

@@ -23,5 +23,5 @@ include $(ROOTDIR)/scripts/make/build.mk
 include $(ROOTDIR)/scripts/make/testing.mk
 include $(ROOTDIR)/scripts/make/linters.mk
 include $(ROOTDIR)/scripts/make/release.mk
+include $(ROOTDIR)/scripts/make/sm-k6.mk
 include $(ROOTDIR)/scripts/make/helpers.mk
-include $(ROOTDIR)/scripts/make/xk6.mk

internal/prober/multihttp/script_test.go

@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 
@@ -852,7 +853,8 @@ func TestSettingsToScript(t *testing.T) {
 	t.Cleanup(cancel)
 	// logger := zerolog.New(zerolog.NewTestWriter(t))
 	logger := zerolog.Nop()
-	k6path := filepath.Join(testhelper.ModuleDir(t), "dist", "k6")
+	k6path := filepath.Join(testhelper.ModuleDir(t), "dist", runtime.GOOS+"-"+runtime.GOARCH, "sm-k6")
+	t.Log(k6path)
 	runner := k6runner.New(k6runner.RunnerOpts{Uri: k6path})
 
 	prober, err := NewProber(ctx, check, logger, runner, http.Header{})

scripts/make/sm-k6.mk

@@ -0,0 +1,21 @@
+XK6_PLATFORMS := $(filter-out linux/arm,$(PLATFORMS)) darwin/arm64 darwin/amd64
+
+.PHONY: sm-k6
+sm-k6:
+	@true
+
+define sm-k6
+$(DISTDIR)/$(1)-$(2)/sm-k6:
+	mkdir -p "$(DISTDIR)/$(1)-$(2)"
+	# Renovate updates the following line. Keep its syntax as it is.
+	curl -sSL https://github.com/grafana/xk6-sm/releases/download/v0.0.3/sm-k6-$(1)-$(2) -o "$$@"
+	chmod +x "$$@"
+
+sm-k6: $(DISTDIR)/$(1)-$(2)/sm-k6
+endef
+
+$(foreach BUILD_PLATFORM,$(XK6_PLATFORMS), \
+	$(eval $(call sm-k6,$(word 1,$(subst /, ,$(BUILD_PLATFORM))),$(word 2,$(subst /, ,$(BUILD_PLATFORM))))))
+
+.PHONY: sm-k6-native
+sm-k6-native: $(DISTDIR)/$(HOST_OS)-$(HOST_ARCH)/sm-k6

scripts/make/vars.mk

@@ -23,5 +23,4 @@ ifeq ($(USE_LOCAL_TOOLS),true)
 GOLANGCI_LINT := golangci-lint
 GOTESTSUM     := gotestsum
 SHELLCHECK    := shellcheck
-XK6           := xk6
 endif

scripts/package/nfpm.yaml.template

@@ -21,7 +21,7 @@ contents:
   dst: /etc/systemd/system/synthetic-monitoring-agent.service
 
 # Copy k6 as sm-k6 to prevent clashing with k6 if it's installed.
-- src: {{.DISTDIR}}/{{.Os}}-{{.Arch}}/k6
+- src: {{.DISTDIR}}/{{.Os}}-{{.Arch}}/sm-k6
   dst: /usr/bin/sm-k6
 rpm:
 deb: