refactor(shulker-proxy-agent,shulker-server-agent): make network admi…

…ns optional
jeremylvln · Nov 2, 2023 · 1bdac2f · 1bdac2f
1 parent d4fccbf
commit 1bdac2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/Configuration.kt b/packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/Configuration.kt
@@ -7,7 +7,9 @@ object Configuration {
     val PROXY_NAME = getStringEnv("SHULKER_PROXY_NAME")
     val PROXY_TTL_SECONDS = getLongEnv("SHULKER_PROXY_TTL_SECONDS")
 
-    val NETWORK_ADMINS = getStringEnv("SHULKER_NETWORK_ADMINS").split(",").map(UUID::fromString)
+    val NETWORK_ADMINS = (getOptionalStringEnv("SHULKER_NETWORK_ADMINS") ?: "")
+        .split(",")
+        .map(UUID::fromString)
 
     val REDIS_HOST = getStringEnv("SHULKER_PROXY_REDIS_HOST")
     val REDIS_PORT = getIntEnv("SHULKER_PROXY_REDIS_PORT")

diff --git a/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/Configuration.kt b/packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/Configuration.kt
@@ -3,7 +3,9 @@ package io.shulkermc.serveragent
 import java.util.UUID
 
 object Configuration {
-    val NETWORK_ADMINS = getStringEnv("SHULKER_NETWORK_ADMINS").split(",").map(UUID::fromString)
+    val NETWORK_ADMINS = (getOptionalStringEnv("SHULKER_NETWORK_ADMINS") ?: "")
+        .split(",")
+        .map(UUID::fromString)
 
-    private fun getStringEnv(name: String): String = requireNotNull(System.getenv(name)) { "Missing $name" }
+    private fun getOptionalStringEnv(name: String): String? = System.getenv(name)
 }