From 12595077c703b5177384344afe3042d0b4a09b1b Mon Sep 17 00:00:00 2001 From: Michael Hohn Date: Fri, 10 May 2024 13:21:50 -0700 Subject: [PATCH] wip --- cmd/commander/main.go | 44 ++++++++++------------------------ config/mcc/commander.go | 4 ++++ config/mcc/common.go | 4 ++++ config/mcc/logger.go | 4 ++++ config/mcc/queue.go | 4 ++++ config/mcc/runner.go | 4 ++++ config/mcc/storage.go | 4 ++++ interfaces/mci/commander.go | 10 +++++++- interfaces/mci/common.go | 2 +- interfaces/mci/logger.go | 2 +- interfaces/mci/queue.go | 2 +- interfaces/mci/runner.go | 2 +- interfaces/mci/storage.go | 2 +- lib/commander/lcmem/lcmem.go | 3 +++ lib/logger/llmem/localdisk.go | 3 +++ lib/queue/lqmem/inmemory.go | 3 +++ lib/runner/lrmem/inmemory.go | 3 +++ lib/storage/lsmem/localdisk.go | 3 +++ 18 files changed, 66 insertions(+), 37 deletions(-) create mode 100644 config/mcc/commander.go create mode 100644 config/mcc/common.go create mode 100644 config/mcc/logger.go create mode 100644 config/mcc/queue.go create mode 100644 config/mcc/runner.go create mode 100644 config/mcc/storage.go diff --git a/cmd/commander/main.go b/cmd/commander/main.go index 7893903..8a99c8d 100644 --- a/cmd/commander/main.go +++ b/cmd/commander/main.go @@ -10,7 +10,8 @@ import ( "os" "github.com/BurntSushi/toml" - "github.com/advanced-security/mrvacommander/intefaces/mci" + "github.com/advanced-security/mrvacommander/config/mcc" + "github.com/advanced-security/mrvacommander/interfaces/mci" "github.com/advanced-security/mrvacommander/lib/commander/lcmem" "github.com/advanced-security/mrvacommander/lib/logger/llmem" "github.com/advanced-security/mrvacommander/lib/queue/lqmem" @@ -63,12 +64,12 @@ func main() { switch *mode { case "standalone": // Assemble single-process version - state := MCState{ - commander: lcmem.LCCommander, - logger: llmem.LCLogger, - queue: lqmem.LCQueue, - storage: lsmem.LCStorage, - runner: lrmem.LCRunner, + state := mci.State{ + Commander: lcmem.Commander{}, + Logger: llmem.Logger{}, + Queue: lqmem.Queue{}, + Storage: lsmem.Storage{}, + Runner: lrmem.Runner{}, } case "container": @@ -89,31 +90,12 @@ func main() { } -type MCCConf struct { -} -type MCLConf struct { -} -type MCQConf struct { -} -type MCSConf struct { -} -type MCRConf struct { -} - -type MCState struct { - commander mci.MCCommander - logger mci.MCLogger - queue mci.MCQueue - storage mci.MCStorage - runner mci.MCRunner -} - type MCConfig struct { - commander MCCConf - logger MCLConf - queue MCQConf - storage MCSConf - runner MCRConf + commander mcc.Commander + logger mcc.Logger + queue mcc.Queue + storage mcc.Storage + runner mcc.Runner } func loadConfig(fname string) *MCConfig { diff --git a/config/mcc/commander.go b/config/mcc/commander.go new file mode 100644 index 0000000..d40dd30 --- /dev/null +++ b/config/mcc/commander.go @@ -0,0 +1,4 @@ +package mcc + +type Commander struct { +} diff --git a/config/mcc/common.go b/config/mcc/common.go new file mode 100644 index 0000000..35530ac --- /dev/null +++ b/config/mcc/common.go @@ -0,0 +1,4 @@ +package mcc + +type Common struct { +} diff --git a/config/mcc/logger.go b/config/mcc/logger.go new file mode 100644 index 0000000..edc6a05 --- /dev/null +++ b/config/mcc/logger.go @@ -0,0 +1,4 @@ +package mcc + +type Logger struct { +} diff --git a/config/mcc/queue.go b/config/mcc/queue.go new file mode 100644 index 0000000..d20d700 --- /dev/null +++ b/config/mcc/queue.go @@ -0,0 +1,4 @@ +package mcc + +type Queue struct { +} diff --git a/config/mcc/runner.go b/config/mcc/runner.go new file mode 100644 index 0000000..42ac490 --- /dev/null +++ b/config/mcc/runner.go @@ -0,0 +1,4 @@ +package mcc + +type Runner struct { +} diff --git a/config/mcc/storage.go b/config/mcc/storage.go new file mode 100644 index 0000000..32f74cf --- /dev/null +++ b/config/mcc/storage.go @@ -0,0 +1,4 @@ +package mcc + +type Storage struct { +} diff --git a/interfaces/mci/commander.go b/interfaces/mci/commander.go index a267692..384ccc2 100644 --- a/interfaces/mci/commander.go +++ b/interfaces/mci/commander.go @@ -1,4 +1,12 @@ package mci -type MCCommander struct { +type Commander interface { +} + +type State struct { + Commander Commander + Logger Logger + Queue Queue + Storage Storage + Runner Runner } diff --git a/interfaces/mci/common.go b/interfaces/mci/common.go index 3d8ae70..aab7cf6 100644 --- a/interfaces/mci/common.go +++ b/interfaces/mci/common.go @@ -1,4 +1,4 @@ package mci -type MCCommon struct { +type Common struct { } diff --git a/interfaces/mci/logger.go b/interfaces/mci/logger.go index 69c3ba7..a0742c2 100644 --- a/interfaces/mci/logger.go +++ b/interfaces/mci/logger.go @@ -1,4 +1,4 @@ package mci -type MCLogger struct { +type Logger interface { } diff --git a/interfaces/mci/queue.go b/interfaces/mci/queue.go index e548f7b..5adc611 100644 --- a/interfaces/mci/queue.go +++ b/interfaces/mci/queue.go @@ -1,4 +1,4 @@ package mci -type MCQueue struct { +type Queue interface { } diff --git a/interfaces/mci/runner.go b/interfaces/mci/runner.go index afffafa..bfebbd9 100644 --- a/interfaces/mci/runner.go +++ b/interfaces/mci/runner.go @@ -1,4 +1,4 @@ package mci -type MCRunner struct { +type Runner interface { } diff --git a/interfaces/mci/storage.go b/interfaces/mci/storage.go index ca73406..2cd4af0 100644 --- a/interfaces/mci/storage.go +++ b/interfaces/mci/storage.go @@ -1,4 +1,4 @@ package mci -type MCStorage struct { +type Storage interface { } diff --git a/lib/commander/lcmem/lcmem.go b/lib/commander/lcmem/lcmem.go index 1197615..26ef695 100644 --- a/lib/commander/lcmem/lcmem.go +++ b/lib/commander/lcmem/lcmem.go @@ -12,6 +12,9 @@ import ( "github.com/hohn/ghes-mirva-server/store" ) +type Commander struct { +} + func StatusResponse(w http.ResponseWriter, js co.JobSpec, ji co.JobInfo, vaid int) { slog.Debug("Submitting status response", "session", vaid) diff --git a/lib/logger/llmem/localdisk.go b/lib/logger/llmem/localdisk.go index 1e1daff..84f06b4 100644 --- a/lib/logger/llmem/localdisk.go +++ b/lib/logger/llmem/localdisk.go @@ -1 +1,4 @@ package llmem + +type Logger struct { +} diff --git a/lib/queue/lqmem/inmemory.go b/lib/queue/lqmem/inmemory.go index 6acafc1..f078845 100644 --- a/lib/queue/lqmem/inmemory.go +++ b/lib/queue/lqmem/inmemory.go @@ -1 +1,4 @@ package lqmem + +type Queue struct { +} diff --git a/lib/runner/lrmem/inmemory.go b/lib/runner/lrmem/inmemory.go index 74ee4a2..7d22c60 100644 --- a/lib/runner/lrmem/inmemory.go +++ b/lib/runner/lrmem/inmemory.go @@ -1 +1,4 @@ package lrmem + +type Runner struct { +} diff --git a/lib/storage/lsmem/localdisk.go b/lib/storage/lsmem/localdisk.go index eb9b1e4..22a03d5 100644 --- a/lib/storage/lsmem/localdisk.go +++ b/lib/storage/lsmem/localdisk.go @@ -1 +1,4 @@ package lsmem + +type Storage struct { +}