Merge branch 'ps-rm-config-global' into 'master'

Remove config.Config global variable

Closes #2699

See merge request gitlab-org/gitaly!3505

3 files changed, 0 insertions, 54 deletions

diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
index 56c7587bf..deb4fb7c5 100644
--- a/internal/gitaly/config/config.go
+++ b/internal/gitaly/config/config.go
@@ -33,13 +33,6 @@ const (
 	GitalyDataPrefix = "+gitaly"
 )
 
-var (
-	// Config stores the global configuration
-	// Deprecated: please do not use global variable and pass preconfigured Cfg as a parameter
-	// where it is needed.
-	Config Cfg
-)
-
 // DailyJob enables a daily task to be scheduled for specific storages
 type DailyJob struct {
 	Hour     uint     `toml:"start_hour"`
diff --git a/internal/gitaly/config/config_test.go b/internal/gitaly/config/config_test.go
index 7fbf45129..65829556e 100644
--- a/internal/gitaly/config/config_test.go
+++ b/internal/gitaly/config/config_test.go
@@ -18,17 +18,6 @@ import (
 	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config/sentry"
 )
 
-func TestLoad_doesntClearPreviousGlobalConfig(t *testing.T) {
-	defer func(old Cfg) { Config = old }(Config)
-
-	Config = Cfg{SocketPath: "/tmp"}
-	cfg, err := Load(&bytes.Buffer{})
-	require.NoError(t, err)
-
-	require.Equal(t, "", cfg.SocketPath)
-	require.Equal(t, "/tmp", Config.SocketPath)
-}
-
 func TestLoadBrokenConfig(t *testing.T) {
 	tmpFile := strings.NewReader(`path = "/tmp"\nname="foo"`)
 	_, err := Load(tmpFile)
@@ -424,11 +413,6 @@ func TestValidateHooks(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			originalConfig := Config
-			defer func() {
-				Config = originalConfig
-			}()
-
 			tempHookDir, cleanup := setupTempHookDirs(t, tc.hookFiles)
 			defer cleanup()
 
diff --git a/internal/testhelper/configure.go b/internal/testhelper/configure.go
index b2a647426..7b011a76c 100644
--- a/internal/testhelper/configure.go
+++ b/internal/testhelper/configure.go
@@ -36,39 +36,8 @@ func Configure() func() {
 			log.Fatal(err)
 		}
 
-		config.Config.Logging.Dir = filepath.Join(testDirectory, "log")
-		if err := os.Mkdir(config.Config.Logging.Dir, 0755); err != nil {
-			os.RemoveAll(testDirectory)
-			log.Fatal(err)
-		}
-
-		config.Config.Storages = []config.Storage{
-			{Name: "default", Path: GitlabTestStoragePath()},
-		}
-		if err := os.Mkdir(config.Config.Storages[0].Path, 0755); err != nil {
-			os.RemoveAll(testDirectory)
-			log.Fatal(err)
-		}
-
-		config.Config.SocketPath = "/bogus"
-		config.Config.GitlabShell.Dir = "/"
-
-		config.Config.InternalSocketDir = filepath.Join(testDirectory, "internal-socket")
-		if err := os.Mkdir(config.Config.InternalSocketDir, 0755); err != nil {
-			os.RemoveAll(testDirectory)
-			log.Fatal(err)
-		}
-
-		config.Config.BinDir = filepath.Join(testDirectory, "bin")
-		if err := os.Mkdir(config.Config.BinDir, 0755); err != nil {
-			os.RemoveAll(testDirectory)
-			log.Fatal(err)
-		}
-
 		for _, f := range []func() error{
-			func() error { return ConfigureRuby(&config.Config) },
 			ConfigureGit,
-			func() error { return config.Config.Validate() },
 		} {
 			if err := f(); err != nil {
 				os.RemoveAll(testDirectory)