From 4942ebaec167e40df229ebf0cb942d0497cdc8b0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 9 Mar 2025 04:27:58 -0400 Subject: [PATCH] refactor: remove use of config plugin from scheduler plugin --- plugins/scheduler/go.mod | 2 -- plugins/scheduler/go.sum | 2 -- plugins/scheduler/triggers.go | 27 +++++++++++++++++++++------ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/plugins/scheduler/go.mod b/plugins/scheduler/go.mod index 938db56c5..c5742cd6b 100644 --- a/plugins/scheduler/go.mod +++ b/plugins/scheduler/go.mod @@ -4,7 +4,6 @@ go 1.23.0 require ( github.com/dokku/dokku/plugins/common v0.0.0-00010101000000-000000000000 - github.com/dokku/dokku/plugins/config v0.0.0-00010101000000-000000000000 github.com/spf13/pflag v1.0.6 ) @@ -13,7 +12,6 @@ require ( github.com/fatih/color v1.18.0 // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/joho/godotenv v1.2.0 // indirect github.com/kr/fs v0.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect diff --git a/plugins/scheduler/go.sum b/plugins/scheduler/go.sum index 12803b5db..b61585913 100644 --- a/plugins/scheduler/go.sum +++ b/plugins/scheduler/go.sum @@ -10,8 +10,6 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= -github.com/joho/godotenv v1.2.0 h1:vGTvz69FzUFp+X4/bAkb0j5BoLC+9bpqTWY8mjhA9pc= -github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= diff --git a/plugins/scheduler/triggers.go b/plugins/scheduler/triggers.go index 3d350e2db..a83ce8013 100644 --- a/plugins/scheduler/triggers.go +++ b/plugins/scheduler/triggers.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/dokku/dokku/plugins/common" - "github.com/dokku/dokku/plugins/config" ) // TriggerSchedulerDetect outputs a manually selected scheduler for the app @@ -36,30 +35,46 @@ func TriggerInstall() error { return nil } - globalScheduler := config.GetWithDefault("--global", "DOKKU_SCHEDULER", "") + results, _ := common.CallPlugnTrigger(common.PlugnTriggerInput{ + Trigger: "config-get-global", + Args: []string{"DOKKU_SCHEDULER"}, + }) + globalScheduler := results.StdoutContents() if globalScheduler != "" { common.LogVerboseQuiet(fmt.Sprintf("Setting scheduler property 'selected' to %v", globalScheduler)) if err := common.PropertyWrite("scheduler", "--global", "selected", globalScheduler); err != nil { return err } - if err := config.UnsetMany("--global", []string{"DOKKU_SCHEDULER"}, false); err != nil { + _, err := common.CallPlugnTrigger(common.PlugnTriggerInput{ + Trigger: "config-unset", + Args: []string{"--global", "DOKKU_SCHEDULER"}, + }) + if err != nil { common.LogWarn(err.Error()) } } for _, appName := range apps { - scheduler := config.GetWithDefault(appName, "DOKKU_SCHEDULER", "") + results, _ := common.CallPlugnTrigger(common.PlugnTriggerInput{ + Trigger: "config-get", + Args: []string{appName, "DOKKU_SCHEDULER"}, + }) + scheduler := results.StdoutContents() if scheduler == "" { continue } - common.LogVerboseQuiet(fmt.Sprintf("Setting scheduler property 'selected' to %v", scheduler)) + common.LogVerboseQuiet(fmt.Sprintf("Setting %s scheduler property 'selected' to %v", appName, scheduler)) if err := common.PropertyWrite("scheduler", appName, "selected", scheduler); err != nil { return err } - if err := config.UnsetMany(appName, []string{"DOKKU_SCHEDULER"}, false); err != nil { + _, err := common.CallPlugnTrigger(common.PlugnTriggerInput{ + Trigger: "config-unset", + Args: []string{appName, "DOKKU_SCHEDULER"}, + }) + if err != nil { common.LogWarn(err.Error()) } }