@aetherionfw/infra 1.0.0 → 1.1.0

package/dist/builder/FrameworkStack.d.ts

@@ -1,5 +1,20 @@
 import { Construct } from 'constructs';
 import { TerraformStack } from 'cdktf';
 export declare class FrameworkStack extends TerraformStack {
+    /** All created Lambda functions indexed by their function name */
+    private lambdaFunctions;
+    /** All created Cognito User Pools indexed by their props.name */
+    private cognitoPools;
     constructor(scope: Construct, id: string);
+    private buildRestApiGateway;
+    private buildHttpApiGateway;
+    private wireRestApiRoute;
+    private wireHttpApiRoute;
+    /**
+     * Parses a path like `/users/{id}/orders` and creates intermediate
+     * API Gateway resources, reusing already-created segments.
+     */
+    private getOrCreateRestResource;
+    private getOrCreateAuthorizer;
+    private createCorsOptionsMethod;
 }

package/dist/builder/FrameworkStack.js

@@ -16,15 +16,36 @@ const iam_role_policy_1 = require("@cdktf/provider-aws/lib/iam-role-policy");
 const db_instance_1 = require("@cdktf/provider-aws/lib/db-instance");
 const lambda_function_1 = require("@cdktf/provider-aws/lib/lambda-function");
 const lambda_event_source_mapping_1 = require("@cdktf/provider-aws/lib/lambda-event-source-mapping");
+const lambda_permission_1 = require("@cdktf/provider-aws/lib/lambda-permission");
+const api_gateway_rest_api_1 = require("@cdktf/provider-aws/lib/api-gateway-rest-api");
+const api_gateway_resource_1 = require("@cdktf/provider-aws/lib/api-gateway-resource");
+const api_gateway_method_1 = require("@cdktf/provider-aws/lib/api-gateway-method");
+const api_gateway_integration_1 = require("@cdktf/provider-aws/lib/api-gateway-integration");
+const api_gateway_deployment_1 = require("@cdktf/provider-aws/lib/api-gateway-deployment");
+const api_gateway_stage_1 = require("@cdktf/provider-aws/lib/api-gateway-stage");
+const api_gateway_authorizer_1 = require("@cdktf/provider-aws/lib/api-gateway-authorizer");
+const api_gateway_method_response_1 = require("@cdktf/provider-aws/lib/api-gateway-method-response");
+const api_gateway_integration_response_1 = require("@cdktf/provider-aws/lib/api-gateway-integration-response");
+const apigatewayv2_api_1 = require("@cdktf/provider-aws/lib/apigatewayv2-api");
+const apigatewayv2_integration_1 = require("@cdktf/provider-aws/lib/apigatewayv2-integration");
+const apigatewayv2_route_1 = require("@cdktf/provider-aws/lib/apigatewayv2-route");
+const apigatewayv2_stage_1 = require("@cdktf/provider-aws/lib/apigatewayv2-stage");
 const core_1 = require("@aetherionfw/core");
 class FrameworkStack extends cdktf_1.TerraformStack {
+    /** All created Lambda functions indexed by their function name */
+    lambdaFunctions = new Map();
+    /** All created Cognito User Pools indexed by their props.name */
+    cognitoPools = new Map();
     constructor(scope, id) {
         super(scope, id);
         new provider_1.AwsProvider(this, 'AWS', {
             region: 'us-east-1',
         });
         const registry = core_1.MetadataRegistry.getInstance();
+        // ────────────────────────────────────────────
         // 1. Build Infra Resources
+        // ────────────────────────────────────────────
+        const apiGatewayConfigs = new Map();
         const infraClasses = registry.getInfraClasses();
         for (const target of infraClasses) {
             const resources = registry.getInfraResources(target);
@@ -34,7 +55,6 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                     case 'S3Bucket':
                         new s3_bucket_1.S3Bucket(this, res.name, {
                             bucket: res.props.name,
-                            // Minimal abstracted configuration mapped to raw CDKTF
                         });
                         break;
                     case 'DynamoTable':
@@ -64,7 +84,6 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                         });
                         break;
                     case 'CloudFrontDistribution':
-                        // Simplified mapping for a highly complex resource
                         new cloudfront_distribution_1.CloudfrontDistribution(this, res.name, {
                             enabled: true,
                             origin: [{
@@ -83,11 +102,13 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                             restrictions: { geoRestriction: { restrictionType: 'none' } },
                         });
                         break;
-                    case 'CognitoUserPool':
-                        new cognito_user_pool_1.CognitoUserPool(this, res.name, {
+                    case 'CognitoUserPool': {
+                        const pool = new cognito_user_pool_1.CognitoUserPool(this, res.name, {
                             name: res.props.name,
                         });
+                        this.cognitoPools.set(res.props.name, pool);
                         break;
+                    }
                     case 'Vpc':
                         new vpc_1.Vpc(this, res.name, {
                             cidrBlock: res.props.cidr,
@@ -99,7 +120,7 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                     case 'IamRole':
                         new iam_role_1.IamRole(this, res.name, {
                             name: res.props.name,
-                            assumeRolePolicy: res.props.assumedBy, // Assume this is a JSON string passed in
+                            assumeRolePolicy: res.props.assumedBy,
                         });
                         break;
                     case 'RdsInstance':
@@ -107,23 +128,27 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                             engine: res.props.engine,
                             instanceClass: res.props.size,
                             dbName: res.props.dbName,
-                            skipFinalSnapshot: true, // safe default for dev frameworks
+                            skipFinalSnapshot: true,
                         });
                         break;
+                    case 'ApiGateway':
+                        // Collect for later processing (after Lambdas are created)
+                        apiGatewayConfigs.set(res.props.name, { infraResource: res, props: res.props });
+                        break;
                     default:
                         console.warn(`Unknown infra resource type: ${res.type}`);
                 }
             }
         }
+        // ────────────────────────────────────────────
         // 2. Build Lambdas and IAM Policies (1:1 Lambda per Handle Architecture)
+        // ────────────────────────────────────────────
         const controllers = registry.getControllers();
         for (const [target, controllerMeta] of controllers) {
             const handles = registry.getHandles(target);
             const iamPermissions = registry.getIamPermissions(target);
-            const routes = registry.getRoutes(target);
             const sqsTriggers = registry.getSqsTriggers(target);
             if (handles.length === 0) {
-                // Fallback or skip if no methods are decorated with @Handle
                 continue;
             }
             for (const handle of handles) {
@@ -145,7 +170,6 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                 // 2b. Attach IAM Policies (Method overrides Class)
                 let handlePerms = iamPermissions.find(p => p.methodName === methodName);
                 if (!handlePerms) {
-                    // Fallback to class-level permissions
                     handlePerms = iamPermissions.find(p => !p.methodName);
                 }
                 if (handlePerms) {
@@ -178,26 +202,344 @@ class FrameworkStack extends cdktf_1.TerraformStack {
                     memorySize: handle.memorySize || controllerMeta.memorySize || 128,
                     timeout: handle.timeout || controllerMeta.timeout || 3,
                     role: role.arn,
-                    filename: 'dummy.zip', // CDKTF requires a deployment package
+                    filename: 'dummy.zip',
                     handler: 'index.handler',
                     environment: {
                         variables: {
-                            AETHERION_TARGET_CLASS: controllerMeta.lambdaName, // Storing for debug
+                            AETHERION_TARGET_CLASS: controllerMeta.lambdaName,
                             AETHERION_TARGET_METHOD: methodName,
                         }
                     }
                 });
+                this.lambdaFunctions.set(lambdaName, lambdaFunction);
                 // 2d. Check for SQS Triggers targeting this handle
                 const handleTriggers = sqsTriggers.filter(t => t.methodName === methodName);
                 for (const trigger of handleTriggers) {
                     console.log(`Linking SQS Trigger ${trigger.queueName} to ${lambdaName}`);
                     new lambda_event_source_mapping_1.LambdaEventSourceMapping(this, `${lambdaName}-${trigger.queueName}-mapping`, {
                         functionName: lambdaFunction.arn,
-                        eventSourceArn: `arn:aws:sqs:us-east-1:123456789012:${trigger.queueName}`, // mock
+                        eventSourceArn: `arn:aws:sqs:us-east-1:123456789012:${trigger.queueName}`,
                     });
                 }
             }
         }
+        // ────────────────────────────────────────────
+        // 3. Build API Gateways and wire Routes
+        // ────────────────────────────────────────────
+        const apiRefs = new Map();
+        // 3a. Create or import each API Gateway
+        for (const [apiName, config] of apiGatewayConfigs) {
+            const props = config.props;
+            console.log(`Building API Gateway: ${apiName} (${props.type})`);
+            if (props.type === 'REST') {
+                this.buildRestApiGateway(apiName, props, apiRefs);
+            }
+            else {
+                this.buildHttpApiGateway(apiName, props, apiRefs);
+            }
+        }
+        // 3b. Wire controllers to their API Gateways
+        for (const [target, controllerMeta] of controllers) {
+            if (!controllerMeta.apiGateway)
+                continue;
+            const apiRef = apiRefs.get(controllerMeta.apiGateway);
+            if (!apiRef) {
+                console.warn(`API Gateway "${controllerMeta.apiGateway}" not found for controller "${controllerMeta.lambdaName}"`);
+                continue;
+            }
+            const routes = registry.getRoutes(target);
+            const handles = registry.getHandles(target);
+            for (const route of routes) {
+                // Find the matching handle for this route to get the lambda name
+                const handle = handles.find(h => h.methodName === route.methodName);
+                if (!handle)
+                    continue;
+                const lambdaName = `${controllerMeta.lambdaName}-${route.methodName}`;
+                const lambdaFn = this.lambdaFunctions.get(lambdaName);
+                if (!lambdaFn)
+                    continue;
+                console.log(`Wiring ${route.method} ${route.path} → ${lambdaName}`);
+                if (apiRef.metadata.type === 'REST') {
+                    this.wireRestApiRoute(apiRef, route, lambdaFn, lambdaName);
+                }
+                else {
+                    this.wireHttpApiRoute(apiRef, route, lambdaFn, lambdaName);
+                }
+            }
+        }
+        // 3c. Create Deployments and Stages
+        for (const [apiName, apiRef] of apiRefs) {
+            const stageName = apiRef.metadata.stageName || 'dev';
+            if (apiRef.metadata.type === 'REST' && apiRef.restApi && !apiRef.metadata.existingApiId) {
+                const deployment = new api_gateway_deployment_1.ApiGatewayDeployment(this, `${apiName}-deployment`, {
+                    restApiId: apiRef.restApi.id,
+                    lifecycle: {
+                        createBeforeDestroy: true,
+                    },
+                });
+                new api_gateway_stage_1.ApiGatewayStage(this, `${apiName}-stage`, {
+                    restApiId: apiRef.restApi.id,
+                    deploymentId: deployment.id,
+                    stageName,
+                });
+                console.log(`Created REST API deployment: ${apiName} → stage "${stageName}"`);
+            }
+            else if (apiRef.metadata.type === 'HTTP' && apiRef.httpApi) {
+                new apigatewayv2_stage_1.Apigatewayv2Stage(this, `${apiName}-stage`, {
+                    apiId: apiRef.httpApi.id,
+                    name: stageName,
+                    autoDeploy: true,
+                });
+                console.log(`Created HTTP API stage: ${apiName} → "${stageName}"`);
+            }
+        }
+    }
+    // ────────────────────────────────────────────
+    // REST API Gateway Builder
+    // ────────────────────────────────────────────
+    buildRestApiGateway(apiName, props, apiRefs) {
+        if (props.existingApiId) {
+            // Import existing REST API
+            console.log(`Importing existing REST API: ${props.existingApiId}`);
+            apiRefs.set(apiName, {
+                metadata: props,
+                rootResourceId: props.existingRootResourceId || '',
+                resourceMap: new Map(),
+                authorizerMap: new Map(),
+                methodIds: [],
+            });
+        }
+        else {
+            // Create new REST API
+            const restApi = new api_gateway_rest_api_1.ApiGatewayRestApi(this, apiName, {
+                name: props.name,
+                description: props.description || `API Gateway for ${props.name}`,
+            });
+            apiRefs.set(apiName, {
+                metadata: props,
+                restApi,
+                rootResourceId: restApi.rootResourceId,
+                resourceMap: new Map(),
+                authorizerMap: new Map(),
+                methodIds: [],
+            });
+        }
+    }
+    // ────────────────────────────────────────────
+    // HTTP API Gateway Builder
+    // ────────────────────────────────────────────
+    buildHttpApiGateway(apiName, props, apiRefs) {
+        if (props.existingApiId) {
+            console.log(`Importing existing HTTP API: ${props.existingApiId}`);
+            apiRefs.set(apiName, {
+                metadata: props,
+                rootResourceId: '',
+                resourceMap: new Map(),
+                authorizerMap: new Map(),
+                methodIds: [],
+            });
+        }
+        else {
+            const corsConfig = props.corsEnabled !== false ? {
+                allowOrigins: props.corsOrigins || ['*'],
+                allowMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'],
+                allowHeaders: ['Content-Type', 'Authorization', 'X-Amz-Date', 'X-Api-Key'],
+            } : undefined;
+            const httpApi = new apigatewayv2_api_1.Apigatewayv2Api(this, apiName, {
+                name: props.name,
+                protocolType: 'HTTP',
+                description: props.description || `HTTP API for ${props.name}`,
+                corsConfiguration: corsConfig,
+            });
+            apiRefs.set(apiName, {
+                metadata: props,
+                httpApi,
+                rootResourceId: '',
+                resourceMap: new Map(),
+                authorizerMap: new Map(),
+                methodIds: [],
+            });
+        }
+    }
+    // ────────────────────────────────────────────
+    // REST API Route Wiring
+    // ────────────────────────────────────────────
+    wireRestApiRoute(apiRef, route, lambdaFn, lambdaName) {
+        const restApi = apiRef.restApi;
+        const restApiId = restApi ? restApi.id : apiRef.metadata.existingApiId;
+        // Build hierarchical resources for the path
+        const resourceId = this.getOrCreateRestResource(apiRef, route.path, restApiId);
+        // Determine authorization type
+        let authorizationType = 'NONE';
+        let authorizerId;
+        if (route.authorizer) {
+            const authorizer = this.getOrCreateAuthorizer(apiRef, route.authorizer, restApiId);
+            if (authorizer) {
+                authorizationType = 'COGNITO_USER_POOLS';
+                authorizerId = authorizer.id;
+            }
+        }
+        const methodId = `${lambdaName}-${route.method}`;
+        // Create Method
+        const method = new api_gateway_method_1.ApiGatewayMethod(this, methodId, {
+            restApiId,
+            resourceId,
+            httpMethod: route.method.toUpperCase(),
+            authorization: authorizationType,
+            authorizerId,
+        });
+        apiRef.methodIds.push(methodId);
+        // Create Integration (AWS_PROXY)
+        new api_gateway_integration_1.ApiGatewayIntegration(this, `${methodId}-integration`, {
+            restApiId,
+            resourceId,
+            httpMethod: method.httpMethod,
+            type: 'AWS_PROXY',
+            integrationHttpMethod: 'POST',
+            uri: lambdaFn.invokeArn,
+        });
+        // Grant API Gateway permission to invoke Lambda
+        new lambda_permission_1.LambdaPermission(this, `${methodId}-permission`, {
+            statementId: `AllowAPIGateway-${methodId}`,
+            action: 'lambda:InvokeFunction',
+            functionName: lambdaFn.functionName,
+            principal: 'apigateway.amazonaws.com',
+        });
+        // CORS: Create OPTIONS method if CORS is enabled
+        if (apiRef.metadata.corsEnabled !== false) {
+            this.createCorsOptionsMethod(apiRef, route.path, restApiId, resourceId, lambdaName);
+        }
+    }
+    // ────────────────────────────────────────────
+    // HTTP API Route Wiring
+    // ────────────────────────────────────────────
+    wireHttpApiRoute(apiRef, route, lambdaFn, lambdaName) {
+        const httpApi = apiRef.httpApi;
+        const apiId = httpApi ? httpApi.id : apiRef.metadata.existingApiId;
+        const integrationId = `${lambdaName}-${route.method}-int`;
+        // Create Integration
+        const integration = new apigatewayv2_integration_1.Apigatewayv2Integration(this, integrationId, {
+            apiId,
+            integrationType: 'AWS_PROXY',
+            integrationUri: lambdaFn.invokeArn,
+            payloadFormatVersion: '2.0',
+        });
+        // Create Route
+        const routeKey = `${route.method.toUpperCase()} ${route.path}`;
+        new apigatewayv2_route_1.Apigatewayv2Route(this, `${lambdaName}-${route.method}-route`, {
+            apiId,
+            routeKey,
+            target: `integrations/${integration.id}`,
+        });
+        // Grant API Gateway permission to invoke Lambda
+        new lambda_permission_1.LambdaPermission(this, `${lambdaName}-${route.method}-permission`, {
+            statementId: `AllowHTTPAPI-${lambdaName}-${route.method}`,
+            action: 'lambda:InvokeFunction',
+            functionName: lambdaFn.functionName,
+            principal: 'apigateway.amazonaws.com',
+        });
+    }
+    // ────────────────────────────────────────────
+    // Hierarchical Resource Builder (REST API)
+    // ────────────────────────────────────────────
+    /**
+     * Parses a path like `/users/{id}/orders` and creates intermediate
+     * API Gateway resources, reusing already-created segments.
+     */
+    getOrCreateRestResource(apiRef, path, restApiId) {
+        if (path === '/')
+            return apiRef.rootResourceId;
+        const segments = path.split('/').filter(Boolean);
+        let currentParentId = apiRef.rootResourceId;
+        let currentPath = '';
+        for (const segment of segments) {
+            currentPath += `/${segment}`;
+            if (apiRef.resourceMap.has(currentPath)) {
+                currentParentId = apiRef.resourceMap.get(currentPath).id;
+                continue;
+            }
+            const resource = new api_gateway_resource_1.ApiGatewayResource(this, `resource-${currentPath.replace(/[/{}]/g, '-')}`, {
+                restApiId,
+                parentId: currentParentId,
+                pathPart: segment,
+            });
+            apiRef.resourceMap.set(currentPath, resource);
+            currentParentId = resource.id;
+        }
+        return currentParentId;
+    }
+    // ────────────────────────────────────────────
+    // Cognito Authorizer Builder (REST API)
+    // ────────────────────────────────────────────
+    getOrCreateAuthorizer(apiRef, authorizerName, restApiId) {
+        // Reuse existing authorizer if already created for this API
+        if (apiRef.authorizerMap.has(authorizerName)) {
+            return apiRef.authorizerMap.get(authorizerName);
+        }
+        // Look up the Cognito User Pool by name
+        const pool = this.cognitoPools.get(authorizerName);
+        if (!pool) {
+            console.warn(`Authorizer "${authorizerName}" references a Cognito User Pool that was not found in @Infra resources.`);
+            return undefined;
+        }
+        const authorizer = new api_gateway_authorizer_1.ApiGatewayAuthorizer(this, `${authorizerName}-authorizer`, {
+            name: `${authorizerName}-cognito-authorizer`,
+            restApiId,
+            type: 'COGNITO_USER_POOLS',
+            providerArns: [pool.arn],
+        });
+        apiRef.authorizerMap.set(authorizerName, authorizer);
+        return authorizer;
+    }
+    // ────────────────────────────────────────────
+    // CORS OPTIONS Method (REST API)
+    // ────────────────────────────────────────────
+    createCorsOptionsMethod(apiRef, path, restApiId, resourceId, lambdaName) {
+        const corsId = `${lambdaName}-OPTIONS-${path.replace(/[/{}]/g, '-')}`;
+        // Avoid duplicate OPTIONS methods on the same resource
+        if (apiRef.methodIds.includes(corsId))
+            return;
+        apiRef.methodIds.push(corsId);
+        const origins = apiRef.metadata.corsOrigins?.join(',') || '*';
+        const headers = 'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token';
+        const methods = 'GET,POST,PUT,PATCH,DELETE,OPTIONS';
+        const optionsMethod = new api_gateway_method_1.ApiGatewayMethod(this, corsId, {
+            restApiId,
+            resourceId,
+            httpMethod: 'OPTIONS',
+            authorization: 'NONE',
+        });
+        new api_gateway_integration_1.ApiGatewayIntegration(this, `${corsId}-integration`, {
+            restApiId,
+            resourceId,
+            httpMethod: optionsMethod.httpMethod,
+            type: 'MOCK',
+            requestTemplates: {
+                'application/json': '{"statusCode": 200}',
+            },
+        });
+        new api_gateway_method_response_1.ApiGatewayMethodResponse(this, `${corsId}-response`, {
+            restApiId,
+            resourceId,
+            httpMethod: optionsMethod.httpMethod,
+            statusCode: '200',
+            responseParameters: {
+                'method.response.header.Access-Control-Allow-Headers': true,
+                'method.response.header.Access-Control-Allow-Methods': true,
+                'method.response.header.Access-Control-Allow-Origin': true,
+            },
+        });
+        new api_gateway_integration_response_1.ApiGatewayIntegrationResponse(this, `${corsId}-int-response`, {
+            restApiId,
+            resourceId,
+            httpMethod: optionsMethod.httpMethod,
+            statusCode: '200',
+            responseParameters: {
+                'method.response.header.Access-Control-Allow-Headers': `'${headers}'`,
+                'method.response.header.Access-Control-Allow-Methods': `'${methods}'`,
+                'method.response.header.Access-Control-Allow-Origin': `'${origins}'`,
+            },
+        });
     }
 }
 exports.FrameworkStack = FrameworkStack;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@aetherionfw/infra",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "CDKTF Builder for Aetherion Framework",
   "main": "dist/main.js",
   "dependencies": {
     "cdktf": "^0.20.0",
     "constructs": "^10.3.0",
     "@cdktf/provider-aws": "^19.0.0",
-    "@aetherionfw/core": "1.0.0"
+    "@aetherionfw/core": "1.1.0"
   },
   "devDependencies": {
     "typescript": "^5.5.4"