diff --git a/src/main/java/net/siegeln/cameleer/saas/config/BootstrapDataSeeder.java b/src/main/java/net/siegeln/cameleer/saas/config/BootstrapDataSeeder.java index 3d59880..4892346 100644 --- a/src/main/java/net/siegeln/cameleer/saas/config/BootstrapDataSeeder.java +++ b/src/main/java/net/siegeln/cameleer/saas/config/BootstrapDataSeeder.java @@ -54,7 +54,6 @@ public class BootstrapDataSeeder implements ApplicationRunner { String orgId = getField(config, "organizationId"); String tenantName = getField(config, "tenantName"); String tenantSlug = getField(config, "tenantSlug"); - String bootstrapToken = getField(config, "bootstrapToken"); if (orgId == null || tenantSlug == null) { log.info("Bootstrap file missing organizationId or tenantSlug — skipping"); @@ -84,7 +83,6 @@ public class BootstrapDataSeeder implements ApplicationRunner { env.setTenantId(tenant.getId()); env.setSlug("default"); env.setDisplayName("Default"); - env.setBootstrapToken(bootstrapToken != null ? bootstrapToken : "default-bootstrap-token"); env.setStatus(EnvironmentStatus.ACTIVE); environmentRepository.save(env); log.info("Created default environment for tenant '{}'", tenantSlug); diff --git a/src/main/java/net/siegeln/cameleer/saas/deployment/DeploymentService.java b/src/main/java/net/siegeln/cameleer/saas/deployment/DeploymentService.java index e33cc33..e4ede03 100644 --- a/src/main/java/net/siegeln/cameleer/saas/deployment/DeploymentService.java +++ b/src/main/java/net/siegeln/cameleer/saas/deployment/DeploymentService.java @@ -142,7 +142,7 @@ public class DeploymentService { containerName, runtimeConfig.getDockerNetwork(), Map.of( - "CAMELEER_AUTH_TOKEN", env.getBootstrapToken(), + "CAMELEER_AUTH_TOKEN", "TODO-api-key", "CAMELEER_EXPORT_TYPE", "HTTP", "CAMELEER_EXPORT_ENDPOINT", runtimeConfig.getCameleer3ServerEndpoint(), "CAMELEER_APPLICATION_ID", app.getSlug(), diff --git a/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentEntity.java b/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentEntity.java index ed49610..1e2b9c8 100644 --- a/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentEntity.java +++ b/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentEntity.java @@ -21,9 +21,6 @@ public class EnvironmentEntity { @Column(name = "display_name", nullable = false) private String displayName; - @Column(name = "bootstrap_token", nullable = false, columnDefinition = "TEXT") - private String bootstrapToken; - @Enumerated(EnumType.STRING) @Column(nullable = false, length = 20) private EnvironmentStatus status = EnvironmentStatus.ACTIVE; @@ -53,8 +50,6 @@ public class EnvironmentEntity { public void setSlug(String slug) { this.slug = slug; } public String getDisplayName() { return displayName; } public void setDisplayName(String displayName) { this.displayName = displayName; } - public String getBootstrapToken() { return bootstrapToken; } - public void setBootstrapToken(String bootstrapToken) { this.bootstrapToken = bootstrapToken; } public EnvironmentStatus getStatus() { return status; } public void setStatus(EnvironmentStatus status) { this.status = status; } public Instant getCreatedAt() { return createdAt; } diff --git a/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentService.java b/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentService.java index e575ec1..faa488f 100644 --- a/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentService.java +++ b/src/main/java/net/siegeln/cameleer/saas/environment/EnvironmentService.java @@ -4,7 +4,6 @@ import net.siegeln.cameleer.saas.audit.AuditAction; import net.siegeln.cameleer.saas.audit.AuditService; import net.siegeln.cameleer.saas.license.LicenseDefaults; import net.siegeln.cameleer.saas.license.LicenseRepository; -import net.siegeln.cameleer.saas.runtime.RuntimeConfig; import net.siegeln.cameleer.saas.tenant.Tier; import org.springframework.stereotype.Service; @@ -18,16 +17,13 @@ public class EnvironmentService { private final EnvironmentRepository environmentRepository; private final LicenseRepository licenseRepository; private final AuditService auditService; - private final RuntimeConfig runtimeConfig; public EnvironmentService(EnvironmentRepository environmentRepository, LicenseRepository licenseRepository, - AuditService auditService, - RuntimeConfig runtimeConfig) { + AuditService auditService) { this.environmentRepository = environmentRepository; this.licenseRepository = licenseRepository; this.auditService = auditService; - this.runtimeConfig = runtimeConfig; } public EnvironmentEntity create(UUID tenantId, String slug, String displayName, UUID actorId) { @@ -41,7 +37,6 @@ public class EnvironmentService { entity.setTenantId(tenantId); entity.setSlug(slug); entity.setDisplayName(displayName); - entity.setBootstrapToken(runtimeConfig.getBootstrapToken()); var saved = environmentRepository.save(entity); diff --git a/src/main/java/net/siegeln/cameleer/saas/observability/AgentStatusService.java b/src/main/java/net/siegeln/cameleer/saas/observability/AgentStatusService.java index b738057..db05eb2 100644 --- a/src/main/java/net/siegeln/cameleer/saas/observability/AgentStatusService.java +++ b/src/main/java/net/siegeln/cameleer/saas/observability/AgentStatusService.java @@ -55,7 +55,7 @@ public class AgentStatusService { @SuppressWarnings("unchecked") List> agents = restClient.get() .uri("/api/v1/agents") - .header("Authorization", "Bearer " + runtimeConfig.getBootstrapToken()) + .header("Authorization", "Bearer " + "TODO-api-key") .retrieve() .body(List.class); diff --git a/src/test/java/net/siegeln/cameleer/saas/app/AppControllerTest.java b/src/test/java/net/siegeln/cameleer/saas/app/AppControllerTest.java index a055b1b..da9b5df 100644 --- a/src/test/java/net/siegeln/cameleer/saas/app/AppControllerTest.java +++ b/src/test/java/net/siegeln/cameleer/saas/app/AppControllerTest.java @@ -83,7 +83,6 @@ class AppControllerTest { env.setTenantId(tenantId); env.setSlug("default"); env.setDisplayName("Default"); - env.setBootstrapToken("test-bootstrap-token"); var savedEnv = environmentRepository.save(env); environmentId = savedEnv.getId(); } diff --git a/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentControllerTest.java b/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentControllerTest.java index 040f11c..26b859f 100644 --- a/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentControllerTest.java +++ b/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentControllerTest.java @@ -84,7 +84,6 @@ class DeploymentControllerTest { env.setTenantId(tenantId); env.setSlug("default"); env.setDisplayName("Default"); - env.setBootstrapToken("test-bootstrap-token"); var savedEnv = environmentRepository.save(env); var app = new AppEntity(); diff --git a/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentServiceTest.java b/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentServiceTest.java index d0e6f15..4abea39 100644 --- a/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentServiceTest.java +++ b/src/test/java/net/siegeln/cameleer/saas/deployment/DeploymentServiceTest.java @@ -92,7 +92,6 @@ class DeploymentServiceTest { env.setId(envId); env.setTenantId(tenantId); env.setSlug("prod"); - env.setBootstrapToken("tok-abc"); tenant = new TenantEntity(); tenant.setSlug("acme"); diff --git a/src/test/java/net/siegeln/cameleer/saas/environment/EnvironmentServiceTest.java b/src/test/java/net/siegeln/cameleer/saas/environment/EnvironmentServiceTest.java index 7902ced..d95ee50 100644 --- a/src/test/java/net/siegeln/cameleer/saas/environment/EnvironmentServiceTest.java +++ b/src/test/java/net/siegeln/cameleer/saas/environment/EnvironmentServiceTest.java @@ -4,7 +4,6 @@ import net.siegeln.cameleer.saas.audit.AuditAction; import net.siegeln.cameleer.saas.audit.AuditService; import net.siegeln.cameleer.saas.license.LicenseEntity; import net.siegeln.cameleer.saas.license.LicenseRepository; -import net.siegeln.cameleer.saas.runtime.RuntimeConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -34,14 +33,11 @@ class EnvironmentServiceTest { @Mock private AuditService auditService; - @Mock - private RuntimeConfig runtimeConfig; - private EnvironmentService environmentService; @BeforeEach void setUp() { - environmentService = new EnvironmentService(environmentRepository, licenseRepository, auditService, runtimeConfig); + environmentService = new EnvironmentService(environmentRepository, licenseRepository, auditService); } @Test @@ -56,7 +52,6 @@ class EnvironmentServiceTest { when(licenseRepository.findFirstByTenantIdAndRevokedAtIsNullOrderByCreatedAtDesc(tenantId)) .thenReturn(Optional.of(license)); when(environmentRepository.countByTenantId(tenantId)).thenReturn(0L); - when(runtimeConfig.getBootstrapToken()).thenReturn("test-token"); when(environmentRepository.save(any(EnvironmentEntity.class))).thenAnswer(inv -> inv.getArgument(0)); var result = environmentService.create(tenantId, "prod", "Production", actorId); @@ -64,7 +59,6 @@ class EnvironmentServiceTest { assertThat(result.getSlug()).isEqualTo("prod"); assertThat(result.getDisplayName()).isEqualTo("Production"); assertThat(result.getTenantId()).isEqualTo(tenantId); - assertThat(result.getBootstrapToken()).isEqualTo("test-token"); var actionCaptor = ArgumentCaptor.forClass(AuditAction.class); verify(auditService).log(any(), any(), any(), actionCaptor.capture(), any(), any(), any(), any(), any()); @@ -175,7 +169,6 @@ class EnvironmentServiceTest { when(licenseRepository.findFirstByTenantIdAndRevokedAtIsNullOrderByCreatedAtDesc(tenantId)) .thenReturn(Optional.of(license)); when(environmentRepository.countByTenantId(tenantId)).thenReturn(0L); - when(runtimeConfig.getBootstrapToken()).thenReturn("test-token"); when(environmentRepository.save(any(EnvironmentEntity.class))).thenAnswer(inv -> inv.getArgument(0)); var result = environmentService.createDefaultForTenant(tenantId);