@gradientedge/cdk-utils 8.8.0 → 8.10.0

package/dist/src/lib/manager/aws/cloudwatch-manager.d.ts

@@ -101,6 +101,14 @@ export declare class CloudWatchManager {
      * @param {string} functionName the lambda function name
      */
     createLambdaWidget(id: string, scope: common.CommonConstruct, props: any, functionName: string): cdk.aws_cloudwatch.GaugeWidget | cdk.aws_cloudwatch.GraphWidget | cdk.aws_cloudwatch.SingleValueWidget | cdk.aws_cloudwatch.LogQueryWidget | cdk.aws_cloudwatch.TextWidget | cdk.aws_cloudwatch.AlarmStatusWidget;
+    /**
+     * @summary Method to create a custom widget
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which this resource is defined
+     * @param {types.TextWidgetProps} props
+     * @param {string} service the service identifier
+     */
+    createCustomWidget(id: string, scope: common.CommonConstruct, props: any, service: string): cdk.aws_cloudwatch.GaugeWidget | cdk.aws_cloudwatch.GraphWidget | cdk.aws_cloudwatch.SingleValueWidget | cdk.aws_cloudwatch.LogQueryWidget | cdk.aws_cloudwatch.TextWidget | cdk.aws_cloudwatch.AlarmStatusWidget;
     /**
      * @summary Method to create an ecs cluster widget
      * @param {string} id scoped id of the resource

package/dist/src/lib/manager/aws/cloudwatch-manager.js

@@ -273,6 +273,24 @@ class CloudWatchManager {
             },
         });
     }
+    /**
+     * @summary Method to create a custom widget
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which this resource is defined
+     * @param {types.TextWidgetProps} props
+     * @param {string} service the service identifier
+     */
+    createCustomWidget(id, scope, props, service) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ service: service } })),
+            },
+        });
+    }
     /**
      * @summary Method to create an ecs cluster widget
      * @param {string} id scoped id of the resource
@@ -541,6 +559,14 @@ class CloudWatchManager {
                         },
                     };
                 }
+                if (metricProp.service) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            service: `${metricProp.service}`,
+                        },
+                    };
+                }
                 if (metricProp.distributionId) {
                     metricDimensions = {
                         ...metricProp.dimensionsMap,

package/dist/src/lib/manager/aws/ecs-manager.d.ts

@@ -45,8 +45,9 @@ export declare class EcsManager {
      * @param {ecs.ContainerImage} containerImage
      * @param {Map<string, string>} environment
      * @param {Map<string, string>} secrets
+     * @param {string[]} command
      */
-    createEcsFargateTask(id: string, scope: common.CommonConstruct, props: types.EcsTaskProps, cluster: ecs.ICluster, role: iam.Role, logGroup: logs.ILogGroup, containerImage: ecs.ContainerImage, environment?: any, secrets?: any): cdk.aws_ecs.TaskDefinition;
+    createEcsFargateTask(id: string, scope: common.CommonConstruct, props: types.EcsTaskProps, cluster: ecs.ICluster, role: iam.Role, logGroup: logs.ILogGroup, containerImage: ecs.ContainerImage, environment?: any, secrets?: any, command?: string[]): cdk.aws_ecs.TaskDefinition;
     /**
      * @summary Method to create an application loadbalanced ecs fargate task
      * @param {string} id scoped id of the resource

package/dist/src/lib/manager/aws/ecs-manager.js

@@ -83,8 +83,9 @@ class EcsManager {
      * @param {ecs.ContainerImage} containerImage
      * @param {Map<string, string>} environment
      * @param {Map<string, string>} secrets
+     * @param {string[]} command
      */
-    createEcsFargateTask(id, scope, props, cluster, role, logGroup, containerImage, environment, secrets) {
+    createEcsFargateTask(id, scope, props, cluster, role, logGroup, containerImage, environment, secrets, command) {
         if (!props)
             throw `EcsTask props undefined for ${id}`;
         const ecsTask = new ecs.TaskDefinition(scope, `${id}`, {
@@ -119,6 +120,7 @@ class EcsManager {
             memoryLimitMiB: props.memoryMiB ? parseInt(props.memoryMiB) : undefined,
             privileged: false,
             secrets: secrets,
+            command: command,
         });
         utils.createCfnOutput(`${id}-taskArn`, scope, ecsTask.taskDefinitionArn);
         return ecsTask;

package/dist/src/lib/types/aws/index.d.ts

@@ -527,6 +527,7 @@ export interface MetricProps extends watch.MetricProps {
     stateMachineArn?: string;
     eventBusName?: string;
     ruleName?: string;
+    service?: string;
 }
 /**
  * @category cdk-utils.cloudwatch-manager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.8.0",
+  "version": "8.10.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {

package/src/lib/manager/aws/cloudwatch-manager.ts

@@ -287,6 +287,24 @@ export class CloudWatchManager {
     })
   }
 
+  /**
+   * @summary Method to create a custom widget
+   * @param {string} id scoped id of the resource
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.TextWidgetProps} props
+   * @param {string} service the service identifier
+   */
+  public createCustomWidget(id: string, scope: common.CommonConstruct, props: any, service: string) {
+    if (!props) throw `Widget props undefined for ${id}`
+    const metricProps: any[] = props.metricProps
+    return this.createWidget(id, scope, {
+      ...props,
+      ...{
+        metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ service: service } })),
+      },
+    })
+  }
+
   /**
    * @summary Method to create an ecs cluster widget
    * @param {string} id scoped id of the resource
@@ -593,6 +611,14 @@ export class CloudWatchManager {
             },
           }
         }
+        if (metricProp.service) {
+          metricDimensions = {
+            ...metricProp.dimensionsMap,
+            ...{
+              service: `${metricProp.service}`,
+            },
+          }
+        }
         if (metricProp.distributionId) {
           metricDimensions = {
             ...metricProp.dimensionsMap,

package/src/lib/manager/aws/ecs-manager.ts

@@ -66,6 +66,7 @@ export class EcsManager {
    * @param {ecs.ContainerImage} containerImage
    * @param {Map<string, string>} environment
    * @param {Map<string, string>} secrets
+   * @param {string[]} command
    */
   public createEcsFargateTask(
     id: string,
@@ -76,7 +77,8 @@ export class EcsManager {
     logGroup: logs.ILogGroup,
     containerImage: ecs.ContainerImage,
     environment?: any,
-    secrets?: any
+    secrets?: any,
+    command?: string[]
   ) {
     if (!props) throw `EcsTask props undefined for ${id}`
 
@@ -113,6 +115,7 @@ export class EcsManager {
       memoryLimitMiB: props.memoryMiB ? parseInt(props.memoryMiB) : undefined,
       privileged: false,
       secrets: secrets,
+      command: command,
     })
 
     utils.createCfnOutput(`${id}-taskArn`, scope, ecsTask.taskDefinitionArn)

package/src/lib/types/aws/index.ts

@@ -556,6 +556,7 @@ export interface MetricProps extends watch.MetricProps {
   stateMachineArn?: string
   eventBusName?: string
   ruleName?: string
+  service?: string
 }
 
 /**