FIXES PLT-6648 Add support for Server Side Encryption on S3 (#6467)
Help from Jason Blais on wording Update storage_settings.jsx Update en.json
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
7683e751ab
Коммит
2105b10ccd
@@ -262,6 +262,7 @@ type FileSettings struct {
|
||||
AmazonS3Endpoint string
|
||||
AmazonS3SSL *bool
|
||||
AmazonS3SignV2 *bool
|
||||
AmazonS3SSE *bool
|
||||
}
|
||||
|
||||
type EmailSettings struct {
|
||||
@@ -551,6 +552,11 @@ func (o *Config) SetDefaults() {
|
||||
// Signature v2 is not enabled by default.
|
||||
}
|
||||
|
||||
if o.FileSettings.AmazonS3SSE == nil {
|
||||
o.FileSettings.AmazonS3SSE = new(bool)
|
||||
*o.FileSettings.AmazonS3SSE = false // Not Encrypted by default.
|
||||
}
|
||||
|
||||
if o.FileSettings.EnableFileAttachments == nil {
|
||||
o.FileSettings.EnableFileAttachments = new(bool)
|
||||
*o.FileSettings.EnableFileAttachments = true
|
||||
|
||||
@@ -24,3 +24,12 @@ func TestConfigDefaultEmailNotificationContentsType(t *testing.T) {
|
||||
t.Fatal("EmailSettings.EmailNotificationContentsType should default to 'full'")
|
||||
}
|
||||
}
|
||||
|
||||
func TestConfigDefaultFileSettingsS3SSE(t *testing.T) {
|
||||
c1 := Config{}
|
||||
c1.SetDefaults()
|
||||
|
||||
if *c1.FileSettings.AmazonS3SSE != false {
|
||||
t.Fatal("FileSettings.AmazonS3SSE should default to false")
|
||||
}
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user