WIP: ca876f4 [Release] Update index.json for extension [ containerapp ]

Author: DomAyre

.github/CODEOWNERS

@@ -337,3 +337,5 @@
 /src/storage-discovery/ @shanefujs @calvinhzy
 
 /src/aks-agent/ @feiskyer @mainred @nilo19
+
+/src/migrate/ @saifaldin14

.github/workflows/TestTriggerExtensionRelease.yml

@@ -13,7 +13,7 @@ permissions:
 
 jobs:
     build:
-        name: Trigger Extension Release Pipeline
+        name: Test Trigger Extension Release Pipeline
         runs-on: ubuntu-latest
         steps:
         - name: Harden Runner
@@ -26,7 +26,7 @@ jobs:
             client-id: ${{ secrets.ADO_SP_ClientID }}
             tenant-id: ${{ secrets.ADO_SP_TenantID }}
             allow-no-subscriptions: true
-        - name: Trigger ADO Pipeline and Wait for Completion
+        - name: Test Trigger ADO Pipeline and Wait for Completion
           uses: azure/cli@v2
           env:
             ado-org: ${{secrets.ADO_ORGANIZATION}}
@@ -89,7 +89,7 @@ jobs:
                   exit 1
                 fi
                 
-                # Wait 30 seconds before checking again
-                echo "Build still running... waiting 30 seconds"
-                sleep 30
+                # Wait 60 seconds before checking again
+                echo "Build still running... waiting 60 seconds"
+                sleep 60
               done

.github/workflows/TriggerExtensionRelease.yml

@@ -26,7 +26,7 @@ jobs:
             client-id: ${{ secrets.ADO_SP_ClientID }}
             tenant-id: ${{ secrets.ADO_SP_TenantID }}
             allow-no-subscriptions: true
-        - name: Azure CLI
+        - name: Trigger ADO Pipeline and Wait for Completion
           uses: azure/cli@v2
           env:
             ado-org: ${{secrets.ADO_ORGANIZATION}}
@@ -35,4 +35,61 @@ jobs:
             commit-id: ${{ github.sha }}
           with:
             inlineScript: |
-              az pipelines build queue --definition-id ${{ env.ado-pipeline-id }} --organization ${{ env.ado-org }}  --project ${{ env.ado-project }} --variables commit_id=${{ env.commit-id }}
+              # Trigger the pipeline and capture the build ID
+              echo "Triggering ADO pipeline..."
+              BUILD_RESULT=$(az pipelines build queue \
+                --definition-id ${{ env.ado-pipeline-id }} \
+                --organization ${{ env.ado-org }} \
+                --project ${{ env.ado-project }} \
+                --variables commit_id=${{ env.commit-id }} \
+                --output json)
+              
+              BUILD_ID=$(echo $BUILD_RESULT | jq -r '.id')
+              echo "Pipeline triggered with Build ID: $BUILD_ID"
+              
+              if [ "$BUILD_ID" = "null" ] || [ -z "$BUILD_ID" ]; then
+                echo "Failed to get build ID from pipeline trigger"
+                exit 1
+              fi
+              
+              # Wait for the build to complete
+              echo "Waiting for build $BUILD_ID to complete..."
+              while true; do
+                BUILD_JSON=$(az pipelines build show \
+                  --id $BUILD_ID \
+                  --organization ${{ env.ado-org }} \
+                  --project ${{ env.ado-project }} \
+                  --output json)
+                
+                BUILD_STATUS=$(echo "$BUILD_JSON" | jq -r '.status')
+                BUILD_RESULT_STATUS=$(echo "$BUILD_JSON" | jq -r '.result // "none"')
+                
+                echo "Current status: $BUILD_STATUS, Result: $BUILD_RESULT_STATUS"
+                
+                # Check if build is completed
+                if [ "$BUILD_STATUS" = "completed" ]; then
+                  echo "Build completed with result: $BUILD_RESULT_STATUS"
+                  
+                  # Check if the build was successful
+                  if [ "$BUILD_RESULT_STATUS" = "succeeded" ]; then
+                    echo "✅ ADO pipeline build succeeded!"
+                    exit 0
+                  elif [ "$BUILD_RESULT_STATUS" = "partiallySucceeded" ]; then
+                    echo "⚠️ ADO pipeline build partially succeeded"
+                    exit 1
+                  else
+                    echo "❌ ADO pipeline build failed with result: $BUILD_RESULT_STATUS"
+                    exit 1
+                  fi
+                fi
+                
+                # Check for other terminal states
+                if [ "$BUILD_STATUS" = "cancelling" ] || [ "$BUILD_STATUS" = "cancelled" ]; then
+                  echo "❌ ADO pipeline build was cancelled"
+                  exit 1
+                fi
+                
+                # Wait 60 seconds before checking again
+                echo "Build still running... waiting 60 seconds"
+                sleep 60
+              done

scripts/ci/find_extension_upgraded.py

@@ -11,6 +11,17 @@ To release a new version, please select a new version number (usually plus 1 to
 
 Pending
 +++++++
+* Fix stdin reading hang in CI/CD pipelines by using select with timeout for non-interactive mode.
+* Update pytest marker registration and fix datetime.utcnow() deprecation warning in tests.
+* Improve test framework with real-time stderr output visibility and subprocess timeout.
+
+1.0.0b7
++++++++
+* Bump aks-mcp to v0.0.10 - here are the notable changes:
+  * Fix: Improved server health check endpoints /health for both HTTP and SSE connections for http, sse
+  * Fix: enforce json output for az monitor metrics and aks tools
+  * Fix: Build the resource URL with correct MCP endpoint path based on transport
+* Fix feedback slash command
 
 1.0.0b6
 +++++++

src/aks-agent/HISTORY.rst

@@ -26,6 +26,6 @@
 CONST_MCP_BINARY_NAME = "aks-mcp"
 CONST_MCP_DEFAULT_PORT = 8003
 CONST_MCP_DEFAULT_URL = "http://localhost:8003/sse"
-CONST_MCP_MIN_VERSION = "0.0.9"
+CONST_MCP_MIN_VERSION = "0.0.10"
 CONST_MCP_GITHUB_REPO = "Azure/aks-mcp"
 CONST_MCP_BINARY_DIR = "bin"

src/aks-agent/azext_aks_agent/_consts.py

@@ -5,6 +5,7 @@
 
 import logging
 import os
+import select
 import sys
 
 from azext_aks_agent._consts import (
@@ -123,7 +124,7 @@ def _should_refresh_toolsets(requested_mode: str, user_refresh_request: bool) ->
     return False
 
 
-# pylint: disable=too-many-locals
+# pylint: disable=too-many-locals,too-many-branches
 def aks_agent(
     cmd,
     resource_group_name,
@@ -177,13 +178,25 @@ def aks_agent(
 
         # Detect and read piped input
         piped_data = None
-        if not sys.stdin.isatty():
-            piped_data = sys.stdin.read().strip()
-            if interactive:
-                console.print(
-                    "[bold yellow]Interactive mode disabled when reading piped input[/bold yellow]"
-                )
-                interactive = False
+        # In non-interactive mode with a prompt, we shouldn't try to read stdin
+        # as it may hang in CI/CD environments. Only read stdin if:
+        # 1. Not a TTY (indicating piped input)
+        # 2. Interactive mode is enabled (allows stdin reading)
+        should_check_stdin = not sys.stdin.isatty() and interactive
+
+        if should_check_stdin:
+            try:
+                # Use select with timeout to avoid hanging
+                # Check if data is available with 100ms timeout
+                if select.select([sys.stdin], [], [], 0.1)[0]:
+                    piped_data = sys.stdin.read().strip()
+                    console.print(
+                        "[bold yellow]Interactive mode disabled when reading piped input[/bold yellow]"
+                    )
+                    interactive = False
+            except Exception:  # pylint: disable=broad-exception-caught
+                # Continue without piped data if stdin reading fails
+                pass
 
         # Determine MCP mode and smart refresh logic
         use_aks_mcp = bool(use_aks_mcp)

src/aks-agent/azext_aks_agent/agent/agent.py

@@ -92,7 +92,7 @@ def track_agent_feedback(self, feedback):
         feedback_filtered = Feedback()
         feedback_filtered.user_feedback = feedback.user_feedback
         feedback_metadata = FeedbackMetadata()
-        feedback_metadata.model = feedback.metadata.model
+        feedback_metadata.llm = feedback.metadata.llm
         feedback_filtered.metadata = feedback_metadata
         self.track("AgentCLIFeedback", properties={"feedback": json.dumps(feedback_filtered.to_dict())})
         # Flush the telemetry data immediately to avoid too much data being sent at once