Update console_link logic on clearing snapshots with missing repo

.github/workflows/full_pr_e2e_test.yml

@@ -15,8 +15,11 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 jobs:
-  full-es68-e2e-aws-test:
+  e2e-tests:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        job-name: [full-es68source-e2e-test, rfs-default-e2e-test]
     steps:
       - name: Sanitize branch and repo names
         env:
@@ -34,6 +37,6 @@ jobs:
         uses: lewijacn/[email protected]
         with:
           jenkins_url: "https://migrations.ci.opensearch.org"
-          job_name: "full-es68source-e2e-test"
+          job_name: "${{ matrix.job-name }}"
           api_token: "${{ secrets.JENKINS_MIGRATIONS_GENERIC_WEBHOOK_TOKEN }}"
           job_params: "GIT_REPO_URL=${{ steps.sanitize-input.outputs.pr_repo_url }},GIT_BRANCH=${{ steps.sanitize-input.outputs.branch_name }}"

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/console_link/middleware/clusters.py

@@ -1,6 +1,7 @@
 from console_link.models.cluster import Cluster, HttpMethod
 from dataclasses import dataclass
 import logging
+from requests.exceptions import HTTPError
 
 logger = logging.getLogger(__name__)
 
@@ -68,6 +69,7 @@ def clear_cluster(cluster: Cluster):
 
 
 def clear_snapshots(cluster: Cluster, repository: str) -> None:
+    logger.info(f"Clearing snapshots from repository '{repository}'")
     """
     Clears all snapshots from the specified repository.
 
@@ -79,7 +81,9 @@ def clear_snapshots(cluster: Cluster, repository: str) -> None:
         # List all snapshots in the repository
         snapshots_path = f"/_snapshot/{repository}/_all"
         response = call_api(cluster, snapshots_path, raise_error=True)
+        logger.debug(f"Raw response: {response.json()}")
         snapshots = response.json().get("snapshots", [])
+        logger.info(f"Found {len(snapshots)} snapshots in repository '{repository}'.")
 
         if not snapshots:
             logger.info(f"No snapshots found in repository '{repository}'.")
@@ -94,9 +98,11 @@ def clear_snapshots(cluster: Cluster, repository: str) -> None:
 
     except Exception as e:
         # Handle 404 errors specifically for missing repository
-        if "repository_missing_exception" in str(e):
-            logger.info(f"Repository '{repository}' is missing. Skipping snapshot clearing.")
-        else:
-            # Re-raise other errors
-            logger.error(f"Error clearing snapshots from repository '{repository}': {e}")
-            raise e
+        if isinstance(e, HTTPError) and e.response.status_code == 404:
+            error_details = e.response.json().get('error', {})
+            if error_details.get('type') == 'repository_missing_exception':
+                logger.info(f"Repository '{repository}' is missing. Skipping snapshot clearing.")
+                return
+        # Re-raise other errors
+        logger.error(f"Error clearing snapshots from repository '{repository}': {e}")
+        raise e

TrafficCapture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/tests/test_clusters_middleware.py

@@ -0,0 +1,68 @@
+import pytest
+from unittest.mock import MagicMock
+from console_link.middleware.clusters import clear_snapshots
+from console_link.models.cluster import Cluster
+import requests
+import logging
+
+
+# Helper to mock HTTPError with response
+def create_http_error_mock(status_code, json_data):
+    response_mock = MagicMock()
+    response_mock.status_code = status_code
+    response_mock.json.return_value = json_data
+    return requests.exceptions.HTTPError(response=response_mock)
+
+
+@pytest.fixture
+def mock_cluster_with_missing_repo(mocker):
+    cluster = MagicMock(spec=Cluster)
+    # Simulate repository missing exception
+    error_mock = create_http_error_mock(
+        status_code=404,
+        json_data={
+            'error': {
+                'type': 'repository_missing_exception',
+                'reason': '[migration_assistant_repo] missing'
+            }
+        }
+    )
+    mocker.patch.object(cluster, 'call_api', side_effect=error_mock)
+    return cluster
+
+
+@pytest.fixture
+def mock_cluster_with_snapshots(mocker):
+    cluster = MagicMock(spec=Cluster)
+    # Mock the response for listing snapshots
+    mock_response = MagicMock()
+    mock_response.json.return_value = {
+        'snapshots': [
+            {'snapshot': 'snapshot_1'},
+            {'snapshot': 'snapshot_2'}
+        ]
+    }
+    mock_response.status_code = 200
+
+    def mock_call_api(path, *args, **kwargs):
+        if "_all" in path:
+            return mock_response
+        elif "snapshot_1" in path or "snapshot_2" in path:
+            return MagicMock()  # Simulate successful deletion
+        raise ValueError(f"Unexpected path: {path}")
+
+    mocker.patch.object(cluster, 'call_api', side_effect=mock_call_api)
+    return cluster
+
+
+def test_clear_snapshots_repository_missing(mock_cluster_with_missing_repo, caplog):
+    with caplog.at_level(logging.INFO, logger='console_link.middleware.clusters'):
+        clear_snapshots(mock_cluster_with_missing_repo, 'migration_assistant_repo')
+        assert "Repository 'migration_assistant_repo' is missing. Skipping snapshot clearing." in caplog.text
+
+
+def test_clear_snapshots_success(mock_cluster_with_snapshots, caplog):
+    with caplog.at_level(logging.INFO, logger='console_link.middleware.clusters'):
+        clear_snapshots(mock_cluster_with_snapshots, 'migration_assistant_repo')
+        assert "Deleted snapshot: snapshot_1 from repository 'migration_assistant_repo'." in caplog.text
+        assert "Deleted snapshot: snapshot_2 from repository 'migration_assistant_repo'." in caplog.text