From db4402c40dca7724416f1f6a38e4e256e871c302 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior 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) --- utils/file_backend_s3.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'utils/file_backend_s3.go') diff --git a/utils/file_backend_s3.go b/utils/file_backend_s3.go index b0601bc8a..75282897f 100644 --- a/utils/file_backend_s3.go +++ b/utils/file_backend_s3.go @@ -253,12 +253,9 @@ func CheckMandatoryS3Fields(settings *model.FileSettings) *model.AppError { return model.NewAppError("S3File", "api.admin.test_s3.missing_s3_bucket", nil, "", http.StatusBadRequest) } + // if S3 endpoint is not set call the set defaults to set that if len(settings.AmazonS3Endpoint) == 0 { - return model.NewAppError("S3File", "api.admin.test_s3.missing_s3_endpoint", nil, "", http.StatusBadRequest) - } - - if len(settings.AmazonS3Region) == 0 { - return model.NewAppError("S3File", "api.admin.test_s3.missing_s3_region", nil, "", http.StatusBadRequest) + settings.SetDefaults() } return nil -- cgit v1.2.3-1-g7c22