clean

Author: Ian-Nara

Dockerfile

@@ -22,10 +22,8 @@ ENV E2E_PHONE_SUPPORT ""
 
 ENV UID2_CORE_E2E_OPERATOR_API_KEY ""
 ENV UID2_CORE_E2E_OPTOUT_API_KEY ""
-ENV UID2_CORE_E2E_OPTOUT_INTERNAL_API_KEY ""
 ENV UID2_CORE_E2E_CORE_URL ""
 ENV UID2_CORE_E2E_OPTOUT_URL ""
-ENV UID2_CORE_E2E_LOCALSTACK_URL ""
 
 ENV UID2_OPERATOR_E2E_CLIENT_SITE_ID ""
 ENV UID2_OPERATOR_E2E_CLIENT_API_KEY ""

docker-compose.yml

@@ -16,7 +16,6 @@ services:
       - LOCALSTACK_HOST=localstack:5001
       - SERVICES=s3,sqs,kms
       - DEFAULT_REGION=us-east-1
-      - AWS_DEFAULT_REGION=us-east-1
     healthcheck:
       test: awslocal s3api wait bucket-exists --bucket test-core-bucket
         && awslocal s3api wait bucket-exists --bucket test-optout-bucket
@@ -65,10 +64,7 @@ services:
       core:
         condition: service_healthy
     healthcheck:
-      test: wget --tries=1 --spider http://localhost:8081/ops/healthcheck
-        && wget --tries=1 --spider http://localhost:8082/ops/healthcheck || exit 1
-      interval: 5s
-      timeout: 10s
+      test: wget --tries=1 --spider http://localhost:8081/ops/healthcheck || exit 1
       retries: 12
     networks:
       - e2e_default

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

@@ -16,23 +16,21 @@ public class Optout extends App {
     // The SQS delta producer runs on port 8082 (8081 + 1)
     private static final int DELTA_PRODUCER_PORT_OFFSET = 1;
 
-    // Loaded lazily to avoid crashing when env var is missing
     private String optoutInternalApiKey;
 
     public Optout(String host, Integer port, String name) {
         super(host, port, name);
-        // Load API key lazily - only fail when actually used
-        this.optoutInternalApiKey = EnvUtil.getEnv(Const.Config.Core.OPTOUT_INTERNAL_API_KEY, false);
+        this.optoutInternalApiKey = EnvUtil.getEnv(Const.Config.Core.OPTOUT_API_KEY, false);
     }
 
     public Optout(String host, String name) {
         super(host, null, name);
-        this.optoutInternalApiKey = EnvUtil.getEnv(Const.Config.Core.OPTOUT_INTERNAL_API_KEY, false);
+        this.optoutInternalApiKey = EnvUtil.getEnv(Const.Config.Core.OPTOUT_API_KEY, false);
     }
 
     private String getOptoutInternalApiKey() {
         if (optoutInternalApiKey == null || optoutInternalApiKey.isEmpty()) {
-            throw new IllegalStateException("Missing environment variable: " + Const.Config.Core.OPTOUT_INTERNAL_API_KEY);
+            throw new IllegalStateException("Missing environment variable: " + Const.Config.Core.OPTOUT_API_KEY);
         }
         return optoutInternalApiKey;
     }

src/test/java/common/Const.java

@@ -13,7 +13,6 @@ public static final class Config {
         public static final class Core {
             public static final String OPERATOR_API_KEY = "UID2_CORE_E2E_OPERATOR_API_KEY";
             public static final String OPTOUT_API_KEY = "UID2_CORE_E2E_OPTOUT_API_KEY";
-            public static final String OPTOUT_INTERNAL_API_KEY = "UID2_CORE_E2E_OPTOUT_INTERNAL_API_KEY";
             public static final String CORE_URL = "UID2_CORE_E2E_CORE_URL";
             public static final String OPTOUT_URL = "UID2_CORE_E2E_OPTOUT_URL";
             public static final String LOCALSTACK_URL = "UID2_CORE_E2E_LOCALSTACK_URL";

src/test/java/common/KmsHelper.java

@@ -32,7 +32,7 @@ private KmsHelper() {
     /**
      * Fetches the public key from LocalStack KMS for the configured key ID.
      * 
-     * @return The public key as a base64-encoded string (without PEM headers)
+     * @return The public key as a base64-encoded string
      * @throws Exception if the key cannot be fetched or parsed
      */
     public static String getPublicKeyFromLocalstack() throws Exception {
@@ -42,8 +42,6 @@ public static String getPublicKeyFromLocalstack() throws Exception {
                     .build();
 
             GetPublicKeyResponse response = kmsClient.getPublicKey(request);
-            
-            // The public key is returned as raw DER-encoded bytes
             byte[] publicKeyBytes = response.publicKey().asByteArray();
 
             // Return as base64-encoded string (format expected by JwtService)
@@ -65,10 +63,8 @@ public static PublicKey getPublicKeyObjectFromLocalstack() throws Exception {
 
             GetPublicKeyResponse response = kmsClient.getPublicKey(request);
 
-            // The public key is returned as raw DER-encoded X.509 SubjectPublicKeyInfo
             byte[] publicKeyBytes = response.publicKey().asByteArray();
 
-            // Convert to Java PublicKey
             KeyFactory keyFactory = KeyFactory.getInstance("RSA");
             X509EncodedKeySpec keySpec = new X509EncodedKeySpec(publicKeyBytes);
             return keyFactory.generatePublic(keySpec);

src/test/java/suite/core/CoreTest.java

@@ -33,8 +33,6 @@ public void testAttest_EmptyAttestationRequest(Core core) {
     /**
      * Tests valid attestation request with JWT signing.
      * 
-     * LocalStack 4.x supports KMS Sign operation for RSA keys, so JWTs are generated.
-     * 
      * Since LocalStack generates its own RSA key material,
      * we dynamically fetch the public key from LocalStack's
      * KMS using GetPublicKey API to validate JWT signatures.