From 43ac0cdb9c4eea9d3c5eceb2c11b9e5b98b87b00 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Mon, 30 May 2022 13:41:24 +0100 Subject: [chore] Global server configuration overhaul (#575) * move config flag names and usage to config package, rewrite config package to use global Configuration{} struct Signed-off-by: kim * improved code comment Signed-off-by: kim * linter Signed-off-by: kim * fix unmarshaling Signed-off-by: kim * remove kim's custom go compiler changes Signed-off-by: kim * generate setter and flag-name functions, implement these in codebase Signed-off-by: kim * update deps Signed-off-by: kim * small change Signed-off-by: kim * appease the linter... Signed-off-by: kim * move configuration into ConfigState structure, ensure reloading to/from viper settings to keep in sync Signed-off-by: kim * lint Signed-off-by: kim * update code comments Signed-off-by: kim * fix merge issue Signed-off-by: kim * fix merge issue Signed-off-by: kim * improved version string (removes time + go version) Signed-off-by: kim * fix version string build to pass test script + consolidate logic in func Signed-off-by: kim * add license text, update config.Defaults comment Signed-off-by: kim * add license text to generated config helpers file Signed-off-by: kim * defer unlock on config.Set___(), to ensure unlocked on panic Signed-off-by: kim * make it more obvious which cmd flags are being attached Signed-off-by: kim --- internal/config/validate_test.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'internal/config/validate_test.go') diff --git a/internal/config/validate_test.go b/internal/config/validate_test.go index 6d8294205..066f1807b 100644 --- a/internal/config/validate_test.go +++ b/internal/config/validate_test.go @@ -21,7 +21,6 @@ package config_test import ( "testing" - "github.com/spf13/viper" "github.com/stretchr/testify/suite" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/testrig" @@ -41,7 +40,7 @@ func (suite *ConfigValidateTestSuite) TestValidateConfigOK() { func (suite *ConfigValidateTestSuite) TestValidateConfigNoHost() { testrig.InitTestConfig() - viper.Set(config.Keys.Host, "") + config.SetHost("") err := config.Validate() suite.EqualError(err, "host must be set") @@ -50,7 +49,7 @@ func (suite *ConfigValidateTestSuite) TestValidateConfigNoHost() { func (suite *ConfigValidateTestSuite) TestValidateConfigNoProtocol() { testrig.InitTestConfig() - viper.Set(config.Keys.Protocol, "") + config.SetProtocol("") err := config.Validate() suite.EqualError(err, "protocol must be set") @@ -59,8 +58,8 @@ func (suite *ConfigValidateTestSuite) TestValidateConfigNoProtocol() { func (suite *ConfigValidateTestSuite) TestValidateConfigNoProtocolOrHost() { testrig.InitTestConfig() - viper.Set(config.Keys.Host, "") - viper.Set(config.Keys.Protocol, "") + config.SetHost("") + config.SetProtocol("") err := config.Validate() suite.EqualError(err, "host must be set; protocol must be set") @@ -69,7 +68,7 @@ func (suite *ConfigValidateTestSuite) TestValidateConfigNoProtocolOrHost() { func (suite *ConfigValidateTestSuite) TestValidateConfigBadProtocol() { testrig.InitTestConfig() - viper.Set(config.Keys.Protocol, "foo") + config.SetProtocol("foo") err := config.Validate() suite.EqualError(err, "protocol must be set to either http or https, provided value was foo") @@ -78,8 +77,8 @@ func (suite *ConfigValidateTestSuite) TestValidateConfigBadProtocol() { func (suite *ConfigValidateTestSuite) TestValidateConfigBadProtocolNoHost() { testrig.InitTestConfig() - viper.Set(config.Keys.Host, "") - viper.Set(config.Keys.Protocol, "foo") + config.SetHost("") + config.SetProtocol("foo") err := config.Validate() suite.EqualError(err, "host must be set; protocol must be set to either http or https, provided value was foo") -- cgit v1.2.3