Merge pull request #271 from splitio/semver

Semver

Author: mmelograno

CHANGES.txt

@@ -1,4 +1,14 @@
-5.7.0 (TD)
+5.8.0 (May 14, 2024)
+ - Added support for targeting rules based on semantic versions (https://semver.org/).
+ - Added special impression label "targeting rule type unsupported by sdk" when the matcher type is not supported by the SDK, which returns 'control' treatment.
+ - Forward TLS server name when in redis-sentinel & redis-cluster
+ - Fixed vulnerabilities:
+   - Updated debian image to 12.5
+   - Updated golang image to 1.21.10
+   - Updated gin/gonic to 1.10
+ - Updated go-split-commons to v6
+
+5.7.0 (TBD)
  - Add support for FIPS-compliant binaries & docker images
 
 5.6.1 (Jan 29, 2024)

docker/Dockerfile.proxy

@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.21.6-bookworm AS builder
+FROM golang:1.21.10-bookworm AS builder
 
 ARG EXTRA_BUILD_ARGS
 ARG FIPS_MODE
@@ -17,7 +17,7 @@ RUN bash -c 'if [[ "${FIPS_MODE}" = "enabled" ]]; \
     fi'
 
 # Runner stage
-FROM debian:12.4 AS runner
+FROM debian:12.5 AS runner
 
 RUN apt update -y
 RUN apt install -y bash ca-certificates

docker/Dockerfile.synchronizer

@@ -1,5 +1,5 @@
 # Build stage
-FROM golang:1.21.6-bookworm AS builder
+FROM golang:1.21.10-bookworm AS builder
 
 ARG EXTRA_BUILD_ARGS
 ARG FIPS_MODE
@@ -17,7 +17,7 @@ RUN bash -c 'if [[ "${FIPS_MODE}" = "enabled" ]]; \
     fi'
 
 # Runner stage
-FROM debian:12.4 AS runner
+FROM debian:12.5 AS runner
 
 RUN apt update -y
 RUN apt install -y bash ca-certificates

go.mod

@@ -5,48 +5,50 @@ go 1.21
 require (
 	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-contrib/gzip v0.0.6
-	github.com/gin-gonic/gin v1.9.1
+	github.com/gin-gonic/gin v1.10.0
 	github.com/google/uuid v1.3.0
 	github.com/splitio/gincache v1.0.1
-	github.com/splitio/go-split-commons/v5 v5.2.1
+	github.com/splitio/go-split-commons/v6 v6.0.0
 	github.com/splitio/go-toolkit/v5 v5.4.0
-	github.com/stretchr/testify v1.8.4
+	github.com/stretchr/testify v1.9.0
 	go.etcd.io/bbolt v1.3.6
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 )
 
 require (
 	github.com/bits-and-blooms/bitset v1.3.1 // indirect
 	github.com/bits-and-blooms/bloom/v3 v3.3.1 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/bytedance/sonic v1.11.6 // indirect
+	github.com/bytedance/sonic/loader v0.1.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/redis/go-redis/v9 v9.0.4 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	golang.org/x/arch v0.8.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -39,6 +39,7 @@ type Options struct {
 	Snapshotter       cstorage.Snapshotter
 	TLS               *tls.Config
 	FullConfig        interface{}
+	FlagSpecVersion   string
 }
 
 type AdminServer struct {
@@ -66,6 +67,7 @@ func NewServer(options *Options) (*AdminServer, error) {
 		options.EventsEvCalc,
 		options.Runtime,
 		options.HcAppMonitor,
+		options.FlagSpecVersion,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("error instantiating dashboard controller: %w", err)

splitio/admin/admin.go

@@ -1,6 +1,6 @@
 package common
 
-import "github.com/splitio/go-split-commons/v5/storage"
+import "github.com/splitio/go-split-commons/v6/storage"
 
 // Storages wraps storages in one struct
 type Storages struct {

splitio/admin/common/config.go

@@ -29,6 +29,7 @@ type DashboardController struct {
 	eventsEvCalc      evcalc.Monitor
 	runtime           common.Runtime
 	appMonitor        application.MonitorIterface
+	FlagSpecVersion   string
 }
 
 // NewDashboardController instantiates a new dashboard controller
@@ -41,6 +42,7 @@ func NewDashboardController(
 	eventsEvCalc evcalc.Monitor,
 	runtime common.Runtime,
 	appMonitor application.MonitorIterface,
+	flagSpecVersion string,
 ) (*DashboardController, error) {
 
 	toReturn := &DashboardController{
@@ -52,6 +54,7 @@ func NewDashboardController(
 		eventsEvCalc:      eventsEvCalc,
 		impressionsEvCalc: impressionEvCalc,
 		appMonitor:        appMonitor,
+		FlagSpecVersion:   flagSpecVersion,
 	}
 
 	var err error
@@ -104,12 +107,13 @@ func (c *DashboardController) segmentKeys(ctx *gin.Context) {
 func (c *DashboardController) renderDashboard() ([]byte, error) {
 	var layoutBuffer bytes.Buffer
 	err := c.layout.Execute(&layoutBuffer, dashboard.RootObject{
-		DashboardTitle: c.title,
-		Version:        splitio.Version,
-		ProxyMode:      c.proxy,
-		RefreshTime:    30000,
-		Stats:          *c.gatherStats(),
-		Health:         c.appMonitor.GetHealthStatus(),
+		DashboardTitle:  c.title,
+		Version:         splitio.Version,
+		ProxyMode:       c.proxy,
+		RefreshTime:     30000,
+		Stats:           *c.gatherStats(),
+		Health:          c.appMonitor.GetHealthStatus(),
+		FlagSpecVersion: c.FlagSpecVersion,
 	})
 
 	if err != nil {

splitio/admin/controllers/dashboard.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/splitio/go-split-commons/v5/storage"
-	"github.com/splitio/go-split-commons/v5/telemetry"
+	"github.com/splitio/go-split-commons/v6/storage"
+	"github.com/splitio/go-split-commons/v6/telemetry"
 
 	"github.com/splitio/split-synchronizer/v5/splitio/admin/views/dashboard"
 	"github.com/splitio/split-synchronizer/v5/splitio/producer/evcalc"

splitio/admin/controllers/helpers.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"github.com/splitio/go-split-commons/v5/dtos"
-	"github.com/splitio/go-split-commons/v5/storage/mocks"
+	"github.com/splitio/go-split-commons/v6/dtos"
+	"github.com/splitio/go-split-commons/v6/storage/mocks"
 	"github.com/splitio/go-toolkit/v5/datastructures/set"
 	"github.com/splitio/go-toolkit/v5/logging"
 	adminCommon "github.com/splitio/split-synchronizer/v5/splitio/admin/common"