Skip to content

Fix: Environment variable access logic for config #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
this-Aditya merged 6 commits into from
Jan 23, 2026
Merged

Fix: Environment variable access logic for config #127

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb7497d
Fixing the logic for accessing environment variables in the config
this-Aditya Nov 8, 2025
e0eccdc
Using immutable properties
this-Aditya Nov 8, 2025
49b65f3
Ktlint format
this-Aditya Nov 8, 2025
11641aa
Minor fixes
this-Aditya Jan 22, 2026
4d5153d
Misc changes
this-Aditya Jan 23, 2026
1b861b0
Ktlint format
this-Aditya Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion radar-gateway/src/main/kotlin/org/radarbase/gateway/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ fun main(args: Array<String>) {
),
args,
).withDefaults()
.withEnv()
} catch (ex: IllegalArgumentException) {
logger.error("No configuration file was found.")
logger.error("Usage: radar-gateway <config-file>")
Expand All @@ -27,7 +28,6 @@ fun main(args: Array<String>) {

try {
config.validate()
config.checkEnvironmentVars()
} catch (ex: IllegalStateException) {
logger.error("Configuration incomplete: {}", ex.message)
exitProcess(1)
Expand Down
13 changes: 10 additions & 3 deletions radar-gateway/src/main/kotlin/org/radarbase/gateway/config/GatewayConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.radarbase.gateway.config

import org.radarbase.gateway.inject.ManagementPortalEnhancerFactory
import org.radarbase.jersey.config.ConfigLoader.copyOnChange
import org.radarbase.jersey.enhancer.EnhancerFactory

data class GatewayConfig(
Expand Down Expand Up @@ -29,7 +30,13 @@ data class GatewayConfig(
auth.validate()
}

fun checkEnvironmentVars() {
s3.checkEnvironmentVars()
}
fun withEnv(): GatewayConfig = this.copyOnChange(
s3,
{
it.withEnv()
},
{
copy(s3 = it)
},
)
}
47 changes: 28 additions & 19 deletions radar-gateway/src/main/kotlin/org/radarbase/gateway/config/S3StorageConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,40 @@ import org.radarbase.gateway.utils.Env.AWS_DEFAULT_REGION
import org.radarbase.gateway.utils.Env.AWS_ENDPOINT_URL_S3
import org.radarbase.gateway.utils.Env.AWS_S3_BUCKET_NAME
import org.radarbase.gateway.utils.Env.AWS_SECRET_ACCESS_KEY
import org.radarbase.jersey.config.ConfigLoader.copyEnv
import org.radarbase.jersey.config.ConfigLoader.copyOnChange

data class S3StorageConfig(
var url: String? = null,
var accessKey: String? = null,
var secretKey: String? = null,
var bucketName: String? = null,
var region: String? = null,
var path: S3StoragePathConfig = S3StoragePathConfig(),
val url: String? = null,
val accessKey: String? = null,
val secretKey: String? = null,
val bucketName: String? = null,
val region: String? = null,
val path: S3StoragePathConfig = S3StoragePathConfig(),
) {
fun checkEnvironmentVars() {
url ?: run {
url = System.getenv(AWS_ENDPOINT_URL_S3)
fun withEnv(): S3StorageConfig = this
.copyEnv(AWS_ENDPOINT_URL_S3) {
copy(url = it)
}
accessKey ?: run {
accessKey = System.getenv(AWS_ACCESS_KEY_ID)
.copyEnv(AWS_ACCESS_KEY_ID) {
copy(accessKey = it)
}
secretKey ?: run {
secretKey = System.getenv(AWS_SECRET_ACCESS_KEY)
.copyEnv(AWS_SECRET_ACCESS_KEY) {
copy(secretKey = it)
}
bucketName ?: run {
bucketName = System.getenv(AWS_S3_BUCKET_NAME)
.copyEnv(AWS_S3_BUCKET_NAME) {
copy(bucketName = it)
}
region ?: run {
region = System.getenv(AWS_DEFAULT_REGION)
.copyEnv(AWS_DEFAULT_REGION) {
copy(region = it)
}
path.checkEnvironmentVars()
}
.copyOnChange(
path,
{
it.withEnv()
},
{
copy(path = it)
},
)
}
12 changes: 6 additions & 6 deletions radar-gateway/src/main/kotlin/org/radarbase/gateway/config/S3StoragePathConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.radarbase.gateway.config

import org.radarbase.gateway.utils.Env.AWS_S3_PATH_PREFIX
import org.radarbase.jersey.config.ConfigLoader.copyEnv

data class S3StoragePathConfig(
var prefix: String? = null,
var collectPerDay: Boolean = true,
val prefix: String? = null,
val collectPerDay: Boolean = true,
) {
fun checkEnvironmentVars() {
prefix ?: run {
prefix = System.getenv(AWS_S3_PATH_PREFIX)
fun withEnv(): S3StoragePathConfig = this
.copyEnv(AWS_S3_PATH_PREFIX) {
copy(prefix = it)
}
}
}
Loading