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

Chore: Remove public vars in setting package (#81018)

Browse Source 
Removes the public variable setting.SecretKey plus some other ones. 
Introduces some new functions for creating setting.Cfg.
This commit is contained in:
Marcus Efraimsson
2024-01-23 12:36:22 +01:00
committed by GitHub
parent 147bf01745
commit 6768c6c059
131 changed files with 759 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/datasources/service/datasource_test.go
+6 -6
View File
@@ -608,7 +608,7 @@ func TestService_GetHttpTransport(t *testing.T) {
},
})
setting.SecretKey = "password"
cfg.SecretKey = "password"
sjson := simplejson.New()
sjson.Set("tlsAuthWithCACert", true)
@@ -659,7 +659,7 @@ func TestService_GetHttpTransport(t *testing.T) {
},
})
setting.SecretKey = "password"
cfg.SecretKey = "password"
sjson := simplejson.New()
sjson.Set("tlsAuth", true)
@@ -706,7 +706,7 @@ func TestService_GetHttpTransport(t *testing.T) {
},
})
setting.SecretKey = "password"
cfg.SecretKey = "password"
sjson := simplejson.New()
sjson.Set("tlsAuthWithCACert", true)
@@ -968,10 +968,10 @@ func TestService_GetHttpTransport(t *testing.T) {
},
})
origSigV4Enabled := setting.SigV4AuthEnabled
setting.SigV4AuthEnabled = true
origSigV4Enabled := cfg.SigV4AuthEnabled
cfg.SigV4AuthEnabled = true
t.Cleanup(func() {
setting.SigV4AuthEnabled = origSigV4Enabled
cfg.SigV4AuthEnabled = origSigV4Enabled
})
sjson, err := simplejson.NewJson([]byte(`{ "sigV4Auth": true }`))