fix(shulker-proxy-agent): having no network admins tries to parse an …

…empty string uuid

packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/Configuration.kt

@@ -9,7 +9,11 @@ object Configuration {
  val PROXY_TTL_SECONDS = getLongEnv("SHULKER_PROXY_TTL_SECONDS")
 
  val NETWORK_ADMINS: List<UUID> = getOptionalStringEnv("SHULKER_NETWORK_ADMINS")
- .map { it.split(",").map(UUID::fromString) }
+ .map {
+ it.split(",")
+ .filter(String::isNotBlank)
+ .map(UUID::fromString)
+ }
  .orElse(emptyList())
 
  val REDIS_HOST = getStringEnv("SHULKER_PROXY_REDIS_HOST")

packages/shulker-proxy-agent/src/common/kotlin/io/shulkermc/proxyagent/ShulkerProxyAgentCommon.kt

@@ -45,14 +45,17 @@ class ShulkerProxyAgentCommon(val proxyInterface: ProxyInterface, val logger: Lo
 
  fun onProxyInitialization() {
  try {
+ this.logger.fine("Creating Agones SDK from environment")
  this.agonesGateway = AgonesSDKImpl.createFromEnvironment()
+
  val gameServer = this.agonesGateway.getGameServer().get()
  this.logger.info(
  "Identified Shulker proxy: ${gameServer.objectMeta.namespace}/${gameServer.objectMeta.name}"
  )
 
  ShulkerProxyAPI.INSTANCE = ShulkerProxyAPIImpl(this)
 
+ this.logger.fine("Creating Redis pool")
  this.jedisPool = this.createJedisPool()
  this.jedisPool.resource.use { jedis -> jedis.ping() }
 
@@ -84,7 +87,7 @@ class ShulkerProxyAgentCommon(val proxyInterface: ProxyInterface, val logger: Lo
  this.cache.registerProxy(Configuration.PROXY_NAME)
  this.agonesGateway.setAllocated()
  } catch (e: Exception) {
- this.logger.severe("Failed to parse configuration")
+ this.logger.severe("Shulker Agent crashed, stopping proxy")
  e.printStackTrace()
  this.shutdown()
  }

packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/Configuration.kt

@@ -1,11 +1,16 @@
 package io.shulkermc.serveragent
 
+import java.util.Optional
 import java.util.UUID
 
 object Configuration {
- val NETWORK_ADMINS = (getOptionalStringEnv("SHULKER_NETWORK_ADMINS") ?: "")
- .split(",")
- .map(UUID::fromString)
+ val NETWORK_ADMINS: List<UUID> = getOptionalStringEnv("SHULKER_NETWORK_ADMINS")
+ .map {
+ it.split(",")
+ .filter(String::isNotBlank)
+ .map(UUID::fromString)
+ }
+ .orElse(emptyList())
 
- private fun getOptionalStringEnv(name: String): String? = System.getenv(name)
+ private fun getOptionalStringEnv(name: String): Optional<String> = Optional.ofNullable(System.getenv(name))
 }

packages/shulker-server-agent/src/common/kotlin/io/shulkermc/serveragent/ShulkerServerAgentCommon.kt

@@ -22,6 +22,7 @@ class ShulkerServerAgentCommon(val serverInterface: ServerInterface, private val
 
  fun onServerInitialization() {
  try {
+ this.logger.fine("Creating Agones SDK from environment")
  this.agonesGateway = AgonesSDKImpl.createFromEnvironment()
  val gameServer = this.agonesGateway.getGameServer().get()
  this.logger.info(
@@ -48,7 +49,7 @@ class ShulkerServerAgentCommon(val serverInterface: ServerInterface, private val
 
  this.agonesGateway.setReady()
  } catch (e: Exception) {
- this.logger.severe("Failed to parse configuration: ${e.message}")
+ this.logger.severe("Shulker Agent crashed, stopping server")
  e.printStackTrace()
  this.shutdown()
  }