@byaga/cdk-patterns 0.9.2 → 0.9.3

package/jest.config.js

@@ -0,0 +1,16 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  reporters: [
+    "default",
+    ["jest-junit", {
+      outputDirectory: './test-results/junit',
+      outputName: 'junit.xml',
+    }],
+    ["jest-html-reporters", {
+      publicPath: './test-results/html',
+      filename: 'index.html',
+      expand: true
+    }]
+  ]
+};

package/lib/methods/apply-honeycomb-to-lambda.js

@@ -8,7 +8,7 @@ function applyHoneycombToLambda(stack, props) {
     if (!honeyCombLayer)
         honeyCombLayer = aws_lambda_1.LayerVersion.fromLayerVersionArn(stack, stack.genId('hc-layer'), `arn:aws:lambda:${stack.region}:702835727665:layer:honeycomb-lambda-extension-x86_64-v11-1-1:1`);
     const layers = props.layers ? [...props.layers] : [];
-    const environment = props.environment || {};
+    const environment = { ...props.environment };
     const options = { parameterGroup: stack.project };
     layers.push(honeyCombLayer);
     environment.LIBHONEY_API_KEY = new SsmParameter_1.SsmParameter(stack, `/honeycomb/api-key`, options).stringValue;

package/lib/methods/apply-honeycomb-to-lambda.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/methods/apply-honeycomb-to-lambda.spec.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ts_mockito_1 = require("ts-mockito");
+const DeployStack_1 = require("../DeployStack");
+const aws_lambda_1 = require("aws-cdk-lib/aws-lambda");
+const apply_honeycomb_to_lambda_1 = require("./apply-honeycomb-to-lambda");
+let mockStack;
+let mockLayer;
+let fromLayerVersionArn;
+jest.mock('../SsmParameter', () => {
+    const { SsmParameter } = jest.requireActual('../SsmParameter');
+    class MockSsmParameter extends SsmParameter {
+        static mocks = {
+            stringValue: jest.fn()
+        };
+        get stringValue() {
+            return MockSsmParameter.mocks.stringValue();
+        }
+    }
+    MockSsmParameter.mocks.stringValue.mockReturnValue('test-value');
+    return { SsmParameter: MockSsmParameter };
+});
+const existingLayer = (0, ts_mockito_1.instance)((0, ts_mockito_1.mock)(aws_lambda_1.LayerVersion));
+const props = {
+    runtime: aws_lambda_1.Runtime.NODEJS_18_X,
+    handler: 'index.handler',
+    code: aws_lambda_1.Code.fromInline('exports.handler = function(event, ctx, cb) { return cb(null, "hi"); }'),
+    environment: { existingVar: 'existingValue' },
+    layers: [existingLayer]
+};
+// Mock the wrapper object instead of the LayerVersion class
+beforeEach(() => {
+    mockStack = (0, ts_mockito_1.mock)(DeployStack_1.DeployStack);
+    mockLayer = (0, ts_mockito_1.mock)(aws_lambda_1.LayerVersion);
+    fromLayerVersionArn = jest.spyOn(aws_lambda_1.LayerVersion, 'fromLayerVersionArn').mockReturnValue(mockLayer);
+});
+afterEach(() => {
+    fromLayerVersionArn.mockRestore();
+});
+it('should add honeycomb layer to function props', () => {
+    const result = (0, apply_honeycomb_to_lambda_1.applyHoneycombToLambda)((0, ts_mockito_1.instance)(mockStack), props);
+    expect(result.layers).toContain(mockLayer);
+});
+it('should add honeycomb environment variables to function props', () => {
+    const result = (0, apply_honeycomb_to_lambda_1.applyHoneycombToLambda)((0, ts_mockito_1.instance)(mockStack), props);
+    expect(result.environment).toEqual(expect.objectContaining({
+        LIBHONEY_API_KEY: 'test-value',
+        LIBHONEY_DATASET: 'test-value',
+        LOGS_API_DISABLE_PLATFORM_MSGS: 'true'
+    }));
+});
+it('should not overwrite existing layers in function props', () => {
+    const result = (0, apply_honeycomb_to_lambda_1.applyHoneycombToLambda)((0, ts_mockito_1.instance)(mockStack), props);
+    expect(result.layers).toContain(existingLayer);
+});
+it('should not overwrite existing environment variables in function props', () => {
+    const result = (0, apply_honeycomb_to_lambda_1.applyHoneycombToLambda)((0, ts_mockito_1.instance)(mockStack), props);
+    expect(result.environment).toEqual(expect.objectContaining({
+        existingVar: 'existingValue'
+    }));
+});

package/lib/methods/build-node-source.js

@@ -46,7 +46,7 @@ exports.defaultIgnore = {
             p.name !== 'package-lock.json';
     },
     childrenIncluded: (p) => {
-        return p.name === "node_modules";
+        return p.name !== "node_modules";
     }
 };
 function buildNodeSource(type, id, options = {}) {

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@byaga/cdk-patterns",
-  "version": "0.9.2",
+  "version": "0.9.3",
   "description": "Collection of common patterns used when making AWS CloudFormation templates using CDK",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
-    "build": "tsc"
+    "build": "tsc",
+    "test": "jest"
   },
   "keywords": [
     "CDK",
@@ -22,7 +23,12 @@
     "fs-extra": "^11.1.1"
   },
   "devDependencies": {
+    "@types/jest": "^29.5.11",
     "@types/node": "^20.8.10",
+    "jest-html-reporters": "^3.1.7",
+    "jest-junit": "^16.0.0",
+    "ts-jest": "^29.1.1",
+    "ts-mockito": "^2.6.1",
     "typescript": "^5.2.2"
   }
 }

package/test-results/html/index.html

@@ -0,0 +1 @@
+<!doctype html><html><head><meta charset="utf-8"><meta http-equiv="Content-Type" content="text/html;charset=utf-8"><meta name="keywords" contect="jest, reporters"><meta name="author" contect="hazyzh"><meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0,minimum-scale=1,maximum-scale=1"><link rel="shortcut icon" href="data:image/png;base64,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"></head><title>Report</title><body><div id="app"></div><script defer="defer" src="./jest-html-reporters-attach/index/index.js"></script></body></html>