mirror of
https://github.com/grafana/grafana.git
synced 2026-08-14 15:15:03 -05:00
Chore: Convert API tests to standard Go lib (#29009)
* Chore: Convert tests to standard Go lib Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
This commit is contained in:
co-authored by
Will Browne
parent
df8f63de7f
commit
cb62e69997
@@ -78,7 +78,7 @@ var (
|
||||
// Log settings.
|
||||
LogConfigs []util.DynMap
|
||||
|
||||
// Http server options
|
||||
// HTTP server options
|
||||
Protocol Scheme
|
||||
Domain string
|
||||
HttpAddr, HttpPort string
|
||||
@@ -193,7 +193,7 @@ var (
|
||||
LDAPAllowSignup bool
|
||||
LDAPActiveSyncEnabled bool
|
||||
|
||||
// QUOTA
|
||||
// Quota
|
||||
Quota QuotaSettings
|
||||
|
||||
// Alerting
|
||||
@@ -228,8 +228,8 @@ type Cfg struct {
|
||||
Logger log.Logger
|
||||
|
||||
// HTTP Server Settings
|
||||
AppUrl string
|
||||
AppSubUrl string
|
||||
AppURL string
|
||||
AppSubURL string
|
||||
ServeFromSubPath bool
|
||||
StaticRootPath string
|
||||
Protocol Scheme
|
||||
@@ -707,7 +707,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
|
||||
|
||||
cfg.Raw = iniFile
|
||||
|
||||
// Temporary keep global, to make refactor in steps
|
||||
// Temporarily keep global, to make refactor in steps
|
||||
Raw = cfg.Raw
|
||||
|
||||
cfg.BuildVersion = BuildVersion
|
||||
@@ -1203,8 +1203,8 @@ func readServerSettings(iniFile *ini.File, cfg *Cfg) error {
|
||||
}
|
||||
ServeFromSubPath = server.Key("serve_from_sub_path").MustBool(false)
|
||||
|
||||
cfg.AppUrl = AppUrl
|
||||
cfg.AppSubUrl = AppSubUrl
|
||||
cfg.AppURL = AppUrl
|
||||
cfg.AppSubURL = AppSubUrl
|
||||
cfg.ServeFromSubPath = ServeFromSubPath
|
||||
|
||||
Protocol = HTTPScheme
|
||||
|
||||
Reference in New Issue
Block a user