Merge pull request #6 from fbuchlak/main

brefphp · Jun 29, 2023 · ab01888 · ab01888
2 parents b12804b + 4f5987e
commit ab01888
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/src/layers.ts b/src/layers.ts
@@ -12,7 +12,7 @@ export function functionLayer(
 
     return LayerVersion.fromLayerVersionArn(
         scope,
-        'BrefFunctionLayer',
+        'Bref001FunctionLayer',
         functionLayerArn(region, phpVersion, platform)
     );
 }
@@ -27,11 +27,11 @@ export function fpmLayer(
 
     return LayerVersion.fromLayerVersionArn(
         scope,
-        'BrefFpmLayer',
+        'Bref101FpmLayer',
         fpmLayerArn(region, phpVersion, platform)
     );
 }
 
 export function consoleLayer(scope: Construct, region: string): ILayerVersion {
-    return LayerVersion.fromLayerVersionArn(scope, 'BrefConsoleLayer', consoleLayerArn(region));
+    return LayerVersion.fromLayerVersionArn(scope, 'Bref201ConsoleLayer', consoleLayerArn(region));
 }
diff --git a/test/function/ConsoleFunction.test.ts b/test/function/ConsoleFunction.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 import { ConsoleFunction } from '../../src';
 import { compileTestStack } from '../helper';
+import { cx_api } from 'aws-cdk-lib';
 import { Architecture } from 'aws-cdk-lib/aws-lambda';
 import { mapValues } from 'lodash';
 
@@ -19,6 +20,20 @@ describe('ConsoleFunction', () => {
         expect(layers[1]).to.match(/arn:aws:lambda:us-east-1:534081306603:layer:console:\d+/);
     });
 
+    it('adds the console layer with recognizeLayerVersion flag', () => {
+        const template = compileTestStack((stack) => {
+            new ConsoleFunction(stack, 'Console', {
+                handler: 'index.php',
+            });
+        }, { context: { [cx_api.LAMBDA_RECOGNIZE_LAYER_VERSION]: true } });
+
+        const consoleFunction = template.findResources('AWS::Lambda::Function');
+        const layers = consoleFunction.Console63CA37A7.Properties.Layers;
+        expect(layers).length(2);
+        expect(layers[0]).to.match(/arn:aws:lambda:us-east-1:534081306603:layer:php-81:\d+/);
+        expect(layers[1]).to.match(/arn:aws:lambda:us-east-1:534081306603:layer:console:\d+/);
+    });
+
     it('supports ARM', () => {
         const template = compileTestStack((stack) => {
             new ConsoleFunction(stack, 'Console', {

diff --git a/test/helper.ts b/test/helper.ts
@@ -1,9 +1,10 @@
-import { Stack } from 'aws-cdk-lib';
+import { App, AppProps, Stack } from 'aws-cdk-lib';
 import { Template } from 'aws-cdk-lib/assertions';
 import { mapValues } from 'lodash';
 
-export function compileTestStack(definition: (stack: Stack) => void): Template {
-    const stack = new Stack(undefined, 'app', {
+export function compileTestStack(definition: (stack: Stack) => void, appProps: AppProps = undefined): Template {
+    const app = new App(appProps);
+    const stack = new Stack(app, 'app', {
         env: { region: 'us-east-1' },
     });
     definition(stack);