diff --git a/README.md b/README.md
index 3a59549ae4..c865b8410a 100644
--- a/README.md
+++ b/README.md
@@ -15,33 +15,34 @@ A suite of specialized MCP servers that help you get the most out of AWS, wherev
- [AWS MCP Servers Transport Mechanisms](#aws-mcp-servers-transport-mechanisms)
- [Supported transport mechanisms](#supported-transport-mechanisms)
- [Server Sent Events Support Removal](#server-sent-events-support-removal)
- - [Why AWS MCP Servers?](#why-aws-mcp-servers)
+ - [Why AWS MCP Servers?](#why-aws-mcp-servers)
- [Available MCP Servers: Quick Installation](#available-mcp-servers-quick-installation)
- - [πGetting Started with AWS](#-getting-started-with-aws)
+ - [π Getting Started with AWS](#-getting-started-with-aws)
- [Browse by What You're Building](#browse-by-what-youre-building)
- [π Real-time access to official AWS documentation](#-real-time-access-to-official-aws-documentation)
- - [ποΈ Infrastructure \& Deployment](#οΈ-infrastructure--deployment)
- - [Infrastructure as Code](#infrastructure-as-code)
- - [Container Platforms](#container-platforms)
- - [Serverless \& Functions](#serverless--functions)
- - [Support](#support)
- - [π€ AI \& Machine Learning](#-ai--machine-learning)
- - [π Data \& Analytics](#-data--analytics)
- - [SQL \& NoSQL Databases](#sql--nosql-databases)
+ - [ποΈ Infrastructure \& Deployment](#οΈ-infrastructure--deployment)
+ - [Container Platforms](#container-platforms)
+ - [Serverless \& Functions](#serverless--functions)
+ - [Support](#support)
+ - [π€ AI \& Machine Learning](#-ai--machine-learning)
+ - [π Data \& Analytics](#-data--analytics)
+ - [SQL \& NoSQL Databases](#sql--nosql-databases)
- [Search \& Analytics](#search--analytics)
- - [Caching \& Performance](#caching--performance)
- - [π οΈ Developer Tools \& Support](#οΈ-developer-tools--support)
- - [π‘ Integration \& Messaging](#-integration--messaging)
- - [π° Cost \& Operations](#-cost--operations)
- - [𧬠Healthcare \& Lifesciences](#-healthcare--lifesciences)
+ - [Backend API Providers](#backend-api-providers)
+ - [Caching \& Performance](#caching--performance)
+ - [π οΈ Developer Tools \& Support](#οΈ-developer-tools--support)
+ - [π‘ Integration \& Messaging](#-integration--messaging)
+ - [π° Cost \& Operations](#-cost--operations)
+ - [𧬠Healthcare \& Lifesciences](#-healthcare--lifesciences)
- [Browse by How You're Working](#browse-by-how-youre-working)
- [π¨βπ» Vibe Coding \& Development](#-vibe-coding--development)
- [Core Development Workflow](#core-development-workflow)
- - [Infrastructure as Code](#infrastructure-as-code-1)
+ - [Infrastructure as Code](#infrastructure-as-code)
- [Application Development](#application-development)
- [Container \& Serverless Development](#container--serverless-development)
- [Testing \& Data](#testing--data)
- [Lifesciences Workflow Development](#lifesciences-workflow-development)
+ - [Healthcare Data Management](#healthcare-data-management)
- [π¬ Conversational Assistants](#-conversational-assistants)
- [Knowledge \& Search](#knowledge--search)
- [Content Processing \& Generation](#content-processing--generation)
@@ -57,6 +58,8 @@ A suite of specialized MCP servers that help you get the most out of AWS, wherev
- [Remote MCP Servers](#remote-mcp-servers)
- [Use Cases for the Servers](#use-cases-for-the-servers)
- [Installation and Setup](#installation-and-setup)
+ - [For macOS/Linux](#for-macoslinux)
+ - [For Windows](#for-windows)
- [Running MCP servers in containers](#running-mcp-servers-in-containers)
- [Getting Started with Amazon Q Developer CLI](#getting-started-with-amazon-q-developer-cli)
- [`~/.aws/amazonq/mcp.json`](#awsamazonqmcpjson)
@@ -157,7 +160,7 @@ Build, deploy, and manage cloud infrastructure with Infrastructure as Code best
|-------------|-------------|---------|
| [AWS IaC MCP Server](src/aws-iac-mcp-server) | Complete Infrastructure as Code toolkit with CloudFormation documentation access, CDK best practices guidance, construct examples, security validation, and deployment troubleshooting | [](https://kiro.dev/launch/mcp/add?name=awslabs.aws-iac-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.aws-iac-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.aws-iac-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuYXdzLWlhYy1tY3Atc2VydmVyQGxhdGVzdCIsImVudiI6eyJBV1NfUFJPRklMRSI6InlvdXItYXdzLXByb2ZpbGUiLCJGQVNUTUNQX0xPR19MRVZFTCI6IkVSUk9SIn0sImRpc2FibGVkIjpmYWxzZSwiYXV0b0FwcHJvdmUiOltdfQ==IiwiZW52Ijp7IkFXU19QUk9GSUxFIjoieW91ci1hd3MtcHJvZmlsZSIsIkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=AWS%20IaC%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.aws-iac-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
| [AWS Cloud Control API MCP Server](src/ccapi-mcp-server) | Direct AWS resource management with security scanning and best practices | [](https://kiro.dev/launch/mcp/add?name=awslabs.ccapi-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.ccapi-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22AWS_REGION%22%3A%22us-east-1%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.ccapi-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2NhcGktbWNwLXNlcnZlckBsYXRlc3QiLCJlbnYiOnsiQVdTX1BST0ZJTEUiOiJ5b3VyLWF3cy1wcm9maWxlIiwiQVdTX1JFR0lPTiI6InVzLWVhc3QtMSIsIkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=AWS%20Cloud%20Control%20API%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.ccapi-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22AWS_REGION%22%3A%22us-east-1%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
-| [AWS CDK MCP Server](src/cdk-mcp-server) | AWS CDK development with security compliance and best practices | [](https://kiro.dev/launch/mcp/add?name=awslabs.cdk-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.cdk-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2RrLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=CDK%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
+| [AWS CDK MCP Server](src/cdk-mcp-server) β οΈ **DEPRECATED** | AWS CDK development with security compliance and best practices (Use [AWS IaC MCP Server](src/aws-iac-mcp-server) instead) | [](https://kiro.dev/launch/mcp/add?name=awslabs.cdk-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.cdk-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2RrLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=CDK%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
| [AWS Terraform MCP Server](src/terraform-mcp-server) | Terraform workflows with integrated security scanning | [](https://kiro.dev/launch/mcp/add?name=awslabs.terraform-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.terraform-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.terraform-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMudGVycmFmb3JtLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=Terraform%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.terraform-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
| [AWS CloudFormation MCP Server](src/cfn-mcp-server) | Direct CloudFormation resource management via Cloud Control API | [](https://kiro.dev/launch/mcp/add?name=awslabs.cfn-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cfn-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-named-profile%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.cfn-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2ZuLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkFXU19QUk9GSUxFIjoieW91ci1uYW1lZC1wcm9maWxlIn0sImRpc2FibGVkIjpmYWxzZSwiYXV0b0FwcHJvdmUiOltdfQ%3D%3D)
[](https://insiders.vscode.dev/redirect/mcp/install?name=CloudFormation%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cfn-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-named-profile%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
@@ -310,7 +313,7 @@ Interact with AWS HealthAI services.
| Server Name | Description | Install |
|-------------|-------------|---------|
| [AWS IaC MCP Server](src/aws-iac-mcp-server) | Complete Infrastructure as Code toolkit with CloudFormation documentation access, CDK best practices guidance, construct examples, security validation, and deployment troubleshooting | [](https://kiro.dev/launch/mcp/add?name=awslabs.aws-iac-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.aws-iac-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.aws-iac-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuYXdzLWlhYy1tY3Atc2VydmVyQGxhdGVzdCIsImVudiI6eyJBV1NfUFJPRklMRSI6InlvdXItYXdzLXByb2ZpbGUiLCJGQVNUTUNQX0xPR19MRVZFTCI6IkVSUk9SIn0sImRpc2FibGVkIjpmYWxzZSwiYXV0b0FwcHJvdmUiOltdfQ==IiwiZW52Ijp7IkFXU19QUk9GSUxFIjoieW91ci1hd3MtcHJvZmlsZSIsIkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=AWS%20IaC%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.aws-iac-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
-| [AWS CDK MCP Server](src/cdk-mcp-server) | CDK development with security best practices and compliance | [](https://kiro.dev/launch/mcp/add?name=awslabs.cdk-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.cdk-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2RrLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=CDK%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
+| [AWS CDK MCP Server](src/cdk-mcp-server) β οΈ **DEPRECATED** | CDK development with security best practices and compliance (Use [AWS IaC MCP Server](src/aws-iac-mcp-server) instead) | [](https://kiro.dev/launch/mcp/add?name=awslabs.cdk-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.cdk-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2RrLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=CDK%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cdk-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
| [AWS Terraform MCP Server](src/terraform-mcp-server) | Terraform with integrated security scanning and best practices | [](https://kiro.dev/launch/mcp/add?name=awslabs.terraform-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.terraform-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.terraform-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMudGVycmFmb3JtLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=Terraform%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.terraform-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
| [AWS CloudFormation MCP Server](src/cfn-mcp-server) | Direct AWS resource management through Cloud Control API | [](https://kiro.dev/launch/mcp/add?name=awslabs.cfn-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cfn-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-named-profile%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.cfn-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2ZuLW1jcC1zZXJ2ZXJAbGF0ZXN0IiwiZW52Ijp7IkFXU19QUk9GSUxFIjoieW91ci1uYW1lZC1wcm9maWxlIn0sImRpc2FibGVkIjpmYWxzZSwiYXV0b0FwcHJvdmUiOltdfQ%3D%3D)
[](https://insiders.vscode.dev/redirect/mcp/install?name=CloudFormation%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.cfn-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-named-profile%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
| [AWS Cloud Control API MCP Server](src/ccapi-mcp-server) | Direct AWS resource management with security scanning and best practices | [](https://kiro.dev/launch/mcp/add?name=awslabs.ccapi-mcp-server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.ccapi-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22AWS_REGION%22%3A%22us-east-1%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%7D)
[](https://cursor.com/en/install-mcp?name=awslabs.ccapi-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuY2NhcGktbWNwLXNlcnZlckBsYXRlc3QiLCJlbnYiOnsiQVdTX1BST0ZJTEUiOiJ5b3VyLWF3cy1wcm9maWxlIiwiQVdTX1JFR0lPTiI6InVzLWVhc3QtMSIsIkZBU1RNQ1BfTE9HX0xFVkVMIjoiRVJST1IifSwiZGlzYWJsZWQiOmZhbHNlLCJhdXRvQXBwcm92ZSI6W119)
[](https://insiders.vscode.dev/redirect/mcp/install?name=AWS%20Cloud%20Control%20API%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.ccapi-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_PROFILE%22%3A%22your-aws-profile%22%2C%22AWS_REGION%22%3A%22us-east-1%22%2C%22FASTMCP_LOG_LEVEL%22%3A%22ERROR%22%7D%2C%22disabled%22%3Afalse%2C%22autoApprove%22%3A%5B%5D%7D) |
@@ -1112,6 +1115,8 @@ You can use these MCP servers with your AI coding assistant to [vibe code](https
- [Unlocking the power of Model Context Protocol (MCP) on AWS](https://aws.amazon.com/blogs/machine-learning/unlocking-the-power-of-model-context-protocol-mcp-on-aws/)
- [AWS Price List Gets a Natural Language Upgrade: Introducing the AWS Pricing MCP Server](https://aws.amazon.com/blogs/aws-cloud-financial-management/aws-price-list-gets-a-natural-language-upgrade-introducing-the-aws-pricing-mcp-server/)
- [AWS SheBuilds: AWS Team's Journey from Internal Tools to Open Source AI Infrastructure](https://www.youtube.com/watch?v=DZFgufNCvAo)
+- [Guidance for Vibe Coding with AWS MCP servers](https://aws.amazon.com/solutions/guidance/vibe-coding-with-aws-mcp-servers/)
+- [Vibe coding with AWS MCP Servers | Hands-on Workshop](https://github.com/aws-solutions-library-samples/guidance-for-vibe-coding-with-aws-mcp-servers)
## Security
diff --git a/src/cdk-mcp-server/README.md b/src/cdk-mcp-server/README.md
index a90d7ee379..303026c6e6 100644
--- a/src/cdk-mcp-server/README.md
+++ b/src/cdk-mcp-server/README.md
@@ -1,5 +1,7 @@
# AWS CDK MCP Server
+> **β οΈ DEPRECATION NOTICE**: This server is deprecated and will be removed in a future release. Please use the [AWS IaC MCP Server](https://github.com/awslabs/mcp/tree/main/src/aws-iac-mcp-server) instead, which provides all CDK functionality along with additional Infrastructure as Code capabilities.
+
MCP server for AWS Cloud Development Kit (CDK) best practices, infrastructure as code patterns, and security compliance with CDK Nag.
## Features
diff --git a/src/cdk-mcp-server/awslabs/cdk_mcp_server/core/tools.py b/src/cdk-mcp-server/awslabs/cdk_mcp_server/core/tools.py
index 8a342de860..afcd806c25 100644
--- a/src/cdk-mcp-server/awslabs/cdk_mcp_server/core/tools.py
+++ b/src/cdk-mcp-server/awslabs/cdk_mcp_server/core/tools.py
@@ -17,6 +17,7 @@
import logging
import os
import re
+import warnings
from awslabs.cdk_mcp_server.core import search_utils
from awslabs.cdk_mcp_server.data.cdk_nag_parser import (
check_cdk_nag_suppressions,
@@ -140,7 +141,9 @@ async def check_cdk_nag_suppressions_tool(
code: Optional[str] = None,
file_path: Optional[str] = None,
) -> Dict[str, Any]:
- """Check if CDK code contains Nag suppressions that require human review.
+ """DEPRECATED: This tool is deprecated. Please use the AWS IaC MCP Server instead.
+
+ Check if CDK code contains Nag suppressions that require human review.
Scans TypeScript/JavaScript code for NagSuppressions usage to ensure security
suppressions receive proper human oversight and justification.
@@ -153,6 +156,9 @@ async def check_cdk_nag_suppressions_tool(
Returns:
Analysis results with suppression details and security guidance
"""
+ msg = 'CheckCDKNagSuppressions tool is deprecated. Please use the AWS IaC MCP Server instead.'
+ warnings.warn(msg, DeprecationWarning, stacklevel=1)
+
# Use the imported function from cdk_nag_parser.py
return check_cdk_nag_suppressions(code=code, file_path=file_path)
@@ -224,7 +230,9 @@ def save_fallback_script_to_file(
async def bedrock_schema_generator_from_file(
ctx: Context, lambda_code_path: str, output_path: str
) -> Dict[str, Any]:
- """Generate OpenAPI schema for Bedrock Agent Action Groups from a file.
+ """DEPRECATED: This tool is deprecated. Please use the AWS IaC MCP Server instead.
+
+ Generate OpenAPI schema for Bedrock Agent Action Groups from a file.
This tool converts a Lambda file with BedrockAgentResolver into a Bedrock-compatible
OpenAPI schema. It uses a progressive approach to handle common issues:
@@ -241,6 +249,11 @@ async def bedrock_schema_generator_from_file(
Dictionary with schema generation results, including status, path to generated schema,
and diagnostic information if errors occurred
"""
+ msg = (
+ 'GenerateBedrockAgentSchema tool is deprecated. Please use the AWS IaC MCP Server instead.'
+ )
+ warnings.warn(msg, DeprecationWarning, stacklevel=1)
+
# Ensure the output directory exists
os.makedirs(os.path.dirname(os.path.abspath(output_path)), exist_ok=True)