Merge pull request #210 from microsoft/psl-codequlity-cmv2

fix: fixed CodQL issues for Container Migration.

Author: Roopan-Microsoft

scripts/validate_bicep_params.py

@@ -110,7 +110,7 @@ def parse_parameters_env_vars(json_path: Path) -> dict[str, list[str]]:
         data = json.loads(sanitized)
         params = data.get("parameters", {})
     except json.JSONDecodeError:
-        pass
+        pass  # File is not valid JSON after azd variable substitution; fall through to regex scan
 
     # Walk each top-level parameter and scan its entire serialized value
     # for ${VAR} references from the original text.

src/backend-api/src/app/application.py

@@ -133,7 +133,7 @@ def _register_dependencies(self):
             )
             .add_singleton(ILoggerService, ConsoleLoggerService)
             .add_transient(IHttpService, HttpClientService)
-            .add_singleton(IDataService, lambda: InMemoryDataService())
+            .add_singleton(IDataService, InMemoryDataService)
         )
 
     def run(self, host: str = "0.0.0.0", port: int = 8000, reload: bool = True):

src/backend-api/src/app/libs/base/SKLogicBase.py

@@ -81,7 +81,7 @@ def _init_agent(self):
         """
         raise NotImplementedError("This method should be overridden in subclasses")
 
-    async def execute(func_params: dict[str, any]):
+    async def execute(self, func_params: dict[str, any]):
         raise NotImplementedError("Execute method not implemented")
 
     @overload
@@ -92,7 +92,7 @@ async def execute_thread(
         thread: AgentThread | AssistantAgentThread | AzureAIAgentThread = None,
     ) -> tuple[str, AgentThread | AssistantAgentThread | AzureAIAgentThread]:
         """When response_format is None, returns string response."""
-        ...
+        pass
 
     @overload
     async def execute_thread(
@@ -102,7 +102,7 @@ async def execute_thread(
         thread: AgentThread | AssistantAgentThread | AzureAIAgentThread = None,
     ) -> tuple[T, AgentThread | AssistantAgentThread | AzureAIAgentThread]:
         """When response_format is provided, returns typed Pydantic BaseModel response."""
-        ...
+        pass
 
     @abstractmethod
     async def execute_thread(

src/backend-api/src/app/libs/base/fastapi_protocol.py

@@ -16,7 +16,8 @@ class FastAPIWithContext(Protocol):
     app_context: AppContext
 
     # Include essential FastAPI methods for type checking
-    def include_router(self, *args, **kwargs) -> None: ...
+    def include_router(self, *args, **kwargs) -> None:
+        pass
 
 
 def add_app_context_to_fastapi(

src/backend-api/src/tests/application/test_dependency_injection.py

@@ -126,7 +126,7 @@ def test_factory_registration():
     app_context = AppContext()
 
     # Register with factory function
-    app_context.add_singleton(IDataService, lambda: InMemoryDataService())
+    app_context.add_singleton(IDataService, InMemoryDataService)
 
     data_service = app_context.get_service(IDataService)
     assert isinstance(data_service, InMemoryDataService)

src/frontend/frontend_server.py

@@ -4,7 +4,7 @@
 from dotenv import load_dotenv
 from fastapi import FastAPI, Request
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, HTMLResponse, JSONResponse
+from fastapi.responses import FileResponse, JSONResponse
 from fastapi.staticfiles import StaticFiles
 
 # Load environment variables from .env file
@@ -42,7 +42,6 @@ async def serve_index():
 async def get_config(request: Request):
     # Only serve config to same-origin requests by checking the Referer/Origin
     origin = request.headers.get("origin") or ""
-    referer = request.headers.get("referer") or ""
     host = request.headers.get("host") or ""
     if origin and not origin.endswith(host):
         return JSONResponse(status_code=403, content={"detail": "Forbidden"})

src/frontend/src/api/utils.tsx

@@ -414,7 +414,7 @@ export const renderErrorSection = (batchSummary, expandedSections, setExpandedSe
 
 export const renderErrorContent = (batchSummary) => {
   // Group errors by file
-  const errorFiles = batchSummary.files.filter(file => file.error_count && file.error_count);
+  const errorFiles = batchSummary.files.filter(file => file.error_count > 0);
   if (errorFiles.length === 0) {
     return (
       <div className={useStyles().errorItem}>

src/frontend/src/commonComponents/ProgressModal/progressModal.tsx

@@ -41,8 +41,8 @@ const ProgressModal: React.FC<ProgressModalProps> = ({
 }) => {
   // Calculate progress percentage based on step (stable step-level identifier)
   const getProgressPercentage = () => {
+    if (processingCompleted) return 100;
     if (migrationError) return 0; // Show 0% progress for errors
-    if (processingCompleted && !migrationError) return 100;
     if (!apiData) return 0;
 
     // Use apiData.step (stable: "analysis", "design", "yaml_conversion", "documentation")

src/frontend/src/components/batchHistoryPanel.tsx

@@ -21,7 +21,7 @@ interface BatchHistoryItem {
   status: string;
 }
 const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
-  const headers = {}
+  const headers = {};
   const [batchHistory, setBatchHistory] = useState<BatchHistoryItem[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -81,46 +81,6 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
     }
   };
 
-  // Function to categorize batches
-  const categorizeBatches = () => {
-    const now = new Date();
-    const userTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-
-    // Get start of "Today", "Past 7 days", and "Past 30 days" in LOCAL time
-    const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-    const past7DaysStart = new Date(todayStart);
-    const past30DaysStart = new Date(todayStart);
-
-    past7DaysStart.setDate(todayStart.getDate() - 7);
-    past30DaysStart.setDate(todayStart.getDate() - 30);
-
-    const todayBatches: BatchHistoryItem[] = [];
-    const past7DaysBatches: BatchHistoryItem[] = [];
-    const past30DaysBatches: BatchHistoryItem[] = [];
-
-    batchHistory.forEach(batch => {
-      // Convert UTC timestamp to user's local date
-      const updatedAtUTC = new Date(batch.created_at);
-      const updatedAtLocal = new Date(updatedAtUTC.toLocaleString("en-US", { timeZone: userTimeZone }));
-
-      // Extract only the local **date** part for comparison
-      const updatedDate = new Date(updatedAtLocal.getFullYear(), updatedAtLocal.getMonth(), updatedAtLocal.getDate());
-
-      // Categorize based on **exact day comparison**
-      if (updatedDate.getTime() === todayStart.getTime()) {
-        todayBatches.push(batch);
-      } else if (updatedDate.getTime() >= past7DaysStart.getTime()) {
-        past7DaysBatches.push(batch);
-      } else if (updatedDate.getTime() >= past30DaysStart.getTime()) {
-        past30DaysBatches.push(batch);
-      }
-    });
-
-    return { todayBatches, past7DaysBatches, past30DaysBatches };
-  };
-
-  // const { todayBatches, past7DaysBatches, past30DaysBatches } = categorizeBatches();
-
   const deleteBatchFromHistory = (batchId: string) => {
     // Get the current URL path
     const currentPath = window.location.pathname;

src/frontend/src/components/bottomBar.tsx

@@ -1,5 +1,5 @@
 import { Button, Card, Dropdown, DropdownProps, Option } from "@fluentui/react-components"
-import React, { useState } from "react"
+import React from "react"
 import { useNavigate } from "react-router-dom"
 
 // Define possible upload states