Merge branch 'main' into node18

cdklabs · Aug 10, 2023 · 3835ba1 · 3835ba1
2 parents ca0a2e9 + ab22198
commit 3835ba1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/monitoring/aws-step-functions/StepFunctionLambdaIntegrationMonitoring.ts b/lib/monitoring/aws-step-functions/StepFunctionLambdaIntegrationMonitoring.ts
@@ -3,6 +3,7 @@ import {
   HorizontalAnnotation,
   IWidget,
 } from "aws-cdk-lib/aws-cloudwatch";
+import { IFunction, CfnFunction } from "aws-cdk-lib/aws-lambda";
 
 import {
   StepFunctionLambdaIntegrationMetricFactory,
@@ -71,10 +72,10 @@ export class StepFunctionLambdaIntegrationMonitoring extends Monitoring {
   ) {
     super(scope, props);
 
-    const fallbackConstructName = props.lambdaFunction.functionName;
     const namingStrategy = new MonitoringNamingStrategy({
       ...props,
-      fallbackConstructName,
+      namedConstruct: props.lambdaFunction,
+      fallbackConstructName: this.resolveFunctionName(props.lambdaFunction),
     });
     this.title = namingStrategy.resolveHumanReadableName();
     this.functionUrl = scope
@@ -260,4 +261,9 @@ export class StepFunctionLambdaIntegrationMonitoring extends Monitoring {
       }),
     ];
   }
+
+  private resolveFunctionName(lambdaFunction: IFunction): string | undefined {
+    // try to take the name (if specified) instead of token
+    return (lambdaFunction.node.defaultChild as CfnFunction)?.functionName;
+  }
 }
diff --git a/...ing/aws-step-functions/__snapshots__/StepFunctionLambdaIntegrationMonitoring.test.ts.snap b/...ing/aws-step-functions/__snapshots__/StepFunctionLambdaIntegrationMonitoring.test.ts.snap