chore: minor cleanup (#84)

Some minor updates pulled out from #83

cf. commit messages for exact changes

---

_By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license_

API.md

@@ -2703,11 +2703,10 @@ public readonly action: IAlarmActionStrategy;
 ```
 
 - *Type:* <a href="#cdk-monitoring-constructs.IAlarmActionStrategy">IAlarmActionStrategy</a>
+- *Default:* no action.
 
 Default alarm action used for each alarm, unless it is overridden.
 
-If you do not want any actions to be created, just use NoAlarmActionStrategy.
-
 ---
 
 ##### `annotationStrategy`<sup>Optional</sup> <a name="annotationStrategy" id="cdk-monitoring-constructs.AlarmFactoryDefaults.property.annotationStrategy"></a>

lib/common/alarm/AlarmFactory.ts

@@ -336,7 +336,8 @@ export interface AlarmFactoryDefaults {
 
   /**
    * Default alarm action used for each alarm, unless it is overridden.
-   * If you do not want any actions to be created, just use NoAlarmActionStrategy.
+   *
+   * @default no action.
    */
   readonly action?: IAlarmActionStrategy;
 

lib/monitoring/aws-secretsmanager/SecretsManagerMetricsPublisher.ts

@@ -1,6 +1,6 @@
 import * as path from "path";
 
-import { Construct, Duration } from "monocdk";
+import { Construct, Duration, Names } from "monocdk";
 import { Rule, RuleTargetInput, Schedule } from "monocdk/aws-events";
 import { LambdaFunction } from "monocdk/aws-events-targets";
 import { Effect, PolicyStatement } from "monocdk/aws-iam";
@@ -60,7 +60,7 @@ export class SecretsManagerMetricsPublisher extends Construct {
   }
 
   static getInstance(scope: MonitoringScope) {
-    const key = scope.node.uniqueId;
+    const key = Names.nodeUniqueId(scope.node);
     let instance = SecretsManagerMetricsPublisher.instances[key];
     if (!instance) {
       instance = new SecretsManagerMetricsPublisher(scope);
@@ -72,7 +72,7 @@ export class SecretsManagerMetricsPublisher extends Construct {
 
   addSecret(secret: ISecret): void {
     // run 1/hr so alarms can recover automatically
-    const rule = new Rule(this, `RuleFor${secret.node.id}`, {
+    const rule = new Rule(this, `RuleFor${Names.nodeUniqueId(secret.node)}`, {
       schedule: Schedule.cron({
         minute: "0",
       }),

test/facade/MonitoringAspect.test.ts

@@ -378,7 +378,7 @@ describe("MonitoringAspect", () => {
     const facade = createDummyMonitoringFacade(stack);
 
     new opensearch.Domain(stack, "DummyOSDomain", {
-      domainName: "DummyOSDomain",
+      domainName: "dummy-os-domain",
       version: opensearch.EngineVersion.ELASTICSEARCH_7_10,
     });
     new elasticsearch.Domain(stack, "DummyESDomain", {

test/monitoring/aws-opensearch/OpenSearchClusterMonitoring.test.ts

@@ -13,17 +13,17 @@ import { TestMonitoringScope } from "../TestMonitoringScope";
 const stack = new Stack();
 [
   new elasticsearch.CfnDomain(stack, "ElasticsearchCfnDomain", {
-    domainName: "ElasticsearchCfnDomain",
+    domainName: "es-cfn-domain",
   }),
   new elasticsearch.Domain(stack, "ElasticsearchDomain", {
-    domainName: "ElasticsearchDomain",
+    domainName: "es-domain",
     version: elasticsearch.ElasticsearchVersion.V7_7,
   }),
   new opensearch.CfnDomain(stack, "OpenSearchCfnDomain", {
-    domainName: "OpenSearchCfnDomain",
+    domainName: "os-cfn-domain",
   }),
   new opensearch.Domain(stack, "OpenSearchDomain", {
-    domainName: "OpenSearchDomain",
+    domainName: "os-domain",
     version: opensearch.EngineVersion.OPENSEARCH_1_0,
   }),
 ].forEach((domain) => {