Skip to content

Commit f20391d

Browse files
authored
chore: upgrade to libffwaf v1.22.0 (#115)
Jira: APPSEC-56713
1 parent 745360a commit f20391d

File tree

8 files changed

+31
-10
lines changed

8 files changed

+31
-10
lines changed

.github/workflows/_test_bare_metal.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,20 @@ jobs:
88
fail-fast: false
99
matrix:
1010
runs-on: [ macos-15, macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, arm-4core-linux ]
11-
go-version: [ '1.23', '1.22' ]
11+
go-version: [ stable, oldstable ]
1212
include:
1313
# Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go version)
14-
- go-version: '1.22'
14+
- go-version: oldstable
1515
waf-log-level: TRACE
16-
name: ${{ matrix.runs-on }} go${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
16+
name: ${{ matrix.runs-on }} ${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
1717
runs-on: ${{ matrix.runs-on }}
1818
steps:
1919
- uses: actions/checkout@v4
2020
- uses: actions/setup-go@v5
2121
with:
2222
go-version: ${{ matrix.go-version }}
2323
cache: true
24+
cache-dependency-path: "**/go.mod"
2425
# ARM runners (at least during early access) don't have GCC installed
2526
- if: matrix.runs-on == 'arm-4core-linux'
2627
name: Install build requirements (ARM only)

.github/workflows/_test_containerized.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,25 @@ on:
33
workflow_call: # This is called by test.yml
44

55
jobs:
6+
go-versions:
7+
runs-on: ubuntu-latest
8+
outputs:
9+
stable: ${{ steps.stable.outputs.go-version }}
10+
oldstable: ${{ steps.oldstable.outputs.go-version }}
11+
steps:
12+
- uses: actions/setup-go@v5
13+
id: oldstable
14+
with:
15+
go-version: 'oldstable'
16+
cache: false
17+
- uses: actions/setup-go@v5
18+
id: stable
19+
with:
20+
go-version: 'stable'
21+
cache: false
22+
623
test:
24+
needs: [go-versions]
725
strategy:
826
fail-fast: false
927
matrix:
@@ -16,17 +34,19 @@ jobs:
1634
# RPM-based image
1735
- amazonlinux:2 # pretty popular on AWS workloads
1836
- amazonlinux:2023
19-
go-version: [ "1.23", "1.22" ]
37+
go-version:
38+
- ${{ needs.go-versions.outputs.stable }}
39+
- ${{ needs.go-versions.outputs.oldstable }}
2040
include:
2141
# Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go, without any particular tag)
22-
- go-version: '1.23'
42+
- go-version: ${{ needs.go-versions.outputs.stable }}
2343
waf-log-level: TRACE
2444
exclude:
2545
# The amazonlinux:2 variant is only relevant for the default go version yum ships (currently 1.22)
26-
- go-version: '1.23'
46+
- go-version: ${{ needs.go-versions.outputs.stable }}
2747
image: amazonlinux:2
2848
# The amazonlinux:2023 variant is only relevant for the default go version yum ships (currently 1.22)
29-
- go-version: '1.23'
49+
- go-version: ${{ needs.go-versions.outputs.stable }}
3050
image: amazonlinux:2023
3151
name: ${{ matrix.arch }} ${{ format(matrix.image, matrix.go-version) }} go${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
3252
# We use ARM runners when needed to avoid the performance hit of QEMU
@@ -51,7 +71,7 @@ jobs:
5171
- uses: actions/cache@v4
5272
with:
5373
path: ~/go/pkg/mod
54-
key: go-pkg-mod-${{ hashFiles('**/go.sum') }}
74+
key: go-pkg-mod-${{ hashFiles('**/go.mod') }}
5575
restore-keys: go-pkg-mod-
5676
- name: Create container
5777
id: container

internal/lib/.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.20.1
1+
1.22.0
3.96 KB
Binary file not shown.
3.12 KB
Binary file not shown.
18.6 KB
Binary file not shown.
17.2 KB
Binary file not shown.

internal/log/ddwaf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ ddwaf_context ddwaf_context_init(const ddwaf_handle handle);
312312
* @param result Structure containing the result of the operation. (nullable)
313313
* @param timeout Maximum time budget in microseconds.
314314
*
315-
* @return Return code of the operation, also contained in the result structure.
315+
* @return Return code of the operation.
316316
* @error DDWAF_ERR_INVALID_ARGUMENT The context is invalid, the data will not
317317
* be freed.
318318
* @error DDWAF_ERR_INVALID_OBJECT The data provided didn't match the desired

0 commit comments

Comments
 (0)