From 4deb71003d5bb003e99d4672640ee933d17eff69 Mon Sep 17 00:00:00 2001 From: Jan-Gerrit Goebel Date: Wed, 22 Nov 2023 11:42:48 +0100 Subject: [PATCH] Refactor setting util --- services/settingsvc/internal/grpc.go | 2 +- services/settingsvc/internal/preinstall.go | 27 ++++++++++--------- services/settingsvc/internal/settingclient.go | 16 ++--------- 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/services/settingsvc/internal/grpc.go b/services/settingsvc/internal/grpc.go index 5524ab3f7..7ffa64224 100644 --- a/services/settingsvc/internal/grpc.go +++ b/services/settingsvc/internal/grpc.go @@ -128,7 +128,7 @@ func (s *GrpcSettingServer) CreateSetting(ctx context.Context, creq *settingProt func (s *GrpcSettingServer) GetSettingValue(ctx context.Context, sreq *settingProto.Id) (*settingProto.SettingValue, error) { resp := &settingProto.SettingValue{} - setting, err := GetSetting(SettingName(sreq.GetName())) + setting, err := GetSetting(settingUtil.SettingName(sreq.GetName())) if err != nil { newErr := status.Newf( diff --git a/services/settingsvc/internal/preinstall.go b/services/settingsvc/internal/preinstall.go index a1b5c6660..8e5adf644 100644 --- a/services/settingsvc/internal/preinstall.go +++ b/services/settingsvc/internal/preinstall.go @@ -6,6 +6,7 @@ import ( "github.com/golang/glog" "github.com/hobbyfarm/gargantua/v3/pkg/labels" + settingUtil "github.com/hobbyfarm/gargantua/v3/pkg/setting" "github.com/hobbyfarm/gargantua/v3/pkg/util" settingProto "github.com/hobbyfarm/gargantua/v3/protos/setting" "google.golang.org/grpc/codes" @@ -86,7 +87,7 @@ func scopes() []*settingProto.CreateScopeRequest { func predefinedSettings() []*settingProto.CreateSettingRequest { return []*settingProto.CreateSettingRequest{ { - Name: string(SettingAdminUIMOTD), + Name: string(settingUtil.SettingAdminUIMOTD), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ labels.SettingScope: "admin-ui", @@ -99,7 +100,7 @@ func predefinedSettings() []*settingProto.CreateSettingRequest { }, }, { - Name: string(SettingUIMOTD), + Name: string(settingUtil.SettingUIMOTD), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ labels.SettingScope: "public", @@ -112,7 +113,7 @@ func predefinedSettings() []*settingProto.CreateSettingRequest { }, }, { - Name: string(SettingRegistrationDisabled), + Name: string(settingUtil.SettingRegistrationDisabled), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ labels.SettingScope: "public", @@ -126,7 +127,7 @@ func predefinedSettings() []*settingProto.CreateSettingRequest { }, { - Name: string(ScheduledEventRetentionTime), + Name: string(settingUtil.ScheduledEventRetentionTime), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ labels.SettingScope: "gargantua", @@ -139,11 +140,11 @@ func predefinedSettings() []*settingProto.CreateSettingRequest { }, }, { - Name: string(SettingRegistrationPrivacyPolicyRequired), + Name: string(settingUtil.SettingRegistrationPrivacyPolicyRequired), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ - labels.SettingScope: "public", - labels.SettingGroup: "privacy-policy", + labels.SettingScope: "public", + labels.SettingGroup: "privacy-policy", labels.SettingWeight: "3", }, Value: "false", @@ -154,11 +155,11 @@ func predefinedSettings() []*settingProto.CreateSettingRequest { }, }, { - Name: string(SettingRegistrationPrivacyPolicyLink), + Name: string(settingUtil.SettingRegistrationPrivacyPolicyLink), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ - labels.SettingScope: "public", - labels.SettingGroup: "privacy-policy", + labels.SettingScope: "public", + labels.SettingGroup: "privacy-policy", labels.SettingWeight: "2", }, Value: "", @@ -169,11 +170,11 @@ func predefinedSettings() []*settingProto.CreateSettingRequest { }, }, { - Name: string(SettingRegistrationPrivacyPolicyLinkName), + Name: string(settingUtil.SettingRegistrationPrivacyPolicyLinkName), Namespace: util.GetReleaseNamespace(), Labels: map[string]string{ - labels.SettingScope: "public", - labels.SettingGroup: "privacy-policy", + labels.SettingScope: "public", + labels.SettingGroup: "privacy-policy", labels.SettingWeight: "1", }, Value: "", diff --git a/services/settingsvc/internal/settingclient.go b/services/settingsvc/internal/settingclient.go index 77cbc3891..a61728516 100644 --- a/services/settingsvc/internal/settingclient.go +++ b/services/settingsvc/internal/settingclient.go @@ -9,6 +9,7 @@ import ( v1 "github.com/hobbyfarm/gargantua/v3/pkg/apis/hobbyfarm.io/v1" hfClientset "github.com/hobbyfarm/gargantua/v3/pkg/client/clientset/versioned" "github.com/hobbyfarm/gargantua/v3/pkg/client/informers/externalversions" + settingUtil "github.com/hobbyfarm/gargantua/v3/pkg/setting" "github.com/hobbyfarm/gargantua/v3/pkg/util" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -17,19 +18,6 @@ var ( settings = map[string]*v1.Setting{} ) -// TODO remove SettingName and consts in facor of settingUtil -const ( - SettingRegistrationDisabled SettingName = "registration-disabled" - SettingAdminUIMOTD SettingName = "motd-admin-ui" - SettingUIMOTD SettingName = "motd-ui" - ScheduledEventRetentionTime SettingName = "scheduledevent-retention-time" - SettingRegistrationPrivacyPolicyRequired SettingName = "registration-privacy-policy-required" - SettingRegistrationPrivacyPolicyLink SettingName = "registration-privacy-policy-link" - SettingRegistrationPrivacyPolicyLinkName SettingName = "registration-privacy-policy-linkname" -) - -type SettingName string - type SettingsHandlers struct { } @@ -72,7 +60,7 @@ func WatchSettings(ctx context.Context, return nil } -func GetSetting(name SettingName) (*v1.Setting, error) { +func GetSetting(name settingUtil.SettingName) (*v1.Setting, error) { var set, ok = settings[string(name)] if !ok { glog.Errorf("error retrieving setting %s", name)