update reverse proxy

Author: tora-kozic

Caddyfile

@@ -1,61 +1,74 @@
-http://localhost
-
-route /core/* {
-uri strip_prefix /core
-reverse_proxy core:4200
+http://localhost, http://core {
+    route /* {
+    reverse_proxy core:4200
+    }
 }
 
-route /alerts/* {
-uri strip_prefix /alerts
-reverse_proxy alerts:4200
+http://alerts {
+    route /* {
+    reverse_proxy alerts:4200
+    }
 }
 
-route /alert_rules/* {
-uri strip_prefix /alert_rules
-reverse_proxy alert_rules:4200
+
+http://alert-rules {
+    route /* {
+    reverse_proxy alert-rules:4200
+    }
 }
 
-route /detection_lists/* {
-uri strip_prefix /detection_lists
-reverse_proxy detection_lists:4200
+http://detection-lists {
+    route /* {
+    reverse_proxy detection-lists:4200
+    }
 }
 
-route /cases/* {
-uri strip_prefix /cases
-reverse_proxy cases:4200
+http://cases {
+    route /* {
+    reverse_proxy cases:4200
+    }
 }
 
-route /storage/* {
-uri strip_prefix /storage
-reverse_proxy storage:4200
+http://storage {
+    route /* {
+    reverse_proxy storage:4200
+    }
 }
 
-route /connected_server/* {
-uri strip_prefix /connected_server
-reverse_proxy connected_server:4200
+http://connected-server {
+    route /* {
+    reverse_proxy connected-server:4200
+    }
 }
 
-route /audit_log/* {
-uri strip_prefix /audit_log
-reverse_proxy audit_log:4200
+http://audit-log {
+    route /* {
+    reverse_proxy audit-log:4200
+    }
 }
 
-route /file_events/* {
-uri strip_prefix /file_events
-reverse_proxy file_events:4200
+http://file-events {
+    route /* {
+    reverse_proxy file_events:4200
+    }
 }
 
-route /preservation_data_service/* {
-uri strip_prefix /preservation_data_service
-reverse_proxy preservation_data_service:4200
+http://preservation-data-service {
+    route /* {
+    reverse_proxy preservation-data-service:4200
+    }
 }
 
-route /exfiltration_data_service/* {
-uri strip_prefix /exfiltration_data_service
-reverse_proxy exfiltration_data_service:4200
+http://exfiltration-data-service {
+    route /* {
+    reverse_proxy exfiltration-data-service:4200
+    }
 }
 
-route /trusted_activities/* {
-uri strip_prefix /trusted_activities
-reverse_proxy trusted_activities:4200
+http://trusted-activities-service {
+    route /* {
+    reverse_proxy trusted-activities:4200
+    }
 }
+
+

docker-compose.yml

@@ -6,7 +6,7 @@ services:
       - ./Caddyfile:/etc/caddy/Caddyfile
     restart: always
     ports:
-      - "4200:4200"
+      - "4200:80"
     depends_on:
       core:
         condition: service_healthy
@@ -43,12 +43,9 @@ services:
     command: mock docs/core.yml -p 4200 -h 0.0.0.0
     healthcheck:
       test: ["CMD-SHELL", "curl -f http://core:4200 || exit 1"]
-#      test: ["CMD-SHELL", "curl -f http://localhost:4200/core || exit 1"]
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   alerts:
     image: c42/mock-microservice-endpoints:1.0
@@ -63,8 +60,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   alert-rules:
     image: c42/mock-microservice-endpoints:1.0
@@ -79,8 +74,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   detection-lists:
     image: c42/mock-microservice-endpoints:1.0
@@ -95,8 +88,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   cases:
     image: c42/mock-microservice-endpoints:1.0
@@ -111,8 +102,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   storage:
     image: c42/mock-microservice-endpoints:1.0
@@ -127,8 +116,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   connected-server:
     image: c42/mock-microservice-endpoints:1.0
@@ -143,8 +130,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   audit-log:
     image: c42/mock-microservice-endpoints:1.0
@@ -159,8 +144,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   file-events:
     image: c42/mock-microservice-endpoints:1.0
@@ -175,8 +158,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   preservation-data-service:
     image: c42/mock-microservice-endpoints:1.0
@@ -191,8 +172,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   exfiltration-data-service:
     image: c42/mock-microservice-endpoints:1.0
@@ -207,8 +186,6 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
 
   trusted-activities:
     image: c42/mock-microservice-endpoints:1.0
@@ -223,39 +200,3 @@ services:
       interval: 30s
       timeout: 15s
       retries: 3
-    networks:
-      - api-integration-test-network
-
-
-#  health_checker:
-#    image: c42/mock-microservice-endpoints:1.0
-#    entrypoint: ["echo", "All mock server containers are responding to requests!"]
-#    container_name: "health_checker"
-#    depends_on:
-#      core:
-#        condition: service_healthy
-#      alerts:
-#        condition: service_healthy
-#      alert-rules:
-#        condition: service_healthy
-#      detection-lists:
-#        condition: service_healthy
-#      cases:
-#        condition: service_healthy
-#      storage:
-#        condition: service_healthy
-#      connected-server:
-#        condition: service_healthy
-#      audit-log:
-#        condition: service_healthy
-#      file-events:
-#        condition: service_healthy
-#      preservation-data-service:
-#        condition: service_healthy
-#      exfiltration-data-service:
-#        condition: service_healthy
-#      trusted-activities:
-#        condition: service_healthy
-
-networks:
-  api-integration-test-network:

docs/core.yml

@@ -437,7 +437,7 @@ paths:
             '*/*':
               schema:
                 type: string
-                example: http://alerts:4201
+                example: http://alerts:4200
   /v1/FedObserver-API_URL:
     get:
       tags:
@@ -451,7 +451,7 @@ paths:
             '*/*':
               schema:
                type: string
-               example: http://alert-rules:4202
+               example: http://alert-rules:4200
   /v1/employeecasemanagementV2-API_URL:
     get:
       tags:
@@ -465,7 +465,7 @@ paths:
             '*/*':
               schema:
                type: string
-               example: http://detection-lists:4203/svc/api/
+               example: http://detection-lists:4200/svc/api/
   /v1/CASES_API-URL:
     get:
       tags:
@@ -479,7 +479,7 @@ paths:
             '*/*':
               schema:
                 type: string
-                example: http://cases:4204
+                example: http://cases:4200
   /api/v1/connectedServerUrl:
     get:
       tags:
@@ -496,7 +496,7 @@ paths:
                 properties:
                   serverUrl:
                     type: string
-                    example: http://connected-server:4206
+                    example: http://connected-server:4200
   /v1/AUDIT-LOG_API-URL:
     get:
       tags:
@@ -510,7 +510,7 @@ paths:
             '*/*':
               schema:
                type: string
-               example: http://audit-log:4207
+               example: http://audit-log:4200
   /v1/FORENSIC_SEARCH-API_URL:
     get:
       tags:
@@ -524,7 +524,7 @@ paths:
             '*/*':
               schema:
                type: string
-               example: http://file-events:4208
+               example: http://file-events:4200
   /v1/PRESERVATION-DATA-SERVICE_API-URL:
     get:
       tags:
@@ -538,7 +538,7 @@ paths:
             '*/*':
               schema:
                type: string
-               example: http://preservation-data-service:4209
+               example: http://preservation-data-service:4200
   /v1/TRUSTED-DOMAINS_API-URL:
     get:
       tags:
@@ -552,7 +552,7 @@ paths:
             '*/*':
               schema:
                 type: string
-                example: http://trusted-activities-service:4211
+                example: http://trusted-activities-service:4200
 
   # DEVICES
 
@@ -1729,7 +1729,7 @@ components:
               type: string
             serverUrl:
               type: string
-              example: http://storage:4205
+              example: http://storage:4200
     FileDownloadTokenResponse_core:
       type: object
       properties: