public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Rename constants/variables to follow Go naming standards (#28002)

Browse Source 
* settings: Rename constants/variables to follow Go naming standards
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen
2020-10-02 15:45:45 +02:00
committed by GitHub
parent a5e12f653d
commit a078e40238
23 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/auth/auth_token.go
+1 -1
View File
@@ -102,7 +102,7 @@ func (s *UserAuthTokenService) CreateToken(ctx context.Context, userId int64, cl
func (s *UserAuthTokenService) LookupToken(ctx context.Context, unhashedToken string) (*models.UserToken, error) {
hashedToken := hashToken(unhashedToken)
if setting.Env == setting.DEV {
if setting.Env == setting.Dev {
s.log.Debug("looking up token", "unhashed", unhashedToken, "hashed", hashedToken)
}
pkg/services/rendering/rendering.go
+3 -3
View File
@@ -64,7 +64,7 @@ func (rs *RenderingService) Init() error {
// RendererCallbackUrl has already been passed, it won't generate an error.
u, _ := url.Parse(rs.Cfg.RendererCallbackUrl)
rs.domain = u.Hostname()
case setting.HttpAddr != setting.DEFAULT_HTTP_ADDR:
case setting.HttpAddr != setting.DefaultHTTPAddr:
rs.domain = setting.HttpAddr
default:
rs.domain = "localhost"
@@ -227,9 +227,9 @@ func (rs *RenderingService) getURL(path string) string {
protocol := setting.Protocol
switch setting.Protocol {
case setting.HTTP:
case setting.HTTPScheme:
protocol = "http"
case setting.HTTP2, setting.HTTPS:
case setting.HTTP2Scheme, setting.HTTPSScheme:
protocol = "https"
}
pkg/services/rendering/rendering_test.go
+3 -3
View File
@@ -28,7 +28,7 @@ func TestGetUrl(t *testing.T) {
t.Run("And protocol HTTP configured should return expected path", func(t *testing.T) {
rs.Cfg.ServeFromSubPath = false
rs.Cfg.AppSubUrl = ""
setting.Protocol = setting.HTTP
setting.Protocol = setting.HTTPScheme
url := rs.getURL(path)
require.Equal(t, "http://localhost:3000/"+path+"&render=1", url)
@@ -43,7 +43,7 @@ func TestGetUrl(t *testing.T) {
t.Run("And protocol HTTPS configured should return expected path", func(t *testing.T) {
rs.Cfg.ServeFromSubPath = false
rs.Cfg.AppSubUrl = ""
setting.Protocol = setting.HTTPS
setting.Protocol = setting.HTTPSScheme
url := rs.getURL(path)
require.Equal(t, "https://localhost:3000/"+path+"&render=1", url)
})
@@ -51,7 +51,7 @@ func TestGetUrl(t *testing.T) {
t.Run("And protocol HTTP2 configured should return expected path", func(t *testing.T) {
rs.Cfg.ServeFromSubPath = false
rs.Cfg.AppSubUrl = ""
setting.Protocol = setting.HTTP2
setting.Protocol = setting.HTTP2Scheme
url := rs.getURL(path)
require.Equal(t, "https://localhost:3000/"+path+"&render=1", url)
})