Make sure Dashboards are named globaly unique

fourTheorem · Oct 7, 2022 · 12a072b · 12a072b
1 parent d976a93
commit 12a072b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/serverless-plugin/dashboard.js b/serverless-plugin/dashboard.js
@@ -110,7 +110,8 @@ module.exports = function dashboard (serverless, dashboardConfig, functionDashbo
       const dashboardResource = {
         Type: 'AWS::CloudWatch::Dashboard',
         Properties: {
-          DashboardName: `${context.stackName}Dashboard`,
+          // eslint-disable-next-line no-template-curly-in-string
+          DashboardName: { 'Fn::Sub': '${AWS::StackName}-${AWS::Region}-Dashboard' },
           DashboardBody: { 'Fn::Sub': JSON.stringify(dash) }
         }
       }

diff --git a/serverless-plugin/tests/dashboard.test.js b/serverless-plugin/tests/dashboard.test.js
@@ -36,7 +36,8 @@ test('A dashboard includes metrics', (t) => {
   const dashResources = cfTemplate.getResourcesByType('AWS::CloudWatch::Dashboard')
   t.equal(Object.keys(dashResources).length, 1)
   const [, dashResource] = Object.entries(dashResources)[0]
-  t.equal(dashResource.Properties.DashboardName, 'testStackDashboard')
+  // eslint-disable-next-line no-template-curly-in-string
+  t.same(dashResource.Properties.DashboardName, { 'Fn::Sub': '${AWS::StackName}-${AWS::Region}-Dashboard' })
   const dashBody = JSON.parse(dashResource.Properties.DashboardBody['Fn::Sub'])
 
   t.ok(dashBody.start)
@@ -276,7 +277,8 @@ test('A dashboard includes metrics for ALB', (t) => {
   const dashResources = cfTemplate.getResourcesByType('AWS::CloudWatch::Dashboard')
   t.equal(Object.keys(dashResources).length, 1)
   const [, dashResource] = Object.entries(dashResources)[0]
-  t.equal(dashResource.Properties.DashboardName, 'testStackDashboard')
+  // eslint-disable-next-line no-template-curly-in-string
+  t.same(dashResource.Properties.DashboardName, { 'Fn::Sub': '${AWS::StackName}-${AWS::Region}-Dashboard' })
   const dashBody = JSON.parse(dashResource.Properties.DashboardBody['Fn::Sub'])
 
   t.ok(dashBody.start)