Skip to content

Commit 03d2ebb

Browse files
aepfliaepfli
authored
Merge branch 'main' into add-provider-id
2 parents d36650b + cd46044 commit 03d2ebb

File tree

19 files changed

+2492
-94
lines changed

19 files changed

+2492
-94
lines changed

‎.golangci.yml

+7-44
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,11 @@
11
run:
2-
skip-dirs:
3-
- (^|/)bin($|/)
4-
- (^|/)examples($|/)
5-
- (^|/)schemas($|/)
6-
- (^|/)test-harness($|/)
7-
linters:
8-
enable:
9-
- asciicheck
10-
- asasalint
11-
- bidichk
12-
- bodyclose
13-
- contextcheck
14-
- dogsled
15-
- dupl
16-
- dupword
17-
- durationcheck
18-
- errchkjson
19-
- exhaustive
20-
- funlen
21-
- gci
22-
- goconst
23-
- gocritic
24-
- gocyclo
25-
- interfacebloat
26-
- gosec
27-
- lll
28-
- misspell
29-
- nakedret
30-
- nilerr
31-
- nilnil
32-
- noctx
33-
- nosprintfhostport
34-
- prealloc
35-
- promlinter
36-
- revive
37-
- rowserrcheck
38-
- exportloopref
39-
- stylecheck
40-
- unconvert
41-
- unparam
42-
- whitespace
43-
- wrapcheck
44-
- gofumpt
45-
- tenv
2+
timeout: 3m
463
linters-settings:
474
funlen:
485
statements: 50
496
golint:
507
min-confidence: 0.6
8+
enable-all: true
519
issues:
5210
exclude:
5311
- pkg/generated
@@ -65,3 +23,8 @@ issues:
6523
- gocyclo
6624
- dupl
6725
- staticcheck
26+
exclude-dirs:
27+
- (^|/)bin($|/)
28+
- (^|/)examples($|/)
29+
- (^|/)schemas($|/)
30+
- (^|/)test-harness($|/)

‎.release-please-manifest.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"flagd": "0.12.2",
3-
"flagd-proxy": "0.7.2",
4-
"core": "0.11.2"
2+
"flagd": "0.12.3",
3+
"flagd-proxy": "0.7.3",
4+
"core": "0.11.3"
55
}

‎Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ uninstall:
6666
rm /etc/systemd/system/flagd.service
6767
rm -f $(DESTDIR)$(PREFIX)/bin/flagd
6868
lint:
69-
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
70-
$(foreach module, $(ALL_GO_MOD_DIRS), ${GOPATH}/bin/golangci-lint run --deadline=5m --timeout=5m $(module)/... || exit;)
69+
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
70+
$(foreach module, $(ALL_GO_MOD_DIRS), ${GOPATH}/bin/golangci-lint run $(module)/...;)
7171
lint-fix:
72-
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
73-
$(foreach module, $(ALL_GO_MOD_DIRS), ${GOPATH}/bin/golangci-lint run --fix --deadline=5m --timeout=5m $(module)/... || exit;)
72+
go install -v github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
73+
$(foreach module, $(ALL_GO_MOD_DIRS), ${GOPATH}/bin/golangci-lint run --fix $(module)/...;)
7474
install-mockgen:
7575
go install go.uber.org/mock/mockgen@v0.4.0
7676
mockgen: install-mockgen

‎core/CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# Changelog
22

3+
## [0.11.3](https://github.com/open-feature/flagd/compare/core/v0.11.2...core/v0.11.3) (2025-03-25)
4+
5+
6+
### 🐛 Bug Fixes
7+
8+
* **deps:** update github.com/open-feature/flagd-schemas digest to 9b0ee43 ([#1598](https://github.com/open-feature/flagd/issues/1598)) ([0587ce4](https://github.com/open-feature/flagd/commit/0587ce44e60b643ff6960c1eaf4461f933ea95b7))
9+
* **deps:** update github.com/open-feature/flagd-schemas digest to e840a03 ([#1587](https://github.com/open-feature/flagd/issues/1587)) ([9ee0c57](https://github.com/open-feature/flagd/commit/9ee0c573d6dbfa0c4e9b18c9da7313094ea56916))
10+
* **deps:** update module connectrpc.com/otelconnect to v0.7.2 ([#1574](https://github.com/open-feature/flagd/issues/1574)) ([6094dce](https://github.com/open-feature/flagd/commit/6094dce5c0472f593b79d6d40e080f9b8d6503e5))
11+
* **deps:** update module github.com/google/go-cmp to v0.7.0 ([#1569](https://github.com/open-feature/flagd/issues/1569)) ([6e9dbd2](https://github.com/open-feature/flagd/commit/6e9dbd2dbf8365f839e353f53cb638847a1f05d6))
12+
* **deps:** update module github.com/prometheus/client_golang to v1.21.1 ([#1576](https://github.com/open-feature/flagd/issues/1576)) ([cd95193](https://github.com/open-feature/flagd/commit/cd95193f71fd465ffd1b177fa492aa84d8414a87))
13+
* **deps:** update module google.golang.org/grpc to v1.71.0 ([#1578](https://github.com/open-feature/flagd/issues/1578)) ([5c2c64f](https://github.com/open-feature/flagd/commit/5c2c64f878b8603dd37cbfd79b0e1588e4b5a3c6))
14+
* incorrect metadata returned per source ([#1599](https://github.com/open-feature/flagd/issues/1599)) ([b333e11](https://github.com/open-feature/flagd/commit/b333e11ecfe54f72c44ee61b3dcb1f2a487c94d4))
15+
16+
17+
### ✨ New Features
18+
19+
* accept version numbers which are not strings ([#1589](https://github.com/open-feature/flagd/issues/1589)) ([6a13796](https://github.com/open-feature/flagd/commit/6a137967a258e799cbac9e3bb3927a07412c2a7b))
20+
321
## [0.11.2](https://github.com/open-feature/flagd/compare/core/v0.11.1...core/v0.11.2) (2025-02-21)
422

523

‎core/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/open-feature/flagd/core
22

33
go 1.22.7
44

5-
toolchain go1.22.9
5+
toolchain go1.24.1
66

77
require (
88
buf.build/gen/go/open-feature/flagd/grpc/go v1.5.1-20250127221518-be6d1143b690.2
@@ -12,7 +12,7 @@ require (
1212
github.com/diegoholiveira/jsonlogic/v3 v3.7.4
1313
github.com/fsnotify/fsnotify v1.8.0
1414
github.com/google/go-cmp v0.7.0
15-
github.com/open-feature/flagd-schemas v0.2.9-0.20250310135615-e840a037dc49
15+
github.com/open-feature/flagd-schemas v0.2.9-0.20250319190911-9b0ee43ecc47
1616
github.com/open-feature/open-feature-operator/apis v0.2.44
1717
github.com/prometheus/client_golang v1.21.1
1818
github.com/robfig/cron v1.2.0

‎core/go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,8 @@ github.com/open-feature/flagd-schemas v0.2.9-0.20250127221449-bb763438abc5 h1:0R
235235
github.com/open-feature/flagd-schemas v0.2.9-0.20250127221449-bb763438abc5/go.mod h1:WKtwo1eW9/K6D+4HfgTXWBqCDzpvMhDa5eRxW7R5B2U=
236236
github.com/open-feature/flagd-schemas v0.2.9-0.20250310135615-e840a037dc49 h1:hJaCK9RPXzxKVrHXinB7dt5MT6RRbEA6fF1ZZbUFWPE=
237237
github.com/open-feature/flagd-schemas v0.2.9-0.20250310135615-e840a037dc49/go.mod h1:WKtwo1eW9/K6D+4HfgTXWBqCDzpvMhDa5eRxW7R5B2U=
238+
github.com/open-feature/flagd-schemas v0.2.9-0.20250319190911-9b0ee43ecc47 h1:c6nodciz/xeU0xiAcDQ5MBW34DnPoi5/lEgjV5kZeZA=
239+
github.com/open-feature/flagd-schemas v0.2.9-0.20250319190911-9b0ee43ecc47/go.mod h1:WKtwo1eW9/K6D+4HfgTXWBqCDzpvMhDa5eRxW7R5B2U=
238240
github.com/open-feature/open-feature-operator/apis v0.2.44 h1:0r4Z+RnJltuHdRBv79NFgAckhna6/M3Wcec6gzNX5vI=
239241
github.com/open-feature/open-feature-operator/apis v0.2.44/go.mod h1:xB2uLzvUkbydieX7q6/NqannBz3bt/e5BS2DeOyyw4Q=
240242
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=

‎core/pkg/store/flags.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (f *State) Get(_ context.Context, key string) (model.Flag, model.Metadata,
7070
metadata := f.getMetadata()
7171
flag, ok := f.Flags[key]
7272
if ok {
73-
metadata = f.getMetadataForSource(flag.Source)
73+
metadata = f.GetMetadataForSource(flag.Source)
7474
}
7575

7676
return flag, metadata, ok
@@ -319,7 +319,7 @@ func (f *State) Merge(
319319
return notifications, resyncRequired
320320
}
321321

322-
func (f *State) getMetadataForSource(source string) model.Metadata {
322+
func (f *State) GetMetadataForSource(source string) model.Metadata {
323323
perSource, ok := f.MetadataPerSource[source]
324324
if ok && perSource != nil {
325325
return maps.Clone(perSource)

‎flagd-proxy/CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [0.7.3](https://github.com/open-feature/flagd/compare/flagd-proxy/v0.7.2...flagd-proxy/v0.7.3) (2025-03-25)
4+
5+
6+
### 🐛 Bug Fixes
7+
8+
* **deps:** update module github.com/open-feature/flagd/core to v0.11.2 ([#1570](https://github.com/open-feature/flagd/issues/1570)) ([e151b1f](https://github.com/open-feature/flagd/commit/e151b1f97524a568e361103bf7a388f2598e5861))
9+
* **deps:** update module github.com/prometheus/client_golang to v1.21.1 ([#1576](https://github.com/open-feature/flagd/issues/1576)) ([cd95193](https://github.com/open-feature/flagd/commit/cd95193f71fd465ffd1b177fa492aa84d8414a87))
10+
* **deps:** update module google.golang.org/grpc to v1.71.0 ([#1578](https://github.com/open-feature/flagd/issues/1578)) ([5c2c64f](https://github.com/open-feature/flagd/commit/5c2c64f878b8603dd37cbfd79b0e1588e4b5a3c6))
11+
312
## [0.7.2](https://github.com/open-feature/flagd/compare/flagd-proxy/v0.7.1...flagd-proxy/v0.7.2) (2025-02-21)
413

514

‎flagd-proxy/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/open-feature/flagd/flagd-proxy
22

33
go 1.22.7
44

5-
toolchain go1.22.9
5+
toolchain go1.24.1
66

77
require (
88
buf.build/gen/go/open-feature/flagd/grpc/go v1.5.1-20250127221518-be6d1143b690.2

‎flagd-proxy/tests/loadtest/go.mod

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/open-feature/flagd/flagd-proxy/tests/loadtest
22

3-
go 1.20
3+
go 1.22
4+
5+
toolchain go1.24.1
46

57
require (
68
buf.build/gen/go/open-feature/flagd/grpc/go v1.3.0-20240215170432-1e611e2999cc.3
@@ -13,5 +15,5 @@ require (
1315
golang.org/x/sys v0.20.0 // indirect
1416
golang.org/x/text v0.15.0 // indirect
1517
google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae // indirect
16-
google.golang.org/protobuf v1.34.1 // indirect
18+
google.golang.org/protobuf v1.36.4 // indirect
1719
)

0 commit comments

Comments
 (0)