mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-20 13:31:56 +00:00
fix(BE): s3 prefix path
This commit is contained in:
@@ -73,6 +73,7 @@ var (
|
|||||||
S3SecretKey string
|
S3SecretKey string
|
||||||
S3ForcePathStyle bool
|
S3ForcePathStyle bool
|
||||||
S3PublicBaseURL string
|
S3PublicBaseURL string
|
||||||
|
S3EnvPrefix string
|
||||||
S3DocumentKeyPrefix string
|
S3DocumentKeyPrefix string
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -123,7 +124,12 @@ func init() {
|
|||||||
S3SecretKey = strings.TrimSpace(viper.GetString("S3_SECRET_KEY"))
|
S3SecretKey = strings.TrimSpace(viper.GetString("S3_SECRET_KEY"))
|
||||||
S3ForcePathStyle = viper.GetBool("S3_FORCE_PATH_STYLE")
|
S3ForcePathStyle = viper.GetBool("S3_FORCE_PATH_STYLE")
|
||||||
S3PublicBaseURL = strings.TrimSuffix(strings.TrimSpace(viper.GetString("S3_PUBLIC_BASE_URL")), "/")
|
S3PublicBaseURL = strings.TrimSuffix(strings.TrimSpace(viper.GetString("S3_PUBLIC_BASE_URL")), "/")
|
||||||
S3DocumentKeyPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/"), "docs")
|
S3EnvPrefix = defaultString(strings.Trim(strings.TrimSpace(viper.GetString("S3_ENV_PREFIX")), "/"), "local")
|
||||||
|
docPrefix := strings.Trim(strings.TrimSpace(viper.GetString("S3_DOCUMENT_PREFIX")), "/")
|
||||||
|
if docPrefix == "" {
|
||||||
|
docPrefix = "docs"
|
||||||
|
}
|
||||||
|
S3DocumentKeyPrefix = joinPath(S3EnvPrefix, docPrefix)
|
||||||
|
|
||||||
// SSO integration
|
// SSO integration
|
||||||
SSOIssuer = viper.GetString("SSO_ISSUER")
|
SSOIssuer = viper.GetString("SSO_ISSUER")
|
||||||
@@ -242,6 +248,17 @@ func defaultString(v, def string) string {
|
|||||||
return v
|
return v
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func joinPath(parts ...string) string {
|
||||||
|
out := make([]string, 0, len(parts))
|
||||||
|
for _, part := range parts {
|
||||||
|
part = strings.Trim(part, "/")
|
||||||
|
if part != "" {
|
||||||
|
out = append(out, part)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return strings.Join(out, "/")
|
||||||
|
}
|
||||||
|
|
||||||
func ensureProdConfig() {
|
func ensureProdConfig() {
|
||||||
if SSOAuthorizeURL == "" || !strings.HasPrefix(SSOAuthorizeURL, "https://") {
|
if SSOAuthorizeURL == "" || !strings.HasPrefix(SSOAuthorizeURL, "https://") {
|
||||||
panic("SSO_AUTHORIZE_URL must be https in production")
|
panic("SSO_AUTHORIZE_URL must be https in production")
|
||||||
|
|||||||
Reference in New Issue
Block a user