From 9c0cdb1fe43f062c639a64056b8aed5dca212615 Mon Sep 17 00:00:00 2001 From: Michael Hohn Date: Tue, 11 Jun 2024 16:55:10 -0700 Subject: [PATCH] Simplify naming, don't restate package name --- cmd/server/main.go | 20 ++++++++++---------- pkg/agent/agent.go | 4 ++-- pkg/logger/types.go | 6 +++--- pkg/queue/types.go | 6 +++--- pkg/server/server.go | 2 +- pkg/server/types.go | 4 ++-- pkg/storage/container.go | 2 +- pkg/storage/storage.go | 2 +- pkg/storage/types.go | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 3eb2d0d..bc4ba5e 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -87,7 +87,7 @@ func main() { os.Exit(1) } - sc.Setup(&server.CommanderVisibles{ + sc.Setup(&server.Visibles{ Logger: sl, Queue: sq, ServerStore: ss, @@ -95,15 +95,15 @@ func main() { QLDBStore: ql, }) - sl.Setup(&logger.LoggerVisibles{}) + sl.Setup(&logger.Visibles{}) - sq.Setup(&queue.QueueVisibles{ + sq.Setup(&queue.Visibles{ Logger: sl, }) - ss.Setup(&storage.ServerStorageVisibles{}) + ss.Setup(&storage.Visibles{}) - sr.Setup(&agent.RunnerVisibles{ + sr.Setup(&agent.Visibles{ Logger: sl, Queue: sq, QueryPackStore: qp, @@ -136,7 +136,7 @@ func main() { sr := agent.NewRunnerSingle(2, sq) // FIXME take value from configuration - sc.Setup(&server.CommanderVisibles{ + sc.Setup(&server.Visibles{ Logger: sl, Queue: sq, ServerStore: ss, @@ -144,15 +144,15 @@ func main() { QLDBStore: ql, }) - sl.Setup(&logger.LoggerVisibles{}) + sl.Setup(&logger.Visibles{}) - sq.Setup(&queue.QueueVisibles{ + sq.Setup(&queue.Visibles{ Logger: sl, }) - ss.Setup(&storage.ServerStorageVisibles{}) + ss.Setup(&storage.Visibles{}) - sr.Setup(&agent.RunnerVisibles{ + sr.Setup(&agent.Visibles{ Logger: sl, Queue: sq, QueryPackStore: qp, diff --git a/pkg/agent/agent.go b/pkg/agent/agent.go index 0592748..ef4dadd 100644 --- a/pkg/agent/agent.go +++ b/pkg/agent/agent.go @@ -33,7 +33,7 @@ func NewRunnerSingle(numWorkers int, queue queue.Queue) *RunnerSingle { return &r } -type RunnerVisibles struct { +type Visibles struct { Logger logger.Logger Queue queue.Queue // TODO extra package for query pack storage @@ -42,7 +42,7 @@ type RunnerVisibles struct { QLDBStore storage.Storage } -func (c *RunnerSingle) Setup(st *RunnerVisibles) { +func (c *RunnerSingle) Setup(st *Visibles) { return } diff --git a/pkg/logger/types.go b/pkg/logger/types.go index 7fe3bbd..dd08e48 100644 --- a/pkg/logger/types.go +++ b/pkg/logger/types.go @@ -1,7 +1,7 @@ package logger type LoggerSingle struct { - modules *LoggerVisibles + modules *Visibles } func NewLoggerSingle() *LoggerSingle { @@ -9,8 +9,8 @@ func NewLoggerSingle() *LoggerSingle { return &l } -type LoggerVisibles struct{} +type Visibles struct{} -func (l *LoggerSingle) Setup(v *LoggerVisibles) { +func (l *LoggerSingle) Setup(v *Visibles) { l.modules = v } diff --git a/pkg/queue/types.go b/pkg/queue/types.go index b8f5406..ad45c37 100644 --- a/pkg/queue/types.go +++ b/pkg/queue/types.go @@ -9,14 +9,14 @@ type QueueSingle struct { NumWorkers int jobs chan common.AnalyzeJob results chan common.AnalyzeResult - modules *QueueVisibles + modules *Visibles } -type QueueVisibles struct { +type Visibles struct { Logger logger.Logger } -func (q *QueueSingle) Setup(v *QueueVisibles) { +func (q *QueueSingle) Setup(v *Visibles) { q.modules = v } diff --git a/pkg/server/server.go b/pkg/server/server.go index 312af2b..603bb15 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -21,7 +21,7 @@ import ( "github.com/gorilla/mux" ) -func (c *CommanderSingle) Setup(st *CommanderVisibles) { +func (c *CommanderSingle) Setup(st *Visibles) { r := mux.NewRouter() c.st = st diff --git a/pkg/server/types.go b/pkg/server/types.go index 7723c89..927d2c4 100644 --- a/pkg/server/types.go +++ b/pkg/server/types.go @@ -26,7 +26,7 @@ type SessionInfo struct { } type CommanderSingle struct { - st *CommanderVisibles + st *Visibles } func NewCommanderSingle() *CommanderSingle { @@ -42,7 +42,7 @@ func NewCommanderSingle() *CommanderSingle { // Runner agent.Runner // } -type CommanderVisibles struct { +type Visibles struct { Logger logger.Logger Queue queue.Queue ServerStore storage.Storage diff --git a/pkg/storage/container.go b/pkg/storage/container.go index 8a3febb..3ba0214 100644 --- a/pkg/storage/container.go +++ b/pkg/storage/container.go @@ -32,7 +32,7 @@ func (s *StorageContainer) FindAvailableDBs(analysisReposRequested []common.Owne return notFoundRepos, analysisRepos } -func (s *StorageContainer) Setup(v *ServerStorageVisibles) { +func (s *StorageContainer) Setup(v *Visibles) { s.modules = v } diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 1fe6dda..42f394e 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -28,7 +28,7 @@ func NewStorageSingle(startingID int) *StorageSingle { return &s } -func (s *StorageSingle) Setup(v *ServerStorageVisibles) { +func (s *StorageSingle) Setup(v *Visibles) { s.modules = v } diff --git a/pkg/storage/types.go b/pkg/storage/types.go index 7c94c02..c464669 100644 --- a/pkg/storage/types.go +++ b/pkg/storage/types.go @@ -13,7 +13,7 @@ type DBLocation struct { type StorageSingle struct { currentID int - modules *ServerStorageVisibles + modules *Visibles } type DBSpec struct { @@ -60,7 +60,7 @@ type StorageContainer struct { // Database version of StorageSingle RequestID int DB *gorm.DB - modules *ServerStorageVisibles + modules *Visibles } -type ServerStorageVisibles struct{} +type Visibles struct{}