yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

chore: changes to reconcile release/jubilee with dev

Browse Source
This commit is contained in:
Atanas Janeshliev
2025-05-28 15:06:03 +02:00
parent 8109b384c5
commit 2aa8acfb5b
6 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/services/imapservice/conflicts.go
View File

@ -54,7 +54,7 @@ type LabelConflictManager struct {
gluonIDProvider gluonIDProvider
client apiClient
reporter sentryReporter
getFeatureFlagValueFn unleash.GetFlagValueFn
featureFlagProvider unleash.FeatureFlagValueProvider
}
func NewLabelConflictManager(
@ -62,13 +62,13 @@ func NewLabelConflictManager(
gluonIDProvider gluonIDProvider,
client apiClient,
reporter sentryReporter,
getFeatureFlagValueFn unleash.GetFlagValueFn) *LabelConflictManager {
featureFlagProvider unleash.FeatureFlagValueProvider) *LabelConflictManager {
return &LabelConflictManager{
gluonLabelNameProvider: gluonLabelNameProvider,
gluonIDProvider: gluonIDProvider,
client: client,
reporter: reporter,
getFeatureFlagValueFn: getFeatureFlagValueFn,
featureFlagProvider: featureFlagProvider,
}
}
@ -104,7 +104,7 @@ func (r *nullLabelConflictResolverImpl) ResolveConflict(_ context.Context, _ pro
}
func (m *LabelConflictManager) NewConflictResolver(connectors []*Connector) LabelConflictResolver {
if m.getFeatureFlagValueFn(unleash.LabelConflictResolverDisabled) {
if m.featureFlagProvider.GetFlagValue(unleash.LabelConflictResolverDisabled) {
return &nullLabelConflictResolverImpl{}
}