From 14f0e2fb7231584d723c51e5667573310221eb18 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 28 Feb 2024 11:44:02 -0500 Subject: [PATCH] refactor: use const for prefix --- plugins/scheduler-k3s/functions.go | 4 ++-- plugins/scheduler-k3s/scheduler_k3s.go | 1 + plugins/scheduler-k3s/subcommands.go | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/scheduler-k3s/functions.go b/plugins/scheduler-k3s/functions.go index ad9d45c16..0ee22af7b 100644 --- a/plugins/scheduler-k3s/functions.go +++ b/plugins/scheduler-k3s/functions.go @@ -536,14 +536,14 @@ func getAutoscaling(input GetAutoscalingInput) (ProcessAutoscaling, error) { // getKedaValues retrieves keda values for a given app and process type func getKedaValues(appName string) (GlobalKedaValues, error) { - properties, err := common.PropertyGetAllByPrefix("scheduler-k3s", appName, "trigger-auth-") + properties, err := common.PropertyGetAllByPrefix("scheduler-k3s", appName, TriggerAuthPropertyPrefix) if err != nil { return GlobalKedaValues{}, fmt.Errorf("Error getting trigger-auth properties: %w", err) } auths := map[string]KedaAuthentication{} for key, value := range properties { - parts := strings.SplitN(strings.TrimPrefix(key, "trigger-auth-"), ":", 2) + parts := strings.SplitN(strings.TrimPrefix(key, TriggerAuthPropertyPrefix), ".", 2) if len(parts) != 2 { return GlobalKedaValues{}, fmt.Errorf("Invalid trigger-auth property format: %s", key) } diff --git a/plugins/scheduler-k3s/scheduler_k3s.go b/plugins/scheduler-k3s/scheduler_k3s.go index 39ce66f11..7a0ea7ab8 100644 --- a/plugins/scheduler-k3s/scheduler_k3s.go +++ b/plugins/scheduler-k3s/scheduler_k3s.go @@ -45,6 +45,7 @@ const DefaultIngressClass = "traefik" const GlobalProcessType = "--global" const KubeConfigPath = "/etc/rancher/k3s/k3s.yaml" const DefaultKubeContext = "" +const TriggerAuthPropertyPrefix = "trigger-auth." var ( runtimeScheme = runtime.NewScheme() diff --git a/plugins/scheduler-k3s/subcommands.go b/plugins/scheduler-k3s/subcommands.go index a4e445d96..315c70bc9 100644 --- a/plugins/scheduler-k3s/subcommands.go +++ b/plugins/scheduler-k3s/subcommands.go @@ -65,7 +65,7 @@ func CommandAutoscalingAuthSet(appName string, trigger string, metadata map[stri } if len(metadata) == 0 { - properties, err := common.PropertyGetAllByPrefix("scheduler-k3s", appName, fmt.Sprintf("trigger-auth.%s.", trigger)) + properties, err := common.PropertyGetAllByPrefix("scheduler-k3s", appName, fmt.Sprintf("%s%s.", TriggerAuthPropertyPrefix, trigger)) if err != nil { return fmt.Errorf("Unable to get property list: %w", err) } @@ -79,7 +79,7 @@ func CommandAutoscalingAuthSet(appName string, trigger string, metadata map[stri } for key, value := range metadata { - if err := common.PropertyWrite("scheduler-k3s", appName, fmt.Sprintf("trigger-auth.%s.%s", trigger, key), value); err != nil { + if err := common.PropertyWrite("scheduler-k3s", appName, fmt.Sprintf("%s%s.%s", TriggerAuthPropertyPrefix, trigger, key), value); err != nil { return fmt.Errorf("Unable to set property: %w", err) } }