Update to version 7.0.1 (#591)

Author: simonkrol

CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.0.1] - 2025-03-14
+
+### Changed
+
+- Updated metrics module to support identical metrics for different resources
+- Updated aws-cdk-lib and aws-cdk package versions
+
+### Security
+
+- Upgraded esbuild to v0.25.0 for advisory [GHSA-67mh-4wv8-2f99](https://github.com/advisories/GHSA-67mh-4wv8-2f99)
+- Upgraded axios to 1.8.2 for advisory [GHSA-jr5f-v2jv-69x6](https://github.com/axios/axios/security/advisories/GHSA-jr5f-v2jv-69x6)
+
+### Fixed
+
+- Minor eslint warnings
+
 ## [7.0.0] - 2025-01-27
 
 ### Changed

VERSION.txt

@@ -1 +1 @@
-7.0.0
+7.0.1

source/constructs/cdk.json

@@ -2,7 +2,7 @@
   "app": "npx ts-node --prefer-ts-exts bin/constructs.ts",
   "context": {
     "solutionId": "SO0023",
-    "solutionVersion": "custom-v7.0.0",
+    "solutionVersion": "custom-v7.0.1",
     "solutionName": "dynamic-image-transformation-for-amazon-cloudfront"
   }
 }

source/constructs/lib/back-end/back-end-construct.ts

@@ -228,8 +228,11 @@ export class BackEnd extends Construct {
       ).toString()
     ).toString();
 
-    solutionsMetrics.addLambdaInvocationCount(imageHandlerLambdaFunction.functionName);
-    solutionsMetrics.addLambdaBilledDurationMemorySize([imageHandlerLogGroup], "BilledDurationMemorySizeQuery");
+    solutionsMetrics.addLambdaInvocationCount({ functionName: imageHandlerLambdaFunction.functionName });
+    solutionsMetrics.addLambdaBilledDurationMemorySize({
+      logGroups: [imageHandlerLogGroup],
+      queryDefinitionName: "BilledDurationMemorySizeQuery",
+    });
     solutionsMetrics.addQueryDefinition({
       logGroups: [imageHandlerLogGroup],
       queryString: new QueryString({
@@ -246,8 +249,14 @@ export class BackEnd extends Construct {
       queryDefinitionName: "RequestInfoQuery",
     });
 
-    solutionsMetrics.addCloudFrontMetric(conditionalCloudFrontDistributionId, "Requests");
-    solutionsMetrics.addCloudFrontMetric(conditionalCloudFrontDistributionId, "BytesDownloaded");
+    solutionsMetrics.addCloudFrontMetric({
+      distributionId: conditionalCloudFrontDistributionId,
+      metricName: "Requests",
+    });
+    solutionsMetrics.addCloudFrontMetric({
+      distributionId: conditionalCloudFrontDistributionId,
+      metricName: "BytesDownloaded",
+    });
 
     Aspects.of(solutionsMetrics).add(new ConditionAspect(props.sendAnonymousStatistics));
 

source/constructs/lib/dashboard/ops-insights-dashboard.ts

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
 import { Aws, CfnCondition, Duration } from "aws-cdk-lib";
 import { Dashboard, PeriodOverride, TextWidget } from "aws-cdk-lib/aws-cloudwatch";
 import { Size, DefaultGraphWidget, DefaultSingleValueWidget } from "./widgets";

source/constructs/lib/dashboard/sih-metrics.ts

@@ -1,8 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
 import { MathExpression, Metric } from "aws-cdk-lib/aws-cloudwatch";
 
-/** Properties for configuring metrics
+/**
+  Properties for configuring metrics
  */
 export interface MetricProps {
   /** The name of the backend Lambda function to monitor */

source/constructs/lib/dashboard/widgets.ts

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+
 import {
   GraphWidget,
   GraphWidgetProps,
@@ -48,7 +49,7 @@ export interface DefaultSingleValueWidgetProps extends Omit<SingleValueWidgetPro
 
 /**
  * Creates a standardized graph widget which adds a RUNNING_SUM line to the metric being graphed
- * @extends GraphWidget
+ * @augments GraphWidget
  */
 export class RunningSumGraphWidget extends GraphWidget {
   constructor(props: GraphWidgetProps) {
@@ -72,7 +73,7 @@ export class RunningSumGraphWidget extends GraphWidget {
 
 /**
  * Creates a standardized graph widget with running sum functionality
- * @extends RunningSumGraphWidget
+ * @augments RunningSumGraphWidget
  */
 export class DefaultGraphWidget extends RunningSumGraphWidget {
   constructor(props: DefaultGraphWidgetProps) {
@@ -102,7 +103,7 @@ export class DefaultGraphWidget extends RunningSumGraphWidget {
 /**
  * Creates a standardized single value widget which adds the provided label to the metric being graphed
  * and sets the period as time range by default.
- * @extends SingleValueWidget
+ * @augments SingleValueWidget
  */
 export class DefaultSingleValueWidget extends SingleValueWidget {
   constructor(props: DefaultSingleValueWidgetProps) {

source/constructs/lib/serverless-image-stack.ts

@@ -188,6 +188,7 @@ export class ServerlessImageHandlerStack extends Stack {
       allowedPattern: "^$|^E[A-Z0-9]{8,}$",
     });
 
+    /* eslint-disable no-new */
     new CfnRule(this, "ExistingDistributionIdRequiredRule", {
       ruleCondition: Fn.conditionEquals(useExistingCloudFrontDistribution.valueAsString, "Yes"),
       assertions: [