From 8f9b1e1af5389d60dbcd84f31d411e99eedc15eb Mon Sep 17 00:00:00 2001 From: Mauro Antonio Sanz Date: Tue, 4 Feb 2025 12:27:22 -0300 Subject: [PATCH 1/6] testing cars changes --- infra/sidecar.Dockerfile | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/infra/sidecar.Dockerfile b/infra/sidecar.Dockerfile index 41a43ee..26fcb2a 100644 --- a/infra/sidecar.Dockerfile +++ b/infra/sidecar.Dockerfile @@ -1,35 +1,42 @@ # ----- Builder image -FROM golang:1.21.6-bookworm AS builder +ARG GOLANG_VERSION=1.23.5 +FROM golang:${GOLANG_VERSION}-bookworm AS builder ARG FIPS_MODE ARG COMMIT_SHA -RUN apt update -y -RUN apt install -y build-essential ca-certificates python3 git socat +RUN DEBIAN_FRONTEND=noninteractive \ + apt-get update && \ + apt-get install --no-install-recommends -y \ + build-essential ca-certificates python3 git socat WORKDIR /splitd COPY . . RUN export GITHUB_SHA="${COMMIT_SHA}" && bash -c '\ - if [[ "${FIPS_MODE}" = "enabled" ]]; \ - then echo "building in fips mode"; make clean splitd-fips splitd.yaml.tpl EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}"; mv splitd-fips splitd; \ - else echo "building in standard mode"; make clean splitd splitd.yaml.tpl EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}"; \ - fi' + if [[ "${FIPS_MODE}" = "enabled" ]]; \ + then echo "building in fips mode"; make clean splitd-fips splitd.yaml.tpl EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}"; mv splitd-fips splitd; \ + else echo "building in standard mode"; make clean splitd splitd.yaml.tpl EXTRA_BUILD_ARGS="${EXTRA_BUILD_ARGS}"; \ + fi' # ----- Runner image -FROM debian:12.4 AS runner +FROM debian:bookworm-20250203-slim AS runner -RUN apt update -y -RUN apt install -y bash ca-certificates wget socat +ARG YQ_VERSION=v4.44.6 -RUN wget https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_amd64 -RUN chmod +x yq_linux_amd64 -RUN mv yq_linux_amd64 /usr/local/bin/yq +RUN DEBIAN_FRONTEND=noninteractive \ + apt-get update && \ + apt-get install --no-install-recommends -y \ + bash ca-certificates wget socat && \ + wget -O /usr/local/bin/yq \ + "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64" && \ + chmod +x /usr/local/bin/yq && \ + mkdir -p /opt/splitd && \ + rm -rf /var/lib/apt/lists/* -RUN mkdir -p /opt/splitd COPY --from=builder /splitd/splitd /opt/splitd COPY --from=builder /splitd/splitd.yaml.tpl /opt/splitd COPY infra/entrypoint.sh /opt/splitd RUN chmod +x /opt/splitd/entrypoint.sh -ENTRYPOINT ["/opt/splitd/entrypoint.sh"] +ENTRYPOINT ["/opt/splitd/entrypoint.sh"] \ No newline at end of file From 1542d12d8c3f31063426779c9e25295dfb2bf85e Mon Sep 17 00:00:00 2001 From: Mauro Antonio Sanz Date: Tue, 4 Feb 2025 12:46:20 -0300 Subject: [PATCH 2/6] update version --- splitio/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/splitio/version.go b/splitio/version.go index 16afa17..a1ccf2e 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -1,3 +1,3 @@ package splitio -const Version = "1.6.0" +const Version = "1.6.1.rc.1" From 4c09a214326c37bf95df81334ed36fb42037d7bd Mon Sep 17 00:00:00 2001 From: Mauro Antonio Sanz Date: Tue, 4 Feb 2025 13:33:48 -0300 Subject: [PATCH 3/6] update go version --- go.mod | 3 +-- splitio/version.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0ffc40d..a0ef6c9 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,9 @@ module github.com/splitio/splitd -go 1.21 +go 1.23.5 require ( github.com/gin-gonic/gin v1.10.0 - github.com/go-playground/assert/v2 v2.2.0 github.com/splitio/go-split-commons/v6 v6.1.0 github.com/splitio/go-toolkit/v5 v5.4.0 github.com/stretchr/testify v1.9.0 diff --git a/splitio/version.go b/splitio/version.go index a1ccf2e..2de693c 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -1,3 +1,3 @@ package splitio -const Version = "1.6.1.rc.1" +const Version = "1.6.1.rc.2" From 6fd415b1b2a3173cc6494e8ce37e78104e779761 Mon Sep 17 00:00:00 2001 From: Mauro Antonio Sanz Date: Wed, 5 Feb 2025 14:53:53 -0300 Subject: [PATCH 4/6] fixing vulnerabilities --- CHANGES | 2 +- go.mod | 12 ++++++------ go.sum | 22 ++++++++++++---------- infra/sidecar.Dockerfile | 2 +- splitio/version.go | 2 +- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index c72dade..9328f11 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -1.6.0 (Feb 4, 2025) +1.6.0 (Feb 5, 2025) - Added Health & Readiness endpoints 1.5.0 (Jan 29, 2025): diff --git a/go.mod b/go.mod index a0ef6c9..b094406 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/splitio/splitd -go 1.23.5 +go 1.23.6 require ( github.com/gin-gonic/gin v1.10.0 @@ -8,7 +8,7 @@ require ( github.com/splitio/go-toolkit/v5 v5.4.0 github.com/stretchr/testify v1.9.0 github.com/vmihailenco/msgpack/v5 v5.3.5 - golang.org/x/sync v0.3.0 + golang.org/x/sync v0.10.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -39,10 +39,10 @@ require ( github.com/ugorji/go/codec v1.2.12 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.23.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/text v0.21.0 // indirect google.golang.org/protobuf v1.34.1 // indirect ) diff --git a/go.sum b/go.sum index 770c13c..2ba861e 100644 --- a/go.sum +++ b/go.sum @@ -82,20 +82,22 @@ github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +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/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= diff --git a/infra/sidecar.Dockerfile b/infra/sidecar.Dockerfile index 26fcb2a..a26df79 100644 --- a/infra/sidecar.Dockerfile +++ b/infra/sidecar.Dockerfile @@ -1,5 +1,5 @@ # ----- Builder image -ARG GOLANG_VERSION=1.23.5 +ARG GOLANG_VERSION=1.23.6 FROM golang:${GOLANG_VERSION}-bookworm AS builder ARG FIPS_MODE diff --git a/splitio/version.go b/splitio/version.go index 2de693c..5bf924f 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -1,3 +1,3 @@ package splitio -const Version = "1.6.1.rc.2" +const Version = "1.6.1-rc.3" From 244b9a3987e5479a94cb1f7b83fbe53d51af48fc Mon Sep 17 00:00:00 2001 From: Mauro Antonio Sanz Date: Wed, 5 Feb 2025 16:12:51 -0300 Subject: [PATCH 5/6] update changes and version --- CHANGES | 3 ++- go.sum | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 9328f11..a2cb5e2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ 1.6.0 (Feb 5, 2025) -- Added Health & Readiness endpoints +- Added Health & Readiness endpoints. +- Fixing vulnerabilities. 1.5.0 (Jan 29, 2025): - Added support for the new impressions tracking toggle available on feature flags, both respecting the setting and including the new field being returned on SplitView type objects. Read more in our docs. diff --git a/go.sum b/go.sum index 2ba861e..ffa9c93 100644 --- a/go.sum +++ b/go.sum @@ -86,8 +86,6 @@ golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -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/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= From c56e2175281c53e3fec0d84d3609ec0c9703fcfd Mon Sep 17 00:00:00 2001 From: Mauro Antonio Sanz Date: Wed, 5 Feb 2025 16:15:48 -0300 Subject: [PATCH 6/6] update version --- splitio/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/splitio/version.go b/splitio/version.go index 5bf924f..16afa17 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -1,3 +1,3 @@ package splitio -const Version = "1.6.1-rc.3" +const Version = "1.6.0"