Manage packages, remove redundant use-strict

- 'use strict' can be manageble for each module  at top level as we use alwaysStrict in the tscofig
- Fix some types

cdk-test-project/source/general-stack.ts

@@ -4,8 +4,7 @@ import * as sns from 'aws-cdk-lib/aws-sns'
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb'
 import * as apigateway from 'aws-cdk-lib/aws-apigateway'
 import * as sqs from 'aws-cdk-lib/aws-sqs'
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import { CfnResource } from 'aws-cdk-lib'
+import type { CfnResource } from 'aws-cdk-lib'
 import * as events from 'aws-cdk-lib/aws-events'
 import { LambdaFunction } from 'aws-cdk-lib/aws-events-targets'
 

cdk-test-project/source/sfn-stack.ts

@@ -1,8 +1,8 @@
 import * as cdk from 'aws-cdk-lib'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as sns from 'aws-cdk-lib/aws-sns'
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-import { CfnResource, Duration } from 'aws-cdk-lib'
+import { Duration } from 'aws-cdk-lib'
+import type { CfnResource } from 'aws-cdk-lib'
 import * as sfn from 'aws-cdk-lib/aws-stepfunctions'
 import { LambdaInvoke } from 'aws-cdk-lib/aws-stepfunctions-tasks'
 

cf-macro/index.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import _ from 'lodash'
 import Ajv from 'ajv'
@@ -67,10 +66,10 @@ export function handler (event: Event): Event {
       addDashboard(config.dashboard, functionDashboardConfigs, outputFragment)
     }
   } catch (err) {
-    console.error(err)
+    logger.error(err)
     status = 'fail'
   }
-  // logger.info({ outputFragment })
+  logger.info({ outputFragment })
 
   return {
     requestId: event.requestId,

cf-macro/tests/cdk-cf.test.ts

@@ -1,5 +1,3 @@
-/* eslint-disable no-template-curly-in-string */
-'use strict'
 
 import { test } from 'tap'
 import { getResourcesByType } from 'slic-watch-core/cf-template'

cf-macro/tests/index.test.ts

@@ -1,9 +1,10 @@
-'use strict'
 
 import { test } from 'tap'
 import _ from 'lodash'
 import { handler } from '../index'
-import template from './event.json' assert { type: 'json'}
+import type Template from 'cloudform-types/types/template'
+import _template from './event.json' assert { type: 'json'}
+const template = _template as Template
 
 const event = { fragment: template }
 
@@ -32,7 +33,7 @@ test('macro uses topicArn if specified', t => {
       Metadata: {
         ...event.fragment.Metadata,
         slicWatch: {
-          ...event.fragment.Metadata.slicWatch,
+          ...event.fragment.Metadata?.slicWatch,
           topicArn: 'arn:aws:sns:eu-west-1:123456789123:TestTopic'
         }
       }
@@ -45,8 +46,9 @@ 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
-  handler(testevent)
+  if (testevent.fragment.Metadata?.slicWatch.enabled === false) {
+    handler(testevent)
+  }
   t.end()
 })
 
@@ -58,35 +60,36 @@ test('Macro adds dashboard and alarms if no function configuration is provided',
       Resources: {
         ...event.fragment.Resources,
         HelloLambdaFunction: {
-          ...event.fragment.Resources.HelloLambdaFunction,
+          ...event.fragment.Resources?.HelloLambdaFunction,
           Metadata: {}
         }
       }
     }
   }
   const compiledTemplate = handler(testEvent).fragment
-  t.same(compiledTemplate.Resources.Properties, template.Resources.Properties)
+  t.same(compiledTemplate.Resources.Properties, template.Resources?.Properties)
   t.end()
 })
 
 test('Macro execution fails if an invalid SLIC Watch config is provided', t => {
   const testevent = _.cloneDeep(event)
-  testevent.fragment.Metadata.slicWatch.topicArrrrn = 'pirateTopic'
-  const result = handler(testevent)
-  t.equal(result.status, 'fail')
+  if (testevent.fragment.Metadata?.slicWatch.topicArrrrn === 'pirateTopic') {
+    const result = handler(testevent)
+    t.equal(result.status, 'fail')
+  }
   t.end()
 })
 
 test('Macro execution succeeds with no slicWatch config', t => {
   const testevent = _.cloneDeep(event)
-  delete testevent.fragment.Metadata.slicWatch
+  delete testevent.fragment.Metadata?.slicWatch
   handler(testevent)
   t.end()
 })
 
 test('Macro execution succeeds if no SNS Topic is provided', t => {
   const testevent = _.cloneDeep(event)
-  delete testevent.fragment.Metadata.slicWatch.topicArn
+  delete testevent.fragment.Metadata?.slicWatch.topicArn
   handler(testevent)
   t.end()
 })

core/alarms/alarms.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { cascade } from '../inputs/cascading-config'
 import type { SlicWatchAlarmsConfig } from '../inputs/cascading-config'

core/alarms/alb-target-group.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { ResourceType } from '../cf-template'
 import { getResourcesByType } from '../cf-template'

core/alarms/alb.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { Context, DefaultAlarmsProperties } from './default-config-alarms'
 import { fetchAlarmResources } from './default-config-alarms'

core/alarms/api-gateway.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { getResourcesByType } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'

core/alarms/appsync.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { getResourcesByType } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'

core/alarms/default-config-alarms.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { AlbTargetAlarmsConfig } from './alb-target-group'
 import type { AlbAlarmsConfig } from './alb'
@@ -28,7 +27,7 @@ export function fetchAlarmResources (type: string, service: string, metrics: str
       const { enabled, ...rest } = config[metric]
       if (enabled !== false) {
         const alarm = getAlarm({ metric, resourceName, config: rest })
-        const name = makeResourceName(service, resourceName, metric)
+        const name = makeResourceName(service, resourceName, metric.replaceAll('-', ''))
         const resource = createAlarm({
           MetricName: metric,
           ...alarm,

core/alarms/dynamodb.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { getResourcesByType } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'

core/alarms/ecs.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { getResourcesByType } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'

core/alarms/eventbridge.ts

@@ -1,6 +1,4 @@
 
-'use strict'
-
 import type { Context, DefaultAlarmsProperties } from './default-config-alarms'
 import { fetchAlarmResources } from './default-config-alarms'
 import type Template from 'cloudform-types/types/template'

core/alarms/get-statistic-name.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { type AllAlarms } from './default-config-alarms'
 

core/alarms/kinesis.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { getResourcesByType } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'

core/alarms/lambda.ts

@@ -1,4 +1,4 @@
-'use strict'
+
 import { getResourcesByType, getEventSourceMappingFunctions } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'
 import { createAlarm } from './default-config-alarms'

core/alarms/make-name.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import stringcase from 'case'
 

core/alarms/sns.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { Context, DefaultAlarmsProperties } from './default-config-alarms'
 import { fetchAlarmResources } from './default-config-alarms'

core/alarms/sqs.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { getResourcesByType } from '../cf-template'
 import type { Context, DefaultAlarmsProperties, CfAlarmsProperties } from './default-config-alarms'

core/alarms/step-functions.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { Context, DefaultAlarmsProperties } from './default-config-alarms'
 import { fetchAlarmResources } from './default-config-alarms'

core/alarms/tests/alarms.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { test } from 'tap'
 

core/alarms/tests/alb-target-group.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createALBTargetAlarms, { findLoadBalancersForTargetGroup } from '../alb-target-group'
 import { test } from 'tap'

core/alarms/tests/alb.test.ts

@@ -1,6 +1,6 @@
-'use strict'
 
-import createALBAlarms, { type AlbAlarmProperties } from '../alb'
+import createALBAlarms from '../alb'
+import type { AlbAlarmsConfig } from '../alb'
 import { test } from 'tap'
 import defaultConfig from '../../inputs/default-config'
 import {
@@ -32,7 +32,7 @@ test('ALB alarms are created', (t) => {
     }
 
   )
-  function createAlarmResources (elbAlarmProperties: AlbAlarmProperties) {
+  function createAlarmResources (elbAlarmProperties: AlbAlarmsConfig) {
     const compiledTemplate = createTestCloudFormationTemplate(albCfTemplate)
     return createALBAlarms(elbAlarmProperties, testContext, compiledTemplate)
   }

core/alarms/tests/api-gateway.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createApiGatewayAlarms, { resolveRestApiNameAsCfn, resolveRestApiNameForSub } from '../api-gateway'
 import { test } from 'tap'

core/alarms/tests/appsync.test.ts

@@ -1,6 +1,6 @@
-'use strict'
 
-import createAppSyncAlarms, { type AppSyncAlarmProperties } from '../appsync'
+import createAppSyncAlarms from '../appsync'
+import type { AppSyncAlarmsConfig } from '../appsync'
 import { test } from 'tap'
 import defaultConfig from '../../inputs/default-config'
 import {
@@ -32,7 +32,7 @@ test('AppSync alarms are created', (t) => {
     }
 
   )
-  function createAlarmResources (appSyncAlarmProperties: AppSyncAlarmProperties) {
+  function createAlarmResources (appSyncAlarmProperties: AppSyncAlarmsConfig) {
     const compiledTemplate = createTestCloudFormationTemplate(appSyncCfTemplate)
     return createAppSyncAlarms(appSyncAlarmProperties, testContext, compiledTemplate)
   }

core/alarms/tests/dynamodb.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createDynamoDbAlarms from '../dynamodb'
 import { addResource, getResourcesByType } from '../../cf-template'

core/alarms/tests/ecs.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createECSAlarms, { resolveEcsClusterNameAsCfn } from '../ecs'
 import { test } from 'tap'

core/alarms/tests/eventbridge.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createRuleAlarms from '../eventbridge'
 import { getResourcesByType } from '../../cf-template'

core/alarms/tests/get-statistic-name.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { test } from 'tap'
 import { getStatisticName } from '../get-statistic-name'

core/alarms/tests/kinesis.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createKinesisAlarms from '../kinesis'
 import { getResourcesByType } from '../../cf-template'

core/alarms/tests/lambda.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createLambdaAlarms from '../lambda'
 import { getResourcesByType } from '../../cf-template'

core/alarms/tests/sns.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createSNSAlarms from '../sns'
 import { getResourcesByType } from '../../cf-template'

core/alarms/tests/sqs.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createSQSAlarms from '../sqs'
 import { getResourcesByType } from '../../cf-template'

core/alarms/tests/step-functions.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import createStatesAlarms from '../step-functions'
 import { getResourcesByType } from '../../cf-template'

core/dashboards/dashboard.ts

@@ -1,6 +1,4 @@
 
-'use strict'
-
 import { cascade } from '../inputs/cascading-config'
 import { type Widgets, type SlicWatchDashboardConfig } from '../inputs/cascading-config'
 import { getResourcesByType, getEventSourceMappingFunctions, addResource } from '../cf-template'

core/dashboards/default-config-dashboard.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { type Widgets } from '../inputs/cascading-config'
 import type FunctionProperties from 'cloudform-types/types/lambda/function'

core/dashboards/tests/dashboard.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import _ from 'lodash'
 import { test } from 'tap'

core/filter-object.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 /**
  * Filter an object to produce a new object with entries matching the supplied predicate

core/inputs/cascading-config.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { AlbAlarmsConfig } from '../alarms/alb'
 import type { AlbTargetAlarmsConfig } from '../alarms/alb-target-group'

core/inputs/config-schema.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 /*
  * Source https://github.com/ajv-validator/ajv-formats/blob/4dd65447575b35d0187c6b125383366969e6267e/src/formats.ts#L113

core/inputs/default-config.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import type { SlicWatchAlarmsConfig, SlicWatchDashboardConfig } from '../inputs/cascading-config'
 

core/inputs/function-config.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import _ from 'lodash'
 

core/inputs/tests/cascading-config.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { test } from 'tap'
 

core/inputs/tests/config-schema.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import Ajv from 'ajv'
 import { test } from 'tap'

core/tests/cf-template.test.ts

@@ -1,6 +1,4 @@
 
-'use strict'
-
 import { resolveFunctionResourceName, getResourcesByType } from '../cf-template'
 import type Template from 'cloudform-types/types/template'
 import { type ResourceType } from './../cf-template'

core/tests/filter-object.test.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import { test } from 'tap'
 

core/tests/testing-utils.ts

@@ -1,4 +1,3 @@
-'use strict'
 
 import path from 'path'
 import fs from 'fs'