Skip to content

Commit c495551

Browse files
committed
dev: unbound settings and user settings
1 parent 101327c commit c495551

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

pkg/apis/clickhouse.altinity.com/v1/type_settings.go

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,30 @@ func (s *Settings) ensureConverter() SettingsName2KeyConverter {
8080
// Just return converter
8181
return NewSettingsName2KeyConverterPlain()
8282
}
83-
if s.converter == nil {
84-
s.converter = NewSettingsName2KeyConverterPlain()
83+
if !s.HasConverter() {
84+
s.SetConverter(NewSettingsName2KeyConverterPlain())
85+
}
86+
return s.GetConverter()
87+
}
88+
89+
func (s *Settings) SetConverter(converter SettingsName2KeyConverter) *Settings {
90+
if s != nil {
91+
s.converter = converter
92+
}
93+
return s
94+
}
95+
96+
func (s *Settings) GetConverter() SettingsName2KeyConverter {
97+
if s == nil {
98+
return nil
8599
}
86100
return s.converter
87101
}
88102

103+
func (s *Settings) HasConverter() bool {
104+
return s.GetConverter() != nil
105+
}
106+
89107
// Ensure ensures settings are in place
90108
func (s *Settings) Ensure() *Settings {
91109
if s == nil {

pkg/apis/clickhouse.altinity.com/v1/type_settings_user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func NewSettingsUser(settings *Settings, username string) *SettingsUser {
2626
Settings: *settings,
2727
username: username,
2828
}
29-
s.converter = NewSettingsName2KeyConverterPrefix(username)
29+
s.Settings.SetConverter(NewSettingsName2KeyConverterPrefix(username))
3030
return s
3131
}
3232

0 commit comments

Comments
 (0)