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/components/imguploader/azureblobuploader_test.go
+1 -1
View File
@@ -18,7 +18,7 @@ func TestUploadToAzureBlob(t *testing.T) {
})
require.NoError(t, err)
uploader, _ := NewImageUploader()
uploader, _ := NewImageUploader(cfg)
path, err := uploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")
pkg/components/imguploader/imguploader.go
+8 -8
View File
@@ -32,10 +32,10 @@ var (
logger = log.New("imguploader")
)
func NewImageUploader() (ImageUploader, error) {
switch setting.ImageUploadProvider {
func NewImageUploader(cfg *setting.Cfg) (ImageUploader, error) {
switch cfg.ImageUploadProvider {
case "s3":
s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
if err != nil {
return nil, err
}
@@ -64,7 +64,7 @@ func NewImageUploader() (ImageUploader, error) {
return NewS3Uploader(endpoint, region, bucket, path, "public-read", accessKey, secretKey, pathStyleAccess), nil
case "webdav":
webdavSec, err := setting.Raw.GetSection("external_image_storage.webdav")
webdavSec, err := cfg.Raw.GetSection("external_image_storage.webdav")
if err != nil {
return nil, err
}
@@ -80,7 +80,7 @@ func NewImageUploader() (ImageUploader, error) {
return NewWebdavImageUploader(url, username, password, public_url)
case "gcs":
gcssec, err := setting.Raw.GetSection("external_image_storage.gcs")
gcssec, err := cfg.Raw.GetSection("external_image_storage.gcs")
if err != nil {
return nil, err
}
@@ -102,7 +102,7 @@ func NewImageUploader() (ImageUploader, error) {
return gcs.NewUploader(keyFile, bucketName, path, enableSignedURLs, suExp)
case "azure_blob":
azureBlobSec, err := setting.Raw.GetSection("external_image_storage.azure_blob")
azureBlobSec, err := cfg.Raw.GetSection("external_image_storage.azure_blob")
if err != nil {
return nil, err
}
@@ -118,8 +118,8 @@ func NewImageUploader() (ImageUploader, error) {
return NewLocalImageUploader()
}
if setting.ImageUploadProvider != "" {
logger.Error("The external image storage configuration is invalid", "unsupported provider", setting.ImageUploadProvider)
if cfg.ImageUploadProvider != "" {
logger.Error("The external image storage configuration is invalid", "unsupported provider", cfg.ImageUploadProvider)
}
return NopImageUploader{}, nil
pkg/components/imguploader/imguploader_test.go
+15 -15
View File
@@ -17,10 +17,10 @@ func TestImageUploaderFactory(t *testing.T) {
})
require.NoError(t, err)
setting.ImageUploadProvider = "s3"
cfg.ImageUploadProvider = "s3"
t.Run("with bucket url https://foo.bar.baz.s3-us-east-2.amazonaws.com", func(t *testing.T) {
s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
require.NoError(t, err)
_, err = s3sec.NewKey("bucket_url", "https://foo.bar.baz.s3-us-east-2.amazonaws.com")
require.NoError(t, err)
@@ -29,7 +29,7 @@ func TestImageUploaderFactory(t *testing.T) {
_, err = s3sec.NewKey("secret_key", "secret_key")
require.NoError(t, err)
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*S3Uploader)
@@ -41,7 +41,7 @@ func TestImageUploaderFactory(t *testing.T) {
})
t.Run("with bucket url https://s3.amazonaws.com/mybucket", func(t *testing.T) {
s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
require.NoError(t, err)
_, err = s3sec.NewKey("bucket_url", "https://s3.amazonaws.com/my.bucket.com")
require.NoError(t, err)
@@ -50,7 +50,7 @@ func TestImageUploaderFactory(t *testing.T) {
_, err = s3sec.NewKey("secret_key", "secret_key")
require.NoError(t, err)
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*S3Uploader)
@@ -62,7 +62,7 @@ func TestImageUploaderFactory(t *testing.T) {
})
t.Run("with bucket url https://s3-us-west-2.amazonaws.com/mybucket", func(t *testing.T) {
s3sec, err := setting.Raw.GetSection("external_image_storage.s3")
s3sec, err := cfg.Raw.GetSection("external_image_storage.s3")
require.NoError(t, err)
_, err = s3sec.NewKey("bucket_url", "https://s3-us-west-2.amazonaws.com/my.bucket.com")
require.NoError(t, err)
@@ -71,7 +71,7 @@ func TestImageUploaderFactory(t *testing.T) {
_, err = s3sec.NewKey("secret_key", "secret_key")
require.NoError(t, err)
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*S3Uploader)
@@ -90,7 +90,7 @@ func TestImageUploaderFactory(t *testing.T) {
})
require.NoError(t, err)
setting.ImageUploadProvider = "webdav"
cfg.ImageUploadProvider = "webdav"
webdavSec, err := cfg.Raw.GetSection("external_image_storage.webdav")
require.NoError(t, err)
@@ -101,7 +101,7 @@ func TestImageUploaderFactory(t *testing.T) {
_, err = webdavSec.NewKey("password", "password")
require.NoError(t, err)
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*WebdavUploader)
@@ -118,7 +118,7 @@ func TestImageUploaderFactory(t *testing.T) {
})
require.NoError(t, err)
setting.ImageUploadProvider = "gcs"
cfg.ImageUploadProvider = "gcs"
gcpSec, err := cfg.Raw.GetSection("external_image_storage.gcs")
require.NoError(t, err)
@@ -127,7 +127,7 @@ func TestImageUploaderFactory(t *testing.T) {
_, err = gcpSec.NewKey("bucket", "project-grafana-east")
require.NoError(t, err)
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*gcs.Uploader)
@@ -143,7 +143,7 @@ func TestImageUploaderFactory(t *testing.T) {
})
require.NoError(t, err)
setting.ImageUploadProvider = "azure_blob"
cfg.ImageUploadProvider = "azure_blob"
t.Run("with container name", func(t *testing.T) {
azureBlobSec, err := cfg.Raw.GetSection("external_image_storage.azure_blob")
@@ -157,7 +157,7 @@ func TestImageUploaderFactory(t *testing.T) {
_, err = azureBlobSec.NewKey("sas_token_expiration_days", "sas_token_expiration_days")
require.NoError(t, err)
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*AzureBlobUploader)
@@ -176,9 +176,9 @@ func TestImageUploaderFactory(t *testing.T) {
})
require.NoError(t, err)
setting.ImageUploadProvider = "local"
cfg.ImageUploadProvider = "local"
uploader, err := NewImageUploader()
uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
original, ok := uploader.(*LocalUploader)
pkg/components/imguploader/s3uploader_test.go
+1 -1
View File
@@ -17,7 +17,7 @@ func TestUploadToS3(t *testing.T) {
})
require.NoError(t, err)
s3Uploader, err := NewImageUploader()
s3Uploader, err := NewImageUploader(cfg)
require.NoError(t, err)
path, err := s3Uploader.Upload(context.Background(), "../../../public/img/logo_transparent_400x.png")