diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-03-13 17:26:56 +0100 |
|---|---|---|
| committer | Saturnino Abril <saturnino.abril@gmail.com> | 2018-03-14 00:26:56 +0800 |
| commit | db4402c40dca7724416f1f6a38e4e256e871c302 (patch) | |
| tree | 4f7220368cdba1f7cbe154d0938301ea9c8caee9 /utils/file_backend_s3.go | |
| parent | caf9c2409935124db85daf5b04d61b7a663ebfc8 (diff) | |
| download | chat-db4402c40dca7724416f1f6a38e4e256e871c302.tar.gz chat-db4402c40dca7724416f1f6a38e4e256e871c302.tar.bz2 chat-db4402c40dca7724416f1f6a38e4e256e871c302.zip | |
remove s3 region to be mandatory and fix when user call test s3 when the config is saved (#8454)
Diffstat (limited to 'utils/file_backend_s3.go')
| -rw-r--r-- | utils/file_backend_s3.go | 7 |
1 files changed, 2 insertions, 5 deletions
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 |