Chore: Remove public vars in setting package (#81018)
Removes the public variable setting.SecretKey plus some other ones. Introduces some new functions for creating setting.Cfg.
This commit is contained in:
@@ -41,11 +41,9 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.F
|
||||
{
|
||||
oldVersion := setting.BuildVersion
|
||||
oldCommit := setting.BuildCommit
|
||||
oldEnv := setting.Env
|
||||
t.Cleanup(func() {
|
||||
setting.BuildVersion = oldVersion
|
||||
setting.BuildCommit = oldCommit
|
||||
setting.Env = oldEnv
|
||||
})
|
||||
}
|
||||
|
||||
@@ -83,7 +81,7 @@ func setupTestEnvironment(t *testing.T, cfg *setting.Cfg, features featuremgmt.F
|
||||
|
||||
m := web.New()
|
||||
m.Use(getContextHandler(t, cfg).Middleware)
|
||||
m.UseMiddleware(web.Renderer(filepath.Join(setting.StaticRootPath, "views"), "[[", "]]"))
|
||||
m.UseMiddleware(web.Renderer(filepath.Join("", "views"), "[[", "]]"))
|
||||
m.Get("/api/frontend/settings/", hs.GetFrontendSettings)
|
||||
|
||||
return m, hs
|
||||
@@ -111,7 +109,6 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testing.T) {
|
||||
// TODO: Remove
|
||||
setting.BuildVersion = cfg.BuildVersion
|
||||
setting.BuildCommit = cfg.BuildCommit
|
||||
setting.Env = cfg.Env
|
||||
|
||||
tests := []struct {
|
||||
desc string
|
||||
@@ -125,7 +122,7 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testing.T) {
|
||||
BuildInfo: buildInfo{
|
||||
Version: setting.BuildVersion,
|
||||
Commit: setting.BuildCommit,
|
||||
Env: setting.Env,
|
||||
Env: cfg.Env,
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -136,7 +133,7 @@ func TestHTTPServer_GetFrontendSettings_hideVersionAnonymous(t *testing.T) {
|
||||
BuildInfo: buildInfo{
|
||||
Version: "",
|
||||
Commit: "",
|
||||
Env: setting.Env,
|
||||
Env: cfg.Env,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user