Fixes

Author: mnapoli

src/function/PhpFpmFunction.ts

@@ -1,7 +1,7 @@
 import { Function, FunctionProps, Runtime } from 'aws-cdk-lib/aws-lambda';
 import { Duration, Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import { functionDefaults, vpcDefaults } from './defaults';
+import { functionDefaults } from './defaults';
 import { phpLayer } from '../layers';
 import { packagePhpCode } from '../package';
 
@@ -26,7 +26,6 @@ export class PhpFpmFunction extends Function {
 
         super(scope, id, {
             ...defaults,
-            ...vpcDefaults(props.vpc),
             // Provided props override defaults
             ...props,
             // But we force the layers to an empty array because we define them below

src/function/PhpFunction.ts

@@ -1,16 +1,13 @@
 import { Function, FunctionProps, Runtime } from 'aws-cdk-lib/aws-lambda';
 import { Duration, Stack } from 'aws-cdk-lib';
 import { Construct } from 'constructs';
-import { functionDefaults, vpcDefaults } from './defaults';
+import { functionDefaults } from './defaults';
 import { phpLayer } from '../layers';
 import { packagePhpCode } from '../package';
-import { IVpc } from 'aws-cdk-lib/aws-ec2';
-import { VpcForServerlessApp } from '../vpc/VpcForServerlessApp';
 
 export type PhpFunctionProps = Partial<FunctionProps> & {
     phpVersion?: '8.2' | '8.3' | '8.4' | '8.5';
     handler: string;
-    vpc?: IVpc | VpcForServerlessApp;
 };
 
 export class PhpFunction extends Function {
@@ -27,7 +24,6 @@ export class PhpFunction extends Function {
 
         super(scope, id, {
             ...defaults,
-            ...vpcDefaults(props.vpc),
             // Provided props override defaults
             ...props,
             // But we force the layers to an empty array because we define them below

src/function/defaults.ts

@@ -1,5 +1,3 @@
-import { IVpc, SecurityGroup, SubnetSelection, SubnetType } from 'aws-cdk-lib/aws-ec2';
-import { VpcForServerlessApp } from '../vpc/VpcForServerlessApp';
 import { Architecture } from 'aws-cdk-lib/aws-lambda';
 
 export const functionDefaults = {
@@ -9,23 +7,3 @@ export const functionDefaults = {
     architecture: Architecture.X86_64,
     excludedPhpPaths: ['.git', '.idea', 'cdk.out', 'node_modules', '.bref', '.serverless', 'tests'],
 } as const;
-
-export function vpcDefaults(vpc?: IVpc):
-    | Record<string, never>
-    | {
-          vpc: IVpc;
-          securityGroups: SecurityGroup[];
-          vpcSubnets: SubnetSelection;
-      } {
-    if (vpc instanceof VpcForServerlessApp) {
-        // Automatically set the security group and subnets
-        return {
-            vpc: vpc,
-            securityGroups: [vpc.appSecurityGroup],
-            vpcSubnets: {
-                subnetType: SubnetType.PRIVATE_WITH_EGRESS,
-            },
-        };
-    }
-    return {};
-}