From 0884f89431cd26bcc9674b3b7ab628b090f5881e Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Tue, 7 Dec 2021 13:31:39 +0100
Subject: Implement Cobra CLI tooling, Viper config tooling (#336)

* start pulling out + replacing urfave and config

* replace many many instances of config

* move more stuff => viper

* properly remove urfave

* move some flags to root command

* add testrig commands to root

* alias config file keys

* start adding cli parsing tests

* reorder viper init

* remove config path alias

* fmt

* change config file keys to non-nested

* we're more or less in business now

* tidy up the common func

* go fmt

* get tests passing again

* add note about the cliparsing tests

* reorganize

* update docs with changes

* structure cmd dir better

* rename + move some files around

* fix dangling comma
---
 internal/timeline/get_test.go      | 5 +++--
 internal/timeline/index_test.go    | 5 +++--
 internal/timeline/manager.go       | 5 +----
 internal/timeline/manager_test.go  | 5 +++--
 internal/timeline/timeline_test.go | 6 ++----
 5 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'internal/timeline')

diff --git a/internal/timeline/get_test.go b/internal/timeline/get_test.go
index b05585cab..cebb9033f 100644
--- a/internal/timeline/get_test.go
+++ b/internal/timeline/get_test.go
@@ -38,9 +38,10 @@ func (suite *GetTestSuite) SetupSuite() {
 }
 
 func (suite *GetTestSuite) SetupTest() {
-	suite.config = testrig.NewTestConfig()
-	suite.db = testrig.NewTestDB()
 	testrig.InitTestLog()
+	testrig.InitTestConfig()
+
+	suite.db = testrig.NewTestDB()
 	suite.tc = testrig.NewTestTypeConverter(suite.db)
 
 	testrig.StandardDBSetup(suite.db, nil)
diff --git a/internal/timeline/index_test.go b/internal/timeline/index_test.go
index 0f3a1df4a..a326f223e 100644
--- a/internal/timeline/index_test.go
+++ b/internal/timeline/index_test.go
@@ -39,9 +39,10 @@ func (suite *IndexTestSuite) SetupSuite() {
 }
 
 func (suite *IndexTestSuite) SetupTest() {
-	suite.config = testrig.NewTestConfig()
-	suite.db = testrig.NewTestDB()
 	testrig.InitTestLog()
+	testrig.InitTestConfig()
+
+	suite.db = testrig.NewTestDB()
 	suite.tc = testrig.NewTestTypeConverter(suite.db)
 
 	testrig.StandardDBSetup(suite.db, nil)
diff --git a/internal/timeline/manager.go b/internal/timeline/manager.go
index 5d41d72a9..c5b10921b 100644
--- a/internal/timeline/manager.go
+++ b/internal/timeline/manager.go
@@ -26,7 +26,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
-	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/typeutils"
@@ -84,12 +83,11 @@ type Manager interface {
 }
 
 // NewManager returns a new timeline manager with the given database, typeconverter, config, and log.
-func NewManager(db db.DB, tc typeutils.TypeConverter, config *config.Config) Manager {
+func NewManager(db db.DB, tc typeutils.TypeConverter) Manager {
 	return &manager{
 		accountTimelines: sync.Map{},
 		db:               db,
 		tc:               tc,
-		config:           config,
 	}
 }
 
@@ -97,7 +95,6 @@ type manager struct {
 	accountTimelines sync.Map
 	db               db.DB
 	tc               typeutils.TypeConverter
-	config           *config.Config
 }
 
 func (m *manager) Ingest(ctx context.Context, status *gtsmodel.Status, timelineAccountID string) (bool, error) {
diff --git a/internal/timeline/manager_test.go b/internal/timeline/manager_test.go
index 4d725e48d..f5d62fe42 100644
--- a/internal/timeline/manager_test.go
+++ b/internal/timeline/manager_test.go
@@ -36,9 +36,10 @@ func (suite *ManagerTestSuite) SetupSuite() {
 }
 
 func (suite *ManagerTestSuite) SetupTest() {
-	suite.config = testrig.NewTestConfig()
-	suite.db = testrig.NewTestDB()
 	testrig.InitTestLog()
+	testrig.InitTestConfig()
+
+	suite.db = testrig.NewTestDB()
 	suite.tc = testrig.NewTestTypeConverter(suite.db)
 
 	testrig.StandardDBSetup(suite.db, nil)
diff --git a/internal/timeline/timeline_test.go b/internal/timeline/timeline_test.go
index 517575f3e..8ef407711 100644
--- a/internal/timeline/timeline_test.go
+++ b/internal/timeline/timeline_test.go
@@ -20,7 +20,6 @@ package timeline_test
 
 import (
 	"github.com/stretchr/testify/suite"
-	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/timeline"
@@ -29,9 +28,8 @@ import (
 
 type TimelineStandardTestSuite struct {
 	suite.Suite
-	config *config.Config
-	db     db.DB
-	tc     typeutils.TypeConverter
+	db db.DB
+	tc typeutils.TypeConverter
 
 	testAccounts map[string]*gtsmodel.Account
 	testStatuses map[string]*gtsmodel.Status
-- 
cgit v1.2.3