endpoint env refactor
All checks were successful
/ Make image (push) Successful in 1m22s

This commit is contained in:
nquidox 2025-10-18 16:38:21 +03:00
parent f3d123ee3b
commit 947220b65c
5 changed files with 11 additions and 38 deletions

View file

@ -1,7 +1,6 @@
package mediaStorage
import (
"fmt"
"github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials"
log "github.com/sirupsen/logrus"
@ -12,8 +11,7 @@ type Handler struct {
}
type Deps struct {
Host string
Port string
Endpoint string
User string
Password string
Domain string
@ -26,8 +24,7 @@ func NewHandler(deps Deps) *Handler {
secureMode = true
}
endpoint := fmt.Sprintf("%s:%s", deps.Host, deps.Port)
minioClient, err := minio.New(endpoint, &minio.Options{
minioClient, err := minio.New(deps.Endpoint, &minio.Options{
Creds: credentials.NewStaticV4(deps.User, deps.Password, ""),
Secure: secureMode,
})
@ -36,11 +33,11 @@ func NewHandler(deps Deps) *Handler {
}
log.WithFields(log.Fields{
"endpoint": endpoint,
"endpoint": deps.Endpoint,
"secure": secureMode,
}).Debug("Media storage | Created minio client")
return &Handler{
newService(minioClient, deps.Domain, endpoint),
newService(minioClient),
}
}

View file

@ -2,7 +2,6 @@ package mediaStorage
import (
"context"
"fmt"
"github.com/minio/minio-go/v7"
log "github.com/sirupsen/logrus"
"io"
@ -16,10 +15,9 @@ type Service struct {
endpoint string
}
func newService(client *minio.Client, domain, endpoint string) *Service {
func newService(client *minio.Client) *Service {
return &Service{
client: client,
domain: domain,
}
}
@ -45,21 +43,7 @@ func (s *Service) Get(ctx context.Context, bucket, object string, expires time.D
return "", err
}
u, err := url.Parse(presigned.String())
if err != nil {
return "", err
}
if s.domain != "" {
domainURL, err := url.Parse(s.domain)
if err != nil {
return "", fmt.Errorf("invalid domain URL: %w", err)
}
u.Scheme = domainURL.Scheme
u.Host = domainURL.Host
}
return u.String(), nil
return presigned.String(), nil
}
func (s *Service) Delete(ctx context.Context, bucket, object string) error {