Fixed optout and core env vars

Author: gmsdelmundo

src/test/java/app/AppsMap.java

@@ -1,6 +1,5 @@
 package app;
 
-import common.EnvUtil;
 import app.component.App;
 
 import java.lang.reflect.InvocationTargetException;
@@ -10,7 +9,6 @@
 
 public final class AppsMap {
     private static final Map<String, String> APP_MAP;
-    private static final String ENV = EnvUtil.getEnv("UID2_E2E_ENV");
 
     private static final Apps APPS;
 
@@ -28,7 +26,7 @@ public final class AppsMap {
                     "github-test-pipeline", "app.GitHubTestPipelineApps"
             );
 
-            APPS = (Apps) Class.forName(APP_MAP.get(ENV)).getDeclaredConstructor().newInstance();
+            APPS = (Apps) Class.forName(APP_MAP.get(App.ENV)).getDeclaredConstructor().newInstance();
         } catch (ClassNotFoundException | NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
             throw new RuntimeException(e);
         }

src/test/java/app/LocalApps.java

@@ -7,12 +7,12 @@
 public final class LocalApps extends Apps {
     public LocalApps() {
         super(Set.of(
-                // TODO: Add optout, monitorstack
                 new Localstack("http://localhost", 5001, "Local - Localstack"),
                 new Admin("http://localhost", 8089, "Local - Admin"),
                 new Core("http://localhost", 8088, "Local - Core"),
                 new Operator("http://localhost", 8888, "Local - Public Operator", Operator.Type.PUBLIC),
                 new Operator("http://localhost", 8180, "Local - Private Operator", Operator.Type.PRIVATE),
+                new Optout("http://localhost", 8081, "Local - Optout"),
                 new Prometheus("http://localhost", 9085, "Local - Validator Prometheus")
         ));
     }

src/test/java/app/component/Core.java

@@ -1,5 +1,6 @@
 package app.component;
 
+import common.Const;
 import common.EnvUtil;
 import common.HttpClient;
 import common.Mapper;
@@ -9,10 +10,10 @@
 import java.util.Map;
 
 public class Core extends App {
-    private static final String CORE_API_TOKEN = EnvUtil.getEnv("UID2_E2E_CORE_API_TOKEN");
-    private static final String OPTOUT_TO_CALL_CORE_API_TOKEN = EnvUtil.getEnv("UID2_E2E_OPTOUT_TO_CALL_CORE_API_TOKEN");
-    public static final String CORE_URL = EnvUtil.getEnv("UID2_E2E_CORE_URL");
-    public static final String OPTOUT_URL = EnvUtil.getEnv("UID2_E2E_OPTOUT_URL");
+    private static final String OPERATOR_API_KEY = EnvUtil.getEnv(Const.Config.Core.OPERATOR_API_KEY);
+    private static final String OPTOUT_API_KEY = EnvUtil.getEnv(Const.Config.Core.OPTOUT_API_KEY);
+    public static final String CORE_URL = EnvUtil.getEnv(Const.Config.Core.CORE_URL);
+    public static final String OPTOUT_URL = EnvUtil.getEnv(Const.Config.Core.OPTOUT_URL);
 
     public Core(String host, Integer port, String name) {
         super(host, port, name);
@@ -23,7 +24,7 @@ public Core(String host, String name) {
     }
 
     public JsonNode attest(String attestationRequest) throws Exception {
-        String response = HttpClient.post(getBaseUrl() + "/attest", attestationRequest, CORE_API_TOKEN);
+        String response = HttpClient.post(getBaseUrl() + "/attest", attestationRequest, OPERATOR_API_KEY);
         return Mapper.OBJECT_MAPPER.readTree(response);
     }
 
@@ -35,12 +36,12 @@ public JsonNode getWithCoreApiToken(String path, boolean encrypted) throws Excep
         Map<String, String> headers = new HashMap<>();
         if (encrypted)
             headers.put("Encrypted", "true");
-        String response = HttpClient.get(getBaseUrl() + path, CORE_API_TOKEN, headers);
+        String response = HttpClient.get(getBaseUrl() + path, OPERATOR_API_KEY, headers);
         return Mapper.OBJECT_MAPPER.readTree(response);
     }
 
     public JsonNode getWithOptOutApiToken(String path) throws Exception {
-        String response = HttpClient.get(getBaseUrl() + path, OPTOUT_TO_CALL_CORE_API_TOKEN);
+        String response = HttpClient.get(getBaseUrl() + path, OPTOUT_API_KEY);
         return Mapper.OBJECT_MAPPER.readTree(response);
     }
 }

src/test/java/app/component/Optout.java

@@ -1,20 +1,7 @@
 package app.component;
 
-
-import common.EnvUtil;
-import common.HttpClient;
-import common.Mapper;
-import com.fasterxml.jackson.databind.JsonNode;
-
 public class Optout extends App {
-    private static final String CORE_API_TOKEN = EnvUtil.getEnv("UID2_E2E_OPTOUT_TO_CALL_CORE_API_TOKEN");
     public Optout(String host, Integer port, String name) {
         super(host, port, name);
     }
-
-    public JsonNode getPath(String path) throws Exception {
-        String response = HttpClient.get(getBaseUrl() + path, CORE_API_TOKEN);
-        return Mapper.OBJECT_MAPPER.readTree(response);
-    }
-
 }