feat(cli): remove unused lambda tool

Author: ranst91

examples/integrations/agentcore/gateway/tools/sample_tool/sample_tool_lambda.py

@@ -488,30 +488,12 @@ export class BackendStack extends cdk.NestedStack {
   }
 
   private createAgentCoreGateway(config: AppConfig): void {
-    // Create sample tool Lambda
-    const toolLambda = new lambda.Function(this, "SampleToolLambda", {
-      runtime: lambda.Runtime.PYTHON_3_13,
-      handler: "sample_tool_lambda.handler",
-      code: lambda.Code.fromAsset(
-        path.join(__dirname, "../../gateway/tools/sample_tool"),
-      ),
-      timeout: cdk.Duration.seconds(30),
-      logGroup: new logs.LogGroup(this, "SampleToolLambdaLogGroup", {
-        logGroupName: `/aws/lambda/${config.stack_name_base}-sample-tool`,
-        retention: logs.RetentionDays.ONE_WEEK,
-        removalPolicy: cdk.RemovalPolicy.DESTROY,
-      }),
-    });
-
     // Create comprehensive IAM role for gateway
     const gatewayRole = new iam.Role(this, "GatewayRole", {
       assumedBy: new iam.ServicePrincipal("bedrock-agentcore.amazonaws.com"),
       description: "Role for AgentCore Gateway with comprehensive permissions",
     });
 
-    // Lambda invoke permission
-    toolLambda.grantInvoke(gatewayRole);
-
     // Bedrock permissions (region-agnostic)
     gatewayRole.addToPolicy(
       new iam.PolicyStatement({
@@ -565,15 +547,6 @@ export class BackendStack extends cdk.NestedStack {
       }),
     );
 
-    // Load tool specification from JSON file
-    const toolSpecPath = path.join(
-      __dirname,
-      "../../gateway/tools/sample_tool/tool_spec.json",
-    );
-    const apiSpec = JSON.parse(
-      require("fs").readFileSync(toolSpecPath, "utf8"),
-    );
-
     // Cognito OAuth2 configuration for gateway
     const cognitoIssuer = `https://cognito-idp.${this.region}.amazonaws.com/${this.userPool.userPoolId}`;
     const cognitoDiscoveryUrl = `${cognitoIssuer}/.well-known/openid-configuration`;
@@ -703,35 +676,7 @@ export class BackendStack extends cdk.NestedStack {
       description: "AgentCore Gateway with MCP protocol and JWT authentication",
     });
 
-    // Create Gateway Target using L1 construct (CfnGatewayTarget)
-    const gatewayTarget = new bedrockagentcore.CfnGatewayTarget(
-      this,
-      "GatewayTarget",
-      {
-        gatewayIdentifier: gateway.attrGatewayIdentifier,
-        name: "sample-tool-target",
-        description: "Sample tool Lambda target",
-        targetConfiguration: {
-          mcp: {
-            lambda: {
-              lambdaArn: toolLambda.functionArn,
-              toolSchema: {
-                inlinePayload: apiSpec,
-              },
-            },
-          },
-        },
-        credentialProviderConfigurations: [
-          {
-            credentialProviderType: "GATEWAY_IAM_ROLE",
-          },
-        ],
-      },
-    );
-
     // Ensure proper creation order
-    gatewayTarget.addDependency(gateway);
-    gateway.node.addDependency(toolLambda);
     gateway.node.addDependency(this.machineClient);
     gateway.node.addDependency(gatewayRole);
 

examples/integrations/agentcore/gateway/tools/sample_tool/tool_spec.json

@@ -6,81 +6,6 @@
 # Maps to: backend-stack.ts createAgentCoreGateway()
 # =============================================================================
 
-# -----------------------------------------------------------------------------
-# CloudWatch Log Group for Lambda
-# -----------------------------------------------------------------------------
-
-resource "aws_cloudwatch_log_group" "tool_lambda" {
-  name              = "/aws/lambda/${var.stack_name_base}-sample-tool"
-  retention_in_days = local.log_retention_days
-
-}
-
-# -----------------------------------------------------------------------------
-# IAM Role for Lambda Function
-# -----------------------------------------------------------------------------
-
-data "aws_iam_policy_document" "tool_lambda_assume_role" {
-  statement {
-    effect  = "Allow"
-    actions = ["sts:AssumeRole"]
-
-    principals {
-      type        = "Service"
-      identifiers = ["lambda.amazonaws.com"]
-    }
-  }
-}
-
-resource "aws_iam_role" "tool_lambda" {
-  name               = "${var.stack_name_base}-sample-tool-lambda-role"
-  assume_role_policy = data.aws_iam_policy_document.tool_lambda_assume_role.json
-  description        = "Execution role for sample tool Lambda"
-
-}
-
-data "aws_iam_policy_document" "tool_lambda_policy" {
-  statement {
-    effect = "Allow"
-    actions = [
-      "logs:CreateLogStream",
-      "logs:PutLogEvents"
-    ]
-    resources = ["${aws_cloudwatch_log_group.tool_lambda.arn}:*"]
-  }
-}
-
-resource "aws_iam_role_policy" "tool_lambda" {
-  name   = "${var.stack_name_base}-sample-tool-lambda-policy"
-  role   = aws_iam_role.tool_lambda.id
-  policy = data.aws_iam_policy_document.tool_lambda_policy.json
-}
-
-# -----------------------------------------------------------------------------
-# Lambda Function for Sample Tool
-# -----------------------------------------------------------------------------
-
-data "archive_file" "tool_lambda" {
-  type        = "zip"
-  source_dir  = local.gateway_lambda_source_path
-  output_path = "${path.module}/artifacts/gateway_lambda.zip"
-  excludes    = ["tool_spec.json", "__pycache__", "*.pyc"]
-}
-
-resource "aws_lambda_function" "sample_tool" {
-  function_name = "${var.stack_name_base}-sample-tool"
-  role          = aws_iam_role.tool_lambda.arn
-  handler       = "sample_tool_lambda.handler"
-  runtime       = "python3.13"
-  timeout       = 30
-
-  filename         = data.archive_file.tool_lambda.output_path
-  source_code_hash = data.archive_file.tool_lambda.output_base64sha256
-
-  depends_on = [aws_cloudwatch_log_group.tool_lambda]
-
-}
-
 # -----------------------------------------------------------------------------
 # IAM Role for Gateway
 # -----------------------------------------------------------------------------
@@ -105,16 +30,6 @@ resource "aws_iam_role" "gateway" {
 }
 
 data "aws_iam_policy_document" "gateway_policy" {
-  # Lambda invoke permission
-  statement {
-    sid    = "LambdaInvoke"
-    effect = "Allow"
-    actions = [
-      "lambda:InvokeFunction"
-    ]
-    resources = [aws_lambda_function.sample_tool.arn]
-  }
-
   # Bedrock permissions (region-agnostic)
   statement {
     sid    = "BedrockInvoke"
@@ -172,7 +87,6 @@ resource "aws_iam_role_policy" "gateway" {
 
 # -----------------------------------------------------------------------------
 # Wait for IAM permission propagation
-# Gateway Target creation can fail due to IAM role propagation delay
 # -----------------------------------------------------------------------------
 
 resource "time_sleep" "gateway_iam_propagation" {
@@ -190,15 +104,13 @@ resource "aws_bedrockagentcore_gateway" "main" {
   role_arn    = aws_iam_role.gateway.arn
   description = "AgentCore Gateway with MCP protocol and JWT authentication"
 
-  # Protocol configuration
   protocol_type = "MCP"
   protocol_configuration {
     mcp {
       supported_versions = ["2025-03-26"]
     }
   }
 
-  # JWT authorizer with Cognito - uses machine client from auth.tf
   authorizer_type = "CUSTOM_JWT"
   authorizer_configuration {
     custom_jwt_authorizer {
@@ -207,55 +119,5 @@ resource "aws_bedrockagentcore_gateway" "main" {
     }
   }
 
-
   depends_on = [time_sleep.gateway_iam_propagation]
 }
-
-# -----------------------------------------------------------------------------
-# AgentCore Gateway Target
-# -----------------------------------------------------------------------------
-
-resource "aws_bedrockagentcore_gateway_target" "sample_tool" {
-  name               = "sample-tool-target"
-  gateway_identifier = aws_bedrockagentcore_gateway.main.gateway_id
-  description        = "Sample tool Lambda target"
-
-  credential_provider_configuration {
-    gateway_iam_role {}
-  }
-
-  target_configuration {
-    mcp {
-      lambda {
-        lambda_arn = aws_lambda_function.sample_tool.arn
-
-        tool_schema {
-          inline_payload {
-            name        = "text_analysis_tool"
-            description = "A tool which analyzes an input block of text to count number of words and return the top N frequent characters."
-
-            input_schema {
-              type        = "object"
-              description = "Input parameters for text analysis"
-
-              property {
-                name        = "text"
-                type        = "string"
-                description = "Input block of text to analyze"
-                required    = true
-              }
-
-              property {
-                name        = "N"
-                type        = "integer"
-                description = "The number of most frequent characters to return (optional, default = 5)"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  depends_on = [aws_bedrockagentcore_gateway.main]
-}

examples/integrations/agentcore/infra-cdk/lib/backend-stack.ts

@@ -54,8 +54,6 @@ locals {
   zip_packager_lambda_source_path = "${path.module}/../../lambdas/zip-packager"
 
   # Lambda source paths
-  gateway_lambda_source_path  = "${path.module}/../../../gateway/tools/sample_tool"
-  gateway_tool_spec_path      = "${path.module}/../../../gateway/tools/sample_tool/tool_spec.json"
   feedback_lambda_source_path = "${path.module}/../../../infra-cdk/lambdas/feedback"
   copilotkit_runtime_source_path = "${path.module}/../../../infra-cdk/lambdas/copilotkit-runtime"