diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/file_backend_s3.go | 7 | ||||
| -rw-r--r-- | utils/file_backend_s3_test.go | 10 |
2 files changed, 7 insertions, 10 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 diff --git a/utils/file_backend_s3_test.go b/utils/file_backend_s3_test.go index ff42a4d19..a8834f226 100644 --- a/utils/file_backend_s3_test.go +++ b/utils/file_backend_s3_test.go @@ -19,14 +19,14 @@ func TestCheckMandatoryS3Fields(t *testing.T) { cfg.AmazonS3Bucket = "test-mm" err = CheckMandatoryS3Fields(&cfg) - if err == nil || err.Message != "api.admin.test_s3.missing_s3_endpoint" { - t.Fatal("should've failed with missing s3 endpoint") + if err != nil { + t.Fatal("should've not failed") } - cfg.AmazonS3Endpoint = "s3.newendpoint.com" + cfg.AmazonS3Endpoint = "" err = CheckMandatoryS3Fields(&cfg) - if err == nil || err.Message != "api.admin.test_s3.missing_s3_region" { - t.Fatal("should've failed with missing s3 region") + if err != nil || cfg.AmazonS3Endpoint != "s3.amazonaws.com" { + t.Fatal("should've not failed because it should set the endpoint to the default") } } |