Fix IT networking

onyx-dot-app · Feb 2, 2025 · 3944a61 · 3944a61
1 parent 7869a5c
commit 3944a61
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/pr-integration-tests.yml b/.github/workflows/pr-integration-tests.yml
@@ -186,7 +186,8 @@ jobs:
       - name: Start Mock Services
         run: |
           cd backend/tests/integration/mock_services
-          docker compose -f docker-compose.mock-it-services.yml -p mock-it-services-stack up -d
+          docker compose -f docker-compose.mock-it-services.yml \
+            -p mock-it-services-stack up -d
 
       - name: Run Standard Integration Tests
         run: |
@@ -206,7 +207,7 @@ jobs:
             -e CONFLUENCE_USER_NAME=${CONFLUENCE_USER_NAME} \
             -e CONFLUENCE_ACCESS_TOKEN=${CONFLUENCE_ACCESS_TOKEN} \
             -e TEST_WEB_HOSTNAME=test-runner \
-            -e MOCK_CONNECTOR_SERVER_HOST=host.docker.internal \
+            -e MOCK_CONNECTOR_SERVER_HOST=mock_connector_server \
             -e MOCK_CONNECTOR_SERVER_PORT=8001 \
             onyxdotapp/onyx-integration:test \
             /app/tests/integration/tests \

diff --git a/backend/tests/integration/mock_services/docker-compose.mock-it-services.yml b/backend/tests/integration/mock_services/docker-compose.mock-it-services.yml
@@ -7,12 +7,14 @@ services:
       dockerfile: Dockerfile
     ports:
       - "8001:8001"
-    environment:
-      - MOCK_CONNECTOR_SERVER_HOST=host.docker.internal
-      - MOCK_CONNECTOR_SERVER_PORT=8001
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8001/health"]
       interval: 10s
       timeout: 5s
       retries: 5
-
+    networks:
+      - onyx-stack_default
+networks:
+  onyx-stack_default:
+    name: onyx-stack_default
+    external: true
diff --git a/backend/tests/integration/tests/indexing/test_checkpointing.py b/backend/tests/integration/tests/indexing/test_checkpointing.py
@@ -28,6 +28,11 @@
 
 @pytest.fixture
 def mock_server_client() -> httpx.Client:
+    print(
+        f"Initializing mock server client with host: "
+        f"{MOCK_CONNECTOR_SERVER_HOST} and port: "
+        f"{MOCK_CONNECTOR_SERVER_PORT}"
+    )
     return httpx.Client(
         base_url=f"http://{MOCK_CONNECTOR_SERVER_HOST}:{MOCK_CONNECTOR_SERVER_PORT}",
         timeout=5.0,

diff --git a/web/src/app/admin/connector/[ccPairId]/page.tsx b/web/src/app/admin/connector/[ccPairId]/page.tsx
@@ -85,7 +85,6 @@ function Main({ ccPairId }: { ccPairId: number }) {
   const {
     currentPageData: indexAttempts,
     isLoading: isLoadingIndexAttempts,
-    error: indexAttemptsError,
     currentPage,
     totalPages,
     goToPage,