chore: support go1.25 (#135)

RomainMuller · web-flow · commit 5bcb13a969fd · 2025-06-13T13:17:22.000+02:00
Allows go1.25 and introduces a "maybe supported" option in the CI
script, as it's not certain whether a dev release is supported or not
supported (and it being binary makes it impossible to do early testing).
diff --git a/.github/workflows/ci.sh b/.github/workflows/ci.sh
@@ -18,7 +18,7 @@ contains() {
 WAF_ENABLED=$([ "$GOOS" = "windows" ] && echo false || echo true)
 
 if $(contains "$GOVERSION" devel); then
-    WAF_ENABLED=false
+    WAF_ENABLED=maybe
 fi
 
 # run is the main function that runs the tests
@@ -32,7 +32,7 @@ run() {
     test_tags="$2,$GOOS,$GOARCH"
     cgo=$($(contains "$2" cgo) && echo 1 || echo 0)
 
-    echo "Running matrix $test_tags where the WAF is" "$($waf_enabled && echo "supported" || echo "not supported")" "..."
+    echo "Running matrix $test_tags where the WAF is enablement is ${waf_enabled}..."
     env CGO_ENABLED="$cgo" go test -shuffle=on -tags="$tags" -args -waf-build-tags="$test_tags" -waf-supported="$waf_enabled" ./...
 
     if ! $waf_enabled; then
diff --git a/_tools/libddwaf-updater/update.go b/_tools/libddwaf-updater/update.go
@@ -32,7 +32,7 @@ var (
 )
 
 const (
-	goVersionUnsupported = "go1.25"
+	goVersionUnsupported = "go1.26"
 )
 
 var (
diff --git a/alignement_test.go b/alignement_test.go
@@ -4,7 +4,7 @@
 // Copyright 2016-present Datadog, Inc.
 
 // Purego only works on linux/macOS with amd64 and arm64 from now
-//go:build (linux || darwin) && (amd64 || arm64) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (linux || darwin) && (amd64 || arm64) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package libddwaf
 
diff --git a/builder_test.go b/builder_test.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (amd64 || arm64) && (linux || darwin) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (amd64 || arm64) && (linux || darwin) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package libddwaf
 
diff --git a/encoder_decoder_test.go b/encoder_decoder_test.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (amd64 || arm64) && (linux || darwin) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (amd64 || arm64) && (linux || darwin) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package libddwaf
 
diff --git a/internal/bindings/libddwaf.go b/internal/bindings/libddwaf.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (linux || darwin) && (amd64 || arm64) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (linux || darwin) && (amd64 || arm64) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package bindings
 
diff --git a/internal/bindings/waf_dl.go b/internal/bindings/waf_dl.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (linux || darwin) && (amd64 || arm64) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (linux || darwin) && (amd64 || arm64) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package bindings
 
diff --git a/internal/bindings/waf_dl_test.go b/internal/bindings/waf_dl_test.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (linux || darwin) && (amd64 || arm64) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (linux || darwin) && (amd64 || arm64) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package bindings
 
diff --git a/internal/bindings/waf_dl_unsupported.go b/internal/bindings/waf_dl_unsupported.go
@@ -4,7 +4,7 @@
 // Copyright 2016-present Datadog, Inc.
 
 // Build when the target OS or architecture are not supported
-//go:build (!linux && !darwin) || (!amd64 && !arm64) || go1.25 || datadog.no_waf || (!cgo && !appsec)
+//go:build (!linux && !darwin) || (!amd64 && !arm64) || go1.26 || datadog.no_waf || (!cgo && !appsec)
 
 package bindings
 
diff --git a/internal/lib/dump_waf_darwin.go b/internal/lib/dump_waf_darwin.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build darwin && (amd64 || arm64) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build darwin && (amd64 || arm64) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package lib
 
diff --git a/internal/lib/dump_waf_linux.go b/internal/lib/dump_waf_linux.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build linux && (amd64 || arm64) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build linux && (amd64 || arm64) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package lib
 
diff --git a/internal/lib/lib_darwin_amd64.go b/internal/lib/lib_darwin_amd64.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build darwin && amd64 && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build darwin && amd64 && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package lib
 
diff --git a/internal/lib/lib_darwin_arm64.go b/internal/lib/lib_darwin_arm64.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build darwin && arm64 && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build darwin && arm64 && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package lib
 
diff --git a/internal/lib/lib_linux_amd64.go b/internal/lib/lib_linux_amd64.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build linux && amd64 && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build linux && amd64 && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package lib
 
diff --git a/internal/lib/lib_linux_arm64.go b/internal/lib/lib_linux_arm64.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build linux && arm64 && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build linux && arm64 && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package lib
 
diff --git a/internal/log/log_purego.go b/internal/log/log_purego.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build !cgo && (darwin || freebsd) && !datadog.no_waf && !go1.25
+//go:build !cgo && (darwin || freebsd) && !datadog.no_waf && !go1.26
 
 package log
 
diff --git a/internal/log/log_unsupported.go b/internal/log/log_unsupported.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (!cgo && ((!darwin && !freebsd) || go1.25)) || datadog.no_waf
+//go:build (!cgo && ((!darwin && !freebsd) || go1.26)) || datadog.no_waf
 
 package log
 
diff --git a/internal/support/waf_unsupported_go.go b/internal/support/waf_unsupported_go.go
@@ -4,7 +4,7 @@
 // Copyright 2016-present Datadog, Inc.
 
 // Unsupported Go versions (>=)
-//go:build go1.25
+//go:build go1.26
 
 package support
 
diff --git a/internal/support/waf_unsupported_go_test.go b/internal/support/waf_unsupported_go_test.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build go1.25
+//go:build go1.26
 
 package support_test
 
diff --git a/waf_support_test.go b/waf_support_test.go
@@ -17,19 +17,20 @@ import (
 )
 
 var (
-	wafSupportedFlag *bool
+	wafSupportedFlag *string
 	wafBuildTags     *string
 )
 
 func init() {
-	wafSupportedFlag = flag.Bool("waf-supported", false, "Set to true if the WAF is supported on the current target")
+	wafSupportedFlag = flag.String("waf-supported", "false", "Set to true if the WAF is supported on the current target (true, false, maybe)")
 	wafBuildTags = flag.String("waf-build-tags", "", "Set to the build tags used to build the WAF")
 }
 
 // TestSupport is used to make sure the WAF is actually enabled and disabled when it respectively should be
 // using data send by the CI.
 func TestSupport(t *testing.T) {
 	require.NotNil(t, wafSupportedFlag, "The `waf-supported` flag should be set")
+	require.Contains(t, []string{"true", "false", "maybe"}, *wafSupportedFlag, "The `waf-supported` flag should be set to true, false or maybe")
 	require.NotNil(t, wafBuildTags, "The `waf-build-tags` flag should be set")
 	require.NotEmpty(t, *wafBuildTags, "The `waf-build-tags` flag should not be empty")
 
@@ -40,9 +41,16 @@ func TestSupport(t *testing.T) {
 	}
 
 	ok, _ := Usable()
-	require.Equal(t, *wafSupportedFlag, ok, "WAF support should match the value of the `waf-supported` flag in the CI")
+	switch *wafSupportedFlag {
+	case "true":
+		require.True(t, ok, "WAF support should match the value of the `waf-supported` flag in the CI (was true)")
+	case "false":
+		require.False(t, ok, "WAF support should match the value of the `waf-supported` flag in the CI (was false)")
+	case "maybe":
+		t.Logf("The actual WAF support status is %v", ok)
+	}
 
-	if *wafSupportedFlag {
+	if ok {
 		require.Empty(t, errors, "No errors should be returned when the WAF is supported")
 	} else {
 		require.NotEmpty(t, errors, "Errors should be returned when the WAF is not supported")
diff --git a/waf_test.go b/waf_test.go
@@ -3,7 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-//go:build (amd64 || arm64) && (linux || darwin) && !go1.25 && !datadog.no_waf && (cgo || appsec)
+//go:build (amd64 || arm64) && (linux || darwin) && !go1.26 && !datadog.no_waf && (cgo || appsec)
 
 package libddwaf
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ var (`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`const (`
`35`		`- goVersionUnsupported = "go1.25"`
	`35`	`+ goVersionUnsupported = "go1.26"`
`36`	`36`	`)`
`37`	`37`
`38`	`38`	`var (`