Skip to content

Commit

Permalink
Merge pull request #2264 from withchao/release-v3.7
Browse files Browse the repository at this point in the history
fix: minio config url recognition error
  • Loading branch information
withchao authored Apr 29, 2024
2 parents d697eac + bbd9ff9 commit eb4698a
Showing 1 changed file with 11 additions and 14 deletions.
25 changes: 11 additions & 14 deletions pkg/common/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
package config

import (
"fmt"
"github.com/openimsdk/tools/db/mongoutil"
"github.com/openimsdk/tools/db/redisutil"
"github.com/openimsdk/tools/mq/kafka"
"github.com/openimsdk/tools/s3/cos"
"github.com/openimsdk/tools/s3/minio"
"github.com/openimsdk/tools/s3/oss"
"net"
"strings"
"time"
)

Expand Down Expand Up @@ -473,25 +472,23 @@ func (k *Kafka) Build() *kafka.Config {
},
}
}

func (m *Minio) Build() *minio.Config {
conf := minio.Config{
formatEndpoint := func(address string) string {
if strings.HasPrefix(address, "http://") || strings.HasPrefix(address, "https://") {
return address
}
return "http://" + address
}
return &minio.Config{
Bucket: m.Bucket,
AccessKeyID: m.AccessKeyID,
SecretAccessKey: m.SecretAccessKey,
SessionToken: m.SessionToken,
PublicRead: m.PublicRead,
Endpoint: formatEndpoint(m.InternalAddress),
SignEndpoint: formatEndpoint(m.ExternalAddress),
}
if _, _, err := net.SplitHostPort(m.InternalAddress); err == nil {
conf.Endpoint = fmt.Sprintf("http://%s", m.InternalAddress)
} else {
conf.Endpoint = m.InternalAddress
}
if _, _, err := net.SplitHostPort(m.ExternalAddress); err == nil {
conf.SignEndpoint = fmt.Sprintf("http://%s", m.ExternalAddress)
} else {
conf.SignEndpoint = m.ExternalAddress
}
return &conf
}
func (c *Cos) Build() *cos.Config {
return &cos.Config{
Expand Down

0 comments on commit eb4698a

Please sign in to comment.