Skip to content

fix: env var decoding for bool config fields and redis sentinel multi-node support and change fs.FS path construction #4496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vsengar-79 wants to merge 5 commits into
base: main
Choose a base branch
from
+13 −6
Open

fix: env var decoding for bool config fields and redis sentinel multi-node support and change fs.FS path construction #4496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3838e6a
Update SentinelAddrs to support multiple addresses
vsengar-79 Jun 9, 2026
20110f6
Fix typo in consumerGroupId to consumerGroupID
vsengar-79 Jun 9, 2026
d331837
Add StringToBasicTypeHookFunc to Viper config
vsengar-79 Jun 9, 2026
560b95b
Add missing strings import to client.go
vsengar-79 Jun 9, 2026
658ad9d
Refactor ReadDir method and update path handling
vsengar-79 Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/config/sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,5 @@ func ConfigureSink(v *viper.Viper) {
ConfigureKafkaConfiguration(v, "sink")

// Override Kafka configuration defaults
v.SetDefault("sink.kafka.consumerGroupId", "openmeter-sink-worker")
v.SetDefault("sink.kafka.consumerGroupID", "openmeter-sink-worker")
}
1 change: 1 addition & 0 deletions app/config/viper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ func DecodeHook() mapstructure.DecodeHookFunc {
mapstructure.TextUnmarshallerHookFunc(),
mapstructure.StringToTimeDurationHookFunc(),
mapstructure.StringToSliceHookFunc(","),
mapstructure.StringToBasicTypeHookFunc(),
)
}

Expand Down
8 changes: 7 additions & 1 deletion pkg/redis/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package redis
import (
"crypto/tls"
"fmt"
"strings"

"github.com/redis/go-redis/extra/redisotel/v9"
"github.com/redis/go-redis/v9"
Expand Down Expand Up @@ -57,9 +58,14 @@ func NewClient(o Options, opts ...Option) (*redis.Client, error) {
// Initialize Redis Client
var client *redis.Client
if o.Sentinel.Enabled {
// Address may be a comma-separated list of sentinel nodes.
sentinelAddrs := strings.Split(o.Address, ",")
for i, a := range sentinelAddrs {
sentinelAddrs[i] = strings.TrimSpace(a)
}
client = redis.NewFailoverClient(&redis.FailoverOptions{
MasterName: o.Sentinel.MasterName,
SentinelAddrs: []string{o.Address},
SentinelAddrs: sentinelAddrs,
DB: o.Database,
Username: o.Username,
Password: o.Password,
Expand Down
8 changes: 4 additions & 4 deletions tools/migrate/fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"bufio"
"bytes"
"io/fs"
"path/filepath"
"path"
"strings"
)

Expand All @@ -29,15 +29,15 @@ func (s *SourceWrapper) Open(name string) (fs.File, error) {
return s.fsys.Open(name)
}

func (s *SourceWrapper) ReadDir(path string) ([]fs.DirEntry, error) {
entries, err := fs.ReadDir(s.fsys, path)
func (s *SourceWrapper) ReadDir(dir string) ([]fs.DirEntry, error) {
entries, err := fs.ReadDir(s.fsys, dir)
if err != nil {
return nil, err
}

results := make([]fs.DirEntry, 0, len(entries))
for _, entry := range entries {
filePath := filepath.Join(path, entry.Name())
filePath := path.Join(dir, entry.Name())

if entry.IsDir() {
r, err := s.ReadDir(filePath)
Expand Down