cdk-cost-analyzer 0.1.55 → 0.1.57

package/.cdk-cost-analyzer-cache/metadata.json

@@ -2,35 +2,35 @@
   "entries": {
     "AmazonS3:US East (N. Virginia):storageClass:General Purpose|volumeType:Standard": {
       "price": 0.023,
-      "timestamp": 1779133647835
+      "timestamp": 1780084662489
     },
     "AmazonDynamoDB:US East (N. Virginia):group:DDB-ReadUnits|productFamily:Amazon DynamoDB PayPerRequest Throughput": {
       "price": 0.023,
-      "timestamp": 1779133647842
+      "timestamp": 1780084662501
     },
     "AmazonDynamoDB:US East (N. Virginia):group:DDB-WriteUnits|productFamily:Amazon DynamoDB PayPerRequest Throughput": {
       "price": 0.023,
-      "timestamp": 1779133647842
+      "timestamp": 1780084662501
     },
     "AmazonEC2:US East (N. Virginia):capacitystatus:Used|instanceType:t3.micro|operatingSystem:Linux|preInstalledSw:NA|tenancy:Shared": {
       "price": 0.023,
-      "timestamp": 1779133647852
+      "timestamp": 1780084662512
     },
     "AWSLambda:US East (N. Virginia):group:AWS-Lambda-Requests": {
       "price": 0.023,
-      "timestamp": 1779133647863
+      "timestamp": 1780084662521
     },
     "AWSLambda:US East (N. Virginia):group:AWS-Lambda-Duration": {
       "price": 0.023,
-      "timestamp": 1779133647863
+      "timestamp": 1780084662522
     },
     "AmazonS3:EU (Frankfurt):storageClass:General Purpose|volumeType:Standard": {
       "price": 0.023,
-      "timestamp": 1779133656295
+      "timestamp": 1780084671568
     },
     "AmazonS3:invalid-region-123:storageClass:General Purpose|volumeType:Standard": {
       "price": 0.023,
-      "timestamp": 1779133656347
+      "timestamp": 1780084671610
     }
   }
 }

package/README.md

@@ -522,59 +522,109 @@ Environment variables for GitHub integration:
 
 ## Supported Resource Types
 
-### Core Resources (Phase 1 & 2)
+See [docs/CALCULATORS.md](docs/CALCULATORS.md) for the full per-resource reference, including pricing model, default assumptions, and configuration options.
 
-- **AWS::EC2::Instance** - EC2 instances with on-demand pricing
-- **AWS::S3::Bucket** - S3 buckets with storage and request costs
-- **AWS::Lambda::Function** - Lambda functions with invocation and duration costs
-- **AWS::RDS::DBInstance** - RDS database instances
-- **AWS::DynamoDB::Table** - DynamoDB tables with provisioned or on-demand billing
-- **AWS::ECS::Service** - ECS services with Fargate or EC2 launch types
-- **AWS::ApiGateway::RestApi** - API Gateway REST APIs
-- **AWS::ApiGatewayV2::Api** - API Gateway HTTP and WebSocket APIs
+### Compute
 
-### Networking Resources (Phase 3 - Current)
+- **AWS::EC2::Instance** - On-demand pricing, configurable hours per month
+- **AWS::AutoScaling::AutoScalingGroup** - Sums underlying EC2 cost
+- **AWS::EC2::LaunchTemplate** - Linked to ASG cost
+- **AWS::EKS::Cluster** - Control plane + node group cost
+- **AWS::Lambda::Function** - Invocation and duration costs
+- **AWS::Batch::JobDefinition** / **AWS::Batch::ComputeEnvironment** - Fargate vCPU/memory (EC2-backed delegates to EC2 pricing)
+- **AWS::AppRunner::Service** - vCPU, memory, request costs *(AWS App Runner is in maintenance mode as of 2026; consider migrating to ECS Express Mode)*
 
-- **AWS::EC2::NatGateway** - NAT Gateways with hourly and data processing costs
-- **AWS::ElasticLoadBalancingV2::LoadBalancer** - Application and Network Load Balancers with LCU costs
-- **AWS::EC2::VPCEndpoint** - VPC Endpoints (interface and gateway types)
+### Containers
 
-### Content Delivery & Caching (Phase 3 - Current)
+- **AWS::ECS::Service** - Fargate or EC2 launch types
+- **AWS::ECS::TaskDefinition** - Fargate task sizing
 
-- **AWS::CloudFront::Distribution** - CloudFront distributions with data transfer and request costs
+### Storage
+
+- **AWS::S3::Bucket** - Storage and request costs
+- **AWS::EFS::FileSystem** - Storage with Infrequent Access tier
+- **AWS::FSx::FileSystem** - Windows, Lustre, ONTAP, OpenZFS
+
+### Database
+
+- **AWS::RDS::DBInstance** - Instance + storage
+- **AWS::RDS::DBCluster** (Aurora Serverless v2) - ACU-based pricing
+- **AWS::DynamoDB::Table** - Provisioned or on-demand billing
+- **AWS::DocDB::DBCluster** / **AWS::DocDB::DBInstance** - DocumentDB clusters and instances
+- **AWS::Neptune::DBCluster** / **AWS::Neptune::DBInstance** - Neptune graph database
+
+### Networking
+
+- **AWS::EC2::NatGateway** - Hourly + data processing
+- **AWS::ElasticLoadBalancingV2::LoadBalancer** - ALB and NLB with LCU costs
+- **AWS::EC2::VPCEndpoint** - Interface and gateway endpoints
+- **AWS::EC2::TransitGateway** - Attachments + data processed
+- **AWS::Route53::HostedZone** - Hosted zone + query costs
+
+### Content Delivery & Caching
+
+- **AWS::CloudFront::Distribution** - Data transfer + requests
+- **AWS::ElastiCache::CacheCluster** / **AWS::ElastiCache::ReplicationGroup** - Node hours
+
+### API Gateway & Serverless
+
+- **AWS::ApiGateway::RestApi** - REST API requests
+- **AWS::ApiGatewayV2::Api** - HTTP and WebSocket APIs
+- **AWS::StepFunctions::StateMachine** - Standard and Express workflows
+
+### Messaging & Streaming
+
+- **AWS::SNS::Topic** - Publish + delivery costs by protocol
+- **AWS::SQS::Queue** - Standard and FIFO request costs
+- **AWS::Kinesis::Stream** / **AWS::KinesisFirehose::DeliveryStream** / **AWS::KinesisAnalyticsV2::Application** - Shards, ingestion, KPUs
+
+### Analytics
+
+- **AWS::Glue::Job** / **AWS::Glue::Crawler** - DPU-hour pricing, DPUs derived from WorkerType/NumberOfWorkers/MaxCapacity
+- **AWS::Athena::WorkGroup** - Per-TB scanned pricing
+- **AWS::Athena::NamedQuery** - Zero cost (charged at query execution time)
+
+### Security
+
+- **AWS::SecretsManager::Secret** - Secret storage + API call costs
+- **AWS::WAFv2::WebACL** - Fixed ACL + per-rule + request costs
+
+### Machine Learning
+
+- **AWS::SageMaker::Endpoint** - Instance-hour estimate (low confidence; instance type is on linked EndpointConfig)
+- **AWS::SageMaker::NotebookInstance** - Instance-hour pricing
+
+### Monitoring
+
+- **AWS::Logs::LogGroup** - Log ingestion
+- **AWS::CloudWatch::Alarm** - Per-alarm cost
+- **AWS::CloudWatch::Dashboard** - Per-dashboard cost
 
 ### Coming Soon
 
-- ElastiCache clusters
-- EKS clusters
-- And more...
+- **AWS::ECS::Service** with Express Mode (AppRunner replacement)
+- And more — track planned support via [open issues](https://github.com/buildinginthecloud/cdk-cost-analyzer/issues)
 
 ## Cost Calculation Assumptions
 
-For resources with usage-based pricing, the following default assumptions are used:
-
-### Phase 1 Resources
-- **S3 Buckets**: 100 GB standard storage, 10,000 GET requests/month
-- **Lambda Functions**: 1 million invocations/month, average 1-second duration
-- **RDS Instances**: 100 GB storage, single-AZ deployment
-- **EC2 Instances**: 730 hours/month (full month), on-demand pricing
-
-### Phase 2 Resources
-- **DynamoDB Tables (Provisioned)**: 5 read capacity units, 5 write capacity units
-- **DynamoDB Tables (On-Demand)**: 10M read requests, 1M write requests per month (configurable)
-- **ECS Services (Fargate)**: 0.25 vCPU, 0.5 GB memory per task
-- **API Gateway (REST)**: 1M requests per month
-- **API Gateway (HTTP)**: 1M requests per month
-- **API Gateway (WebSocket)**: 1M messages, 100K connection minutes per month
-
-### Phase 3 Resources
-- **NAT Gateway**: 500 GB data processed per month
-- **Application Load Balancer**: 50 new connections/sec, 5,000 active connections/min, 1,000 GB processed
-- **Network Load Balancer**: 100 new connections/sec, 10,000 active connections/min, 1,000 GB processed
-- **VPC Endpoint (Interface)**: 100 GB data processed per month
-- **CloudFront Distribution**: 100 GB data transfer out, 1M HTTP/HTTPS requests per month
-
-These assumptions are documented in cost reports and can be customized via configuration file or by extending the calculator classes.
+For resources with usage-based pricing, default assumptions are applied. Each resource section in [docs/CALCULATORS.md](docs/CALCULATORS.md) lists the defaults and how to override them via the `usageAssumptions` block in your configuration file.
+
+A small sample:
+
+- **EC2 Instance**: 730 hours/month, on-demand Linux pricing
+- **Lambda**: 1M invocations/month, 1-second average duration
+- **S3 Bucket**: 100 GB standard storage, 10,000 GET requests/month
+- **NAT Gateway**: 500 GB data processed/month
+- **CloudFront**: 100 GB data transfer, 1M requests/month
+- **Glue Job/Crawler**: DPUs from template, 50 hours/month runtime
+- **Batch (Fargate)**: 1 vCPU peak (or `MaxvCpus` from template), 100 hours/month
+- **App Runner**: 1 vCPU, 2 GB memory, 1M requests/month, 730 hours/month
+- **Athena WorkGroup**: 1 TB scanned/month
+- **WAF Web ACL**: 1M requests/month
+- **FSx**: storage from template (default 32 GB)
+- **DocumentDB / Neptune Instance**: 730 hours/month, 100 GB storage
+
+Override any of these in your config file (see [Configuration](#configuration)) or set them per-resource via `cdk-cost-analyzer.yml`.
 
 ## Report Formats
 

package/dist/action/136.index.js

@@ -328,7 +328,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.8";
+var version = "3.997.12";
 var packageInfo = {
 	version: version};
 

package/dist/action/443.index.js

@@ -85,7 +85,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.8";
+var version = "3.997.12";
 var packageInfo = {
 	version: version};
 

package/dist/action/605.index.js

@@ -107,11 +107,9 @@ Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
     }
     const url = new URL(host);
     (0, checkUrl_1.checkUrl)(url, options.logger);
-    const requestHandler = node_http_handler_1.NodeHttpHandler.create({
-        requestTimeout: options.timeout ?? 1000,
-        connectionTimeout: options.timeout ?? 1000,
-    });
-    return (0, retry_wrapper_1.retryWrapper)(async () => {
+    const requestHandler = node_http_handler_1.NodeHttpHandler.create({ connectionTimeout: options.timeout ?? 1000 });
+    const requestTimeout = options.timeout ?? 1000;
+    const provider = (0, retry_wrapper_1.retryWrapper)(async () => {
         const request = (0, requestHelpers_1.createGetRequest)(url);
         if (token) {
             request.headers.Authorization = token;
@@ -120,13 +118,21 @@ Set AWS_CONTAINER_CREDENTIALS_FULL_URI or AWS_CONTAINER_CREDENTIALS_RELATIVE_URI
             request.headers.Authorization = (await promises_1.default.readFile(tokenFile)).toString();
         }
         try {
-            const result = await requestHandler.handle(request);
+            const result = await requestHandler.handle(request, { requestTimeout });
             return (0, requestHelpers_1.getCredentials)(result.response).then((creds) => (0, client_1.setCredentialFeature)(creds, "CREDENTIALS_HTTP", "z"));
         }
         catch (e) {
             throw new config_1.CredentialsProviderError(String(e), { logger: options.logger });
         }
     }, options.maxRetries ?? 3, options.timeout ?? 1000);
+    return async () => {
+        try {
+            return await provider();
+        }
+        finally {
+            requestHandler.destroy?.();
+        }
+    };
 };
 exports.fromHttp = fromHttp;
 

package/dist/action/762.index.js

@@ -85,7 +85,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.8";
+var version = "3.997.12";
 var packageInfo = {
 	version: version};
 

package/dist/action/998.index.js

@@ -298,7 +298,7 @@ const commonParams = {
     UseDualStack: { type: "builtInParams", name: "useDualstackEndpoint" },
 };
 
-var version = "3.997.8";
+var version = "3.997.12";
 var packageInfo = {
 	version: version};
 

package/dist/action/config/types.d.ts

@@ -188,6 +188,80 @@ export interface UsageAssumptionsConfig {
         /** Number of Kinesis Processing Units for Analytics (default: 2) */
         kpus?: number;
     };
+    /**
+     * WAF (Web Application Firewall) usage assumptions.
+     * @see https://aws.amazon.com/waf/pricing/
+     */
+    waf?: {
+        /** Monthly request count (default: 1,000,000) */
+        requestsPerMonth?: number;
+    };
+    /**
+     * AWS Glue usage assumptions for ETL jobs and crawlers.
+     * @see https://aws.amazon.com/glue/pricing/
+     */
+    glue?: {
+        /** Hours per month the job/crawler runs; DPUs are read from the template (default: 50) */
+        hoursPerMonth?: number;
+    };
+    /**
+     * Amazon Athena usage assumptions.
+     * @see https://aws.amazon.com/athena/pricing/
+     */
+    athena?: {
+        /** TB of data scanned per month (default: 1) */
+        tbScannedPerMonth?: number;
+    };
+    /**
+     * Amazon FSx usage assumptions for file storage cost estimation.
+     * @see https://aws.amazon.com/fsx/pricing/
+     */
+    fsx?: {
+        /** Storage capacity override in GB (default: read from resource or 32 GB) */
+        storageGB?: number;
+    };
+    /**
+     * Amazon DocumentDB usage assumptions.
+     * @see https://aws.amazon.com/documentdb/pricing/
+     */
+    documentdb?: {
+        /** Storage size in GB (default: 100 GB) */
+        storageGB?: number;
+    };
+    /**
+     * Amazon Neptune usage assumptions.
+     * @see https://aws.amazon.com/neptune/pricing/
+     */
+    neptune?: {
+        /** Storage size in GB (default: 100 GB) */
+        storageGB?: number;
+    };
+    /**
+     * Amazon SageMaker usage assumptions.
+     * @see https://aws.amazon.com/sagemaker/pricing/
+     */
+    sagemaker?: {
+        /** Hours per month the instance runs (default: 730) */
+        hoursPerMonth?: number;
+    };
+    /**
+     * AWS App Runner usage assumptions.
+     * @see https://aws.amazon.com/apprunner/pricing/
+     */
+    appRunner?: {
+        /** Monthly request count (default: 1,000,000) */
+        requestsPerMonth?: number;
+        /** Hours per month the service runs (default: 730) */
+        hoursPerMonth?: number;
+    };
+    /**
+     * AWS Batch usage assumptions.
+     * @see https://aws.amazon.com/batch/pricing/
+     */
+    batch?: {
+        /** Hours per month the compute environment runs (default: 100) */
+        hoursPerMonth?: number;
+    };
 }
 export interface SynthesisConfig {
     appPath?: string;