From 639e12b1ccf40611959bab50e213f0d0edd7f01a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mazeau?= Date: Mon, 6 May 2024 12:25:54 +0200 Subject: [PATCH] (chore): move to v3 (#94) JIRA: APPSEC-52726 ### Changes Update go.mod and module references to go-libbdwaf v3 version. --------- Signed-off-by: Eliott Bouhana Co-authored-by: Eliott Bouhana <47679741+eliottness@users.noreply.github.com> --- README.md | 2 +- alignement_test.go | 4 ++-- cgo_ref_pool.go | 4 ++-- context.go | 8 ++++---- decoder.go | 6 +++--- encoder.go | 8 ++++---- encoder_decoder_test.go | 8 ++++---- go.mod | 5 +---- handle.go | 8 ++++---- internal/bindings/safe.go | 2 +- internal/bindings/safe_test.go | 2 +- internal/bindings/waf_dl.go | 6 +++--- internal/bindings/waf_dl_test.go | 2 +- internal/log/log_cgo.go | 2 +- internal/log/log_purego.go | 2 +- internal/support/waf_cgo_disabled.go | 2 +- internal/support/waf_cgo_disabled_test.go | 4 ++-- internal/support/waf_manually_disabled.go | 2 +- internal/support/waf_manually_disabled_test.go | 5 +++-- internal/support/waf_unsupported_go.go | 2 +- internal/support/waf_unsupported_go_test.go | 4 ++-- internal/support/waf_unsupported_target.go | 2 +- internal/support/waf_unsupported_target_test.go | 4 ++-- timer/clock_test.go | 3 ++- timer/timer_test.go | 8 +++++--- waf.go | 6 +++--- waf_support_test.go | 8 +++++--- waf_test.go | 8 ++++---- 28 files changed, 65 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index a3e717d6..7a4674e8 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ func main() { Persistent: map[string]any{ "server.request.path_params": "/rfiinc.txt", }, - }, time.Minute) + }) } ``` diff --git a/alignement_test.go b/alignement_test.go index 3b0680d5..024254e7 100644 --- a/alignement_test.go +++ b/alignement_test.go @@ -11,8 +11,8 @@ package waf import ( "testing" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" "github.com/ebitengine/purego" "github.com/stretchr/testify/require" diff --git a/cgo_ref_pool.go b/cgo_ref_pool.go index 0077054c..d005ed51 100644 --- a/cgo_ref_pool.go +++ b/cgo_ref_pool.go @@ -8,8 +8,8 @@ package waf import ( "strconv" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" ) // cgoRefPool is a way to make sure we can safely send go allocated data on the C side of the WAF diff --git a/context.go b/context.go index a731df34..a6dc7677 100644 --- a/context.go +++ b/context.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/DataDog/go-libddwaf/v2/errors" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" - "github.com/DataDog/go-libddwaf/v2/timer" + "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/timer" "sync/atomic" ) diff --git a/decoder.go b/decoder.go index 94c98414..2220130c 100644 --- a/decoder.go +++ b/decoder.go @@ -6,9 +6,9 @@ package waf import ( - "github.com/DataDog/go-libddwaf/v2/errors" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" ) // decodeErrors transforms the wafObject received by the wafRulesetInfo after the call to wafDl.wafInit to a map where diff --git a/encoder.go b/encoder.go index 573dcf9f..7737df17 100644 --- a/encoder.go +++ b/encoder.go @@ -8,16 +8,16 @@ package waf import ( "context" "fmt" - "github.com/DataDog/go-libddwaf/v2/timer" "math" "reflect" "strings" "time" "unicode" - "github.com/DataDog/go-libddwaf/v2/errors" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/timer" ) // Encode Go values into wafObjects. Only the subset of Go types representable into wafObjects diff --git a/encoder_decoder_test.go b/encoder_decoder_test.go index 6895ba19..aaae53db 100644 --- a/encoder_decoder_test.go +++ b/encoder_decoder_test.go @@ -10,15 +10,15 @@ package waf import ( "context" "encoding/json" - "github.com/DataDog/go-libddwaf/v2/timer" "reflect" "sort" "testing" "time" - "github.com/DataDog/go-libddwaf/v2/errors" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/timer" "github.com/stretchr/testify/require" ) diff --git a/go.mod b/go.mod index 3c393ef8..14e75175 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/DataDog/go-libddwaf/v2 +module github.com/DataDog/go-libddwaf/v3 go 1.20 @@ -16,6 +16,3 @@ require ( gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -// Version where import paths were not changed to go-libddwaf/v2 -retract v2.0.0 diff --git a/handle.go b/handle.go index 95b114c6..daa6cb61 100644 --- a/handle.go +++ b/handle.go @@ -10,10 +10,10 @@ import ( "fmt" "time" - wafErrors "github.com/DataDog/go-libddwaf/v2/errors" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" - "github.com/DataDog/go-libddwaf/v2/timer" + wafErrors "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/timer" "sync/atomic" ) diff --git a/internal/bindings/safe.go b/internal/bindings/safe.go index c961334a..8106913e 100644 --- a/internal/bindings/safe.go +++ b/internal/bindings/safe.go @@ -6,7 +6,7 @@ package bindings import ( - wafErrors "github.com/DataDog/go-libddwaf/v2/errors" + wafErrors "github.com/DataDog/go-libddwaf/v3/errors" "fmt" "reflect" diff --git a/internal/bindings/safe_test.go b/internal/bindings/safe_test.go index b05944c1..a91ecba4 100644 --- a/internal/bindings/safe_test.go +++ b/internal/bindings/safe_test.go @@ -7,7 +7,7 @@ package bindings import ( "errors" - wafErrors "github.com/DataDog/go-libddwaf/v2/errors" + wafErrors "github.com/DataDog/go-libddwaf/v3/errors" "strconv" "testing" diff --git a/internal/bindings/waf_dl.go b/internal/bindings/waf_dl.go index 2303ee1d..d472cd43 100644 --- a/internal/bindings/waf_dl.go +++ b/internal/bindings/waf_dl.go @@ -11,9 +11,9 @@ import ( "fmt" "os" - "github.com/DataDog/go-libddwaf/v2/internal/lib" - "github.com/DataDog/go-libddwaf/v2/internal/log" - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/internal/lib" + "github.com/DataDog/go-libddwaf/v3/internal/log" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" "github.com/ebitengine/purego" ) diff --git a/internal/bindings/waf_dl_test.go b/internal/bindings/waf_dl_test.go index 7b1f831d..72b07c77 100644 --- a/internal/bindings/waf_dl_test.go +++ b/internal/bindings/waf_dl_test.go @@ -15,7 +15,7 @@ import ( "runtime" "testing" - "github.com/DataDog/go-libddwaf/v2/internal/lib" + "github.com/DataDog/go-libddwaf/v3/internal/lib" "github.com/stretchr/testify/require" ) diff --git a/internal/log/log_cgo.go b/internal/log/log_cgo.go index 51182b1c..dee5fd78 100644 --- a/internal/log/log_cgo.go +++ b/internal/log/log_cgo.go @@ -17,7 +17,7 @@ package log // uint64_t message_len // ); import "C" -import "github.com/DataDog/go-libddwaf/v2/internal/unsafe" +import "github.com/DataDog/go-libddwaf/v3/internal/unsafe" // CallbackFunctionPointer returns a pointer to the log callback function which // can be used with libddwaf. diff --git a/internal/log/log_purego.go b/internal/log/log_purego.go index 498706c2..1f1cfdab 100644 --- a/internal/log/log_purego.go +++ b/internal/log/log_purego.go @@ -8,7 +8,7 @@ package log import ( - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" "sync" "github.com/ebitengine/purego" diff --git a/internal/support/waf_cgo_disabled.go b/internal/support/waf_cgo_disabled.go index 63308a0f..9c4ed83c 100644 --- a/internal/support/waf_cgo_disabled.go +++ b/internal/support/waf_cgo_disabled.go @@ -9,7 +9,7 @@ package support -import "github.com/DataDog/go-libddwaf/v2/errors" +import "github.com/DataDog/go-libddwaf/v3/errors" func init() { wafSupportErrors = append(wafSupportErrors, errors.CgoDisabledError{}) diff --git a/internal/support/waf_cgo_disabled_test.go b/internal/support/waf_cgo_disabled_test.go index fd0fbe04..9e534fa3 100644 --- a/internal/support/waf_cgo_disabled_test.go +++ b/internal/support/waf_cgo_disabled_test.go @@ -10,8 +10,8 @@ package support_test import ( "testing" - waf "github.com/DataDog/go-libddwaf/v2" - "github.com/DataDog/go-libddwaf/v2/errors" + waf "github.com/DataDog/go-libddwaf/v3" + "github.com/DataDog/go-libddwaf/v3/errors" "github.com/stretchr/testify/require" ) diff --git a/internal/support/waf_manually_disabled.go b/internal/support/waf_manually_disabled.go index e837546d..8c65ddbc 100644 --- a/internal/support/waf_manually_disabled.go +++ b/internal/support/waf_manually_disabled.go @@ -8,7 +8,7 @@ package support -import "github.com/DataDog/go-libddwaf/v2/errors" +import "github.com/DataDog/go-libddwaf/v3/errors" func init() { wafManuallyDisabledErr = errors.ManuallyDisabledError{} diff --git a/internal/support/waf_manually_disabled_test.go b/internal/support/waf_manually_disabled_test.go index ff8d1d6c..b7ac39a7 100644 --- a/internal/support/waf_manually_disabled_test.go +++ b/internal/support/waf_manually_disabled_test.go @@ -8,10 +8,11 @@ package support_test import ( - "github.com/DataDog/go-libddwaf/v2/errors" "testing" - waf "github.com/DataDog/go-libddwaf/v2" + waf "github.com/DataDog/go-libddwaf/v3" + "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/stretchr/testify/require" ) diff --git a/internal/support/waf_unsupported_go.go b/internal/support/waf_unsupported_go.go index 8eae1dce..4ba254c5 100644 --- a/internal/support/waf_unsupported_go.go +++ b/internal/support/waf_unsupported_go.go @@ -8,7 +8,7 @@ package support -import "github.com/DataDog/go-libddwaf/v2/errors" +import "github.com/DataDog/go-libddwaf/v3/errors" func init() { wafSupportErrors = append(wafSupportErrors, errors.UnsupportedGoVersionError{}) diff --git a/internal/support/waf_unsupported_go_test.go b/internal/support/waf_unsupported_go_test.go index 4d0272f0..7b957cc5 100644 --- a/internal/support/waf_unsupported_go_test.go +++ b/internal/support/waf_unsupported_go_test.go @@ -11,8 +11,8 @@ import ( "runtime" "testing" - waf "github.com/DataDog/go-libddwaf/v2" - "github.com/DataDog/go-libddwaf/v2/errors" + waf "github.com/DataDog/go-libddwaf/v3" + "github.com/DataDog/go-libddwaf/v3/errors" "github.com/stretchr/testify/require" ) diff --git a/internal/support/waf_unsupported_target.go b/internal/support/waf_unsupported_target.go index 38edb295..04546c1f 100644 --- a/internal/support/waf_unsupported_target.go +++ b/internal/support/waf_unsupported_target.go @@ -12,7 +12,7 @@ package support import ( "runtime" - "github.com/DataDog/go-libddwaf/v2/errors" + "github.com/DataDog/go-libddwaf/v3/errors" ) func init() { diff --git a/internal/support/waf_unsupported_target_test.go b/internal/support/waf_unsupported_target_test.go index cd16f816..6f047385 100644 --- a/internal/support/waf_unsupported_target_test.go +++ b/internal/support/waf_unsupported_target_test.go @@ -11,8 +11,8 @@ import ( "runtime" "testing" - waf "github.com/DataDog/go-libddwaf/v2" - "github.com/DataDog/go-libddwaf/v2/errors" + waf "github.com/DataDog/go-libddwaf/v3" + "github.com/DataDog/go-libddwaf/v3/errors" "github.com/stretchr/testify/require" ) diff --git a/timer/clock_test.go b/timer/clock_test.go index 0e4c48a9..f791ecfe 100644 --- a/timer/clock_test.go +++ b/timer/clock_test.go @@ -1,9 +1,10 @@ package timer import ( - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" "testing" "time" + + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" ) func BenchmarkMostUsedFunctions(b *testing.B) { diff --git a/timer/timer_test.go b/timer/timer_test.go index a7c37bb8..938f17ea 100644 --- a/timer/timer_test.go +++ b/timer/timer_test.go @@ -6,12 +6,14 @@ package timer_test import ( - "github.com/DataDog/go-libddwaf/v2/internal/unsafe" - "github.com/DataDog/go-libddwaf/v2/timer" - "github.com/stretchr/testify/require" "strconv" "testing" "time" + + "github.com/DataDog/go-libddwaf/v3/internal/unsafe" + "github.com/DataDog/go-libddwaf/v3/timer" + + "github.com/stretchr/testify/require" ) func hasExpired(t *testing.T, timer timer.Timer, duration time.Duration) { diff --git a/waf.go b/waf.go index 3ce74c58..4d9f0968 100644 --- a/waf.go +++ b/waf.go @@ -8,12 +8,12 @@ package waf import ( "errors" "fmt" - wafErrors "github.com/DataDog/go-libddwaf/v2/errors" "sync" "time" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/support" + wafErrors "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/support" ) // ErrTimeout is the error returned when the WAF times out while processing a request. diff --git a/waf_support_test.go b/waf_support_test.go index 58708d3e..35e1b2a7 100644 --- a/waf_support_test.go +++ b/waf_support_test.go @@ -9,10 +9,12 @@ package waf import ( "flag" - wafErrors "github.com/DataDog/go-libddwaf/v2/errors" - "github.com/DataDog/go-libddwaf/v2/internal/support" - "github.com/stretchr/testify/require" "testing" + + wafErrors "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/support" + + "github.com/stretchr/testify/require" ) var ( diff --git a/waf_test.go b/waf_test.go index db50ab70..174c436a 100644 --- a/waf_test.go +++ b/waf_test.go @@ -12,7 +12,6 @@ import ( _ "embed" "encoding/json" "fmt" - "github.com/DataDog/go-libddwaf/v2/timer" "math/rand" "sort" "strconv" @@ -22,10 +21,11 @@ import ( "text/template" "time" - "github.com/DataDog/go-libddwaf/v2/errors" + "github.com/DataDog/go-libddwaf/v3/errors" + "github.com/DataDog/go-libddwaf/v3/internal/bindings" + "github.com/DataDog/go-libddwaf/v3/internal/lib" + "github.com/DataDog/go-libddwaf/v3/timer" - "github.com/DataDog/go-libddwaf/v2/internal/bindings" - "github.com/DataDog/go-libddwaf/v2/internal/lib" "github.com/stretchr/testify/require" )