Skip to content

Commit 7619a57

Browse files
erkasahidvelji
erka
and
sahidvelji
authored
chore(flipt): bump minimum Go requirement to 1.24 and modernize (open-feature#752)
Signed-off-by: Roman Dmytrenko <[email protected]> Co-authored-by: Sahid Velji <[email protected]>
1 parent 39251ac commit 7619a57

File tree

5 files changed

+14
-26
lines changed

5 files changed

+14
-26
lines changed

‎providers/flipt/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/open-feature/go-sdk-contrib/providers/flipt
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/open-feature/go-sdk v1.15.1

‎providers/flipt/go.sum‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
1919
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
2020
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
2121
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
22-
github.com/open-feature/go-sdk v1.15.0 h1:FEZl4kCH6H2drhnQ0dheDBxLvwwzO7zvzdUl8zzZLX4=
23-
github.com/open-feature/go-sdk v1.15.0/go.mod h1:LkqPL/17XMGcRvTdk1qqwSSG1ICe/D2MQP0blDaXfh0=
2422
github.com/open-feature/go-sdk v1.15.1 h1:TC3FtHtOKlGlIbSf3SEpxXVhgTd/bCbuc39XHIyltkw=
2523
github.com/open-feature/go-sdk v1.15.1/go.mod h1:2WAFYzt8rLYavcubpCoiym3iSCXiHdPB6DxtMkv2wyo=
2624
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
@@ -53,16 +51,10 @@ go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qq
5351
go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck=
5452
go.uber.org/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko=
5553
go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o=
56-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
57-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
5854
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
5955
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
60-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
61-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
6256
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
6357
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
64-
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
65-
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
6658
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
6759
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
6860
google.golang.org/genproto/googleapis/api v0.0.0-20241230172942-26aa7a208def h1:0Km0hi+g2KXbXL0+riZzSCKz23f4MmwicuEb00JeonI=
@@ -71,8 +63,6 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def h1:
7163
google.golang.org/genproto/googleapis/rpc v0.0.0-20241230172942-26aa7a208def/go.mod h1:bdAgzvd4kFrpykc5/AC2eLUiegK9T/qxZHD4hXYf/ho=
7264
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
7365
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
74-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
75-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
7666
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
7767
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
7868
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎providers/flipt/pkg/provider/provider_test.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package flipt
22

33
import (
4-
"context"
54
"encoding/json"
65
"errors"
76
"testing"
@@ -58,7 +57,7 @@ func TestBooleanEvaluation(t *testing.T) {
5857

5958
p := NewProvider(WithService(mockSvc), ForNamespace("flipt"))
6059

61-
actual := p.BooleanEvaluation(context.Background(), tt.flagKey, tt.defaultValue, map[string]any{})
60+
actual := p.BooleanEvaluation(t.Context(), tt.flagKey, tt.defaultValue, map[string]any{})
6261

6362
assert.Equal(t, tt.expected, actual)
6463
})
@@ -186,7 +185,7 @@ func TestStringEvaluation(t *testing.T) {
186185

187186
p := NewProvider(WithService(mockSvc))
188187

189-
actual := p.StringEvaluation(context.Background(), tt.flagKey, tt.defaultValue, map[string]any{})
188+
actual := p.StringEvaluation(t.Context(), tt.flagKey, tt.defaultValue, map[string]any{})
190189

191190
assert.Equal(t, tt.expected, actual)
192191
})
@@ -319,7 +318,7 @@ func TestFloatEvaluation(t *testing.T) {
319318

320319
p := NewProvider(WithService(mockSvc), ForNamespace("flipt"))
321320

322-
actual := p.FloatEvaluation(context.Background(), tt.flagKey, tt.defaultValue, map[string]any{})
321+
actual := p.FloatEvaluation(t.Context(), tt.flagKey, tt.defaultValue, map[string]any{})
323322
assert.Equal(t, tt.expected, actual)
324323
})
325324
}
@@ -465,7 +464,7 @@ func TestIntEvaluation(t *testing.T) {
465464

466465
p := NewProvider(WithService(mockSvc))
467466

468-
actual := p.IntEvaluation(context.Background(), tt.flagKey, tt.defaultValue, map[string]any{})
467+
actual := p.IntEvaluation(t.Context(), tt.flagKey, tt.defaultValue, map[string]any{})
469468

470469
assert.Equal(t, tt.expected, actual)
471470
})
@@ -667,7 +666,7 @@ func TestObjectEvaluation(t *testing.T) {
667666

668667
p := NewProvider(WithService(mockSvc), ForNamespace("flipt"))
669668

670-
actual := p.ObjectEvaluation(context.Background(), tt.flagKey, tt.defaultValue, map[string]any{})
669+
actual := p.ObjectEvaluation(t.Context(), tt.flagKey, tt.defaultValue, map[string]any{})
671670

672671
assert.Equal(t, tt.expected.Value, actual.Value)
673672
})

‎providers/flipt/pkg/service/transport/service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func (s *Service) Evaluate(ctx context.Context, namespaceKey, flagKey string, ev
253253
return resp, nil
254254
}
255255

256-
func convertMapInterface(m map[string]interface{}) map[string]string {
256+
func convertMapInterface(m map[string]any) map[string]string {
257257
ee := make(map[string]string)
258258
for k, v := range m {
259259
ee[k] = fmt.Sprintf("%v", v)

‎providers/flipt/pkg/service/transport/service_test.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package transport
22

33
import (
4-
"context"
54
"testing"
65

76
of "github.com/open-feature/go-sdk/openfeature"
@@ -112,7 +111,7 @@ func TestGetFlag(t *testing.T) {
112111
client: mockClient,
113112
}
114113

115-
actual, err := s.GetFlag(context.Background(), "foo-namespace", "foo")
114+
actual, err := s.GetFlag(t.Context(), "foo-namespace", "foo")
116115
if tt.expectedErr != nil {
117116
assert.EqualError(t, err, tt.expectedErr.Error())
118117
} else {
@@ -168,12 +167,12 @@ func TestEvaluate_NonBoolean(t *testing.T) {
168167
client: mockClient,
169168
}
170169

171-
evalCtx := map[string]interface{}{
170+
evalCtx := map[string]any{
172171
"requestID": reqID,
173172
of.TargetingKey: entityID,
174173
}
175174

176-
actual, err := s.Evaluate(context.Background(), "foo-namespace", "foo", evalCtx)
175+
actual, err := s.Evaluate(t.Context(), "foo-namespace", "foo", evalCtx)
177176
if tt.expectedErr != nil {
178177
assert.ErrorContains(t, err, tt.expectedErr.Error())
179178
} else {
@@ -207,23 +206,23 @@ func TestEvaluate_Boolean(t *testing.T) {
207206
client: mockClient,
208207
}
209208

210-
evalCtx := map[string]interface{}{
209+
evalCtx := map[string]any{
211210
"requestID": reqID,
212211
of.TargetingKey: entityID,
213212
}
214213

215-
actual, err := s.Boolean(context.Background(), "foo-namespace", "foo", evalCtx)
214+
actual, err := s.Boolean(t.Context(), "foo-namespace", "foo", evalCtx)
216215
assert.NoError(t, err)
217216
assert.False(t, actual.Enabled, "match value should be false")
218217
}
219218

220219
func TestEvaluateInvalidContext(t *testing.T) {
221220
s := &Service{}
222221

223-
_, err := s.Evaluate(context.Background(), "foo-namespace", "foo", nil)
222+
_, err := s.Evaluate(t.Context(), "foo-namespace", "foo", nil)
224223
assert.EqualError(t, err, of.NewInvalidContextResolutionError("evalCtx is nil").Error())
225224

226-
_, err = s.Evaluate(context.Background(), "foo-namespace", "foo", map[string]interface{}{})
225+
_, err = s.Evaluate(t.Context(), "foo-namespace", "foo", map[string]any{})
227226
assert.EqualError(t, err, of.NewTargetingKeyMissingResolutionError("targetingKey is missing").Error())
228227
}
229228

0 commit comments

Comments
 (0)