awslabs.terraform-mcp-server 0.0.11__tar.gz → 1.0.0__tar.gz

awslabs_terraform_mcp_server-1.0.0/CHANGELOG.md

@@ -0,0 +1,19 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.0.0] - 2025-05-26
+
+### Removed
+
+- **BREAKING CHANGE:** Server Sent Events (SSE) support has been removed in accordance with the Model Context Protocol specification's [backwards compatibility guidelines](https://modelcontextprotocol.io/specification/2025-03-26/basic/transports#backwards-compatibility)
+- This change prepares for future support of [Streamable HTTP](https://modelcontextprotocol.io/specification/draft/basic/transports#streamable-http) transport
+
+## Unreleased
+
+### Added
+
+- Initial project setup

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/Dockerfile

@@ -10,7 +10,7 @@
 # and limitations under the License.
 
 #FROM public.ecr.aws/sam/build-python3.10:1.137.1-20250411084548
-FROM public.ecr.aws/sam/build-python3.10@sha256:a40f492a0cd8d76557f8a187fc00e49e8864b3cea683e74718ce317790c1ce61 AS uv
+FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1 AS uv
 
 # Install the project into `/app`
 WORKDIR /app
@@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
 # Make the directory just in case it doesn't exist
 RUN mkdir -p /root/.local
 
-FROM public.ecr.aws/sam/build-python3.10@sha256:a40f492a0cd8d76557f8a187fc00e49e8864b3cea683e74718ce317790c1ce61
+FROM public.ecr.aws/sam/build-python3.10@sha256:e78695db10ca8cb129e59e30f7dc9789b0dbd0181dba195d68419c72bac51ac1
 
 # Place executables in the environment at the front of the path and include other binaries
 ENV PATH="/app/.venv/bin:$PATH:/usr/sbin"

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: awslabs.terraform-mcp-server
-Version: 0.0.11
+Version: 1.0.0
 Summary: An AWS Labs Model Context Protocol (MCP) server for terraform
 Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4>=4.12.0
@@ -56,6 +56,12 @@ MCP server for Terraform on AWS best practices, infrastructure as code patterns,
   - Pass variables and specify AWS regions
   - Get formatted command output for analysis
 
+- **Terragrunt Workflow Execution** - Run Terragrunt commands directly
+  - Initialize, plan, validate, apply, run-all and destroy operations
+  - Pass variables and specify AWS regions
+  - Configure terragrunt-config and and include/exclude paths flags
+  - Get formatted command output for analysis
+
 ## Tools and Resources
 
 - **Terraform Development Workflow**: Follow security-focused development process via `terraform://workflow_guide`

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/README.md

@@ -41,6 +41,12 @@ MCP server for Terraform on AWS best practices, infrastructure as code patterns,
   - Pass variables and specify AWS regions
   - Get formatted command output for analysis
 
+- **Terragrunt Workflow Execution** - Run Terragrunt commands directly
+  - Initialize, plan, validate, apply, run-all and destroy operations
+  - Pass variables and specify AWS regions
+  - Configure terragrunt-config and and include/exclude paths flags
+  - Get formatted command output for analysis
+
 ## Tools and Resources
 
 - **Terraform Development Workflow**: Follow security-focused development process via `terraform://workflow_guide`

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/awslabs/terraform_mcp_server/impl/tools/__init__.py

@@ -2,6 +2,7 @@
 
 from .search_user_provided_module import search_user_provided_module_impl
 from .execute_terraform_command import execute_terraform_command_impl
+from .execute_terragrunt_command import execute_terragrunt_command_impl
 from .search_aws_provider_docs import search_aws_provider_docs_impl
 from .search_awscc_provider_docs import search_awscc_provider_docs_impl
 from .search_specific_aws_ia_modules import search_specific_aws_ia_modules_impl
@@ -10,6 +11,7 @@ from .run_checkov_scan import run_checkov_scan_impl
 __all__ = [
     'search_user_provided_module_impl',
     'execute_terraform_command_impl',
+    'execute_terragrunt_command_impl',
     'search_aws_provider_docs_impl',
     'search_awscc_provider_docs_impl',
     'search_specific_aws_ia_modules_impl',

awslabs_terraform_mcp_server-1.0.0/awslabs/terraform_mcp_server/impl/tools/execute_terragrunt_command.py

@@ -0,0 +1,303 @@
+"""Implementation of Terragrunt command execution tool."""
+
+import json
+import os
+import re
+import subprocess
+from awslabs.terraform_mcp_server.impl.tools.utils import get_dangerous_patterns
+from awslabs.terraform_mcp_server.models import (
+    TerragruntExecutionRequest,
+    TerragruntExecutionResult,
+)
+from loguru import logger
+
+
+async def execute_terragrunt_command_impl(
+    request: TerragruntExecutionRequest,
+) -> TerragruntExecutionResult:
+    """Execute Terragrunt workflow commands against an AWS account.
+
+    This tool runs Terragrunt commands (init, plan, validate, apply, destroy, run-all) in the
+    specified working directory, with optional variables and region settings.
+
+    Parameters:
+        request: Details about the Terragrunt command to execute
+
+    Returns:
+        A TerragruntExecutionResult object containing command output and status
+    """
+    logger.info(f"Executing 'terragrunt {request.command}' in {request.working_directory}")
+
+    # Helper function to clean output text
+    def clean_output_text(text: str) -> str:
+        """Clean output text by removing or replacing problematic Unicode characters.
+
+        Args:
+            text: The text to clean
+
+        Returns:
+            Cleaned text with ASCII-friendly replacements
+        """
+        if not text:
+            return text
+
+        # First remove ANSI escape sequences (color codes, cursor movement)
+        ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+        text = ansi_escape.sub('', text)
+
+        # Remove C0 and C1 control characters (except common whitespace)
+        control_chars = re.compile(r'[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F-\x9F]')
+        text = control_chars.sub('', text)
+
+        # Replace HTML entities
+        html_entities = {
+            '->': '->',  # Replace HTML arrow
+            '&lt;': '<',  # Less than
+            '&gt;': '>',  # Greater than
+            '&amp;': '&',  # Ampersand
+        }
+        for entity, replacement in html_entities.items():
+            text = text.replace(entity, replacement)
+
+        # Replace box-drawing and other special Unicode characters with ASCII equivalents
+        unicode_chars = {
+            '\u2500': '-',  # Horizontal line
+            '\u2502': '|',  # Vertical line
+            '\u2514': '+',  # Up and right
+            '\u2518': '+',  # Up and left
+            '\u2551': '|',  # Double vertical
+            '\u2550': '-',  # Double horizontal
+            '\u2554': '+',  # Double down and right
+            '\u2557': '+',  # Double down and left
+            '\u255a': '+',  # Double up and right
+            '\u255d': '+',  # Double up and left
+            '\u256c': '+',  # Double cross
+            '\u2588': '#',  # Full block
+            '\u25cf': '*',  # Black circle
+            '\u2574': '-',  # Left box drawing
+            '\u2576': '-',  # Right box drawing
+            '\u2577': '|',  # Down box drawing
+            '\u2575': '|',  # Up box drawing
+        }
+        for char, replacement in unicode_chars.items():
+            text = text.replace(char, replacement)
+
+        return text
+
+    # Set environment variables for AWS region if provided
+    env = os.environ.copy()
+    if request.aws_region:
+        env['AWS_REGION'] = request.aws_region
+
+    # Security check for command injection
+    allowed_commands = ['init', 'plan', 'validate', 'apply', 'destroy', 'output', 'run-all']
+    if request.command not in allowed_commands:
+        logger.error(f'Invalid Terragrunt command: {request.command}')
+        return TerragruntExecutionResult(
+            command=f'terragrunt {request.command}',
+            status='error',
+            error_message=f'Invalid Terragrunt command: {request.command}. Allowed commands are: {", ".join(allowed_commands)}',
+            working_directory=request.working_directory,
+            outputs=None,
+            affected_dirs=None,
+        )
+
+    # Validate that terragrunt_config is not used with run-all
+    if request.terragrunt_config and request.command == 'run-all':
+        logger.error('terragrunt_config cannot be used with run-all command')
+        return TerragruntExecutionResult(
+            command=f'terragrunt {request.command}',
+            status='error',
+            error_message='Invalid configuration: --terragrunt-config cannot be used with run-all command',
+            working_directory=request.working_directory,
+            outputs=None,
+            affected_dirs=None,
+        )
+
+    # Check for potentially dangerous characters or command injection attempts
+    dangerous_patterns = get_dangerous_patterns()
+    logger.debug(f'Checking for {len(dangerous_patterns)} dangerous patterns')
+
+    for pattern in dangerous_patterns:
+        if request.variables:
+            # Check if the pattern is in any of the variable values
+            for var_name, var_value in request.variables.items():
+                if pattern in str(var_value) or pattern in str(var_name):
+                    logger.error(
+                        f'Potentially dangerous pattern detected in variable {var_name}: {pattern}'
+                    )
+                    return TerragruntExecutionResult(
+                        command=f'terragrunt {request.command}',
+                        status='error',
+                        error_message=f"Security violation: Potentially dangerous pattern '{pattern}' detected in variable '{var_name}'",
+                        working_directory=request.working_directory,
+                        outputs=None,
+                        affected_dirs=None,
+                    )
+
+        # Check terragrunt_config for dangerous patterns
+        if request.terragrunt_config and pattern in str(request.terragrunt_config):
+            logger.error(f'Potentially dangerous pattern detected in terragrunt_config: {pattern}')
+            return TerragruntExecutionResult(
+                command=f'terragrunt {request.command}',
+                status='error',
+                error_message=f"Security violation: Potentially dangerous pattern '{pattern}' detected in terragrunt_config",
+                working_directory=request.working_directory,
+                outputs=None,
+                affected_dirs=None,
+            )
+
+        # Also check include_dirs and exclude_dirs for dangerous patterns
+        if request.include_dirs:
+            for dir_path in request.include_dirs:
+                if pattern in str(dir_path):
+                    logger.error(
+                        f'Potentially dangerous pattern detected in include_dirs: {pattern}'
+                    )
+                    return TerragruntExecutionResult(
+                        command=f'terragrunt {request.command}',
+                        status='error',
+                        error_message=f"Security violation: Potentially dangerous pattern '{pattern}' detected in include_dirs",
+                        working_directory=request.working_directory,
+                        outputs=None,
+                        affected_dirs=None,
+                    )
+
+        if request.exclude_dirs:
+            for dir_path in request.exclude_dirs:
+                if pattern in str(dir_path):
+                    logger.error(
+                        f'Potentially dangerous pattern detected in exclude_dirs: {pattern}'
+                    )
+                    return TerragruntExecutionResult(
+                        command=f'terragrunt {request.command}',
+                        status='error',
+                        error_message=f"Security violation: Potentially dangerous pattern '{pattern}' detected in exclude_dirs",
+                        working_directory=request.working_directory,
+                        outputs=None,
+                        affected_dirs=None,
+                    )
+
+    # Build the command
+    base_cmd = ['terragrunt']
+
+    # Handle run-all command differently
+    if request.command == 'run-all':
+        base_cmd.append('run-all')
+        # The actual terraform command becomes the first argument
+        # Default to 'apply' if not specified in the command
+        base_cmd.append('apply')
+    else:
+        base_cmd.append(request.command)
+
+    # Add auto-approve flag for apply and destroy commands to make them non-interactive
+    if request.command in ['apply', 'destroy'] or (request.command == 'run-all'):
+        logger.info(f'Adding -auto-approve flag to {request.command} command')
+        base_cmd.append('-auto-approve')
+
+    # Add terragrunt_config if specified and not using run-all
+    if request.terragrunt_config:
+        logger.info(f'Using custom terragrunt config file: {request.terragrunt_config}')
+        base_cmd.append(f'--terragrunt-config={request.terragrunt_config}')
+
+    # Add variables only for commands that accept them (plan, apply, destroy, output)
+    if request.command in ['plan', 'apply', 'destroy', 'output', 'run-all'] and request.variables:
+        logger.info(f'Adding {len(request.variables)} variables to {request.command} command')
+        for key, value in request.variables.items():
+            base_cmd.append(f'-var={key}={value}')
+
+    # Add include-dirs if specified
+    if request.include_dirs and request.command == 'run-all':
+        for dir_path in request.include_dirs:
+            base_cmd.append(f'--queue-include-dir={dir_path}')
+
+    # Add exclude-dirs if specified
+    if request.exclude_dirs and request.command == 'run-all':
+        for dir_path in request.exclude_dirs:
+            base_cmd.append(f'--queue-exclude-dir={dir_path}')
+
+    # Execute command
+    try:
+        process = subprocess.run(
+            base_cmd, cwd=request.working_directory, capture_output=True, text=True, env=env
+        )
+
+        # Prepare the result
+        stdout = process.stdout
+        stderr = process.stderr if process.stderr else ''
+
+        # Clean output text if requested
+        if request.strip_ansi:
+            logger.debug('Cleaning command output text (ANSI codes and control characters)')
+            stdout = clean_output_text(stdout)
+            stderr = clean_output_text(stderr)
+
+        # Extract affected directories for run-all command
+        affected_dirs = None
+        if request.command == 'run-all':
+            affected_dirs = []
+            # Look for directory paths in the output
+            dir_pattern = re.compile(r'Module at\s+"([^"]+)"')
+            for match in dir_pattern.finditer(stdout):
+                affected_dirs.append(match.group(1))
+
+        result = {
+            'command': f'terragrunt {request.command}',
+            'status': 'success' if process.returncode == 0 else 'error',
+            'return_code': process.returncode,
+            'stdout': stdout,
+            'stderr': stderr,
+            'working_directory': request.working_directory,
+            'outputs': None,
+            'affected_dirs': affected_dirs,
+        }
+
+        # Get outputs if this was a successful apply or output command
+        if (
+            request.command in ['apply', 'output'] or (request.command == 'run-all')
+        ) and process.returncode == 0:
+            try:
+                logger.info('Getting Terragrunt outputs')
+                output_process = subprocess.run(
+                    ['terragrunt', 'output', '-json'],
+                    cwd=request.working_directory,
+                    capture_output=True,
+                    text=True,
+                    env=env,
+                )
+
+                if output_process.returncode == 0 and output_process.stdout:
+                    # Get output and clean it if needed
+                    output_stdout = output_process.stdout
+                    if request.strip_ansi:
+                        output_stdout = clean_output_text(output_stdout)
+
+                    # Parse the JSON output
+                    raw_outputs = json.loads(output_stdout)
+
+                    # Process outputs to extract values from complex structure
+                    processed_outputs = {}
+                    for key, value in raw_outputs.items():
+                        # Terraform outputs in JSON format have a nested structure
+                        # with 'value', 'type', and sometimes 'sensitive'
+                        if isinstance(value, dict) and 'value' in value:
+                            processed_outputs[key] = value['value']
+                        else:
+                            processed_outputs[key] = value
+
+                    result['outputs'] = processed_outputs
+                    logger.info(f'Extracted {len(processed_outputs)} Terragrunt outputs')
+            except Exception as e:
+                logger.warning(f'Failed to get Terragrunt outputs: {e}')
+
+        # Return the output
+        return TerragruntExecutionResult(**result)
+    except Exception as e:
+        return TerragruntExecutionResult(
+            command=f'terragrunt {request.command}',
+            status='error',
+            error_message=str(e),
+            working_directory=request.working_directory,
+            outputs=None,
+            affected_dirs=None,
+        )

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/awslabs/terraform_mcp_server/models/__init__.py

@@ -5,6 +5,8 @@ from .models import (
     SubmoduleInfo,
     TerraformExecutionRequest,
     TerraformExecutionResult,
+    TerragruntExecutionRequest,
+    TerragruntExecutionResult,
     CheckovVulnerability,
     CheckovScanRequest,
     CheckovScanResult,
@@ -21,6 +23,8 @@ __all__ = [
     'SubmoduleInfo',
     'TerraformExecutionRequest',
     'TerraformExecutionResult',
+    'TerragruntExecutionRequest',
+    'TerragruntExecutionResult',
     'CheckovVulnerability',
     'CheckovScanRequest',
     'CheckovScanResult',

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/awslabs/terraform_mcp_server/models/models.py

@@ -302,3 +302,66 @@ class SearchUserProvidedModuleResult(BaseModel):
     outputs: List[TerraformOutput] = Field([], description='Outputs provided by the module')
     readme_content: Optional[str] = Field(None, description='README content of the module')
     error_message: Optional[str] = Field(None, description='Error message if execution failed')
+
+
+class TerragruntExecutionRequest(BaseModel):
+    """Request model for Terragrunt command execution with parameters.
+
+    Attributes:
+        command: The Terragrunt command to execute (init, plan, validate, apply, destroy, etc.).
+        working_directory: Directory containing Terragrunt configuration files.
+        variables: Optional dictionary of Terraform variables to pass.
+        aws_region: Optional AWS region to use.
+        strip_ansi: Whether to strip ANSI color codes from command output.
+        include_dirs: Optional list of directories to include in a multi-module run.
+        exclude_dirs: Optional list of directories to exclude from a multi-module run.
+        run_all: Whether to run the command in all subdirectories with terragrunt.hcl files.
+    """
+
+    command: Literal['init', 'plan', 'validate', 'apply', 'destroy', 'output', 'run-all'] = Field(
+        ..., description='Terragrunt command to execute'
+    )
+    working_directory: str = Field(..., description='Directory containing Terragrunt files')
+    variables: Optional[Dict[str, str]] = Field(None, description='Terraform variables to pass')
+    aws_region: Optional[str] = Field(None, description='AWS region to use')
+    strip_ansi: bool = Field(True, description='Whether to strip ANSI color codes from output')
+    include_dirs: Optional[List[str]] = Field(
+        None, description='Directories to include in a multi-module run'
+    )
+    exclude_dirs: Optional[List[str]] = Field(
+        None, description='Directories to exclude from a multi-module run'
+    )
+    run_all: bool = Field(False, description='Run command on all modules in subdirectories')
+    terragrunt_config: Optional[str] = Field(
+        None, description='Path to a custom terragrunt config file (not valid with run-all)'
+    )
+
+
+class TerragruntExecutionResult(BaseModel):
+    """Result model for Terragrunt command execution.
+
+    Attributes:
+        command: The Terragrunt command that was executed.
+        status: Execution status (success/error).
+        return_code: The command's return code (0 for success).
+        stdout: Standard output from the Terragrunt command.
+        stderr: Standard error output from the Terragrunt command.
+        working_directory: Directory where the command was executed.
+        error_message: Optional error message if execution failed.
+        outputs: Dictionary of output values from Terragrunt (for apply command).
+        affected_dirs: List of directories affected by a run-all command.
+    """
+
+    command: str
+    status: Literal['success', 'error']
+    return_code: Optional[int] = None
+    stdout: Optional[str] = None
+    stderr: str = ''
+    working_directory: str
+    error_message: Optional[str] = None
+    outputs: Optional[Dict[str, Any]] = Field(
+        None, description='Terragrunt outputs (for apply or output command)'
+    )
+    affected_dirs: Optional[List[str]] = Field(
+        None, description='Directories affected by a run-all command'
+    )

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/awslabs/terraform_mcp_server/server.py

@@ -1,13 +1,13 @@
 #!/usr/bin/env python3
 """terraform MCP server implementation."""
 
-import argparse
 from awslabs.terraform_mcp_server.impl.resources import (
     terraform_aws_provider_assets_listing_impl,
     terraform_awscc_provider_resources_listing_impl,
 )
 from awslabs.terraform_mcp_server.impl.tools import (
     execute_terraform_command_impl,
+    execute_terragrunt_command_impl,
     run_checkov_scan_impl,
     search_aws_provider_docs_impl,
     search_awscc_provider_docs_impl,
@@ -24,6 +24,8 @@ from awslabs.terraform_mcp_server.models import (
     TerraformAWSProviderDocsResult,
     TerraformExecutionRequest,
     TerraformExecutionResult,
+    TerragruntExecutionRequest,
+    TerragruntExecutionResult,
 )
 from awslabs.terraform_mcp_server.static import (
     AWS_TERRAFORM_BEST_PRACTICES,
@@ -84,6 +86,61 @@ async def execute_terraform_command(
     return await execute_terraform_command_impl(request)
 
 
+@mcp.tool(name='ExecuteTerragruntCommand')
+async def execute_terragrunt_command(
+    command: Literal['init', 'plan', 'validate', 'apply', 'destroy', 'output', 'run-all'] = Field(
+        ..., description='Terragrunt command to execute'
+    ),
+    working_directory: str = Field(..., description='Directory containing Terragrunt files'),
+    variables: Optional[Dict[str, str]] = Field(None, description='Terraform variables to pass'),
+    aws_region: Optional[str] = Field(None, description='AWS region to use'),
+    strip_ansi: bool = Field(True, description='Whether to strip ANSI color codes from output'),
+    include_dirs: Optional[List[str]] = Field(
+        None, description='Directories to include in a multi-module run'
+    ),
+    exclude_dirs: Optional[List[str]] = Field(
+        None, description='Directories to exclude from a multi-module run'
+    ),
+    run_all: bool = Field(False, description='Run command on all modules in subdirectories'),
+    terragrunt_config: Optional[str] = Field(
+        None, description='Path to a custom terragrunt config file (not valid with run-all)'
+    ),
+) -> TerragruntExecutionResult:
+    """Execute Terragrunt workflow commands against an AWS account.
+
+    This tool runs Terragrunt commands (init, plan, validate, apply, destroy, run-all) in the
+    specified working directory, with optional variables and region settings. Terragrunt extends
+    Terraform's functionality by providing features like remote state management, dependencies
+    between modules, and the ability to execute Terraform commands on multiple modules at once.
+
+    Parameters:
+        command: Terragrunt command to execute
+        working_directory: Directory containing Terragrunt files
+        variables: Terraform variables to pass
+        aws_region: AWS region to use
+        strip_ansi: Whether to strip ANSI color codes from output
+        include_dirs: Directories to include in a multi-module run
+        exclude_dirs: Directories to exclude from a multi-module run
+        run_all: Run command on all modules in subdirectories
+        terragrunt_config: Path to a custom terragrunt config file (not valid with run-all)
+
+    Returns:
+        A TerragruntExecutionResult object containing command output and status
+    """
+    request = TerragruntExecutionRequest(
+        command=command,
+        working_directory=working_directory,
+        variables=variables,
+        aws_region=aws_region,
+        strip_ansi=strip_ansi,
+        include_dirs=include_dirs,
+        exclude_dirs=exclude_dirs,
+        run_all=run_all,
+        terragrunt_config=terragrunt_config,
+    )
+    return await execute_terragrunt_command_impl(request)
+
+
 @mcp.tool(name='SearchAwsProviderDocs')
 async def search_aws_provider_docs(
     asset_name: str = Field(
@@ -362,18 +419,7 @@ async def terraform_aws_best_practices() -> str:
 
 def main():
     """Run the MCP server with CLI argument support."""
-    parser = argparse.ArgumentParser(description='A Model Context Protocol (MCP) server')
-    parser.add_argument('--sse', action='store_true', help='Use SSE transport')
-    parser.add_argument('--port', type=int, default=8888, help='Port to run the server on')
-
-    args = parser.parse_args()
-
-    # Run server with appropriate transport
-    if args.sse:
-        mcp.settings.port = args.port
-        mcp.run(transport='sse')
-    else:
-        mcp.run()
+    mcp.run()
 
 
 if __name__ == '__main__':

{awslabs_terraform_mcp_server-0.0.11 → awslabs_terraform_mcp_server-1.0.0}/awslabs/terraform_mcp_server/static/MCP_INSTRUCTIONS.md

@@ -1,8 +1,6 @@
 # Terraform MCP Server Instructions
 
-## Overview
-
-MCP server specialized in AWS cloud infrastructure provided through Terraform. I help you create, understand, optimize, and execute Terraform configurations for AWS using security-focused development practices.
+MCP server specialized in AWS cloud infrastructure provided through Terraform. I help you create, understand, optimize, and execute Terraform Or Terragrunt configurations for AWS using security-focused development practices.
 
 ## How to Use This Server (Required Workflow)
 
@@ -80,7 +78,10 @@ When implementing specific AWS resources (only after confirming no suitable AWS-
 1. `ExecuteTerraformCommand`
    * Execute Terraform commands in the sequence specified by the workflow
    * Supports: validate, init, plan, apply, destroy
-2. `RunCheckovScan`
+2. `ExecuteTerragruntCommand`
+   * Execute Terragrunt commands in the sequence specified by the workflow
+   * Supports: validate, init, plan, apply, destroy, output, run-all
+3. `RunCheckovScan`
    * Run after validation passes, before initialization
    * Identifies security and compliance issues
 
@@ -103,6 +104,8 @@ The AWSCC provider (Cloud Control API-based) offers:
 - "Find documentation for awscc_lambda_function resource" (specifically AWSCC)
 - "Find documentation for aws_lambda_function resource" (specifically AWS)
 - "Execute terraform plan in my ./infrastructure directory"
+- "Execute terragrunt plan in my ./infrastructure directory"
+- "Execute terragrunt run-all plan in my ./infrastructure directory"
 - "How can I use the AWS Bedrock module to create a RAG application?"
 - "Show me details about the AWS-IA Bedrock Terraform module"
 - "Compare the four specific AWS-IA modules for generative AI applications"
@@ -115,6 +118,10 @@ The AWSCC provider (Cloud Control API-based) offers:
 - "Use the terraform-aws-modules/vpc/aws module to implement a VPC"
 - "Search for the hashicorp/consul/aws module and explain how to use it"
 - "What variables are required for the terraform-aws-modules/eks/aws module?"
+- "I have a multi-environment Terragrunt project. How can I run apply on all modules at once?"
+- "Execute terragrunt run-all apply in my ./infrastructure directory"
+- "How to construct a well-formed terragrunt hierarchy folder structure"
+- "Generate common inputs for all environments using generate in Terragrunt"
 
 ## Best Practices
 
@@ -129,5 +136,7 @@ When interacting with this server:
 7. **Be specific** about your requirements and constraints
 8. **Specify AWS region** when relevant to your infrastructure needs
 9. **Provide context** about your architecture and use case
-10. **For Terraform execution**, ensure the working directory exists and contains valid Terraform files
+10. **For Terraform/Terragrunt execution**, ensure the working directory exists and contains valid Terraform/Terragrunt files
 11. **Review generated code** carefully before applying changes to your infrastructure
+12. When using **Terragrunt**, leverage DRY features—locals, dependencies, and generate blocks—to compose multi-env stacks.
+13. **Organize repos with clear folder hierarchies** (e.g. live/, modules/) and consistent naming so both Terraform and Terragrunt code is discoverable.