From 4536cd8de637dfb9961055242295ee1235bf2e6d Mon Sep 17 00:00:00 2001 From: Sunny Wu Date: Tue, 18 Feb 2025 15:15:26 +1100 Subject: [PATCH] temparorily disable dynamic config --- src/main/java/com/uid2/operator/Main.java | 9 +++-- .../service/ConfigServiceManager.java | 12 +++---- .../operator/ConfigServiceManagerTest.java | 34 +++++++++---------- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/uid2/operator/Main.java b/src/main/java/com/uid2/operator/Main.java index bc285d4fa..b9477958f 100644 --- a/src/main/java/com/uid2/operator/Main.java +++ b/src/main/java/com/uid2/operator/Main.java @@ -306,20 +306,19 @@ private Future initialiseConfigService() throws Exception { .put("scanPeriod", 10000)) ); - Future.all(dynamicConfigFuture, staticConfigFuture, featureFlagConfigRetriever.getConfig()) + Future.all(staticConfigFuture, featureFlagConfigRetriever.getConfig()) .onComplete(ar -> { if (ar.succeeded()) { CompositeFuture configServiceManagerCompositeFuture = ar.result(); - IConfigService dynamicConfigService = configServiceManagerCompositeFuture.resultAt(0); - IConfigService staticConfigService = configServiceManagerCompositeFuture.resultAt(1); - JsonObject featureFlagConfig = configServiceManagerCompositeFuture.resultAt(2); + IConfigService staticConfigService = configServiceManagerCompositeFuture.resultAt(0); + JsonObject featureFlagConfig = configServiceManagerCompositeFuture.resultAt(1); boolean remoteConfigFeatureFlag = featureFlagConfig .getJsonObject("remote_config") .getBoolean("enabled", false); ConfigServiceManager configServiceManager = new ConfigServiceManager( - vertx, dynamicConfigService, staticConfigService, remoteConfigFeatureFlag); + vertx, staticConfigService, remoteConfigFeatureFlag); setupFeatureFlagListener(configServiceManager, featureFlagConfigRetriever); diff --git a/src/main/java/com/uid2/operator/service/ConfigServiceManager.java b/src/main/java/com/uid2/operator/service/ConfigServiceManager.java index 5fa3ffac2..6b84553ec 100644 --- a/src/main/java/com/uid2/operator/service/ConfigServiceManager.java +++ b/src/main/java/com/uid2/operator/service/ConfigServiceManager.java @@ -10,15 +10,13 @@ public class ConfigServiceManager { private final Vertx vertx; private final DelegatingConfigService delegatingConfigService; - private final IConfigService dynamicConfigService; private final IConfigService staticConfigService; private static final Logger logger = LoggerFactory.getLogger(ConfigServiceManager.class); - public ConfigServiceManager(Vertx vertx, IConfigService dynamicConfigService, IConfigService staticConfigService, boolean useDynamicConfig) { + public ConfigServiceManager(Vertx vertx, IConfigService staticConfigService, boolean useDynamicConfig) { this.vertx = vertx; - this.dynamicConfigService = dynamicConfigService; this.staticConfigService = staticConfigService; - this.delegatingConfigService = new DelegatingConfigService(useDynamicConfig ? dynamicConfigService : staticConfigService); + this.delegatingConfigService = new DelegatingConfigService(staticConfigService); } public Future updateConfigService(boolean useDynamicConfig) { @@ -27,13 +25,13 @@ public Future updateConfigService(boolean useDynamicConfig) { if (lockAsyncResult.succeeded()) { Lock lock = lockAsyncResult.result(); try { - if (useDynamicConfig) { + /*if (useDynamicConfig) { logger.info("Switching to DynamicConfigService"); delegatingConfigService.updateConfigService(dynamicConfigService); - } else { + } else {*/ logger.info("Switching to StaticConfigService"); delegatingConfigService.updateConfigService(staticConfigService); - } +// } promise.complete(); } catch (Exception e) { promise.fail(e); diff --git a/src/test/java/com/uid2/operator/ConfigServiceManagerTest.java b/src/test/java/com/uid2/operator/ConfigServiceManagerTest.java index b481bdac3..386c366ac 100644 --- a/src/test/java/com/uid2/operator/ConfigServiceManagerTest.java +++ b/src/test/java/com/uid2/operator/ConfigServiceManagerTest.java @@ -36,23 +36,23 @@ void setUp(Vertx vertx) { IConfigService staticConfigService = mock(IConfigService.class); when(staticConfigService.getConfig()).thenReturn(staticConfig); - configServiceManager = new ConfigServiceManager(vertx, dynamicConfigService, staticConfigService, true); +// configServiceManager = new ConfigServiceManager(vertx, dynamicConfigService, staticConfigService, true); } - @Test - void testRemoteFeatureFlag(VertxTestContext testContext) { - IConfigService delegatingConfigService = configServiceManager.getDelegatingConfigService(); - - configServiceManager.updateConfigService(true) - .compose(updateToDynamic -> { - testContext.verify(() -> assertEquals(bootstrapConfig, delegatingConfigService.getConfig())); - - return configServiceManager.updateConfigService(false); - }) - .onSuccess(updateToStatic -> testContext.verify(() -> { - assertEquals(staticConfig, delegatingConfigService.getConfig()); - testContext.completeNow(); - })) - .onFailure(testContext::failNow); - } +// @Test +// void testRemoteFeatureFlag(VertxTestContext testContext) { +// IConfigService delegatingConfigService = configServiceManager.getDelegatingConfigService(); +// +// configServiceManager.updateConfigService(true) +// .compose(updateToDynamic -> { +// testContext.verify(() -> assertEquals(bootstrapConfig, delegatingConfigService.getConfig())); +// +// return configServiceManager.updateConfigService(false); +// }) +// .onSuccess(updateToStatic -> testContext.verify(() -> { +// assertEquals(staticConfig, delegatingConfigService.getConfig()); +// testContext.completeNow(); +// })) +// .onFailure(testContext::failNow); +// } }