Skip to content

Complete conditional check simplification in cloud_engineer_agent.py #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
awsdataarchitect merged 4 commits into from
Dec 16, 2025
Merged

Complete conditional check simplification in cloud_engineer_agent.py #7

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40a75cf
Refactor cloud_engineer_agent.py to simplify redundant conditional ch…
kiro-agent Dec 16, 2025
23b178a
Merge remote-tracking branch 'origin/main' into cloudeng-strands-agen…
kiro-agent Dec 16, 2025
d882e00
[skip ci] Restore defensive null checks for MCP clients
amazon-q-developer[bot] Dec 16, 2025
8db684e
Add explicit null checks (is not None) for MCP clients
kiro-agent Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cloud_engineer_agent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
aws_diagram_mcp_client = None

# Get tools from MCP clients (if initialized)
docs_tools = aws_docs_mcp_client.list_tools_sync() if mcp_initialized and aws_docs_mcp_client else []
diagram_tools = aws_diagram_mcp_client.list_tools_sync() if mcp_initialized and aws_diagram_mcp_client else []
docs_tools = aws_docs_mcp_client.list_tools_sync() if mcp_initialized else []
diagram_tools = aws_diagram_mcp_client.list_tools_sync() if mcp_initialized else []

@amazon-q-developer amazon-q-developer Bot Dec 16, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛑 Logic Error: Removing the null checks creates a potential crash risk. If mcp_initialized is True but the MCP clients are None (which could happen if the initialization logic changes in the future), this will cause an AttributeError when calling list_tools_sync() on None. The redundant checks provide defensive programming against future code changes.

Suggested change
docs_tools = aws_docs_mcp_client.list_tools_sync() if mcp_initialized else []
diagram_tools = aws_diagram_mcp_client.list_tools_sync() if mcp_initialized else []
docs_tools = aws_docs_mcp_client.list_tools_sync() if mcp_initialized and aws_docs_mcp_client else []
diagram_tools = aws_diagram_mcp_client.list_tools_sync() if mcp_initialized and aws_diagram_mcp_client else []


# Create a BedrockModel with system inference profile
bedrock_model = BedrockModel(
Expand Down