Check Github Actions

fourTheorem · Mar 3, 2023 · 7faf642 · 7faf642
1 parent eb510d6
commit 7faf642
Show file tree

Hide file tree

Showing 8 changed files with 14,389 additions and 1,358 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,11 +31,11 @@ jobs:
           flag-name: run-node-${{ matrix.node-version }}
           parallel: true
           path-to-lcov: coverage/lcov.info
-      - name: Package test project with Serverless v2
-        working-directory: ./serverless-test-project
-        run: |
-          npm i serverless@2
-          npm run test:v2
+      # - name: Package test project with Serverless v2
+      #   working-directory: ./serverless-test-project
+      #   run: |
+      #     npm i serverless@2
+      #     npm run test:v2
   finish:
     needs: build
     runs-on: ubuntu-latest

diff --git a/cf-macro/index.ts b/cf-macro/index.ts
@@ -43,11 +43,8 @@ export function handler (event: Event): Event {
       }
 
       const alarmActions = []
-      if (slicWatchConfig?.topicArn) {
-        alarmActions.push(slicWatchConfig.topicArn)
-      } else if (process.env.ALARM_SNS_TOPIC) {
-        alarmActions.push(process.env.ALARM_SNS_TOPIC)
-      }
+      slicWatchConfig?.topicArn && alarmActions.push(slicWatchConfig.topicArn)
+      process.env.ALARM_SNS_TOPIC && alarmActions.push(process.env.ALARM_SNS_TOPIC)
 
       const context = {
         alarmActions

diff --git a/cf-macro/tests/index.test.ts b/cf-macro/tests/index.test.ts
@@ -7,7 +7,7 @@ import { handler } from '../index'
 const require = createRequire(import.meta.url)
 const template = require('./event.json')
 
-const event = { fragment: template, templateParameterValues: { stack: 'sam-test-stack-project' } }
+const event = { fragment: template }
 
 test('macro returns success', t => {
   const result = handler(event)
@@ -47,7 +47,7 @@ test('macro uses topicArn if specified', t => {
 
 test('Macro skips SLIC Watch if top-level enabled==false', t => {
   const testevent = _.cloneDeep(event)
-  testevent.fragment.Metadata.slicWatch.enabled = false
+  testevent.fragment.Metadata.slicWatch.ActionsEnabled = false
   handler(testevent)
   t.end()
 })