Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 13 additions & 11 deletions core/pkg/runtime/from_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/open-feature/flagd/core/pkg/sync"
"github.com/open-feature/flagd/core/pkg/sync/file"
"github.com/open-feature/flagd/core/pkg/sync/grpc"
"github.com/open-feature/flagd/core/pkg/sync/grpc/credentials"
httpSync "github.com/open-feature/flagd/core/pkg/sync/http"
"github.com/open-feature/flagd/core/pkg/sync/kubernetes"
"github.com/robfig/cron"
Expand Down Expand Up @@ -130,20 +131,20 @@ func syncProvidersFromConfig(logger *logger.Logger, sources []SourceConfig) ([]s
for _, syncProvider := range sources {
switch syncProvider.Provider {
case syncProviderFile:
syncImpls = append(syncImpls, newFile(syncProvider, logger))
syncImpls = append(syncImpls, NewFile(syncProvider, logger))
logger.Debug(fmt.Sprintf("using filepath sync-provider for: %q", syncProvider.URI))
case syncProviderKubernetes:
k, err := newK8s(syncProvider.URI, logger)
k, err := NewK8s(syncProvider.URI, logger)
if err != nil {
return nil, err
}
syncImpls = append(syncImpls, k)
logger.Debug(fmt.Sprintf("using kubernetes sync-provider for: %s", syncProvider.URI))
case syncProviderHTTP:
syncImpls = append(syncImpls, newHTTP(syncProvider, logger))
syncImpls = append(syncImpls, NewHTTP(syncProvider, logger))
logger.Debug(fmt.Sprintf("using remote sync-provider for: %s", syncProvider.URI))
case syncProviderGrpc:
syncImpls = append(syncImpls, newGRPC(syncProvider, logger))
syncImpls = append(syncImpls, NewGRPC(syncProvider, logger))
logger.Debug(fmt.Sprintf("using grpc sync-provider for: %s", syncProvider.URI))

default:
Expand All @@ -154,20 +155,21 @@ func syncProvidersFromConfig(logger *logger.Logger, sources []SourceConfig) ([]s
return syncImpls, nil
}

func newGRPC(config SourceConfig, logger *logger.Logger) *grpc.Sync {
func NewGRPC(config SourceConfig, logger *logger.Logger) *grpc.Sync {
return &grpc.Sync{
URI: config.URI,
Logger: logger.WithFields(
zap.String("component", "sync"),
zap.String("sync", "grpc"),
),
CertPath: config.CertPath,
ProviderID: config.ProviderID,
Selector: config.Selector,
CertPath: config.CertPath,
ProviderID: config.ProviderID,
Selector: config.Selector,
CredentialBuilder: &credentials.CredentialBuilder{},
}
}

func newHTTP(config SourceConfig, logger *logger.Logger) *httpSync.Sync {
func NewHTTP(config SourceConfig, logger *logger.Logger) *httpSync.Sync {
return &httpSync.Sync{
URI: config.URI,
Client: &http.Client{
Expand All @@ -182,7 +184,7 @@ func newHTTP(config SourceConfig, logger *logger.Logger) *httpSync.Sync {
}
}

func newK8s(uri string, logger *logger.Logger) (*kubernetes.Sync, error) {
func NewK8s(uri string, logger *logger.Logger) (*kubernetes.Sync, error) {
reader, dynamic, err := kubernetes.GetClients()
if err != nil {
return nil, err
Expand All @@ -198,7 +200,7 @@ func newK8s(uri string, logger *logger.Logger) (*kubernetes.Sync, error) {
), nil
}

func newFile(config SourceConfig, logger *logger.Logger) *file.Sync {
func NewFile(config SourceConfig, logger *logger.Logger) *file.Sync {
return &file.Sync{
URI: config.URI,
Logger: logger.WithFields(
Expand Down
34 changes: 11 additions & 23 deletions core/pkg/sync-store/sync_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import (
"time"

"github.com/open-feature/flagd/core/pkg/logger"
"github.com/open-feature/flagd/core/pkg/runtime"
isync "github.com/open-feature/flagd/core/pkg/sync"
"github.com/open-feature/flagd/core/pkg/sync/file"
"github.com/open-feature/flagd/core/pkg/sync/kubernetes"
"go.uber.org/zap"
)

Expand Down Expand Up @@ -265,29 +264,18 @@ func (sb *SyncBuilder) SyncFromURI(uri string, logger *logger.Logger) (isync.ISy
switch uriB := []byte(uri); {
// filepath may be used for debugging, not recommended in deployment
case regFile.Match(uriB):
return &file.Sync{
return runtime.NewFile(runtime.SourceConfig{
URI: regFile.ReplaceAllString(uri, ""),
Logger: logger.WithFields(
zap.String("component", "sync"),
zap.String("sync", "filepath"),
zap.String("target", "target"),
),
Mux: &sync.RWMutex{},
}, nil
}, logger.WithFields(
zap.String("component", "sync"),
zap.String("sync", "filepath"),
zap.String("target", "target"),
)), nil
case regCrd.Match(uriB):
reader, dynamic, err := kubernetes.GetClients()
if err != nil {
return nil, err
}
return kubernetes.NewK8sSync(
logger.WithFields(
zap.String("component", "sync"),
zap.String("sync", "kubernetes"),
),
regCrd.ReplaceAllString(uri, ""),
reader,
dynamic,
), nil
return runtime.NewK8s(uri, logger.WithFields(
zap.String("component", "sync"),
zap.String("sync", "kubernetes"),
))
}
return nil, fmt.Errorf("unrecognized URI: %s", uri)
}