Merge pull request #265 from grafana/set-build-version

Set version from runtime build info

build-package.sh

@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 ARCH=$(go env GOARCH)
 BUILD="build"
@@ -7,7 +7,7 @@ DIST="dist"
 PKG=""
 NAME="xk6-disruptor"
 OS=$(go env GOOS)
-VERSION="latest"
+VERSION=""
 
 function usage() {
 cat << EOF
@@ -33,7 +33,6 @@ options:
   -v, --version: package version in semver formatf
   -y, --binary: name of the binary (default is name-os-arch)
 
-
 EOF
 }
 
@@ -59,6 +58,13 @@ function build() {
     binary="$NAME-$os-$arch"
   fi
 
+  # set disruptor version to use for build
+  mod=$(go list -m)
+  replace="."
+  if [[ ! -z $version ]]; then
+    replace=${mod}@${version}
+  fi
+
   #start sub shell to create its own environment
   (
    if [[ $os == "linux" ]]; then # disable cross-compiling for linux
@@ -67,8 +73,8 @@ function build() {
 
    export GOARCH=$arch
    export GOOS=$os
-   export XK6_BUILD_FLAGS='-ldflags "-w -s -X github.com/grafana/xk6-disruptor/pkg/internal/consts.Version='${version}'"'
-   xk6 build --with $(go list -m)=. --output $BUILD/$binary
+   export XK6_BUILD_FLAGS='-ldflags "-w -s'
+   xk6 build --with $mod=${replace} --output $BUILD/$binary
   )
 }
 

pkg/disruptors/controller.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grafana/xk6-disruptor/pkg/internal/consts"
+	"github.com/grafana/xk6-disruptor/pkg/internal/version"
 
 	"github.com/grafana/xk6-disruptor/pkg/kubernetes/helpers"
 
@@ -44,7 +44,7 @@ func (c *agentController) InjectDisruptorAgent(ctx context.Context) error {
 	agentContainer := corev1.EphemeralContainer{
 		EphemeralContainerCommon: corev1.EphemeralContainerCommon{
 			Name:            "xk6-agent",
-			Image:           consts.AgentImage(),
+			Image:           version.AgentImage(),
 			ImagePullPolicy: corev1.PullIfNotPresent,
 			SecurityContext: &corev1.SecurityContext{
 				Capabilities: &corev1.Capabilities{

pkg/internal/version/version.go

@@ -0,0 +1,39 @@
+// Package version provide information about the build version
+package version
+
+import (
+	"runtime/debug"
+)
+
+const xk6DisruptorPath = "github.com/grafana/xk6-disruptor"
+
+// DisruptorVersion returns the version of the currently executed disruptor
+func DisruptorVersion() string {
+	if bi, ok := debug.ReadBuildInfo(); ok {
+		for _, d := range bi.Deps {
+			if d.Path == xk6DisruptorPath {
+				if d.Replace != nil {
+					return d.Replace.Version
+				}
+				return d.Version
+			}
+		}
+	}
+
+	return ""
+}
+
+// AgentImage returns the name of the agent image that corresponds to
+// this version of the extension.
+func AgentImage() string {
+	tag := "latest"
+
+	// if a specific version of the disruptor was built, use it for agent's tag
+	// (go test sets version to "")
+	dv := DisruptorVersion()
+	if dv != "" && dv != "(devel)" {
+		tag = dv
+	}
+
+	return "ghcr.io/grafana/xk6-disruptor-agent:" + tag
+}