Merge branch 'master' into global-accelerator-sg

mergify[bot] · web-flow · commit d40fff49dea2 · 2020-08-11T07:59:44.000Z
diff --git a/packages/@aws-cdk/aws-cloudwatch/README.md b/packages/@aws-cdk/aws-cloudwatch/README.md
@@ -230,6 +230,7 @@ The following widgets are available:
 - `AlarmWidget` -- shows the graph and alarm line for a single alarm.
 - `SingleValueWidget` -- shows the current value of a set of metrics.
 - `TextWidget` -- shows some static Markdown.
+- `AlarmStatusWidget` -- shows the status of your alarms in a grid view.
 
 ### Graph widget
 
@@ -319,6 +320,19 @@ dashboard.addWidgets(new TextWidget({
 }));
 ```
 
+### Alarm Status widget
+
+An alarm status widget displays instantly the status of any type of alarms and gives the
+ability to aggregate one or more alarms together in a small surface.
+
+```ts
+dashboard.addWidgets(
+  new AlarmStatusWidget({
+    alarms: [errorAlarm],
+  })
+);
+```
+
 ### Query results widget
 
 A `LogQueryWidget` shows the results of a query from Logs Insights:
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/alarm-status-widget.ts b/packages/@aws-cdk/aws-cloudwatch/lib/alarm-status-widget.ts
@@ -0,0 +1,63 @@
+import { IAlarm } from './alarm-base';
+import { ConcreteWidget } from './widget';
+
+/**
+ * Properties for an Alarm Status Widget
+ */
+export interface AlarmStatusWidgetProps {
+  /**
+   * CloudWatch Alarms to show in widget
+   */
+  readonly alarms: IAlarm[];
+  /**
+   * The title of the widget
+   *
+   * @default 'Alarm Status'
+   */
+  readonly title?: string;
+  /**
+   * Width of the widget, in a grid of 24 units wide
+   *
+   * @default 6
+   */
+  readonly width?: number;
+  /**
+   * Height of the widget
+   *
+   * @default 3
+   */
+  readonly height?: number;
+}
+
+/**
+ * A dashboard widget that displays alarms in a grid view
+ */
+export class AlarmStatusWidget extends ConcreteWidget {
+  private readonly props: AlarmStatusWidgetProps;
+
+  constructor(props: AlarmStatusWidgetProps) {
+    super(props.width || 6, props.height || 3);
+    this.props = props;
+  }
+
+  public position(x: number, y: number): void {
+    this.x = x;
+    this.y = y;
+  }
+
+  public toJson(): any[] {
+    return [
+      {
+        type: 'alarm',
+        width: this.width,
+        height: this.height,
+        x: this.x,
+        y: this.y,
+        properties: {
+          title: this.props.title ? this.props.title : 'Alarm Status',
+          alarms: this.props.alarms.map((alarm) => alarm.alarmArn),
+        },
+      },
+    ];
+  }
+}
diff --git a/packages/@aws-cdk/aws-cloudwatch/lib/index.ts b/packages/@aws-cdk/aws-cloudwatch/lib/index.ts
@@ -11,6 +11,7 @@ export * from './metric-types';
 export * from './log-query';
 export * from './text';
 export * from './widget';
+export * from './alarm-status-widget';
 
 // AWS::CloudWatch CloudFormation Resources:
 export * from './cloudwatch.generated';
diff --git a/packages/@aws-cdk/aws-cloudwatch/test/test.alarm-status-widget.ts b/packages/@aws-cdk/aws-cloudwatch/test/test.alarm-status-widget.ts
@@ -0,0 +1,35 @@
+import { Stack } from '@aws-cdk/core';
+import { Test } from 'nodeunit';
+import { Metric, Alarm, AlarmStatusWidget } from '../lib';
+export = {
+  'alarm status widget'(test: Test) {
+    // GIVEN
+    const stack = new Stack();
+    const metric = new Metric({ namespace: 'CDK', metricName: 'Test' });
+    const alarm = new Alarm(stack, 'Alarm', {
+      metric,
+      threshold: 1,
+      evaluationPeriods: 1,
+    });
+
+    // WHEN
+    const widget = new AlarmStatusWidget({
+      alarms: [alarm],
+    });
+
+    // THEN
+    test.deepEqual(stack.resolve(widget.toJson()), [
+      {
+        type: 'alarm',
+        width: 6,
+        height: 3,
+        properties: {
+          title: 'Alarm Status',
+          alarms: [{ 'Fn::GetAtt': ['Alarm7103F465', 'Arn'] }],
+        },
+      },
+    ]);
+
+    test.done();
+  },
+};
diff --git a/packages/@aws-cdk/core/lib/annotations.ts b/packages/@aws-cdk/core/lib/annotations.ts
@@ -0,0 +1,60 @@
+import * as cxschema from '@aws-cdk/cloud-assembly-schema';
+import { IConstruct } from './construct-compat';
+
+/**
+ * Includes API for attaching annotations such as warning messages to constructs.
+ */
+export class Annotations {
+  /**
+   * Returns the annotations API for a construct scope.
+   * @param scope The scope
+   */
+  public static of(scope: IConstruct) {
+    return new Annotations(scope);
+  }
+
+  private constructor(private readonly scope: IConstruct) {
+
+  }
+
+  /**
+   * Adds a warning metadata entry to this construct.
+   *
+   * The CLI will display the warning when an app is synthesized, or fail if run
+   * in --strict mode.
+   *
+   * @param message The warning message.
+   */
+  public addWarning(message: string) {
+    this.addMessage(cxschema.ArtifactMetadataEntryType.WARN, message);
+  }
+
+  /**
+   * Adds an info metadata entry to this construct.
+   *
+   * The CLI will display the info message when apps are synthesized.
+   *
+   * @param message The info message.
+   */
+  public addInfo(message: string): void {
+    this.addMessage(cxschema.ArtifactMetadataEntryType.INFO, message);
+  }
+
+  /**
+   * Adds an { "error": <message> } metadata entry to this construct.
+   * The toolkit will fail synthesis when errors are reported.
+   * @param message The error message.
+   */
+  public addError(message: string) {
+    this.addMessage(cxschema.ArtifactMetadataEntryType.ERROR, message);
+  }
+
+  /**
+   * Adds a message metadata entry to the construct node, to be displayed by the CDK CLI.
+   * @param level The message level
+   * @param message The message itself
+   */
+  private addMessage(level: string, message: string) {
+    this.scope.node.addMetadata(level, message);
+  }
+}
diff --git a/packages/@aws-cdk/core/lib/construct-compat.ts b/packages/@aws-cdk/core/lib/construct-compat.ts
@@ -10,9 +10,9 @@
  * This file, in its entirety, is expected to be removed in v2.0.
  */
 
-import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
 import * as constructs from 'constructs';
+import { Annotations } from './annotations';
 import { IAspect, Aspects } from './aspect';
 import { IDependable } from './dependency';
 import { Token } from './token';
@@ -426,31 +426,34 @@ export class ConstructNode {
   public addMetadata(type: string, data: any, fromFunction?: any): void { this._actualNode.addMetadata(type, data, fromFunction); }
 
   /**
-   * Adds a { "info": <message> } metadata entry to this construct.
+   * DEPRECATED: Adds a { "info": <message> } metadata entry to this construct.
    * The toolkit will display the info message when apps are synthesized.
    * @param message The info message.
+   * @deprecated use `Annotations.of(construct).addInfo()`
    */
   public addInfo(message: string): void {
-    this._actualNode.addMetadata(cxschema.ArtifactMetadataEntryType.INFO, message);
+    Annotations.of(this.host).addInfo(message);
   }
 
   /**
-   * Adds a { "warning": <message> } metadata entry to this construct.
+   * DEPRECATED: Adds a { "warning": <message> } metadata entry to this construct.
    * The toolkit will display the warning when an app is synthesized, or fail
    * if run in --strict mode.
    * @param message The warning message.
+   * @deprecated use `Annotations.of(construct).addWarning()`
    */
   public addWarning(message: string): void {
-    this._actualNode.addMetadata(cxschema.ArtifactMetadataEntryType.WARN, message);
+    Annotations.of(this.host).addWarning(message);
   }
 
   /**
-   * Adds an { "error": <message> } metadata entry to this construct.
+   * DEPRECATED: Adds an { "error": <message> } metadata entry to this construct.
    * The toolkit will fail synthesis when errors are reported.
    * @param message The error message.
+   * @deprecated use `Annotations.of(construct).addError()`
    */
   public addError(message: string) {
-    this._actualNode.addMetadata(cxschema.ArtifactMetadataEntryType.ERROR, message);
+    Annotations.of(this.host).addError(message);
   }
 
   /**
diff --git a/packages/@aws-cdk/core/lib/context-provider.ts b/packages/@aws-cdk/core/lib/context-provider.ts
@@ -1,5 +1,6 @@
 import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
+import { Annotations } from './annotations';
 import { Construct } from './construct-compat';
 import { Stack } from './stack';
 import { Token } from './token';
@@ -107,8 +108,9 @@ export class ContextProvider {
       });
 
       if (providerError !== undefined) {
-        scope.construct.addError(providerError);
+        Annotations.of(scope).addError(providerError);
       }
+
       return { value: options.dummyValue };
     }
 
diff --git a/packages/@aws-cdk/core/lib/private/synthesis.ts b/packages/@aws-cdk/core/lib/private/synthesis.ts
@@ -1,5 +1,6 @@
 import * as cxapi from '@aws-cdk/cx-api';
 import * as constructs from 'constructs';
+import { Annotations } from '../annotations';
 import { Aspects, IAspect } from '../aspect';
 import { Construct, IConstruct, SynthesisOptions, ValidationError } from '../construct-compat';
 import { Stack } from '../stack';
@@ -84,7 +85,7 @@ function invokeAspects(root: IConstruct) {
       // if an aspect was added to the node while invoking another aspect it will not be invoked, emit a warning
       // the `nestedAspectWarning` flag is used to prevent the warning from being emitted for every child
       if (!nestedAspectWarning && nodeAspectsCount !== aspects.aspects.length) {
-        construct.construct.addWarning('We detected an Aspect was added via another Aspect, and will not be applied');
+        Annotations.of(construct).addWarning('We detected an Aspect was added via another Aspect, and will not be applied');
         nestedAspectWarning = true;
       }
 
diff --git a/packages/@aws-cdk/core/lib/private/tree-metadata.ts b/packages/@aws-cdk/core/lib/private/tree-metadata.ts
@@ -2,6 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 import { ArtifactType } from '@aws-cdk/cloud-assembly-schema';
+import { Annotations } from '../annotations';
 import { Construct, IConstruct, ISynthesisSession } from '../construct-compat';
 import { Stack } from '../stack';
 import { IInspectable, TreeInspector } from '../tree';
@@ -32,7 +33,7 @@ export class TreeMetadata extends Construct {
         try {
           return visit(c);
         } catch (e) {
-          this.construct.addWarning(`Failed to render tree metadata for node [${c.construct.id}]. Reason: ${e}`);
+          Annotations.of(this).addWarning(`Failed to render tree metadata for node [${c.node.id}]. Reason: ${e}`);
           return undefined;
         }
       });
diff --git a/packages/@aws-cdk/core/lib/stack.ts b/packages/@aws-cdk/core/lib/stack.ts
@@ -2,6 +2,8 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
+import { Annotations } from './annotations';
+import { App } from './app';
 import { Arn, ArnComponents } from './arn';
 import { DockerImageAssetLocation, DockerImageAssetSource, FileAssetLocation, FileAssetSource } from './assets';
 import { CfnElement } from './cfn-element';
@@ -201,7 +203,7 @@ export class Stack extends Construct implements ITaggable {
    * value is an unresolved token (`Token.isUnresolved(stack.region)` returns
    * `true`), this implies that the user wishes that this stack will synthesize
    * into a **region-agnostic template**. In this case, your code should either
-   * fail (throw an error, emit a synth error using `node.addError`) or
+   * fail (throw an error, emit a synth error using `Annotations.of(construct).addError()`) or
    * implement some other region-agnostic behavior.
    */
   public readonly region: string;
@@ -223,7 +225,7 @@ export class Stack extends Construct implements ITaggable {
    * value is an unresolved token (`Token.isUnresolved(stack.account)` returns
    * `true`), this implies that the user wishes that this stack will synthesize
    * into a **account-agnostic template**. In this case, your code should either
-   * fail (throw an error, emit a synth error using `node.addError`) or
+   * fail (throw an error, emit a synth error using `Annotations.of(construct).addError()`) or
    * implement some other region-agnostic behavior.
    */
   public readonly account: string;
@@ -800,7 +802,7 @@ export class Stack extends Construct implements ITaggable {
 
     if (this.templateOptions.transform) {
       // eslint-disable-next-line max-len
-      this.construct.addWarning('This stack is using the deprecated `templateOptions.transform` property. Consider switching to `addTransform()`.');
+      Annotations.of(this).addWarning('This stack is using the deprecated `templateOptions.transform` property. Consider switching to `addTransform()`.');
       this.addTransform(this.templateOptions.transform);
     }
 
@@ -1094,7 +1096,6 @@ import { Stage } from './stage';
 import { ITaggable, TagManager } from './tag-manager';
 import { Token } from './token';
 import { FileSystem } from './fs';
-import { App } from './app';
 
 interface StackDependency {
   stack: Stack;
diff --git a/packages/@aws-cdk/core/test/test.app.ts b/packages/@aws-cdk/core/test/test.app.ts
@@ -2,6 +2,7 @@ import { ContextProvider } from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
 import { Test } from 'nodeunit';
 import { CfnResource, Construct, Stack, StackProps } from '../lib';
+import { Annotations } from '../lib/annotations';
 import { App, AppProps } from '../lib/app';
 
 function withApp(props: AppProps, block: (app: App) => void): cxapi.CloudAssembly {
@@ -28,8 +29,8 @@ function synth(context?: { [key: string]: any }): cxapi.CloudAssembly {
 
     // add some metadata
     stack1.construct.addMetadata('meta', 111);
-    r2.construct.addWarning('warning1');
-    r2.construct.addWarning('warning2');
+    Annotations.of(r2).addWarning('warning1');
+    Annotations.of(r2).addWarning('warning2');
     c1.construct.addMetadata('meta', { key: 'value' });
     app.construct.addMetadata('applevel', 123); // apps can also have metadata
   });
diff --git a/packages/@aws-cdk/core/test/test.construct.ts b/packages/@aws-cdk/core/test/test.construct.ts
@@ -1,6 +1,7 @@
 import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import { Test } from 'nodeunit';
 import { App as Root, Aws, Construct, ConstructNode, ConstructOrder, IConstruct, Lazy, ValidationError } from '../lib';
+import { Annotations } from '../lib/annotations';
 import { reEnableStackTraceCollection, restoreStackTraceColection } from './util';
 
 /* eslint-disable @typescript-eslint/naming-convention */
@@ -288,7 +289,7 @@ export = {
     const previousValue = reEnableStackTraceCollection();
     const root = new Root();
     const con = new Construct(root, 'MyConstruct');
-    con.construct.addWarning('This construct is deprecated, use the other one instead');
+    Annotations.of(con).addWarning('This construct is deprecated, use the other one instead');
     restoreStackTraceColection(previousValue);
 
     test.deepEqual(con.construct.metadata[0].type, cxschema.ArtifactMetadataEntryType.WARN);
@@ -301,7 +302,7 @@ export = {
     const previousValue = reEnableStackTraceCollection();
     const root = new Root();
     const con = new Construct(root, 'MyConstruct');
-    con.construct.addError('Stop!');
+    Annotations.of(con).addError('Stop!');
     restoreStackTraceColection(previousValue);
 
     test.deepEqual(con.construct.metadata[0].type, cxschema.ArtifactMetadataEntryType.ERROR);
@@ -314,7 +315,7 @@ export = {
     const previousValue = reEnableStackTraceCollection();
     const root = new Root();
     const con = new Construct(root, 'MyConstruct');
-    con.construct.addInfo('Hey there, how do you do?');
+    Annotations.of(con).addInfo('Hey there, how do you do?');
     restoreStackTraceColection(previousValue);
 
     test.deepEqual(con.construct.metadata[0].type, cxschema.ArtifactMetadataEntryType.INFO);
