Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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
Comment thread
bitterpanda63 marked this conversation as resolved.
Config.pkgVersion, // version
"firewall-java", // library
IPAddress.get(), // ipAddress
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
27 changes: 27 additions & 0 deletions agent_api/src/test/java/helpers/env/InstanceNameTest.java
Original file line number Diff line number Diff line change
@@ -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());
}
}
Loading