Skip to content

Commit e1b09e4

Browse files
Update static config service to use bootstrap config
1 parent b47557e commit e1b09e4

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

src/main/java/com/uid2/operator/Main.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,17 @@ private Future<IConfigService> initialiseConfigService() throws Exception {
277277
);
278278
Future<ConfigService> dynamicConfigFuture = ConfigService.create(dynamicConfigRetriever);
279279

280+
ConfigRetriever staticConfigRetriever = ConfigRetrieverFactory.create(
281+
vertx,
282+
new JsonObject()
283+
.put("type", "json")
284+
.put("config", config)
285+
.put(ConfigScanPeriodMsProp, -1),
286+
""
287+
);
288+
289+
Future<ConfigService> staticConfigFuture = ConfigService.create(staticConfigRetriever);
290+
280291
ConfigRetriever featureFlagConfigRetriever = ConfigRetrieverFactory.create(
281292
vertx,
282293
new JsonObject()
@@ -288,27 +299,17 @@ private Future<IConfigService> initialiseConfigService() throws Exception {
288299
""
289300
);
290301

291-
featureFlagConfigRetriever.getConfig()
292-
.compose(featureFlagConfig -> {
293-
if (featureFlagConfig == null) {
294-
return Future.failedFuture(new RuntimeException("Feature flag config is null"));
295-
}
296-
297-
JsonObject remoteConfigJson = featureFlagConfig.getJsonObject("remote_config");
298-
JsonObject featureFlagBootstrapConfig = remoteConfigJson.getJsonObject("runtime_config_store");
299302

300-
ConfigRetriever staticConfigRetriever = ConfigRetrieverFactory.create(vertx, featureFlagBootstrapConfig, "");
301-
Future<ConfigService> staticConfigFuture = ConfigService.create(staticConfigRetriever);
302303

303-
return Future.all(dynamicConfigFuture, staticConfigFuture);
304-
})
304+
Future.all(dynamicConfigFuture, staticConfigFuture, featureFlagConfigRetriever.getConfig())
305305
.onComplete(ar -> {
306306
if (ar.succeeded()) {
307307
CompositeFuture configServiceManagerCompositeFuture = ar.result();
308308
IConfigService dynamicConfigService = configServiceManagerCompositeFuture.resultAt(0);
309309
IConfigService staticConfigService = configServiceManagerCompositeFuture.resultAt(1);
310+
JsonObject featureFlagConfig = configServiceManagerCompositeFuture.resultAt(2);
310311

311-
boolean remoteConfigFeatureFlag = featureFlagConfigRetriever.getCachedConfig()
312+
boolean remoteConfigFeatureFlag = featureFlagConfig
312313
.getJsonObject("remote_config")
313314
.getBoolean(Const.Config.RemoteConfigFeatureFlagProp, false);
314315

0 commit comments

Comments
 (0)