Release/v0.8.7 (#124)

afr1ka · web-flow · commit 1e062c7e40ef · 2025-02-21T19:42:43.000+02:00
* Bump up GO version to 1.22.12

* Fix cpu extra load issue
diff --git a/.github/workflows/binaries.yml b/.github/workflows/binaries.yml
@@ -51,7 +51,7 @@ jobs:
     needs:
       - draft-release
     env:
-      X_GO_DISTRIBUTION: "https://go.dev/dl/go1.22.10.linux-amd64.tar.gz"
+      X_GO_DISTRIBUTION: "https://go.dev/dl/go1.22.12.linux-amd64.tar.gz"
       APIFIREWALL_NAMESPACE: "github.com/wallarm/api-firewall"
     strategy:
       matrix:
@@ -162,7 +162,7 @@ jobs:
     needs:
       - draft-release
     env:
-      X_GO_VERSION: "1.22.10"
+      X_GO_VERSION: "1.22.12"
       APIFIREWALL_NAMESPACE: "github.com/wallarm/api-firewall"
     strategy:
       matrix:
@@ -272,19 +272,19 @@ jobs:
         include:
           - arch: armv6
             distro: bullseye
-            go_distribution: https://go.dev/dl/go1.22.10.linux-armv6l.tar.gz
+            go_distribution: https://go.dev/dl/go1.22.12.linux-armv6l.tar.gz
             artifact: armv6-libc
           - arch: aarch64
             distro: bullseye
-            go_distribution: https://go.dev/dl/go1.22.10.linux-arm64.tar.gz
+            go_distribution: https://go.dev/dl/go1.22.12.linux-arm64.tar.gz
             artifact: arm64-libc
           - arch: armv6
             distro: alpine_latest
-            go_distribution: https://go.dev/dl/go1.22.10.linux-armv6l.tar.gz
+            go_distribution: https://go.dev/dl/go1.22.12.linux-armv6l.tar.gz
             artifact: armv6-musl
           - arch: aarch64
             distro: alpine_latest
-            go_distribution: https://go.dev/dl/go1.22.10.linux-arm64.tar.gz
+            go_distribution: https://go.dev/dl/go1.22.12.linux-arm64.tar.gz
             artifact: arm64-musl
     steps:
       - uses: actions/checkout@v2.1.0
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION := 0.8.6
+VERSION := 0.8.7
 NAMESPACE := github.com/wallarm/api-firewall
 
 .DEFAULT_GOAL := build
diff --git a/cmd/api-firewall/internal/handlers/api/updater.go b/cmd/api-firewall/internal/handlers/api/updater.go
@@ -9,6 +9,7 @@ import (
 	"github.com/corazawaf/coraza/v3"
 	"github.com/sirupsen/logrus"
 	"github.com/valyala/fasthttp"
+
 	"github.com/wallarm/api-firewall/internal/config"
 	"github.com/wallarm/api-firewall/internal/platform/allowiplist"
 	"github.com/wallarm/api-firewall/internal/platform/router"
diff --git a/cmd/api-firewall/tests/main_test.go b/cmd/api-firewall/tests/main_test.go
@@ -2864,7 +2864,7 @@ func (s *ServiceTests) testCustomHostHeader(t *testing.T) {
 	ipAddrs := []net.IPAddr{}
 	ipAddrs = append(ipAddrs, net.IPAddr{IP: net.IPv4(127, 0, 0, 1), Zone: ""})
 
-	s.dnsCache.EXPECT().LookupIPAddr(gomock.Any(), gomock.Any()).Return(ipAddrs, nil).Times(3)
+	s.dnsCache.EXPECT().LookupIPAddr(gomock.Any(), gomock.Any()).Return(ipAddrs, nil).Times(2)
 
 	options := proxy.Options{
 		InitialPoolCapacity: 1,
diff --git a/cmd/api-firewall/tests/updater_v2_test.go b/cmd/api-firewall/tests/updater_v2_test.go
@@ -62,15 +62,15 @@ type EntryV2 struct {
 	Status        string `db:"status"`
 }
 
-func insertSpecV2(dbFilePath, newSpec string) (*EntryV2, error) {
+func insertSpecV2(dbFilePath, newSpec, state string) (*EntryV2, error) {
 
 	db, err := sql.Open("sqlite3", dbFilePath)
 	if err != nil {
 		return nil, err
 	}
 	defer db.Close()
 
-	q := fmt.Sprintf("INSERT INTO openapi_schemas(schema_version,schema_format,schema_content,status) VALUES ('1', 'yaml', '%s', 'new')", newSpec)
+	q := fmt.Sprintf("INSERT INTO openapi_schemas(schema_version,schema_format,schema_content,status) VALUES ('1', 'yaml', '%s', '%s')", newSpec, state)
 	_, err = db.Exec(q)
 	if err != nil {
 		return nil, err
@@ -141,7 +141,7 @@ func TestLoadBasicV2(t *testing.T) {
 	var lock sync.RWMutex
 
 	// create DB entry with spec and status = 'new'
-	entry, err := insertSpecV2(currentDBPath, testYamlSpecification)
+	entry, err := insertSpecV2(currentDBPath, testYamlSpecification, "new")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -250,7 +250,7 @@ func TestUpdaterBasicV2(t *testing.T) {
 	}
 
 	// create DB entry with spec and status = 'new'
-	entry, err := insertSpecV2(currentDBPath, testYamlSpecification)
+	entry, err := insertSpecV2(currentDBPath, testYamlSpecification, "new")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -1096,7 +1096,7 @@ func TestUpdaterFromV1DBToV2(t *testing.T) {
 
 	// prepare spec with status = 'new'
 	// create DB entry with spec and status = 'new'
-	entry, err := insertSpecV2(currentDBPath, testYamlSpecification)
+	entry, err := insertSpecV2(currentDBPath, testYamlSpecification, "new")
 	if err != nil {
 		t.Fatal(err)
 	}
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.6
+    image: wallarm/api-firewall:v0.8.7
     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.6
+    image: wallarm/api-firewall:v0.8.7
     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.6
+    image: wallarm/api-firewall:v0.8.7
     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.6
+    image: wallarm/api-firewall:v0.8.7
     restart: on-failure
     environment:
       APIFW_URL: "http://0.0.0.0:8080"
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/wallarm/api-firewall
 
-go 1.22.10
+go 1.22.12
 
 require (
 	github.com/andybalholm/brotli v1.1.1
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.6
+appVersion: 0.8.7
 description: Wallarm OpenAPI-based API Firewall
 home: https://github.com/wallarm/api-firewall
 icon: https://static.wallarm.com/wallarm-logo.svg
diff --git a/internal/platform/proxy/chainpool.go b/internal/platform/proxy/chainpool.go
@@ -22,8 +22,6 @@ import (
 	"github.com/wallarm/api-firewall/internal/config"
 )
 
-const defaultConcurrency = 1000
-
 var defaultLookUpTimeout = 1 * time.Second
 
 var (
@@ -70,12 +68,7 @@ func (p *chanPool) factory(connAddr string) HTTPClient {
 		DisableHeaderNamesNormalizing: true,
 		DisablePathNormalizing:        true,
 		Dial: func(addr string) (net.Conn, error) {
-			tcpDialer := &fasthttp.TCPDialer{
-				Concurrency:          defaultConcurrency,
-				Resolver:             p.dnsResolver,
-				DisableDNSResolution: p.options.DNSConfig.Cache,
-			}
-			return tcpDialer.DialTimeout(connAddr, p.options.DialTimeout)
+			return fasthttp.DialTimeout(connAddr, p.options.DialTimeout)
 		},
 		TLSConfig:           p.tlsConfig,
 		MaxConnsPerHost:     p.options.MaxConnsPerHost,
diff --git a/internal/platform/storage/dbv1.go b/internal/platform/storage/dbv1.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/getkin/kin-openapi/openapi3"
 	_ "github.com/mattn/go-sqlite3"
+
 	"github.com/wallarm/api-firewall/internal/platform/loader"
 )
 

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