From 0092957cca9b50cb5ce5173869cefc26ec15a2e4 Mon Sep 17 00:00:00 2001 From: rng Date: Thu, 13 Aug 2026 11:34:10 +1000 Subject: [PATCH 1/2] Remove co index check as obsolete --- .../ogcapi/server/core/configuration/ActuatorConfig.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java index b2511c5e..e5c8641b 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java @@ -91,13 +91,6 @@ public HealthIndicator ogcApiHealth( .build(); } - if(!client.indices().exists(ExistsRequest.of(b -> b.index(coIndexName))).value()) { - return Health.status(ErrorCode.MISSING_CO_CORE_INDEX.getStatus()) - .withDetail("reason", ErrorCode.MISSING_CO_CORE_INDEX.getMessage()) - .withDetail("code", ErrorCode.MISSING_CO_CORE_INDEX.getCode()) - .build(); - } - if(!client.indices().exists(ExistsRequest.of(b -> b.index(vocabIndexName))).value()) { return Health.status(ErrorCode.MISSING_VOCAB_INDEX.getStatus()) .withDetail("reason", ErrorCode.MISSING_VOCAB_INDEX.getMessage()) From 92ba7511f747c46f464be563d74a6e4c6ec1ece4 Mon Sep 17 00:00:00 2001 From: rng Date: Thu, 13 Aug 2026 11:38:07 +1000 Subject: [PATCH 2/2] Fix test --- .../server/core/configuration/ActuatorConfig.java | 1 - .../core/configuration/ActuatorConfigTest.java | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java index e5c8641b..37fc3cb8 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfig.java @@ -68,7 +68,6 @@ public InfoContributor externalApiInfoContributor( public HealthIndicator ogcApiHealth( @Value("${elasticsearch.vocabs_index.name}") String vocabIndexName, @Value("${elasticsearch.index.name}") String indexName, - @Value("${elasticsearch.cloud_optimized_index.name}") String coIndexName, ElasticsearchClient client) { return () -> { try { diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfigTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfigTest.java index 63cf02c0..d01cf7c9 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfigTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/configuration/ActuatorConfigTest.java @@ -50,7 +50,6 @@ public class ActuatorConfigTest { private ActuatorConfig config; private static final String INDEX = "test-core"; - private static final String CO_INDEX = "test-co-core"; private static final String VOCAB_INDEX = "test-vocabs"; @BeforeEach @@ -74,7 +73,7 @@ void greenCluster_allIndicesExist_returnsUp() throws Exception { when(clusterHealth.status()).thenReturn(HealthStatus.Green); when(client.indices().exists(any(ExistsRequest.class))).thenReturn(booleanHealthTrue); - Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, CO_INDEX, client).health(); + Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, client).health(); assertEquals(Status.UP, health.getStatus()); } @@ -84,7 +83,7 @@ void redCluster_returnsUnavailable() throws Exception { when(client.cluster().health(any(Function.class))).thenReturn(clusterHealth); when(clusterHealth.status()).thenReturn(HealthStatus.Red); - Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, CO_INDEX, client).health(); + Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, client).health(); assertEquals(ErrorCode.ELASTICSEARCH_UNAVAILABLE.getStatus(), health.getStatus().toString()); assertTrue(health.getDetails().containsValue(ErrorCode.ELASTICSEARCH_UNAVAILABLE.getMessage())); @@ -96,7 +95,7 @@ void yellowCluster_returnsUnavailable() throws Exception { when(client.cluster().health(any(Function.class))).thenReturn(clusterHealth); when(clusterHealth.status()).thenReturn(HealthStatus.Yellow); - Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, CO_INDEX, client).health(); + Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, client).health(); assertEquals(ErrorCode.ELASTICSEARCH_UNAVAILABLE.getStatus(), health.getStatus().toString()); } @@ -105,7 +104,7 @@ void yellowCluster_returnsUnavailable() throws Exception { void exceptionThrown_returnsUnavailableWithException() throws Exception { when(client.cluster().health(any(Function.class))).thenThrow(new RuntimeException("connection failed")); - Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, CO_INDEX, client).health(); + Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, client).health(); assertEquals(ErrorCode.ELASTICSEARCH_UNAVAILABLE.getStatus(), health.getStatus().toString()); // Exception details in error section @@ -128,7 +127,7 @@ void missingCoreIndex_returnsMissingCoreIndex() throws Exception { return req.index().contains(INDEX) ? booleanHealthFalse : booleanHealthTrue; }); - Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, CO_INDEX, client).health(); + Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, client).health(); assertEquals(ErrorCode.MISSING_CORE_INDEX.getCode(), health.getDetails().get("code").toString()); } @@ -141,7 +140,7 @@ void missingVocabIndex_returnsMissingVocabIndex() throws Exception { return req.index().contains(VOCAB_INDEX) ? booleanHealthFalse : booleanHealthTrue; }); - Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, CO_INDEX, client).health(); + Health health = config.ogcApiHealth(VOCAB_INDEX, INDEX, client).health(); assertEquals(ErrorCode.MISSING_VOCAB_INDEX.getCode(), health.getDetails().get("code").toString()); } }