feat(java-spring-ai-agents): fix AWS API queries and add target status polling

Author: Yuriy Bezsonov

apps/java-spring-ai-agents/scripts/05-mcp-runtime.sh

@@ -169,7 +169,7 @@ echo "5. Create the AgentCore Runtime"
 # Check if runtime already exists
 EXISTING_RUNTIME_ID=$(aws bedrock-agentcore-control list-agent-runtimes \
     --region ${AWS_REGION} --no-cli-pager \
-    --query "agentRuntimeSummaries[?agentRuntimeName=='backoffice'].agentRuntimeId | [0]" --output text 2>/dev/null || echo "None")
+    --query "agentRuntimes[?agentRuntimeName=='backoffice'].agentRuntimeId | [0]" --output text 2>/dev/null || echo "None")
 
 if [ "${EXISTING_RUNTIME_ID}" != "None" ] && [ -n "${EXISTING_RUNTIME_ID}" ]; then
     echo "AgentCore Runtime already exists: ${EXISTING_RUNTIME_ID}"

apps/java-spring-ai-agents/scripts/06-mcp-gateway.sh

@@ -187,14 +187,31 @@ else
         --query "credentialProviders[?name=='mcp-backoffice-oauth'].credentialProviderArn | [0]" --output text)
 fi
 
-# Check if backoffice target exists
+# Check if backoffice target exists and its status
 EXISTING_BACKOFFICE_TARGET=$(aws bedrock-agentcore-control list-gateway-targets \
     --gateway-identifier "${GATEWAY_ID}" --region ${AWS_REGION} --no-cli-pager \
     --query "items[?name=='backoffice'].targetId | [0]" --output text 2>/dev/null || echo "None")
 
 if [ "${EXISTING_BACKOFFICE_TARGET}" != "None" ] && [ -n "${EXISTING_BACKOFFICE_TARGET}" ]; then
-    echo "Backoffice target already exists"
-else
+    # Check if target is FAILED
+    TARGET_STATUS=$(aws bedrock-agentcore-control get-gateway-target \
+        --gateway-identifier "${GATEWAY_ID}" --target-id "${EXISTING_BACKOFFICE_TARGET}" \
+        --region ${AWS_REGION} --no-cli-pager \
+        --query 'status' --output text 2>/dev/null || echo "UNKNOWN")
+
+    if [ "${TARGET_STATUS}" = "FAILED" ]; then
+        echo "Backoffice target is FAILED, deleting and recreating..."
+        aws bedrock-agentcore-control delete-gateway-target \
+            --gateway-identifier "${GATEWAY_ID}" --target-id "${EXISTING_BACKOFFICE_TARGET}" \
+            --region ${AWS_REGION} --no-cli-pager >/dev/null 2>&1 || true
+        sleep 10
+        EXISTING_BACKOFFICE_TARGET="None"
+    else
+        echo "Backoffice target already exists (status: ${TARGET_STATUS})"
+    fi
+fi
+
+if [ "${EXISTING_BACKOFFICE_TARGET}" = "None" ] || [ -z "${EXISTING_BACKOFFICE_TARGET}" ]; then
     echo "Creating backoffice target"
 
     RUNTIME_ARN="arn:aws:bedrock-agentcore:${AWS_REGION}:${ACCOUNT_ID}:runtime/${MCP_RUNTIME_ID}"
@@ -240,14 +257,31 @@ else
         --query "credentialProviders[?name=='mcp-holidays-apikey-provider'].credentialProviderArn | [0]" --output text)
 fi
 
-# Check if holidays target exists
+# Check if holidays target exists and its status
 EXISTING_HOLIDAYS_TARGET=$(aws bedrock-agentcore-control list-gateway-targets \
     --gateway-identifier "${GATEWAY_ID}" --region ${AWS_REGION} --no-cli-pager \
     --query "items[?name=='holidays'].targetId | [0]" --output text 2>/dev/null || echo "None")
 
 if [ "${EXISTING_HOLIDAYS_TARGET}" != "None" ] && [ -n "${EXISTING_HOLIDAYS_TARGET}" ]; then
-    echo "Holidays target already exists"
-else
+    # Check if target is FAILED
+    TARGET_STATUS=$(aws bedrock-agentcore-control get-gateway-target \
+        --gateway-identifier "${GATEWAY_ID}" --target-id "${EXISTING_HOLIDAYS_TARGET}" \
+        --region ${AWS_REGION} --no-cli-pager \
+        --query 'status' --output text 2>/dev/null || echo "UNKNOWN")
+
+    if [ "${TARGET_STATUS}" = "FAILED" ]; then
+        echo "Holidays target is FAILED, deleting and recreating..."
+        aws bedrock-agentcore-control delete-gateway-target \
+            --gateway-identifier "${GATEWAY_ID}" --target-id "${EXISTING_HOLIDAYS_TARGET}" \
+            --region ${AWS_REGION} --no-cli-pager >/dev/null 2>&1 || true
+        sleep 10
+        EXISTING_HOLIDAYS_TARGET="None"
+    else
+        echo "Holidays target already exists (status: ${TARGET_STATUS})"
+    fi
+fi
+
+if [ "${EXISTING_HOLIDAYS_TARGET}" = "None" ] || [ -z "${EXISTING_HOLIDAYS_TARGET}" ]; then
     echo "Creating holidays target"
 
     OPENAPI_SPEC=$(curl -s "https://date.nager.at/openapi/v3.json" | jq -c '

apps/java-spring-ai-agents/scripts/08-aiagent-runtime.sh

@@ -177,7 +177,7 @@ echo "5. Create the AgentCore Runtime"
 # Check if runtime already exists
 EXISTING_RUNTIME_ID=$(aws bedrock-agentcore-control list-agent-runtimes \
     --region ${AWS_REGION} --no-cli-pager \
-    --query "agentRuntimeSummaries[?agentRuntimeName=='aiagent'].agentRuntimeId | [0]" --output text 2>/dev/null || echo "None")
+    --query "agentRuntimes[?agentRuntimeName=='aiagent'].agentRuntimeId | [0]" --output text 2>/dev/null || echo "None")
 
 if [ "${EXISTING_RUNTIME_ID}" != "None" ] && [ -n "${EXISTING_RUNTIME_ID}" ]; then
     echo "AgentCore Runtime already exists: ${EXISTING_RUNTIME_ID}"

apps/java-spring-ai-agents/scripts/11-mcp-currency.sh

@@ -145,14 +145,31 @@ sleep 10
 echo ""
 echo "5. Create the Gateway target"
 
-# Check if target already exists
+# Check if target already exists and its status
 EXISTING_TARGET=$(aws bedrock-agentcore-control list-gateway-targets \
     --gateway-identifier "${GATEWAY_ID}" --region ${AWS_REGION} --no-cli-pager \
     --query "items[?name=='currency'].targetId | [0]" --output text 2>/dev/null || echo "None")
 
 if [ "${EXISTING_TARGET}" != "None" ] && [ -n "${EXISTING_TARGET}" ]; then
-    echo "Currency target already exists"
-else
+    # Check if target is FAILED
+    TARGET_STATUS=$(aws bedrock-agentcore-control get-gateway-target \
+        --gateway-identifier "${GATEWAY_ID}" --target-id "${EXISTING_TARGET}" \
+        --region ${AWS_REGION} --no-cli-pager \
+        --query 'status' --output text 2>/dev/null || echo "UNKNOWN")
+
+    if [ "${TARGET_STATUS}" = "FAILED" ]; then
+        echo "Currency target is FAILED, deleting and recreating..."
+        aws bedrock-agentcore-control delete-gateway-target \
+            --gateway-identifier "${GATEWAY_ID}" --target-id "${EXISTING_TARGET}" \
+            --region ${AWS_REGION} --no-cli-pager >/dev/null 2>&1 || true
+        sleep 10
+        EXISTING_TARGET="None"
+    else
+        echo "Currency target already exists (status: ${TARGET_STATUS})"
+    fi
+fi
+
+if [ "${EXISTING_TARGET}" = "None" ] || [ -z "${EXISTING_TARGET}" ]; then
     echo "Creating currency target"
 
     LAMBDA_TOOLS='[