Release/v0.8.6 (#122)

afr1ka · web-flow · commit 07225c8a1a35 · 2024-12-20T15:24:49.000+02:00
* Update github workflows

* Update dependencies

* Bump up apifw version to v0.8.6
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -52,6 +52,7 @@ jobs:
       - draft-release
     env:
       X_GO_DISTRIBUTION: "https://go.dev/dl/go1.22.10.linux-amd64.tar.gz"
+      APIFIREWALL_NAMESPACE: "github.com/wallarm/api-firewall"
     strategy:
       matrix:
         include:
@@ -74,7 +75,6 @@ jobs:
           options: >
             --volume ${{ github.workspace }}:/build
             --workdir /build
-            -e APIFIREWALL_NAMESPACE=github.com/wallarm/api-firewall
           run: |-
             set -e
 
@@ -106,7 +106,7 @@ jobs:
             mkdir -p /tmp/api-firewall-${{ matrix.artifact }} && \
             go mod download -x                                && \
             go build                                             \
-                -ldflags="-X main.build=${{ env.X_TAG }} -X ${APIFIREWALL_NAMESPACE}/internal/version.Version=${{ env.X_TAG }} -extldflags=-static -s -w" \
+                -ldflags="-X ${{ env.APIFIREWALL_NAMESPACE }}/internal/version.Version=${{ env.X_TAG }} -extldflags=-static -s -w" \
                 -o /tmp/api-firewall-${{ matrix.artifact }}/api-firewall \
                 -buildvcs=false ./cmd/api-firewall            && \
             /tmp/api-firewall-${{ matrix.artifact }}/api-firewall -v && \
@@ -163,6 +163,7 @@ jobs:
       - draft-release
     env:
       X_GO_VERSION: "1.22.10"
+      APIFIREWALL_NAMESPACE: "github.com/wallarm/api-firewall"
     strategy:
       matrix:
         include:
@@ -209,7 +210,7 @@ jobs:
             mkdir -p /tmp/api-firewall-${{ matrix.artifact }} && \
             go mod download -x                                && \
             go build                                             \
-                -ldflags="-X main.build=${{ env.X_TAG }} -X ${APIFIREWALL_NAMESPACE}/internal/version.Version=${{ env.X_TAG }} -extldflags=-static -s -w" \
+                -ldflags="-X ${{ env.APIFIREWALL_NAMESPACE }}/internal/version.Version=${{ env.X_TAG }} -extldflags=-static -s -w" \
                 -o /tmp/api-firewall-${{ matrix.artifact }}/api-firewall \
                 -buildvcs=false ./cmd/api-firewall            && \
             /tmp/api-firewall-${{ matrix.artifact }}/api-firewall -v && \
@@ -264,6 +265,8 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - draft-release
+    env:
+      APIFIREWALL_NAMESPACE: "github.com/wallarm/api-firewall"
     strategy:
       matrix:
         include:
@@ -347,7 +350,7 @@ jobs:
             mkdir -p /tmp/api-firewall-${{ matrix.artifact }} && \
             go mod download -x                                && \
             go build                                             \
-                -ldflags="-X main.build=${{ env.X_TAG }} -X ${APIFIREWALL_NAMESPACE}/internal/version.Version=${{ env.X_TAG }} -extldflags=-static -s -w" \
+                -ldflags="-X ${{ env.APIFIREWALL_NAMESPACE }}/internal/version.Version=${{ env.X_TAG }} -extldflags=-static -s -w" \
                 -o /tmp/api-firewall-${{ matrix.artifact }}/api-firewall \
                 -buildvcs=false ./cmd/api-firewall            && \
             /tmp/api-firewall-${{ matrix.artifact }}/api-firewall -v && \
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION := 0.8.5
+VERSION := 0.8.6
 NAMESPACE := github.com/wallarm/api-firewall
 
 .DEFAULT_GOAL := build
diff --git a/cmd/api-firewall/tests/wallarm_api2_update.db b/cmd/api-firewall/tests/wallarm_api2_update.db
diff --git a/demo/docker-compose/OWASP_CoreRuleSet/docker-compose.yml b/demo/docker-compose/OWASP_CoreRuleSet/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 services:
   api-firewall:
     container_name: api-firewall
-    image: wallarm/api-firewall:v0.8.5
+    image: wallarm/api-firewall:v0.8.6
     restart: on-failure
     environment:
       APIFW_URL: "http://0.0.0.0:8080"
diff --git a/demo/docker-compose/docker-compose-api-mode.yml b/demo/docker-compose/docker-compose-api-mode.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
   api-firewall:
     container_name: api-firewall
-    image: wallarm/api-firewall:v0.8.5
+    image: wallarm/api-firewall:v0.8.6
     restart: on-failure
     environment:
       APIFW_MODE: "api"
diff --git a/demo/docker-compose/docker-compose-graphql-mode.yml b/demo/docker-compose/docker-compose-graphql-mode.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
   api-firewall:
     container_name: api-firewall
-    image: wallarm/api-firewall:v0.8.5
+    image: wallarm/api-firewall:v0.8.6
     restart: on-failure
     environment:
       APIFW_MODE: "graphql"
diff --git a/demo/docker-compose/docker-compose.yml b/demo/docker-compose/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.8"
 services:
   api-firewall:
     container_name: api-firewall
-    image: wallarm/api-firewall:v0.8.5
+    image: wallarm/api-firewall:v0.8.6
     restart: on-failure
     environment:
       APIFW_URL: "http://0.0.0.0:8080"
diff --git a/docs/release-notes.md b/docs/release-notes.md
@@ -2,6 +2,11 @@
 
 This page describes new releases of Wallarm API Firewall.
 
+## v0.8.6 (2024-12-20)
+
+* Dependency upgrade
+* Make the release binaries version detectable by Syft
+
 ## v0.8.5 (2024-12-13)
 
 * Dependency upgrade
diff --git a/go.mod b/go.mod
@@ -22,11 +22,11 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/savsgio/gotils v0.0.0-20240704082632-aef3928b8a38
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	github.com/valyala/fasthttp v1.58.0
 	github.com/valyala/fastjson v1.6.4
 	github.com/wundergraph/graphql-go-tools v1.67.4
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
+	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
 	golang.org/x/sync v0.10.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -78,7 +78,7 @@ require (
 	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.32.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/tools v0.28.0 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -171,8 +171,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
 github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
@@ -223,8 +223,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf
 golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
+golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
+golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -246,8 +246,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
-golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
-golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff --git a/helm/api-firewall/Chart.yaml b/helm/api-firewall/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: api-firewall
 version: 0.7.2
-appVersion: 0.8.5
+appVersion: 0.8.6
 description: Wallarm OpenAPI-based API Firewall
 home: https://github.com/wallarm/api-firewall
 icon: https://static.wallarm.com/wallarm-logo.svg

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION := 0.8.5`
	`1`	`+VERSION := 0.8.6`
`2`	`2`	`NAMESPACE := github.com/wallarm/api-firewall`
`3`	`3`
`4`	`4`	`.DEFAULT_GOAL := build`