From b4817d9d2f1acfc797144a91ee8ad5a4da2fcaac Mon Sep 17 00:00:00 2001 From: Nikolay Tkachenko Date: Fri, 20 Dec 2024 14:42:48 +0200 Subject: [PATCH 1/3] Update github workflows --- .github/workflows/binaries.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml index a10a4da..c21247b 100644 --- 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 && \ From 6c0cba2601af430f70e382bf7399c0188913bb3b Mon Sep 17 00:00:00 2001 From: Nikolay Tkachenko Date: Fri, 20 Dec 2024 14:54:39 +0200 Subject: [PATCH 2/3] Update dependencies --- cmd/api-firewall/tests/wallarm_api2_update.db | Bin 98304 -> 98304 bytes go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/api-firewall/tests/wallarm_api2_update.db b/cmd/api-firewall/tests/wallarm_api2_update.db index 68ca66bdf3eb568f3da025e317faa9da32d1907e..000edd414c064faed39630b7ec7a1f0517462dea 100644 GIT binary patch delta 34 qcmZo@U~6b#n;^~DK2gS*v3+Aglq_S!=H0R`LX0<>43-%%1^@uYM++ Date: Fri, 20 Dec 2024 14:57:09 +0200 Subject: [PATCH 3/3] Bump up apifw version to v0.8.6 --- Makefile | 2 +- demo/docker-compose/OWASP_CoreRuleSet/docker-compose.yml | 2 +- demo/docker-compose/docker-compose-api-mode.yml | 2 +- demo/docker-compose/docker-compose-graphql-mode.yml | 2 +- demo/docker-compose/docker-compose.yml | 2 +- docs/release-notes.md | 5 +++++ helm/api-firewall/Chart.yaml | 2 +- 7 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 2884ea7..d605187 100644 --- 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/demo/docker-compose/OWASP_CoreRuleSet/docker-compose.yml b/demo/docker-compose/OWASP_CoreRuleSet/docker-compose.yml index ec732b5..884f86a 100644 --- 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 index 1291571..ab31fe9 100644 --- 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 index c606e1f..b3a5b4e 100644 --- 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 index ac1cd4a..60117da 100644 --- 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 index 85fa2bd..be9501c 100644 --- 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/helm/api-firewall/Chart.yaml b/helm/api-firewall/Chart.yaml index 418f174..e61dc99 100644 --- 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