From db4402c40dca7724416f1f6a38e4e256e871c302 Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Tue, 13 Mar 2018 17:26:56 +0100
Subject: remove s3 region to be mandatory and fix when user call test s3 when
 the config is saved (#8454)

---
 api4/system.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'api4/system.go')

diff --git a/api4/system.go b/api4/system.go
index c1541f0b5..7b63afc0b 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -395,6 +395,10 @@ func testS3(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if cfg.FileSettings.AmazonS3SecretAccessKey == model.FAKE_SETTING {
+		cfg.FileSettings.AmazonS3SecretAccessKey = c.App.Config().FileSettings.AmazonS3SecretAccessKey
+	}
+
 	license := c.App.License()
 	backend, appErr := utils.NewFileBackend(&cfg.FileSettings, license != nil && *license.Features.Compliance)
 	if appErr == nil {
-- 
cgit v1.2.3-1-g7c22