IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 17:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Replace encryption.Service usages by secrets.Service (#41625)

Browse Source 
* Replace encryption.Service by secrets.Service on expr.Service

* Replace encryption.Service by secrets.Service on live pkg

* Rename encryption.Service to encryption.Internal to clarify it must be not used
This commit is contained in:
Joan López de la Franca Beltran
2021-11-12 12:16:39 +01:00
committed by GitHub
parent dcae138379
commit 44837fc592
16 changed files with 66 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/secrets/defaultprovider/grafana_provider.go
+2 -2
View File
@@ -10,10 +10,10 @@ import (
type grafanaProvider struct {
settings setting.Provider
encryption encryption.Service
encryption encryption.Internal
}
func New(settings setting.Provider, encryption encryption.Service) secrets.Provider {
func New(settings setting.Provider, encryption encryption.Internal) secrets.Provider {
return grafanaProvider{
settings: settings,
encryption: encryption,
pkg/services/secrets/manager/manager.go
+2 -2
View File
@@ -24,7 +24,7 @@ const (
type SecretsService struct {
store secrets.Store
bus bus.Bus
enc encryption.Service
enc encryption.Internal
settings setting.Provider
currentProvider string
@@ -32,7 +32,7 @@ type SecretsService struct {
dataKeyCache map[string]dataKeyCacheItem
}
func ProvideSecretsService(store secrets.Store, bus bus.Bus, enc encryption.Service, settings setting.Provider) *SecretsService {
func ProvideSecretsService(store secrets.Store, bus bus.Bus, enc encryption.Internal, settings setting.Provider) *SecretsService {
providers := map[string]secrets.Provider{
defaultProvider: grafana.New(settings, enc),
}