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:
@@ -1,17 +1,17 @@
|
||||
// Copyright (c) 2025 Nikolai Papin
|
||||
//
|
||||
//
|
||||
// This file is part of Easywish
|
||||
//
|
||||
//
|
||||
// This program is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
//
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
||||
// the GNU General Public License for more details.
|
||||
//
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
@@ -20,6 +20,7 @@ package config
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
@@ -31,6 +32,9 @@ type Config struct {
|
||||
DatabaseUrl string `mapstructure:"POSTGRES_URL"`
|
||||
RedisUrl string `mapstructure:"REDIS_URL"`
|
||||
MinioUrl string `mapstructure:"MINIO_URL"`
|
||||
MinioHost string `mapstructure:"MINIO_HOST"`
|
||||
MinioPort uint16 `mapstructure:"MINIO_PORT"`
|
||||
MinioTimeout int64 `mapstructure:"MINIO_TIMEOUT"`
|
||||
|
||||
JwtAlgorithm string `mapstructure:"JWT_ALGORITHM"`
|
||||
JwtSecret string `mapstructure:"JWT_SECRET"`
|
||||
@@ -65,6 +69,8 @@ func Load() (*Config, error) {
|
||||
viper.SetDefault("HOSTNAME", "localhost")
|
||||
viper.SetDefault("PORT", "8080")
|
||||
|
||||
viper.SetDefault("MINIO_TIMEOUT", 90 * time.Second)
|
||||
|
||||
viper.SetDefault("JWT_ALGORITHM", "HS256")
|
||||
viper.SetDefault("JWT_SECRET", "default_jwt_secret_please_change")
|
||||
viper.SetDefault("JWT_EXP_ACCESS", 5)
|
||||
@@ -97,9 +103,13 @@ func Load() (*Config, error) {
|
||||
viper.BindEnv("HOSTNAME")
|
||||
viper.BindEnv("PORT")
|
||||
|
||||
viper.BindEnv("MINIO_TIMEOUT")
|
||||
|
||||
viper.BindEnv("POSTGRES_URL")
|
||||
viper.BindEnv("REDIS_URL")
|
||||
viper.BindEnv("MINIO_URL")
|
||||
viper.BindEnv("MINIO_HOST")
|
||||
viper.BindEnv("MINIO_PORT")
|
||||
|
||||
viper.BindEnv("JWT_ALGORITHM")
|
||||
viper.BindEnv("JWT_SECRET")
|
||||
@@ -132,6 +142,8 @@ func Load() (*Config, error) {
|
||||
"POSTGRES_URL",
|
||||
"REDIS_URL",
|
||||
"MINIO_URL",
|
||||
"MINIO_HOST",
|
||||
"MINIO_PORT",
|
||||
}
|
||||
var missing []string
|
||||
for _, key := range required {
|
||||
|
||||
Reference in New Issue
Block a user