From 292b85858cde2e1c16d32e349647df65232f866a Mon Sep 17 00:00:00 2001 From: Lucas Echeverz Date: Fri, 15 Dec 2023 16:46:34 -0300 Subject: [PATCH 1/3] Updating docker image vulnerabilities and split-commons version --- CHANGES.txt | 4 ++++ docker/Dockerfile.proxy | 4 ++-- docker/Dockerfile.synchronizer | 4 ++-- go.mod | 2 +- go.sum | 2 ++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f483093f..34667b68 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +5.5.1 (XXXX) +- Updated docker images for vulnerability fixes. +- Updated go-split-commons version. + 5.5.0 (Dec 12, 2023) - Added support for Flag Sets on Split Proxy and Synchronizer, which enables SDKs to interacting with the flag sets features (more details in our documentation): - Updated Proxy endpoints used by SDKs to fetch flags have been updated to handle any SDKs downloading flags in certain flag sets. diff --git a/docker/Dockerfile.proxy b/docker/Dockerfile.proxy index 0c7e9131..e18039ca 100644 --- a/docker/Dockerfile.proxy +++ b/docker/Dockerfile.proxy @@ -1,5 +1,5 @@ # Build stage -FROM golang:1.21.3-alpine3.18 AS builder +FROM golang:1.21.5-alpine3.19 AS builder ARG EXTRA_BUILD_ARGS @@ -16,7 +16,7 @@ COPY . . RUN make clean split-proxy entrypoints EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}" # Runner stage -FROM alpine:3.18.4 AS runner +FROM alpine:3.19.0 AS runner RUN apk add bash diff --git a/docker/Dockerfile.synchronizer b/docker/Dockerfile.synchronizer index b0854347..e2255d64 100644 --- a/docker/Dockerfile.synchronizer +++ b/docker/Dockerfile.synchronizer @@ -1,5 +1,5 @@ # Build stage -FROM golang:1.21.3-alpine3.18 AS builder +FROM golang:1.21.5-alpine3.19 AS builder ARG EXTRA_BUILD_ARGS @@ -16,7 +16,7 @@ COPY . . RUN make clean split-sync entrypoints EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}" # Runner stage -FROM alpine:3.18.4 AS runner +FROM alpine:3.19.0 AS runner RUN apk add bash diff --git a/go.mod b/go.mod index fd37ae1d..4cb0d4c9 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/google/uuid v1.3.0 github.com/splitio/gincache v1.0.1 - github.com/splitio/go-split-commons/v5 v5.1.0 + github.com/splitio/go-split-commons/v5 v5.1.1-0.20231215145627-50f20bea9ccd github.com/splitio/go-toolkit/v5 v5.3.2 github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.6 diff --git a/go.sum b/go.sum index 5bf34df0..77f97572 100644 --- a/go.sum +++ b/go.sum @@ -92,6 +92,8 @@ github.com/splitio/gincache v1.0.1 h1:dLYdANY/BqH4KcUMCe/LluLyV5WtuE/LEdQWRE06IX github.com/splitio/gincache v1.0.1/go.mod h1:CcgJDSM9Af75kyBH0724v55URVwMBuSj5x1eCWIOECY= github.com/splitio/go-split-commons/v5 v5.1.0 h1:mki1235gjXwuxcXdv/bKVduX1Lv09uXJogds+BspqSM= github.com/splitio/go-split-commons/v5 v5.1.0/go.mod h1:9vAZrlhKvhensyRC11hyVFdgLIBrkX9D5vdYc9qB13w= +github.com/splitio/go-split-commons/v5 v5.1.1-0.20231215145627-50f20bea9ccd h1:SyJzAn3pLbMFafPEzOliYcA4RojNiFk+Sdn0H5cKSVQ= +github.com/splitio/go-split-commons/v5 v5.1.1-0.20231215145627-50f20bea9ccd/go.mod h1:9vAZrlhKvhensyRC11hyVFdgLIBrkX9D5vdYc9qB13w= github.com/splitio/go-toolkit/v5 v5.3.2 h1:Yy9YBcHRmK5WVZjeA/klLGEdF38xpsL1ejnC3ro8a2M= github.com/splitio/go-toolkit/v5 v5.3.2/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From 0f2619fd1f85576cafb2dfe10f91a2a05d53b25d Mon Sep 17 00:00:00 2001 From: Martin Redolatti Date: Mon, 18 Dec 2023 14:23:07 -0300 Subject: [PATCH 2/3] hide redis password --- splitio/commitversion.go | 2 +- splitio/producer/initialization.go | 1 + splitio/version.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/splitio/commitversion.go b/splitio/commitversion.go index bee01bac..589b41f8 100644 --- a/splitio/commitversion.go +++ b/splitio/commitversion.go @@ -5,4 +5,4 @@ This file is created automatically, please do not edit */ // CommitVersion is the version of the last commit previous to release -const CommitVersion = "cf3da63" +const CommitVersion = "5ed4245" diff --git a/splitio/producer/initialization.go b/splitio/producer/initialization.go index 48fe4b9c..f1a865cb 100644 --- a/splitio/producer/initialization.go +++ b/splitio/producer/initialization.go @@ -281,6 +281,7 @@ func Start(logger logging.LoggerInterface, cfg *conf.Main) error { cfgForAdmin := *cfg cfgForAdmin.Apikey = logging.ObfuscateAPIKey(cfgForAdmin.Apikey) + cfgForAdmin.Storage.Redis.Pass = "xxxxxxxxxxxxxxx" adminServer, err := admin.NewServer(&admin.Options{ Host: cfg.Admin.Host, Port: int(cfg.Admin.Port), diff --git a/splitio/version.go b/splitio/version.go index 5760d415..8a1e7069 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -2,4 +2,4 @@ package splitio // Version is the version of this Agent -const Version = "5.5.0" +const Version = "5.5.1-rc1" From 300a54ef69d19b34a1fe63f8dd8bd87e5da5f134 Mon Sep 17 00:00:00 2001 From: Lucas Echeverz Date: Thu, 21 Dec 2023 15:45:16 -0300 Subject: [PATCH 3/3] Updating go-split-commons version --- CHANGES.txt | 3 ++- go.mod | 2 +- go.sum | 2 ++ splitio/version.go | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 34667b68..715cec9f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ -5.5.1 (XXXX) +5.5.1 (Dec 21, 2023) - Updated docker images for vulnerability fixes. - Updated go-split-commons version. +- Updated how redis data is displayed in /info/configs. 5.5.0 (Dec 12, 2023) - Added support for Flag Sets on Split Proxy and Synchronizer, which enables SDKs to interacting with the flag sets features (more details in our documentation): diff --git a/go.mod b/go.mod index 4cb0d4c9..67791ff1 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/google/uuid v1.3.0 github.com/splitio/gincache v1.0.1 - github.com/splitio/go-split-commons/v5 v5.1.1-0.20231215145627-50f20bea9ccd + github.com/splitio/go-split-commons/v5 v5.1.1 github.com/splitio/go-toolkit/v5 v5.3.2 github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.6 diff --git a/go.sum b/go.sum index 77f97572..e87bab4d 100644 --- a/go.sum +++ b/go.sum @@ -94,6 +94,8 @@ github.com/splitio/go-split-commons/v5 v5.1.0 h1:mki1235gjXwuxcXdv/bKVduX1Lv09uX github.com/splitio/go-split-commons/v5 v5.1.0/go.mod h1:9vAZrlhKvhensyRC11hyVFdgLIBrkX9D5vdYc9qB13w= github.com/splitio/go-split-commons/v5 v5.1.1-0.20231215145627-50f20bea9ccd h1:SyJzAn3pLbMFafPEzOliYcA4RojNiFk+Sdn0H5cKSVQ= github.com/splitio/go-split-commons/v5 v5.1.1-0.20231215145627-50f20bea9ccd/go.mod h1:9vAZrlhKvhensyRC11hyVFdgLIBrkX9D5vdYc9qB13w= +github.com/splitio/go-split-commons/v5 v5.1.1 h1:lLOqNQMdZA5Z7FBBh4YODWdE2QFgxSPMptX9ty14x4c= +github.com/splitio/go-split-commons/v5 v5.1.1/go.mod h1:9vAZrlhKvhensyRC11hyVFdgLIBrkX9D5vdYc9qB13w= github.com/splitio/go-toolkit/v5 v5.3.2 h1:Yy9YBcHRmK5WVZjeA/klLGEdF38xpsL1ejnC3ro8a2M= github.com/splitio/go-toolkit/v5 v5.3.2/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/splitio/version.go b/splitio/version.go index 8a1e7069..a906b92b 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -2,4 +2,4 @@ package splitio // Version is the version of this Agent -const Version = "5.5.1-rc1" +const Version = "5.5.1"