From 92121ea656dd6bad61c9aef1e438ff9ae9cf9b95 Mon Sep 17 00:00:00 2001 From: bergquist Date: Wed, 5 Oct 2016 07:34:48 +0200 Subject: [PATCH] feat(alerting): add nop uploader ref #6183 --- conf/defaults.ini | 2 +- conf/sample.ini | 4 ++-- pkg/components/imguploader/imguploader.go | 9 ++++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/conf/defaults.ini b/conf/defaults.ini index 39e10280645..209f0e24350 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -421,7 +421,7 @@ url = https://grafana.net #################################### External Image Storage ############## [external_image_storage] # You can choose between (s3, webdav) -provider = s3 +provider = [external_image_storage.s3] bucket_url = diff --git a/conf/sample.ini b/conf/sample.ini index bb575a596b0..cc0e982a114 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -375,8 +375,8 @@ #################################### External image storage ########################## [external_image_storage] # Used for uploading images to public servers so they can be included in slack/email messages. -# you can choose between (s3, webdav or internal) -;provider = s3 +# you can choose between (s3, webdav) +;provider = [external_image_storage.s3] ;bucket_url = diff --git a/pkg/components/imguploader/imguploader.go b/pkg/components/imguploader/imguploader.go index 1de46e7fd1d..1cbe55c8572 100644 --- a/pkg/components/imguploader/imguploader.go +++ b/pkg/components/imguploader/imguploader.go @@ -10,6 +10,13 @@ type ImageUploader interface { Upload(path string) (string, error) } +type NopImageUploader struct { +} + +func (NopImageUploader) Upload(path string) (string, error) { + return "", nil +} + func NewImageUploader() (ImageUploader, error) { switch setting.ImageUploadProvider { @@ -53,5 +60,5 @@ func NewImageUploader() (ImageUploader, error) { return NewWebdavImageUploader(url, username, password) } - return nil, fmt.Errorf("could not find specified provider") + return NopImageUploader{}, nil }