From 931e477de5ff706e6719dea2c00568830c470369 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 15:09:06 +0000 Subject: [PATCH 1/8] Bump SonarSource/sonarcloud-github-action from 2.0.0 to 2.1.1 Bumps [SonarSource/sonarcloud-github-action](https://github.com/sonarsource/sonarcloud-github-action) from 2.0.0 to 2.1.1. - [Release notes](https://github.com/sonarsource/sonarcloud-github-action/releases) - [Commits](https://github.com/sonarsource/sonarcloud-github-action/compare/v2.0.0...v2.1.1) --- updated-dependencies: - dependency-name: SonarSource/sonarcloud-github-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1ffdf2..c7f81d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: run: make binaries_release - name: SonarQube Scan - uses: SonarSource/sonarcloud-github-action@v2.0.0 + uses: SonarSource/sonarcloud-github-action@v2.1.1 env: SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From dfe1d3179a2fae8892e7f592fc4fc00238c9110a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:13:25 +0000 Subject: [PATCH 2/8] Bump mukunku/tag-exists-action from 1.5.0 to 1.6.0 Bumps [mukunku/tag-exists-action](https://github.com/mukunku/tag-exists-action) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/mukunku/tag-exists-action/releases) - [Commits](https://github.com/mukunku/tag-exists-action/compare/v1.5.0...v1.6.0) --- updated-dependencies: - dependency-name: mukunku/tag-exists-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1ffdf2..4a68691 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Version validation if: ${{ github.event_name == 'pull_request' }} - uses: mukunku/tag-exists-action@v1.5.0 + uses: mukunku/tag-exists-action@v1.6.0 id: checkTag with: tag: v${{ env.VERSION }} From 9821ca53c67b3019b15603c4044e2198e4b99aa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:57:38 +0000 Subject: [PATCH 3/8] Bump softprops/action-gh-release from 1 to 2 Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2. - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1ffdf2..8ef9644 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: tag_prefix: 'v' - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 if: ${{ github.event_name == 'push' }} with: name: splitd-${{ env.VERSION }} From 1a0a5d1bb73823b5ab74193a698206bbc5d7ba9e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:57:40 +0000 Subject: [PATCH 4/8] Bump mathieudutour/github-tag-action from 6.1 to 6.2 Bumps [mathieudutour/github-tag-action](https://github.com/mathieudutour/github-tag-action) from 6.1 to 6.2. - [Release notes](https://github.com/mathieudutour/github-tag-action/releases) - [Commits](https://github.com/mathieudutour/github-tag-action/compare/v6.1...v6.2) --- updated-dependencies: - dependency-name: mathieudutour/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1ffdf2..36ee8df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: - name: Git tag if: ${{ github.event_name == 'push' }} - uses: mathieudutour/github-tag-action@v6.1 + uses: mathieudutour/github-tag-action@v6.2 with: github_token: ${{ secrets.GITHUB_TOKEN }} custom_tag: ${{ env.VERSION }} From c6b42a54173f8103bd07958acf2d8f75517e3ed7 Mon Sep 17 00:00:00 2001 From: Matias Melograno Date: Tue, 14 May 2024 16:11:31 -0300 Subject: [PATCH 5/8] updated to commons v6 --- .github/pull_request_template.md | 11 +++++++++ CHANGES | 5 ++++ external/commons/mocks/evaluator.go | 2 +- external/commons/mocks/impmanager.go | 4 +-- external/commons/mocks/imprecorder.go | 4 +-- external/commons/mocks/splitstorage.go | 9 +++++-- go.mod | 4 +-- go.sum | 8 +++--- splitio/link/client/types/interfaces.go | 2 +- splitio/link/client/v1/impl.go | 2 +- splitio/link/client/v1/impl_test.go | 2 +- splitio/link/service/v1/clientmgr_test.go | 2 +- splitio/sdk/conf/conf.go | 9 ++++--- splitio/sdk/helpers.go | 30 +++++++++++------------ splitio/sdk/helpers_test.go | 2 +- splitio/sdk/integration_test.go | 2 +- splitio/sdk/results.go | 2 +- splitio/sdk/sdk.go | 18 +++++++------- splitio/sdk/sdk_test.go | 8 +++--- splitio/sdk/storage/multi_test.go | 2 +- splitio/sdk/storage/storages.go | 2 +- splitio/sdk/validators.go | 2 +- splitio/sdk/workers/events.go | 8 +++--- splitio/sdk/workers/events_test.go | 6 ++--- splitio/sdk/workers/impressions.go | 8 +++--- splitio/sdk/workers/impressions_test.go | 6 ++--- splitio/version.go | 2 +- 27 files changed, 93 insertions(+), 69 deletions(-) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..6f43500 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,11 @@ +# GO SPLIT COMMONS + +## What did you accomplish? + +- [ ] Bug fix +- [ ] New feature +- [ ] Breaking change + +## How do we test the changes introduced in this PR? + +## Extra Notes diff --git a/CHANGES b/CHANGES index 102dd35..93d2579 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.4.0 (May 14, 2024): +- Updated go-split-commons to v6 + - Added support for targeting rules based on semantic versions (https://semver.org/). + - Added the logic to handle correctly when the SDK receives an unsupported Matcher type. + 1.3.1 (March 4, 2024): - Add socat in runner image diff --git a/external/commons/mocks/evaluator.go b/external/commons/mocks/evaluator.go index f4b8efc..0b3b84c 100644 --- a/external/commons/mocks/evaluator.go +++ b/external/commons/mocks/evaluator.go @@ -1,7 +1,7 @@ package mocks import ( - "github.com/splitio/go-split-commons/v5/engine/evaluator" + "github.com/splitio/go-split-commons/v6/engine/evaluator" "github.com/stretchr/testify/mock" ) diff --git a/external/commons/mocks/impmanager.go b/external/commons/mocks/impmanager.go index 44b761f..e61cfd6 100644 --- a/external/commons/mocks/impmanager.go +++ b/external/commons/mocks/impmanager.go @@ -1,8 +1,8 @@ package mocks import ( - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/provisional" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/provisional" "github.com/stretchr/testify/mock" ) diff --git a/external/commons/mocks/imprecorder.go b/external/commons/mocks/imprecorder.go index 8d498a7..8a47d48 100644 --- a/external/commons/mocks/imprecorder.go +++ b/external/commons/mocks/imprecorder.go @@ -1,8 +1,8 @@ package mocks import ( - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/service" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/service" "github.com/stretchr/testify/mock" ) diff --git a/external/commons/mocks/splitstorage.go b/external/commons/mocks/splitstorage.go index e9c0c58..00b62bd 100644 --- a/external/commons/mocks/splitstorage.go +++ b/external/commons/mocks/splitstorage.go @@ -1,8 +1,8 @@ package mocks import ( - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/storage" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/storage" "github.com/splitio/go-toolkit/v5/datastructures/set" "github.com/stretchr/testify/mock" ) @@ -63,4 +63,9 @@ func (m *SplitStorageMock) GetNamesByFlagSets(sets []string) map[string][]string return args.Get(0).(map[string][]string) } +func (m *SplitStorageMock) GetAllFlagSetNames() []string { + args := m.Called() + return args.Get(0).([]string) +} + var _ storage.SplitStorage = (*SplitStorageMock)(nil) diff --git a/go.mod b/go.mod index c789d2f..0286943 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/splitio/splitd go 1.21 require ( - github.com/splitio/go-split-commons/v5 v5.1.0 - github.com/splitio/go-toolkit/v5 v5.3.2 + 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.1 github.com/vmihailenco/msgpack/v5 v5.3.5 golang.org/x/sync v0.3.0 diff --git a/go.sum b/go.sum index 2b0fcce..05c7b22 100644 --- a/go.sum +++ b/go.sum @@ -7,10 +7,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -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-toolkit/v5 v5.3.2 h1:Yy9YBcHRmK5WVZjeA/klLGEdF38xpsL1ejnC3ro8a2M= -github.com/splitio/go-toolkit/v5 v5.3.2/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko= +github.com/splitio/go-split-commons/v6 v6.0.0 h1:qenr5qbXafjvM832C64CVpjtlShuQiWCwtR5I2h4ogM= +github.com/splitio/go-split-commons/v6 v6.0.0/go.mod h1:TsvIh3XP7yjc7ly4vpj06AkoBND36SodPs5qfhb8rHc= +github.com/splitio/go-toolkit/v5 v5.4.0 h1:g5WFpRhQomnXCmvfsNOWV4s5AuUrWIZ+amM68G8NBKM= +github.com/splitio/go-toolkit/v5 v5.4.0/go.mod h1:xYhUvV1gga9/1029Wbp5pjnR6Cy8nvBpjw99wAbsMko= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= diff --git a/splitio/link/client/types/interfaces.go b/splitio/link/client/types/interfaces.go index 0a8d34f..0d7ac20 100644 --- a/splitio/link/client/types/interfaces.go +++ b/splitio/link/client/types/interfaces.go @@ -1,7 +1,7 @@ package types import ( - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/splitd/splitio/sdk" ) diff --git a/splitio/link/client/v1/impl.go b/splitio/link/client/v1/impl.go index d8cdb70..ebc24be 100644 --- a/splitio/link/client/v1/impl.go +++ b/splitio/link/client/v1/impl.go @@ -3,7 +3,7 @@ package v1 import ( "fmt" - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio" "github.com/splitio/splitd/splitio/link/client/types" diff --git a/splitio/link/client/v1/impl_test.go b/splitio/link/client/v1/impl_test.go index 5688f4d..f174400 100644 --- a/splitio/link/client/v1/impl_test.go +++ b/splitio/link/client/v1/impl_test.go @@ -3,7 +3,7 @@ package v1 import ( "testing" - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio/common/lang" v1 "github.com/splitio/splitd/splitio/link/protocol/v1" diff --git a/splitio/link/service/v1/clientmgr_test.go b/splitio/link/service/v1/clientmgr_test.go index ced3d0d..8fa3a1c 100644 --- a/splitio/link/service/v1/clientmgr_test.go +++ b/splitio/link/service/v1/clientmgr_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio/common/lang" "github.com/splitio/splitd/splitio/link/protocol" diff --git a/splitio/sdk/conf/conf.go b/splitio/sdk/conf/conf.go index 020455f..1314186 100644 --- a/splitio/sdk/conf/conf.go +++ b/splitio/sdk/conf/conf.go @@ -3,9 +3,10 @@ package conf import ( "time" - "github.com/splitio/go-split-commons/v5/conf" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/flagsets" + "github.com/splitio/go-split-commons/v6/conf" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/flagsets" + "github.com/splitio/go-split-commons/v6/service/api/specs" ) const ( @@ -78,6 +79,8 @@ func (c *Config) ToAdvancedConfig() *conf.AdvancedConfig { d.TelemetryServiceURL = c.URLs.Telemetry d.ImpressionsQueueSize = c.Impressions.QueueSize + d.AuthSpecVersion = specs.FLAG_V1_1 + d.FlagsSpecVersion = specs.FLAG_V1_1 return &d } diff --git a/splitio/sdk/helpers.go b/splitio/sdk/helpers.go index 944b526..8abeeac 100644 --- a/splitio/sdk/helpers.go +++ b/splitio/sdk/helpers.go @@ -7,21 +7,21 @@ import ( sss "github.com/splitio/splitd/splitio/sdk/storage" "github.com/splitio/splitd/splitio/sdk/workers" - "github.com/splitio/go-split-commons/v5/conf" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/flagsets" - "github.com/splitio/go-split-commons/v5/healthcheck/application" - "github.com/splitio/go-split-commons/v5/provisional" - "github.com/splitio/go-split-commons/v5/provisional/strategy" - "github.com/splitio/go-split-commons/v5/service/api" - "github.com/splitio/go-split-commons/v5/storage" - "github.com/splitio/go-split-commons/v5/storage/inmemory" - "github.com/splitio/go-split-commons/v5/storage/inmemory/mutexmap" - "github.com/splitio/go-split-commons/v5/synchronizer" - "github.com/splitio/go-split-commons/v5/synchronizer/worker/impressionscount" - "github.com/splitio/go-split-commons/v5/synchronizer/worker/segment" - "github.com/splitio/go-split-commons/v5/synchronizer/worker/split" - "github.com/splitio/go-split-commons/v5/tasks" + "github.com/splitio/go-split-commons/v6/conf" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/flagsets" + "github.com/splitio/go-split-commons/v6/healthcheck/application" + "github.com/splitio/go-split-commons/v6/provisional" + "github.com/splitio/go-split-commons/v6/provisional/strategy" + "github.com/splitio/go-split-commons/v6/service/api" + "github.com/splitio/go-split-commons/v6/storage" + "github.com/splitio/go-split-commons/v6/storage/inmemory" + "github.com/splitio/go-split-commons/v6/storage/inmemory/mutexmap" + "github.com/splitio/go-split-commons/v6/synchronizer" + "github.com/splitio/go-split-commons/v6/synchronizer/worker/impressionscount" + "github.com/splitio/go-split-commons/v6/synchronizer/worker/segment" + "github.com/splitio/go-split-commons/v6/synchronizer/worker/split" + "github.com/splitio/go-split-commons/v6/tasks" "github.com/splitio/go-toolkit/v5/logging" ) diff --git a/splitio/sdk/helpers_test.go b/splitio/sdk/helpers_test.go index bf34f09..d7b7ea8 100644 --- a/splitio/sdk/helpers_test.go +++ b/splitio/sdk/helpers_test.go @@ -3,7 +3,7 @@ package sdk import ( "testing" - "github.com/splitio/go-split-commons/v5/flagsets" + "github.com/splitio/go-split-commons/v6/flagsets" sdkConf "github.com/splitio/splitd/splitio/sdk/conf" "github.com/stretchr/testify/assert" ) diff --git a/splitio/sdk/integration_test.go b/splitio/sdk/integration_test.go index 9aa6f69..cbfb4e1 100644 --- a/splitio/sdk/integration_test.go +++ b/splitio/sdk/integration_test.go @@ -10,7 +10,7 @@ import ( "sync/atomic" "testing" - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio/sdk/conf" "github.com/splitio/splitd/splitio/sdk/types" diff --git a/splitio/sdk/results.go b/splitio/sdk/results.go index 79dc972..fb7853a 100644 --- a/splitio/sdk/results.go +++ b/splitio/sdk/results.go @@ -1,6 +1,6 @@ package sdk -import "github.com/splitio/go-split-commons/v5/dtos" +import "github.com/splitio/go-split-commons/v6/dtos" type EvaluationResult struct { Treatment string diff --git a/splitio/sdk/sdk.go b/splitio/sdk/sdk.go index 82c064c..144634f 100644 --- a/splitio/sdk/sdk.go +++ b/splitio/sdk/sdk.go @@ -9,15 +9,15 @@ import ( "github.com/splitio/splitd/splitio/sdk/storage" "github.com/splitio/splitd/splitio/sdk/types" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/engine" - "github.com/splitio/go-split-commons/v5/engine/evaluator" - "github.com/splitio/go-split-commons/v5/flagsets" - "github.com/splitio/go-split-commons/v5/healthcheck/application" - "github.com/splitio/go-split-commons/v5/provisional" - "github.com/splitio/go-split-commons/v5/service/api" - commonStorage "github.com/splitio/go-split-commons/v5/storage" - "github.com/splitio/go-split-commons/v5/synchronizer" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/engine" + "github.com/splitio/go-split-commons/v6/engine/evaluator" + "github.com/splitio/go-split-commons/v6/flagsets" + "github.com/splitio/go-split-commons/v6/healthcheck/application" + "github.com/splitio/go-split-commons/v6/provisional" + "github.com/splitio/go-split-commons/v6/service/api" + commonStorage "github.com/splitio/go-split-commons/v6/storage" + "github.com/splitio/go-split-commons/v6/synchronizer" "github.com/splitio/go-toolkit/v5/common" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio" diff --git a/splitio/sdk/sdk_test.go b/splitio/sdk/sdk_test.go index 15db214..2fd4c91 100644 --- a/splitio/sdk/sdk_test.go +++ b/splitio/sdk/sdk_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/engine/evaluator" - "github.com/splitio/go-split-commons/v5/storage/inmemory" - "github.com/splitio/go-split-commons/v5/synchronizer" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/engine/evaluator" + "github.com/splitio/go-split-commons/v6/storage/inmemory" + "github.com/splitio/go-split-commons/v6/synchronizer" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/external/commons/mocks" "github.com/splitio/splitd/splitio/common/lang" diff --git a/splitio/sdk/storage/multi_test.go b/splitio/sdk/storage/multi_test.go index e0ab5a9..611f6cb 100644 --- a/splitio/sdk/storage/multi_test.go +++ b/splitio/sdk/storage/multi_test.go @@ -3,7 +3,7 @@ package storage import ( "testing" - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/splitd/splitio/sdk/types" "github.com/stretchr/testify/assert" diff --git a/splitio/sdk/storage/storages.go b/splitio/sdk/storage/storages.go index 85b3c07..f979fa0 100644 --- a/splitio/sdk/storage/storages.go +++ b/splitio/sdk/storage/storages.go @@ -3,7 +3,7 @@ package storage import ( "math" - "github.com/splitio/go-split-commons/v5/dtos" + "github.com/splitio/go-split-commons/v6/dtos" "github.com/splitio/splitd/splitio/sdk/types" ) diff --git a/splitio/sdk/validators.go b/splitio/sdk/validators.go index dfb7399..93e53f7 100644 --- a/splitio/sdk/validators.go +++ b/splitio/sdk/validators.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "github.com/splitio/go-split-commons/v5/storage" + "github.com/splitio/go-split-commons/v6/storage" "github.com/splitio/go-toolkit/v5/logging" ) diff --git a/splitio/sdk/workers/events.go b/splitio/sdk/workers/events.go index 96e1dcb..9537191 100644 --- a/splitio/sdk/workers/events.go +++ b/splitio/sdk/workers/events.go @@ -9,10 +9,10 @@ import ( "github.com/splitio/splitd/splitio/sdk/types" serrors "github.com/splitio/splitd/splitio/util/errors" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/service" - "github.com/splitio/go-split-commons/v5/storage" - "github.com/splitio/go-split-commons/v5/synchronizer/worker/event" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/service" + "github.com/splitio/go-split-commons/v6/storage" + "github.com/splitio/go-split-commons/v6/synchronizer/worker/event" "github.com/splitio/go-toolkit/v5/logging" gtsync "github.com/splitio/go-toolkit/v5/sync" ) diff --git a/splitio/sdk/workers/events_test.go b/splitio/sdk/workers/events_test.go index e52c87b..26e1033 100644 --- a/splitio/sdk/workers/events_test.go +++ b/splitio/sdk/workers/events_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/service" - "github.com/splitio/go-split-commons/v5/storage/inmemory" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/service" + "github.com/splitio/go-split-commons/v6/storage/inmemory" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio/sdk/conf" sss "github.com/splitio/splitd/splitio/sdk/storage" diff --git a/splitio/sdk/workers/impressions.go b/splitio/sdk/workers/impressions.go index 65c3438..8f3132b 100644 --- a/splitio/sdk/workers/impressions.go +++ b/splitio/sdk/workers/impressions.go @@ -9,10 +9,10 @@ import ( "github.com/splitio/splitd/splitio/sdk/types" serrors "github.com/splitio/splitd/splitio/util/errors" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/service" - "github.com/splitio/go-split-commons/v5/storage" - "github.com/splitio/go-split-commons/v5/synchronizer/worker/impression" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/service" + "github.com/splitio/go-split-commons/v6/storage" + "github.com/splitio/go-split-commons/v6/synchronizer/worker/impression" "github.com/splitio/go-toolkit/v5/logging" gtsync "github.com/splitio/go-toolkit/v5/sync" ) diff --git a/splitio/sdk/workers/impressions_test.go b/splitio/sdk/workers/impressions_test.go index 0e57f69..6499bae 100644 --- a/splitio/sdk/workers/impressions_test.go +++ b/splitio/sdk/workers/impressions_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/splitio/go-split-commons/v5/dtos" - "github.com/splitio/go-split-commons/v5/service" - "github.com/splitio/go-split-commons/v5/storage/inmemory" + "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/service" + "github.com/splitio/go-split-commons/v6/storage/inmemory" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio/sdk/conf" sss "github.com/splitio/splitd/splitio/sdk/storage" diff --git a/splitio/version.go b/splitio/version.go index 6a1273c..91214b4 100644 --- a/splitio/version.go +++ b/splitio/version.go @@ -1,3 +1,3 @@ package splitio -const Version = "1.3.1" +const Version = "1.4.0" From 145702fb18855bb8fde35f370c39b4bbfb99a665 Mon Sep 17 00:00:00 2001 From: Matias Melograno Date: Tue, 14 May 2024 16:15:34 -0300 Subject: [PATCH 6/8] added spec version coverage in test --- splitio/sdk/integration_test.go | 4 ++++ splitio/sdk/sdk_test.go | 24 ++++++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/splitio/sdk/integration_test.go b/splitio/sdk/integration_test.go index cbfb4e1..af620e6 100644 --- a/splitio/sdk/integration_test.go +++ b/splitio/sdk/integration_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/splitio/go-split-commons/v6/dtos" + "github.com/splitio/go-split-commons/v6/service/api/specs" "github.com/splitio/go-toolkit/v5/logging" "github.com/splitio/splitd/splitio/sdk/conf" "github.com/splitio/splitd/splitio/sdk/types" @@ -55,6 +56,9 @@ func TestInstantiationAndGetTreatmentE2E(t *testing.T) { Till: 3, } + assert.Equal(t, "-1", r.URL.Query().Get("since")) + assert.Equal(t, specs.FLAG_V1_1, r.URL.Query().Get("s")) + raw, err := json.Marshal(splitChanges) assert.Nil(t, err) diff --git a/splitio/sdk/sdk_test.go b/splitio/sdk/sdk_test.go index 2fd4c91..5fd2f00 100644 --- a/splitio/sdk/sdk_test.go +++ b/splitio/sdk/sdk_test.go @@ -61,12 +61,12 @@ func TestTreatmentLabelsDisabled(t *testing.T) { assert.Equal(t, 1, st.Len()) var imps []dtos.Impression - n, err := st.Pop(1, &imps) + n, _ := st.Pop(1, &imps) assert.Nil(t, nil) assert.Equal(t, 1, n) assert.Equal(t, 1, len(imps)) assertImpEq(t, expectedImpression, &imps[0]) - n, err = st.Pop(1, &imps) + st.Pop(1, &imps) assert.ErrorIs(t, err, storage.ErrQueueEmpty) }) @@ -116,7 +116,7 @@ func TestTreatmentLabelsEnabled(t *testing.T) { assert.Equal(t, 1, st.Len()) var imps []dtos.Impression - n, err := st.Pop(1, &imps) + n, _ := st.Pop(1, &imps) assert.Nil(t, nil) assert.Equal(t, 1, n) assert.Equal(t, 1, len(imps)) @@ -190,7 +190,7 @@ func TestTreatments(t *testing.T) { assert.Equal(t, 3, st.Len()) var imps []dtos.Impression - n, err := st.Pop(3, &imps) + n, _ := st.Pop(3, &imps) assert.Nil(t, nil) assert.Equal(t, 3, n) assert.Equal(t, 3, len(imps)) @@ -279,7 +279,7 @@ func TestTreatmentsByFlagSet(t *testing.T) { assert.Equal(t, 3, st.Len()) var imps []dtos.Impression - n, err := st.Pop(3, &imps) + n, _ := st.Pop(3, &imps) assert.Nil(t, nil) assert.Equal(t, 3, n) assert.Equal(t, 3, len(imps)) @@ -368,7 +368,7 @@ func TestTreatmentsByFlagSets(t *testing.T) { assert.Equal(t, 3, st.Len()) var imps []dtos.Impression - n, err := st.Pop(3, &imps) + n, _ := st.Pop(3, &imps) assert.Nil(t, nil) assert.Equal(t, 3, n) assert.Equal(t, 3, len(imps)) @@ -483,7 +483,7 @@ func TestTrack(t *testing.T) { assert.Equal(t, 1, st.Len()) var evs []dtos.EventDTO - n, err := st.Pop(1, &evs) + n, _ := st.Pop(1, &evs) assert.Nil(t, nil) assert.Equal(t, 1, n) assert.Equal(t, 1, len(evs)) @@ -494,7 +494,7 @@ func TestTrack(t *testing.T) { Value: lang.Ref(123.4), Properties: map[string]interface{}{"a": 123}, }, &evs[0]) - n, err = st.Pop(1, &evs) + st.Pop(1, &evs) assert.ErrorIs(t, err, storage.ErrQueueEmpty) }) @@ -542,7 +542,7 @@ func TestTrackEventsFlush(t *testing.T) { assert.Equal(t, 3, st.Len()) var evs []dtos.EventDTO - n, err := st.Pop(10, &evs) + n, _ := st.Pop(10, &evs) assert.Nil(t, nil) assert.Equal(t, 3, n) assert.Equal(t, 3, len(evs)) @@ -561,7 +561,7 @@ func TestTrackEventsFlush(t *testing.T) { expectedEvent.Key = "key3" assertEventEq(t, &expectedEvent, &evs[2]) - n, err = st.Pop(1, &evs) + st.Pop(1, &evs) assert.ErrorIs(t, err, storage.ErrQueueEmpty) }) @@ -659,7 +659,3 @@ func assertEventEq(t *testing.T, e1, e2 *dtos.EventDTO) { assert.Equal(t, e1.Value, e2.Value) assert.Equal(t, e1.Properties, e2.Properties) } - -func ref[T any](t T) *T { - return &t -} From fa9630d87f6ccbceb3ddba3fd0702f9d22ca4cc8 Mon Sep 17 00:00:00 2001 From: Matias Melograno Date: Tue, 14 May 2024 16:28:36 -0300 Subject: [PATCH 7/8] fixing test --- splitio/sdk/sdk_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/splitio/sdk/sdk_test.go b/splitio/sdk/sdk_test.go index 5fd2f00..7e2f300 100644 --- a/splitio/sdk/sdk_test.go +++ b/splitio/sdk/sdk_test.go @@ -66,7 +66,7 @@ func TestTreatmentLabelsDisabled(t *testing.T) { assert.Equal(t, 1, n) assert.Equal(t, 1, len(imps)) assertImpEq(t, expectedImpression, &imps[0]) - st.Pop(1, &imps) + _, err := st.Pop(1, &imps) assert.ErrorIs(t, err, storage.ErrQueueEmpty) }) @@ -494,7 +494,7 @@ func TestTrack(t *testing.T) { Value: lang.Ref(123.4), Properties: map[string]interface{}{"a": 123}, }, &evs[0]) - st.Pop(1, &evs) + _, err := st.Pop(1, &evs) assert.ErrorIs(t, err, storage.ErrQueueEmpty) }) @@ -561,7 +561,7 @@ func TestTrackEventsFlush(t *testing.T) { expectedEvent.Key = "key3" assertEventEq(t, &expectedEvent, &evs[2]) - st.Pop(1, &evs) + _, err := st.Pop(1, &evs) assert.ErrorIs(t, err, storage.ErrQueueEmpty) }) From 51975d06ae99e2834f67fedbf8fe8624f132b871 Mon Sep 17 00:00:00 2001 From: Matias Melograno Date: Tue, 14 May 2024 17:56:38 -0300 Subject: [PATCH 8/8] template --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6f43500..843904d 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,4 +1,4 @@ -# GO SPLIT COMMONS +# SPLIT DAEMON ## What did you accomplish?