fix(api-gatewayv2): use API name in fallback name when possible

lib/monitoring/aws-apigatewayv2/ApiGatewayV2HttpApiMonitoring.ts

@@ -1,3 +1,4 @@
+import { HttpApi } from "aws-cdk-lib/aws-apigatewayv2";
 import {
   GraphWidget,
   HorizontalAnnotation,
@@ -158,7 +159,11 @@ export class ApiGatewayV2HttpApiMonitoring extends Monitoring {
     super(scope, props);
 
     // used when humanReadableName is not provided by user
-    const fallbackNameArray = [props.api.apiId];
+    const fallbackNameArray = [
+      (props.api as HttpApi)?.httpApiName ??
+        (props.api as HttpApi)?.httpApiId ??
+        props.api.apiId,
+    ];
     fallbackNameArray.push(props.apiStage ?? "$default");
     if (props.apiMethod) {
       fallbackNameArray.push(props.apiMethod);

test/monitoring/aws-apigatewayv2/ApiGatewayV2HttpApiMonitoring.test.ts

@@ -9,19 +9,43 @@ import {
 import { addMonitoringDashboardsToStack } from "../../utils/SnapshotUtil";
 import { TestMonitoringScope } from "../TestMonitoringScope";
 
-test("snapshot test: no alarms", () => {
+test("snapshot test: no alarms with explicit API name", () => {
   const stack = new Stack();
 
   const scope = new TestMonitoringScope(stack, "Scope");
 
-  const testHttpApi = new HttpApi(stack, "testHttpApi", {
-    apiName: "testHttpApi",
+  const monitoring = new ApiGatewayV2HttpApiMonitoring(scope, {
+    api: new HttpApi(stack, "testHttpApi", {
+      apiName: "testHttpApiName",
+    }),
   });
 
+  addMonitoringDashboardsToStack(stack, monitoring);
+  expect(Template.fromStack(stack)).toMatchSnapshot();
+});
+
+test("snapshot test: no alarms with no explicit API name", () => {
+  const stack = new Stack();
+
+  const scope = new TestMonitoringScope(stack, "Scope");
+
   const monitoring = new ApiGatewayV2HttpApiMonitoring(scope, {
-    api: testHttpApi,
-    humanReadableName: "Dummy API Gateway for testing",
-    alarmFriendlyName: "DummyApi",
+    api: new HttpApi(stack, "testHttpApi"),
+  });
+
+  addMonitoringDashboardsToStack(stack, monitoring);
+  expect(Template.fromStack(stack)).toMatchSnapshot();
+});
+
+test("snapshot test: no alarms with imported IHttpApi", () => {
+  const stack = new Stack();
+
+  const scope = new TestMonitoringScope(stack, "Scope");
+
+  const monitoring = new ApiGatewayV2HttpApiMonitoring(scope, {
+    api: HttpApi.fromHttpApiAttributes(scope, "Imported", {
+      httpApiId: "imported-id",
+    }),
   });
 
   addMonitoringDashboardsToStack(stack, monitoring);