Revert "Update operator config endpoint to read file path from env variable"

This reverts commit fbabd23.

Author: Behnam Mozafari

src/main/java/com/uid2/core/Const.java

@@ -16,7 +16,6 @@ public class Config extends com.uid2.shared.Const.Config {
         public static final String KmsAccessKeyIdProp = "kms_aws_access_key_id";
         public static final String KmsSecretAccessKeyProp = "kms_aws_secret_access_key";
         public static final String KmsEndpointProp = "kms_aws_endpoint";
-        public static final String OperatorConfigPathProp = "operator_config_path";
     }
 
     public static final String OPERATOR_CONFIG_PATH = "conf/operator-config.json";

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

@@ -50,9 +50,6 @@
 import java.lang.management.ManagementFactory;
 import java.util.*;
 
-import static com.uid2.core.Const.Config.OperatorConfigPathProp;
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
-
 public class Main {
 
     private static final int vertxServiceInstances = 1;
@@ -165,12 +162,8 @@ public static void main(String[] args) {
                 );
 
                 JwtService jwtService = new JwtService(config);
-
                 FileSystem fileSystem = vertx.fileSystem();
-
-                String operatorConfigPath = config.getString(OperatorConfigPathProp, OPERATOR_CONFIG_PATH);
-
-                coreVerticle = new CoreVerticle(cloudStorage, operatorKeyProvider, attestationService, attestationTokenService, enclaveIdProvider, operatorJWTTokenProvider, jwtService, cloudEncryptionKeyProvider, fileSystem, operatorConfigPath);
+                coreVerticle = new CoreVerticle(cloudStorage, operatorKeyProvider, attestationService, attestationTokenService, enclaveIdProvider, operatorJWTTokenProvider, jwtService, cloudEncryptionKeyProvider, fileSystem);
             } catch (Exception e) {
                 System.out.println("failed to initialize core verticle: " + e.getMessage());
                 System.exit(-1);

src/main/java/com/uid2/core/vertx/CoreVerticle.java

@@ -83,7 +83,6 @@ public class CoreVerticle extends AbstractVerticle {
     private final RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider;
 
     private final FileSystem fileSystem;
-    private final String operatorConfigPath;
 
     public CoreVerticle(ICloudStorage cloudStorage,
                         IAuthorizableProvider authProvider,
@@ -93,7 +92,7 @@ public CoreVerticle(ICloudStorage cloudStorage,
                         OperatorJWTTokenProvider operatorJWTTokenProvider,
                         JwtService jwtService,
                         RotatingCloudEncryptionKeyProvider cloudEncryptionKeyProvider,
-                        FileSystem fileSystem, String operatorConfigPath) throws Exception {
+                        FileSystem fileSystem) throws Exception {
         this.operatorJWTTokenProvider = operatorJWTTokenProvider;
         this.healthComponent.setHealthStatus(false, "not started");
 
@@ -106,7 +105,6 @@ public CoreVerticle(ICloudStorage cloudStorage,
         this.cloudEncryptionKeyProvider = cloudEncryptionKeyProvider;
 
         this.fileSystem = fileSystem;
-        this.operatorConfigPath = operatorConfigPath;
 
         final String jwtAudience = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
         final String jwtIssuer = ConfigStore.Global.get(Const.Config.CorePublicUrlProp);
@@ -140,8 +138,8 @@ public CoreVerticle(ICloudStorage cloudStorage,
                         IEnclaveIdentifierProvider enclaveIdentifierProvider,
                         OperatorJWTTokenProvider jwtTokenProvider,
                         JwtService jwtService,
-                        FileSystem fileSystem, String operatorConfigPath) throws Exception {
-        this(cloudStorage, authorizableProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, jwtTokenProvider, jwtService, null, fileSystem, operatorConfigPath);
+                        FileSystem fileSystem) throws Exception {
+        this(cloudStorage, authorizableProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, jwtTokenProvider, jwtService, null, fileSystem);
     }
 
     @Override
@@ -211,7 +209,7 @@ private Router createRoutesSetup() {
     }
 
     private void handleGetConfig(RoutingContext rc) {
-        fileSystem.readFile(operatorConfigPath, ar -> {
+        fileSystem.readFile(com.uid2.core.Const.OPERATOR_CONFIG_PATH, ar -> {
             if (ar.succeeded()) {
                 try {
                     String fileContent = ar.result().toString();

src/test/java/com/uid2/core/vertx/TestClientSideKeypairMetadataPath.java

@@ -40,7 +40,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 
 @ExtendWith(VertxExtension.class)
 public class TestClientSideKeypairMetadataPath {
@@ -76,7 +75,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext) throws Throwable
         fileSystem = vertx.fileSystem();
         SecretStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testGlobalMetadata/test-secrets.json"))));
         MockitoAnnotations.initMocks(this);
-        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem, OPERATOR_CONFIG_PATH);
+        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem);
         vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
     }
 

src/test/java/com/uid2/core/vertx/TestCoreVerticle.java

@@ -26,7 +26,6 @@
 import io.vertx.junit5.VertxExtension;
 import io.vertx.junit5.VertxTestContext;
 
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 import static org.junit.jupiter.api.Assertions.*;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -123,20 +122,20 @@ void deployVerticle(TestInfo info, Vertx vertx, VertxTestContext testContext) th
             }
         });
 
-        operatorConfig = Files.readString(Paths.get(OPERATOR_CONFIG_PATH)).trim();
+        operatorConfig = Files.readString(Paths.get(com.uid2.core.Const.OPERATOR_CONFIG_PATH)).trim();
 
         when(fileSystem.readFile(anyString(), any())).thenAnswer(invocation -> {
             String path = invocation.getArgument(0);
             Handler<AsyncResult<Buffer>> handler = invocation.getArgument(1);
-            if (Objects.equals(path, OPERATOR_CONFIG_PATH)) {
+            if (Objects.equals(path, com.uid2.core.Const.OPERATOR_CONFIG_PATH)) {
                 handler.handle(Future.succeededFuture(Buffer.buffer(operatorConfig)));
             } else {
                 handler.handle(Future.failedFuture(new RuntimeException("Failed to read file: " + path)));
             }
             return null;
         });
 
-        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, cloudEncryptionKeyProvider, fileSystem, OPERATOR_CONFIG_PATH);
+        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, cloudEncryptionKeyProvider, fileSystem);
         vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
 
     }

src/test/java/com/uid2/core/vertx/TestServiceLinkMetadataPath.java

@@ -35,7 +35,6 @@
 import java.net.URL;
 import java.util.HashSet;
 
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 import static com.uid2.shared.Utils.readToEndAsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -75,7 +74,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext) throws Throwable
         fileSystem = vertx.fileSystem();
         SecretStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testGlobalMetadata/test-secrets.json"))));
         MockitoAnnotations.initMocks(this);
-        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem, OPERATOR_CONFIG_PATH);
+        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem);
         vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
     }
 

src/test/java/com/uid2/core/vertx/TestServiceMetadataPath.java

@@ -35,7 +35,6 @@
 import java.net.URL;
 import java.util.HashSet;
 
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 import static com.uid2.shared.Utils.readToEndAsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.any;
@@ -75,7 +74,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext) throws Throwable
         fileSystem = vertx.fileSystem();
         SecretStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testGlobalMetadata/test-secrets.json"))));
         MockitoAnnotations.initMocks(this);
-        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem, OPERATOR_CONFIG_PATH);
+        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem);
         vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
     }
 

src/test/java/com/uid2/core/vertx/TestSiteSpecificMetadataPath.java

@@ -31,7 +31,6 @@
 import java.net.URL;
 import java.util.HashSet;
 
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 import static com.uid2.shared.Utils.readToEndAsString;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
@@ -74,7 +73,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext) throws Throwable
     SecretStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testSiteSpecificMetadata/test-secrets.json"))));
     ConfigStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testSiteSpecificMetadata/test-configs-provide-private-site-data.json"))));
     MockitoAnnotations.initMocks(this);
-    CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem, OPERATOR_CONFIG_PATH);
+    CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem);
     vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
   }
 

src/test/java/com/uid2/core/vertx/TestSiteSpecificMetadataPathDisabled.java

@@ -33,7 +33,6 @@
 import java.net.URL;
 import java.util.HashSet;
 
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 import static com.uid2.shared.Utils.readToEndAsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -76,7 +75,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext) throws Throwable
     SecretStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testSiteSpecificMetadata/test-secrets.json"))));
     ConfigStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testSiteSpecificMetadata/test-configs-stop-providing-private-site-data.json"))));
     MockitoAnnotations.initMocks(this);
-    CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem, OPERATOR_CONFIG_PATH);
+    CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem);
     vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
   }
 

src/test/java/com/uid2/core/vertx/TestSitesMetadataPath.java

@@ -35,7 +35,6 @@
 import java.net.URL;
 import java.util.HashSet;
 
-import static com.uid2.core.Const.OPERATOR_CONFIG_PATH;
 import static com.uid2.core.util.MetadataHelper.readToEndAsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -79,7 +78,7 @@ void deployVerticle(Vertx vertx, VertxTestContext testContext) throws Throwable
         fileSystem = vertx.fileSystem();
         SecretStore.Global.load(((JsonObject) Json.decodeValue(openFile("/com.uid2.core/testGlobalMetadata/test-secrets.json"))));
         MockitoAnnotations.initMocks(this);
-        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem, OPERATOR_CONFIG_PATH);
+        CoreVerticle verticle = new CoreVerticle(cloudStorage, authProvider, attestationService, attestationTokenService, enclaveIdentifierProvider, operatorJWTTokenProvider, jwtService, fileSystem);
         vertx.deployVerticle(verticle, testContext.succeeding(id -> testContext.completeNow()));
     }