add test suite for new method

kaizencc · kaizencc · commit a96db4ad99a4 · 2021-10-08T11:27:58.000-04:00
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm.ts
@@ -384,7 +384,6 @@ export class Alarm extends AlarmBase {
     // if this is a region-agnostic stack, we can't assume anything about stat.account
     // and therefore we assume its a cross-account call
     if (Token.isUnresolved(stackAccount)) {
-      console.log(stackAccount);
       return true;
     }
 
diff --git a/packages/@aws-cdk/aws-cloudwatch/test/cross-environment.test.ts b/packages/@aws-cdk/aws-cloudwatch/test/cross-environment.test.ts
@@ -7,11 +7,13 @@ const a = new Metric({ namespace: 'Test', metricName: 'ACount' });
 let stack1: Stack;
 let stack2: Stack;
 let stack3: Stack;
+let stack4: Stack;
 describe('cross environment', () => {
   beforeEach(() => {
     stack1 = new Stack(undefined, undefined, { env: { region: 'pluto', account: '1234' } });
     stack2 = new Stack(undefined, undefined, { env: { region: 'mars', account: '5678' } });
     stack3 = new Stack(undefined, undefined, { env: { region: 'pluto', account: '0000' } });
+    stack4 = new Stack(undefined, undefined);
   });
 
   describe('in graphs', () => {
@@ -403,6 +405,107 @@ describe('cross environment', () => {
         });
       }).toThrow(/Cannot create an Alarm based on a MathExpression which specifies a searchAccount or searchRegion/);
     });
+
+    describe('accountId requirements', () => {
+      test('metric account is not defined', () => {
+        const metric = new Metric({
+          namespace: 'Test',
+          metricName: 'ACount',
+        });
+
+        new Alarm(stack4, 'Alarm', {
+          threshold: 1,
+          evaluationPeriods: 1,
+          metric,
+        });
+
+        // Alarm will be defined as legacy alarm.
+        Template.fromStack(stack4).hasResourceProperties('AWS::CloudWatch::Alarm', {
+          Threshold: 1,
+          EvaluationPeriods: 1,
+          MetricName: 'ACount',
+          Namespace: 'Test',
+        });
+      });
+
+      test('metric account is defined and stack account is token', () => {
+        const metric = new Metric({
+          namespace: 'Test',
+          metricName: 'ACount',
+          account: '123456789',
+        });
+
+        new Alarm(stack4, 'Alarm', {
+          threshold: 1,
+          evaluationPeriods: 1,
+          metric,
+        });
+
+        // Alarm will be defined as modern alarm.
+        Template.fromStack(stack4).hasResourceProperties('AWS::CloudWatch::Alarm', {
+          Metrics: Match.anyValue(),
+        });
+      });
+
+      test('metric account is attached to stack account', () => {
+        const metric = new Metric({
+          namespace: 'Test',
+          metricName: 'ACount',
+        });
+
+        new Alarm(stack4, 'Alarm', {
+          threshold: 1,
+          evaluationPeriods: 1,
+          metric: metric.attachTo(stack4),
+        });
+
+        // Alarm will be defined as legacy alarm.
+        Template.fromStack(stack4).hasResourceProperties('AWS::CloudWatch::Alarm', {
+          Threshold: 1,
+          EvaluationPeriods: 1,
+          MetricName: 'ACount',
+          Namespace: 'Test',
+        });
+      });
+
+      test('metric account === stack account, but both are tokens', () => {
+        const metric = new Metric({
+          namespace: 'Test',
+          metricName: 'ACount',
+          account: stack4.account,
+        });
+
+        new Alarm(stack4, 'Alarm', {
+          threshold: 1,
+          evaluationPeriods: 1,
+          metric,
+        });
+
+        // Alarm will be defined as modern alarm, since there is no way of knowing that the two tokens are equal.
+        Template.fromStack(stack4).hasResourceProperties('AWS::CloudWatch::Alarm', {
+          Metrics: Match.anyValue(),
+        });
+      });
+
+      test('metric account !== stack account', () => {
+        const metric = new Metric({
+          namespace: 'Test',
+          metricName: 'ACount',
+          account: '123456789',
+        });
+
+        new Alarm(stack1, 'Alarm', {
+          threshold: 1,
+          evaluationPeriods: 1,
+          metric,
+        });
+
+        // Alarm will be defined as modern alarm.
+        Template.fromStack(stack1).hasResourceProperties('AWS::CloudWatch::Alarm', {
+          Metrics: Match.anyValue(),
+        });
+      });
+    });
   });
 });
 

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,6 @@ export class Alarm extends AlarmBase {`
`384`	`384`	`// if this is a region-agnostic stack, we can't assume anything about stat.account`
`385`	`385`	`// and therefore we assume its a cross-account call`
`386`	`386`	`if (Token.isUnresolved(stackAccount)) {`
`387`		`- console.log(stackAccount);`
`388`	`387`	`return true;`
`389`	`388`	`}`
`390`	`389`