feat: configuration parameters for minio host, port, timeout;
refactor: renamed buckets; fix: corrected Host header changing behavior in minio gin endpoint; feat: function to convert local minio url to /s3/ path url with the backend host
This commit is contained in:
@@ -31,9 +31,9 @@ var Buckets map[string]string
|
||||
func setupBuckets(client *minio.Client) {
|
||||
|
||||
Buckets = map[string]string{
|
||||
"avatars": "avatars",
|
||||
"images": "images",
|
||||
"uploads": "uploads",
|
||||
"avatars": "ew-avatars",
|
||||
"images": "ew-images",
|
||||
"uploads": "ew-uploads",
|
||||
}
|
||||
|
||||
hiddenBuckets := []string{
|
||||
|
||||
@@ -18,21 +18,28 @@
|
||||
package minioclient
|
||||
|
||||
import (
|
||||
"easywish/config"
|
||||
"fmt"
|
||||
"io"
|
||||
"maps"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"time"
|
||||
"maps"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
func setupGinEndpoint(router *gin.Engine) {
|
||||
|
||||
cfg := config.GetConfig()
|
||||
minioHost := fmt.Sprintf("%s:%d", cfg.MinioHost, cfg.MinioPort)
|
||||
|
||||
s3group := router.Group("/s3")
|
||||
s3group.Any("/*path", func(c *gin.Context) {
|
||||
path := c.Param("path")
|
||||
minioURL := &url.URL{
|
||||
Scheme: "http",
|
||||
Host: "minio:9000", // XXX: hardcoded minio host
|
||||
Host: minioHost,
|
||||
Path: path,
|
||||
RawQuery: c.Request.URL.RawQuery,
|
||||
}
|
||||
@@ -42,9 +49,9 @@ func setupGinEndpoint(router *gin.Engine) {
|
||||
}
|
||||
req = req.WithContext(c.Request.Context())
|
||||
maps.Copy(req.Header, c.Request.Header)
|
||||
delete(req.Header, "Host")
|
||||
req.Header.Set("Host", minioHost)
|
||||
client := &http.Client{
|
||||
Timeout: 30 * time.Second, // XXX: magic number
|
||||
Timeout: time.Duration(cfg.MinioTimeout),
|
||||
CheckRedirect: func(req *http.Request, via []*http.Request) error {
|
||||
return http.ErrUseLastResponse
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user