chore: prune unused types

fourTheorem · Nov 14, 2023 · 8038cc2 · 8038cc2
1 parent cb2bad5
commit 8038cc2
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 44 deletions.
diff --git a/core/alarms/alarm-types.ts b/core/alarms/alarm-types.ts
@@ -40,11 +40,6 @@ export interface SlicWatchMergedConfig extends AlarmProperties {
 
 export type InputOutput = SlicWatchAlarmConfig | SlicWatchMergedConfig
 
-export interface ReturnAlarm {
-  resourceName: string
-  resource: Resource
-}
-
 export interface AlarmActionsConfig {
   actionsEnabled?: boolean
   okActions?: string[]

diff --git a/core/alarms/lambda.ts b/core/alarms/lambda.ts
@@ -15,8 +15,6 @@ export interface SlicWatchLambdaAlarmsConfig<T extends InputOutput> extends Slic
   IteratorAge: T
 }
 
-export type FunctionAlarmProperties<T extends InputOutput> = Record<string, SlicWatchLambdaAlarmsConfig<T>>
-
 const lambdaMetrics = ['Errors', 'ThrottlesPc', 'DurationPc', 'Invocations']
 
 /**

diff --git a/core/dashboards/dashboard-types.ts b/core/dashboards/dashboard-types.ts
@@ -20,23 +20,6 @@ export interface WidgetWithSize extends Omit<Widget, 'width' | 'height'> {
   height: number
 }
 
-export interface MetricProperties {
-  metrics: any[][]
-  title: string
-  view: string
-  region: string
-  period?: number
-  yAxis?: YAxisPos
-}
-
-export interface CreateMetricWidget {
-  type: string
-  properties: MetricProperties
-  width: number
-  height: number
-  yAxis?: YAxisPos
-}
-
 export interface WidgetMetricProperties {
   enabled: boolean
   metricPeriod: number

diff --git a/core/dashboards/dashboard.ts b/core/dashboards/dashboard.ts
@@ -1,5 +1,8 @@
 import type Template from 'cloudform-types/types/template'
-import * as cwd from 'cloudwatch-dashboard-types'
+// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+import type {
+  Dashboard, WidgetMetric, Statistic, YAxisPosition, WidgetType, MetricViewType
+} from 'cloudwatch-dashboard-types'
 
 import { cascade } from '../inputs/cascading-config'
 import { getResourcesByType, getEventSourceMappingFunctions, addResource } from '../cf-template'
@@ -94,7 +97,7 @@ export default function addDashboard (dashboardConfig: SlicWatchInputDashboardCo
   ])
 
   if (positionedWidgets.length > 0) {
-    const dash: cwd.Dashboard = { start: timeRange?.start, end: timeRange?.end, widgets: positionedWidgets }
+    const dash: Dashboard = { start: timeRange?.start, end: timeRange?.end, widgets: positionedWidgets }
     const dashboardResource = {
       Type: 'AWS::CloudWatch::Dashboard',
       Properties: {
@@ -115,23 +118,23 @@ export default function addDashboard (dashboardConfig: SlicWatchInputDashboardCo
    * @param {Object} config Cascaded widget/metric configuration
    */
   function createMetricWidget (title: string, metricDefs: MetricDefs[], config: WidgetMetricProperties): WidgetWithSize {
-    const metrics: cwd.WidgetMetric[] = metricDefs.map(
+    const metrics: WidgetMetric[] = metricDefs.map(
       ({ namespace, metric, dimensions, stat, yAxis }) => [
         namespace,
         metric,
         ...Object.entries(dimensions).reduce(
           (acc: string[], [name, value]) => [...acc, name, value],
           []
         ),
-        { stat: stat as cwd.Statistic, yAxis: yAxis as cwd.YAxisPosition }
+        { stat: stat as Statistic, yAxis: yAxis as YAxisPosition }
       ]
     )
     return {
-      type: cwd.WidgetType.Metric,
+      type: WidgetType.Metric,
       properties: {
         metrics,
         title,
-        view: cwd.MetricViewType.TimeSeries,
+        view: MetricViewType.TimeSeries,
         region: '${AWS::Region}',
         period: config.metricPeriod
       },
@@ -170,7 +173,7 @@ export default function addDashboard (dashboardConfig: SlicWatchInputDashboardCo
                   namespace: 'AWS/Lambda',
                   metric,
                   dimensions: { FunctionName: `\${${funcLogicalId}}` },
-                  stat: stat as cwd.Statistic
+                  stat: stat as Statistic
                 })
               }
             }
@@ -198,7 +201,7 @@ export default function addDashboard (dashboardConfig: SlicWatchInputDashboardCo
                   namespace: 'AWS/Lambda',
                   metric: 'IteratorAge',
                   dimensions: { FunctionName: `\${${funcLogicalId}}` },
-                  stat: stat as cwd.Statistic
+                  stat: stat as Statistic
                 })),
                 metricConfig as Widgets
               )
@@ -660,8 +663,8 @@ export default function addDashboard (dashboardConfig: SlicWatchInputDashboardCo
                   namespace: 'AWS/AppSync',
                   metric,
                   dimensions: { GraphQLAPIId: graphQLAPIId },
-                  stat: stat as cwd.Statistic,
-                  yAxis: metricConfig.yAxis as cwd.YAxisPosition
+                  stat: stat as Statistic,
+                  yAxis: metricConfig.yAxis as YAxisPosition
                 })
               }
             }

diff --git a/core/package.json b/core/package.json
@@ -36,7 +36,7 @@
     "yaml": "^1.10.2"
   },
   "devDependencies": {
-    "cloudwatch-dashboard-types": "^1.0.0-rc1",
+    "cloudwatch-dashboard-types": "^1.0.1-rc2",
     "ts-node": "^10.9.1"
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/tsconfig.json b/tsconfig.json
@@ -13,7 +13,7 @@
     "resolveJsonModule": true,
     "target": "ESNext",
     "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
   },
   "ts-node": {
     "swc": true,
-Original file line number
+Diff line change
@@ Expand Up @@
       IteratorAge: T
     }
-    export type FunctionAlarmProperties<T extends InputOutput> = Record<string, SlicWatchLambdaAlarmsConfig<T>>
     const lambdaMetrics = ['Errors', 'ThrottlesPc', 'DurationPc', 'Invocations']
     /**
@@ Expand Down @@