Amazon Q Developer CLI: Create Architecture Diagrams with AWS Diagram MCP & AWS Documentation MCP

Documenting complex AWS architectures is often a time-consuming task. Traditional diagramming tools require manual updates, are prone to errors, and quickly become outdated in dynamic cloud environments.

With the  Amazon Q Developer CLI and the AWS MCP servers (Model Context Protocol) for diagrams and documentation, architects and developers can fully automate this process. The result: always up-to-date architecture diagrams and consistent documentation – generated in minutes.

What is the Amazon Q Developer CLI?

Amazon Q Developer CLI is a generative AI tool built for developers. It allows AWS architectures to be visualised and documented directly from the command line – without any manual drawing.

Two MCP servers power this capability:

• AWS Diagram MCP: generates architecture diagrams from configuration data.
• AWS Documentation MCP: enriches diagrams with explanatory text.

Why traditional documentation falls short

Manual creation and maintenance of diagrams is not only time-intensive but also error-prone. Infrastructure changes often take too long to be reflected in the documentation, resulting in outdated diagrams. In complex multi-account or multi-service architectures, it becomes almost impossible to maintain an accurate overview. Traditional tools reach their limits here – costing teams valuable time that could be better invested in strategic initiatives.

Benefits of Amazon Q Developer CLI with MCP

Using the Amazon Q Developer CLI alongside MCP servers provides significant benefits. Instead of working manually, teams gain automated, accurate, and consistent results. Key advantages include: 

Automation: Diagrams are generated with a single command.

Up-to-date: Architecture changes are immediately reflected – no more outdated diagrams

Consistency: Diagrams and descriptions come from the same source.

Efficiency: Teams save time and focus on innovation rather than documentation upkeep.

This transforms documentation from a burden into a seamlessly integrated part of development and operations.

Practical example

An architect describes the infrastructure using just a few CLI commands. The tool then generates a complete architecture diagram automatically. In parallel, the Documentation MCP adds explanatory text to the visualisation.

The result: a clear, always up-to-date diagram with documentation – instantly ready for reviews, audits, or project planning. Instead of hours of manual updates, documentation is created in minutes.

Conclusion 

Amazon Q Developer CLI combined with AWS Diagram MCP and AWS Documentation MCP is a gamechanger for cloud architects. Teams can work faster, more reliably, and more consistently – freeing up valuable time for innovation.

Would you like to learn how to use Amazon Q Developer CLI for your AWS projects?
Contact us today – we will help you automate architecture visualisation and optimise your cloud management.

GET IN TOUCH!

FAQ – Frequently Asked Questions about GitLab Duo:

Discover More

Discover how demicon unlocks the full potential of AWS to accelerate digital transformation and achieve tangible business impact. Our proven expertise in cloud architecture, security and scalability ensures that your organisation can innovate with confidence and realise long-term success in the digital era.

AWS Partner Page