Fix sam build issue

fourTheorem · Feb 21, 2023 · a6bc083 · a6bc083
1 parent 1e4c860
commit a6bc083
Show file tree

Hide file tree

Showing 9 changed files with 196 additions and 202 deletions.
diff --git a/cf-macro/index.ts b/cf-macro/index.ts
@@ -3,7 +3,7 @@
 import _ from 'lodash'
 import Ajv from 'ajv'
 
-import alarms from 'slic-watch-core/alarms/alarms'
+import alarms from '../core/alarms/alarms'
 import dashboard from 'slic-watch-core/dashboards/dashboard'
 import CloudFormationTemplate from 'slic-watch-core/cf-template'
 import defaultConfig from 'slic-watch-core/inputs/default-config'

diff --git a/cf-macro/package.json b/cf-macro/package.json
@@ -11,7 +11,8 @@
     "version": "2.1.2",
     "private": true,
     "scripts": {
-        "test": "tap --coverage-report=html --no-browser --no-check-coverage tests/**/*.test.ts"
+        "test": "tap --coverage-report=html --no-browser --no-check-coverage tests/**/*.test.ts",
+        "build": "esbuild ./index.ts --outfile=dist/index.js --platform=node --format=esm --packages=external --bundle --sourcemap"
     },
     "tap": {
         "node-arg": [
@@ -22,6 +23,7 @@
         ]
     },
     "devDependencies": {
+        "esbuild": "^0.17.10",
         "esmock": "^2.1.0",
         "ts-node": "^10.9.1"
     },

diff --git a/cf-macro/template.yaml b/cf-macro/template.yaml
@@ -21,18 +21,10 @@ Resources:
   MacroLambdaFunction:
     Type: AWS::Serverless::Function
     Properties:
-      Handler: cf-macro/index.handler
+      Handler: dist/index.handler
       Runtime: nodejs16.x
       Timeout: 60
       Architectures:
         - x86_64
       Policies:
         - AWSLambdaBasicExecutionRole
-    Metadata:
-      BuildMethod: esbuild
-      BuildProperties:
-        Minify: false
-        Target: es2020
-        Sourcemap: true
-        EntryPoints: 
-          - cf-macro/index.ts
diff --git a/core/alarms/lambda.ts b/core/alarms/lambda.ts
@@ -210,7 +210,7 @@ export default function LambdaAlarms (functionAlarmPropertiess: FunctionAlarmPro
       funcName: { Ref: funcLogicalId },
       ComparisonOperator: config.ComparisonOperator,
       Threshold: threshold,
-      Metrics:metrics, 
+      Metrics: metrics, 
       ExtendedStatistic:  config.ExtendedStatistic,
       EvaluationPeriods:  config.EvaluationPeriods,
       TreatMissingData:  config.TreatMissingData,