Merge pull request #293 from AikidoSec/allow-custom-hostnames

Add support for AIKIDO_INSTANCE_NAME

Author: bitterpanda63

agent_api/src/main/java/dev/aikido/agent_api/background/cloud/GetManagerInfo.java

@@ -1,6 +1,7 @@
 package dev.aikido.agent_api.background.cloud;
 
 import dev.aikido.agent_api.Config;
+import dev.aikido.agent_api.helpers.env.InstanceName;
 import dev.aikido.agent_api.helpers.net.Hostname;
 import dev.aikido.agent_api.helpers.net.IPAddress;
 import dev.aikido.agent_api.storage.ServiceConfigStore;
@@ -49,9 +50,10 @@ public record Platform(String name, String version) {}
 
     public static ManagerInfo getManagerInfo() {
         ServiceConfiguration serviceConfig = ServiceConfigStore.getConfig();
+        String instanceName = InstanceName.fromEnv();
         return new ManagerInfo(
             !serviceConfig.isBlockingEnabled(), // dryMode
-            Hostname.get(), // hostname
+            instanceName != null ? instanceName : Hostname.get(), // hostname
             Config.pkgVersion, // version
             "firewall-java", // library
             IPAddress.get(), // ipAddress

agent_api/src/main/java/dev/aikido/agent_api/helpers/env/InstanceName.java

@@ -0,0 +1,13 @@
+package dev.aikido.agent_api.helpers.env;
+
+public final class InstanceName {
+    private InstanceName() {}
+
+    public static String fromEnv() {
+        String name = System.getenv("AIKIDO_INSTANCE_NAME");
+        if (name == null || name.isEmpty()) {
+            return null;
+        }
+        return name;
+    }
+}

agent_api/src/test/java/helpers/env/InstanceNameTest.java

@@ -0,0 +1,27 @@
+package helpers.env;
+
+import dev.aikido.agent_api.helpers.env.InstanceName;
+import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.SetEnvironmentVariable;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class InstanceNameTest {
+
+    @Test
+    @SetEnvironmentVariable(key = "AIKIDO_INSTANCE_NAME", value = "my-service")
+    public void testFromEnv_WithValue() {
+        assertEquals("my-service", InstanceName.fromEnv());
+    }
+
+    @Test
+    @SetEnvironmentVariable(key = "AIKIDO_INSTANCE_NAME", value = "")
+    public void testFromEnv_WithEmptyString() {
+        assertNull(InstanceName.fromEnv());
+    }
+
+    @Test
+    public void testFromEnv_WithNullEnvironmentVariable() {
+        assertNull(InstanceName.fromEnv());
+    }
+}