Bladeren bron

Fallback to default S3 URL on empty media upload URL in settings.

Kailash Nadh 3 jaren geleden
bovenliggende
commit
b46ab6d3a9
2 gewijzigde bestanden met toevoegingen van 3 en 4 verwijderingen
  1. 1 2
      frontend/src/views/settings/media.vue
  2. 2 2
      internal/media/providers/s3/s3.go

+ 1 - 2
frontend/src/views/settings/media.vue

@@ -95,8 +95,7 @@
             label-position="on-border"
             label-position="on-border"
             :message="$t('settings.media.s3.urlHelp')" expanded>
             :message="$t('settings.media.s3.urlHelp')" expanded>
             <b-input v-model="data['upload.s3.url']"
             <b-input v-model="data['upload.s3.url']"
-              name="upload.s3.url"
-              :disabled="!data['upload.s3.bucket']"
+              name="upload.s3.url" :disabled="!data['upload.s3.bucket']" required
               placeholder="https://s3.region.amazonaws.com" :maxlength="200" />
               placeholder="https://s3.region.amazonaws.com" :maxlength="200" />
           </b-field>
           </b-field>
         </div>
         </div>

+ 2 - 2
internal/media/providers/s3/s3.go

@@ -1,7 +1,7 @@
 package s3
 package s3
 
 
 import (
 import (
-	"errors"
+	"fmt"
 	"io"
 	"io"
 	"strings"
 	"strings"
 	"time"
 	"time"
@@ -36,7 +36,7 @@ func NewS3Store(opt Opt) (media.Store, error) {
 		err error
 		err error
 	)
 	)
 	if opt.URL == "" {
 	if opt.URL == "" {
-		return nil, errors.New("Invalid AWS URL in settings.")
+		opt.URL = fmt.Sprintf("https://s3.%s.amazonaws.com", opt.Region)
 	}
 	}
 	opt.URL = strings.TrimRight(opt.URL, "/")
 	opt.URL = strings.TrimRight(opt.URL, "/")