wip

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 {

config/mcc/commander.go

@@ -0,0 +1,4 @@
+package mcc
+
+type Commander struct {
+}

config/mcc/common.go

@@ -0,0 +1,4 @@
+package mcc
+
+type Common struct {
+}

config/mcc/logger.go

@@ -0,0 +1,4 @@
+package mcc
+
+type Logger struct {
+}

config/mcc/queue.go

@@ -0,0 +1,4 @@
+package mcc
+
+type Queue struct {
+}

config/mcc/runner.go

@@ -0,0 +1,4 @@
+package mcc
+
+type Runner struct {
+}

config/mcc/storage.go

@@ -0,0 +1,4 @@
+package mcc
+
+type Storage struct {
+}

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
 }

interfaces/mci/common.go

@@ -1,4 +1,4 @@
 package mci
 
-type MCCommon struct {
+type Common struct {
 }

interfaces/mci/logger.go

@@ -1,4 +1,4 @@
 package mci
 
-type MCLogger struct {
+type Logger interface {
 }

interfaces/mci/queue.go

@@ -1,4 +1,4 @@
 package mci
 
-type MCQueue struct {
+type Queue interface {
 }

interfaces/mci/runner.go

@@ -1,4 +1,4 @@
 package mci
 
-type MCRunner struct {
+type Runner interface {
 }

interfaces/mci/storage.go

@@ -1,4 +1,4 @@
 package mci
 
-type MCStorage struct {
+type Storage interface {
 }

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)
 

lib/logger/llmem/localdisk.go

@@ -1 +1,4 @@
 package llmem
+
+type Logger struct {
+}

lib/queue/lqmem/inmemory.go

@@ -1 +1,4 @@
 package lqmem
+
+type Queue struct {
+}

lib/runner/lrmem/inmemory.go

@@ -1 +1,4 @@
 package lrmem
+
+type Runner struct {
+}

lib/storage/lsmem/localdisk.go

@@ -1 +1,4 @@
 package lsmem
+
+type Storage struct {
+}