Skip to content

Commit 50256e9

Browse files
authored
fix(flagd): Fixed possible nil pointer exception with svcMetadata in service.go (#634)
Signed-off-by: Maks Osowski <[email protected]>
1 parent 5ae0b45 commit 50256e9

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

providers/flagd/pkg/provider_test.go

+28
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,34 @@ func TestNewProvider(t *testing.T) {
189189
WithProviderID("testProvider"),
190190
},
191191
},
192+
{
193+
name: "with selector only with in-process resolver",
194+
expectedResolver: inProcess,
195+
expectHost: defaultHost,
196+
expectPort: defaultInProcessPort,
197+
expectCacheType: defaultCache,
198+
expectCacheSize: defaultMaxCacheSize,
199+
expectMaxRetries: defaultMaxEventStreamRetries,
200+
expectSelector: "flags=test",
201+
options: []ProviderOption{
202+
WithInProcessResolver(),
203+
WithSelector("flags=test"),
204+
},
205+
},
206+
{
207+
name: "with providerID only with in-process resolver",
208+
expectedResolver: inProcess,
209+
expectHost: defaultHost,
210+
expectPort: defaultInProcessPort,
211+
expectCacheType: defaultCache,
212+
expectCacheSize: defaultMaxCacheSize,
213+
expectMaxRetries: defaultMaxEventStreamRetries,
214+
expectProviderID: "testProvider",
215+
options: []ProviderOption{
216+
WithInProcessResolver(),
217+
WithProviderID("testProvider"),
218+
},
219+
},
192220
}
193221

194222
for _, test := range tests {

providers/flagd/pkg/service/in_process/service.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ func NewInProcessService(cfg Configuration) *InProcess {
5050
iSync, uri := makeSyncProvider(cfg, log)
5151

5252
// service specific metadata
53-
var svcMetadata model.Metadata
53+
svcMetadata := make(model.Metadata, 2)
5454
if cfg.Selector != "" {
55-
svcMetadata = make(model.Metadata, 1)
5655
svcMetadata["scope"] = cfg.Selector
5756
}
5857
if cfg.ProviderID != "" {

0 commit comments

Comments
 (0)