Skip to content

Commit 639e12b

Browse files
Hellzyeliottness
Hellzy
and
eliottness
authored
(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 <[email protected]> Co-authored-by: Eliott Bouhana <[email protected]>
1 parent dc08fd2 commit 639e12b

28 files changed

+65
-62
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func main() {
3232
Persistent: map[string]any{
3333
"server.request.path_params": "/rfiinc.txt",
3434
},
35-
}, time.Minute)
35+
})
3636
}
3737
```
3838

‎alignement_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ package waf
1111
import (
1212
"testing"
1313

14-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
15-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
14+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
15+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
1616

1717
"github.com/ebitengine/purego"
1818
"github.com/stretchr/testify/require"

‎cgo_ref_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package waf
88
import (
99
"strconv"
1010

11-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
12-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
11+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
12+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
1313
)
1414

1515
// cgoRefPool is a way to make sure we can safely send go allocated data on the C side of the WAF

‎context.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"sync"
1010
"time"
1111

12-
"github.com/DataDog/go-libddwaf/v2/errors"
13-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
14-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
15-
"github.com/DataDog/go-libddwaf/v2/timer"
12+
"github.com/DataDog/go-libddwaf/v3/errors"
13+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
14+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
15+
"github.com/DataDog/go-libddwaf/v3/timer"
1616

1717
"sync/atomic"
1818
)

‎decoder.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
package waf
77

88
import (
9-
"github.com/DataDog/go-libddwaf/v2/errors"
10-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
11-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
9+
"github.com/DataDog/go-libddwaf/v3/errors"
10+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
11+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
1212
)
1313

1414
// decodeErrors transforms the wafObject received by the wafRulesetInfo after the call to wafDl.wafInit to a map where

‎encoder.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ package waf
88
import (
99
"context"
1010
"fmt"
11-
"github.com/DataDog/go-libddwaf/v2/timer"
1211
"math"
1312
"reflect"
1413
"strings"
1514
"time"
1615
"unicode"
1716

18-
"github.com/DataDog/go-libddwaf/v2/errors"
19-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
20-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
17+
"github.com/DataDog/go-libddwaf/v3/errors"
18+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
19+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
20+
"github.com/DataDog/go-libddwaf/v3/timer"
2121
)
2222

2323
// Encode Go values into wafObjects. Only the subset of Go types representable into wafObjects

‎encoder_decoder_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ package waf
1010
import (
1111
"context"
1212
"encoding/json"
13-
"github.com/DataDog/go-libddwaf/v2/timer"
1413
"reflect"
1514
"sort"
1615
"testing"
1716
"time"
1817

19-
"github.com/DataDog/go-libddwaf/v2/errors"
20-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
21-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
18+
"github.com/DataDog/go-libddwaf/v3/errors"
19+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
20+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
21+
"github.com/DataDog/go-libddwaf/v3/timer"
2222

2323
"github.com/stretchr/testify/require"
2424
)

‎go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/DataDog/go-libddwaf/v2
1+
module github.com/DataDog/go-libddwaf/v3
22

33
go 1.20
44

@@ -16,6 +16,3 @@ require (
1616
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
1717
gopkg.in/yaml.v3 v3.0.1 // indirect
1818
)
19-
20-
// Version where import paths were not changed to go-libddwaf/v2
21-
retract v2.0.0

‎handle.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"fmt"
1111
"time"
1212

13-
wafErrors "github.com/DataDog/go-libddwaf/v2/errors"
14-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
15-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
16-
"github.com/DataDog/go-libddwaf/v2/timer"
13+
wafErrors "github.com/DataDog/go-libddwaf/v3/errors"
14+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
15+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
16+
"github.com/DataDog/go-libddwaf/v3/timer"
1717

1818
"sync/atomic"
1919
)

‎internal/bindings/safe.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
package bindings
77

88
import (
9-
wafErrors "github.com/DataDog/go-libddwaf/v2/errors"
9+
wafErrors "github.com/DataDog/go-libddwaf/v3/errors"
1010

1111
"fmt"
1212
"reflect"

‎internal/bindings/safe_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package bindings
77

88
import (
99
"errors"
10-
wafErrors "github.com/DataDog/go-libddwaf/v2/errors"
10+
wafErrors "github.com/DataDog/go-libddwaf/v3/errors"
1111
"strconv"
1212
"testing"
1313

‎internal/bindings/waf_dl.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"fmt"
1212
"os"
1313

14-
"github.com/DataDog/go-libddwaf/v2/internal/lib"
15-
"github.com/DataDog/go-libddwaf/v2/internal/log"
16-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
14+
"github.com/DataDog/go-libddwaf/v3/internal/lib"
15+
"github.com/DataDog/go-libddwaf/v3/internal/log"
16+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
1717
"github.com/ebitengine/purego"
1818
)
1919

‎internal/bindings/waf_dl_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"runtime"
1616
"testing"
1717

18-
"github.com/DataDog/go-libddwaf/v2/internal/lib"
18+
"github.com/DataDog/go-libddwaf/v3/internal/lib"
1919
"github.com/stretchr/testify/require"
2020
)
2121

‎internal/log/log_cgo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package log
1717
// uint64_t message_len
1818
// );
1919
import "C"
20-
import "github.com/DataDog/go-libddwaf/v2/internal/unsafe"
20+
import "github.com/DataDog/go-libddwaf/v3/internal/unsafe"
2121

2222
// CallbackFunctionPointer returns a pointer to the log callback function which
2323
// can be used with libddwaf.

‎internal/log/log_purego.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package log
99

1010
import (
11-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
11+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
1212
"sync"
1313

1414
"github.com/ebitengine/purego"

‎internal/support/waf_cgo_disabled.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package support
1111

12-
import "github.com/DataDog/go-libddwaf/v2/errors"
12+
import "github.com/DataDog/go-libddwaf/v3/errors"
1313

1414
func init() {
1515
wafSupportErrors = append(wafSupportErrors, errors.CgoDisabledError{})

‎internal/support/waf_cgo_disabled_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ package support_test
1010
import (
1111
"testing"
1212

13-
waf "github.com/DataDog/go-libddwaf/v2"
14-
"github.com/DataDog/go-libddwaf/v2/errors"
13+
waf "github.com/DataDog/go-libddwaf/v3"
14+
"github.com/DataDog/go-libddwaf/v3/errors"
1515
"github.com/stretchr/testify/require"
1616
)
1717

‎internal/support/waf_manually_disabled.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package support
1010

11-
import "github.com/DataDog/go-libddwaf/v2/errors"
11+
import "github.com/DataDog/go-libddwaf/v3/errors"
1212

1313
func init() {
1414
wafManuallyDisabledErr = errors.ManuallyDisabledError{}

‎internal/support/waf_manually_disabled_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
package support_test
99

1010
import (
11-
"github.com/DataDog/go-libddwaf/v2/errors"
1211
"testing"
1312

14-
waf "github.com/DataDog/go-libddwaf/v2"
13+
waf "github.com/DataDog/go-libddwaf/v3"
14+
"github.com/DataDog/go-libddwaf/v3/errors"
15+
1516
"github.com/stretchr/testify/require"
1617
)
1718

‎internal/support/waf_unsupported_go.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
package support
1010

11-
import "github.com/DataDog/go-libddwaf/v2/errors"
11+
import "github.com/DataDog/go-libddwaf/v3/errors"
1212

1313
func init() {
1414
wafSupportErrors = append(wafSupportErrors, errors.UnsupportedGoVersionError{})

‎internal/support/waf_unsupported_go_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"runtime"
1212
"testing"
1313

14-
waf "github.com/DataDog/go-libddwaf/v2"
15-
"github.com/DataDog/go-libddwaf/v2/errors"
14+
waf "github.com/DataDog/go-libddwaf/v3"
15+
"github.com/DataDog/go-libddwaf/v3/errors"
1616
"github.com/stretchr/testify/require"
1717
)
1818

‎internal/support/waf_unsupported_target.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package support
1212
import (
1313
"runtime"
1414

15-
"github.com/DataDog/go-libddwaf/v2/errors"
15+
"github.com/DataDog/go-libddwaf/v3/errors"
1616
)
1717

1818
func init() {

‎internal/support/waf_unsupported_target_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"runtime"
1212
"testing"
1313

14-
waf "github.com/DataDog/go-libddwaf/v2"
15-
"github.com/DataDog/go-libddwaf/v2/errors"
14+
waf "github.com/DataDog/go-libddwaf/v3"
15+
"github.com/DataDog/go-libddwaf/v3/errors"
1616
"github.com/stretchr/testify/require"
1717
)
1818

‎timer/clock_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package timer
22

33
import (
4-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
54
"testing"
65
"time"
6+
7+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
78
)
89

910
func BenchmarkMostUsedFunctions(b *testing.B) {

‎timer/timer_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
package timer_test
77

88
import (
9-
"github.com/DataDog/go-libddwaf/v2/internal/unsafe"
10-
"github.com/DataDog/go-libddwaf/v2/timer"
11-
"github.com/stretchr/testify/require"
129
"strconv"
1310
"testing"
1411
"time"
12+
13+
"github.com/DataDog/go-libddwaf/v3/internal/unsafe"
14+
"github.com/DataDog/go-libddwaf/v3/timer"
15+
16+
"github.com/stretchr/testify/require"
1517
)
1618

1719
func hasExpired(t *testing.T, timer timer.Timer, duration time.Duration) {

‎waf.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ package waf
88
import (
99
"errors"
1010
"fmt"
11-
wafErrors "github.com/DataDog/go-libddwaf/v2/errors"
1211
"sync"
1312
"time"
1413

15-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
16-
"github.com/DataDog/go-libddwaf/v2/internal/support"
14+
wafErrors "github.com/DataDog/go-libddwaf/v3/errors"
15+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
16+
"github.com/DataDog/go-libddwaf/v3/internal/support"
1717
)
1818

1919
// ErrTimeout is the error returned when the WAF times out while processing a request.

‎waf_support_test.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ package waf
99

1010
import (
1111
"flag"
12-
wafErrors "github.com/DataDog/go-libddwaf/v2/errors"
13-
"github.com/DataDog/go-libddwaf/v2/internal/support"
14-
"github.com/stretchr/testify/require"
1512
"testing"
13+
14+
wafErrors "github.com/DataDog/go-libddwaf/v3/errors"
15+
"github.com/DataDog/go-libddwaf/v3/internal/support"
16+
17+
"github.com/stretchr/testify/require"
1618
)
1719

1820
var (

‎waf_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
_ "embed"
1313
"encoding/json"
1414
"fmt"
15-
"github.com/DataDog/go-libddwaf/v2/timer"
1615
"math/rand"
1716
"sort"
1817
"strconv"
@@ -22,10 +21,11 @@ import (
2221
"text/template"
2322
"time"
2423

25-
"github.com/DataDog/go-libddwaf/v2/errors"
24+
"github.com/DataDog/go-libddwaf/v3/errors"
25+
"github.com/DataDog/go-libddwaf/v3/internal/bindings"
26+
"github.com/DataDog/go-libddwaf/v3/internal/lib"
27+
"github.com/DataDog/go-libddwaf/v3/timer"
2628

27-
"github.com/DataDog/go-libddwaf/v2/internal/bindings"
28-
"github.com/DataDog/go-libddwaf/v2/internal/lib"
2929
"github.com/stretchr/testify/require"
3030
)
3131

0 commit comments

Comments
 (0)