@gradientedge/cdk-utils 7.21.0 → 8.0.0

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

@@ -69,7 +69,7 @@ class AcmManager {
      */
     resolveCertificate(id, scope, props, hostedZone) {
         if (!props)
-            throw `Certificate props undefined`;
+            throw `Certificate props undefined for ${id}`;
         let certificate;
         if (props.useExistingCertificate) {
             let certificateArn = props.certificateArn;

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

@@ -56,6 +56,8 @@ class ApiManager {
      * @param lambdaFunction
      */
     createLambdaRestApi(id, scope, props, lambdaFunction) {
+        if (!props)
+            throw `Api props undefined for ${id}`;
         const api = new apig.LambdaRestApi(scope, `${id}`, {
             binaryMediaTypes: props.binaryMediaTypes,
             minimumCompressionSize: props.minimumCompressionSize,

package/dist/src/lib/manager/aws/app-config-manager.js

@@ -91,7 +91,7 @@ class AppConfigManager {
      */
     createApplication(id, scope, props) {
         if (!props)
-            throw `AppConfig props undefined`;
+            throw `AppConfig props undefined for ${id}`;
         const application = new appconfig.CfnApplication(scope, `${id}`, {
             name: `${props.application.name}-${scope.props.stage}`,
             description: props.application.description,
@@ -111,7 +111,7 @@ class AppConfigManager {
      */
     createEnvironment(id, scope, applicationId, props) {
         if (!props)
-            throw `AppConfig props undefined`;
+            throw `AppConfig props undefined for ${id}`;
         const environment = new appconfig.CfnEnvironment(scope, `${id}`, {
             applicationId: applicationId,
             name: scope.props.stage,
@@ -134,7 +134,7 @@ class AppConfigManager {
      */
     createConfigurationProfile(id, scope, applicationId, props) {
         if (!props)
-            throw `AppConfig props undefined`;
+            throw `AppConfig props undefined for ${id}`;
         const profile = new appconfig.CfnConfigurationProfile(scope, `${id}`, {
             applicationId: applicationId,
             locationUri: props.configurationProfile.locationUri || 'hosted',

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

@@ -79,11 +79,11 @@ class CloudFrontManager {
      */
     createCloudFrontDistribution(id, scope, props, siteBucket, logBucket, oai, certificate, aliases) {
         if (!siteBucket)
-            throw `SiteBucket not defined`;
+            throw `SiteBucket not defined for ${id}`;
         if (!certificate)
-            throw `Certificate not defined`;
+            throw `Certificate not defined for ${id}`;
         if (!props)
-            throw `CloudFront props undefined`;
+            throw `CloudFront props undefined for ${id}`;
         const distribution = new cloudfront.CloudFrontWebDistribution(scope, `${id}`, {
             comment: `${id} - ${scope.props.stage} stage`,
             defaultRootObject: props.defaultRootObject,
@@ -223,7 +223,7 @@ class CloudFrontManager {
      */
     createEdgeFunction(id, scope, props, layers, code, environment, vpc, securityGroups, accessPoint, mountPath) {
         if (!props)
-            throw 'EdgeFunction props undefined';
+            throw `EdgeFunction props undefined for ${id}`;
         const edgeFunction = new cloudfront.experimental.EdgeFunction(scope, `${id}`, {
             code: code,
             environment: {

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

@@ -66,7 +66,7 @@ class CloudTrailManager {
      */
     createCloudTrail(id, scope, props, logGroup, dataBucket, logBucket, logBucketPolicy) {
         if (!props)
-            throw `CloudTrail props undefined`;
+            throw `CloudTrail props undefined for ${id}`;
         const role = scope.iamManager.createRoleForCloudTrail(`${id}Role`, scope, logGroup);
         const cloudTrail = new cloudtrail.CfnTrail(scope, `${id}`, {
             cloudWatchLogsLogGroupArn: logGroup.attrArn,
@@ -92,9 +92,9 @@ class CloudTrailManager {
             tags: [{ key: 'service', value: scope.props.name }],
             trailName: `${props.trailName}-${scope.props.stage}`,
         });
-        cloudTrail.addDependsOn(logBucketPolicy);
-        cloudTrail.addDependsOn(logGroup);
-        cloudTrail.addDependsOn(role);
+        cloudTrail.addDependency(logBucketPolicy);
+        cloudTrail.addDependency(logGroup);
+        cloudTrail.addDependency(role);
         utils.createCfnOutput(`${id}-trailName`, scope, cloudTrail.trailName);
         utils.createCfnOutput(`${id}-trailArn`, scope, cloudTrail.attrArn);
         return { cloudTrailRole: role, cloudTrail };

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

@@ -59,7 +59,81 @@ export declare class CloudWatchManager {
      * @param {common.CommonConstruct} scope scope in which this resource is defined
      * @param props
      */
-    createWidget(id: string, scope: common.CommonConstruct, props: any): cdk.aws_cloudwatch.GraphWidget | cdk.aws_cloudwatch.SingleValueWidget | cdk.aws_cloudwatch.LogQueryWidget | cdk.aws_cloudwatch.TextWidget | cdk.aws_cloudwatch.AlarmStatusWidget;
+    createWidget(id: string, scope: common.CommonConstruct, props: any): 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 cloudfront distribution 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} distributionId the cloudfront distribution id
+     */
+    createCloudfrontDistributionWidget(id: string, scope: common.CommonConstruct, props: any, distributionId: 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 step function 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} stateMachineArn the step function arn
+     */
+    createStateWidget(id: string, scope: common.CommonConstruct, props: any, stateMachineArn: 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 event 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} eventBusName the event bus name
+     * @param {string} ruleName the event rule name
+     */
+    createEventWidget(id: string, scope: common.CommonConstruct, props: any, eventBusName: string, ruleName: 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 api gateway 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} apiName the api name
+     */
+    createApiGatewayWidget(id: string, scope: common.CommonConstruct, props: any, apiName: 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 lambda function 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} 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 an ecs cluster 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} clusterName the ecs cluster name
+     */
+    createEcsClusterWidget(id: string, scope: common.CommonConstruct, props: any, clusterName: 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 service 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} clusterName the ecs cluster name
+     * @param {string} serviceName the ecs service name
+     */
+    createEcsServiceWidget(id: string, scope: common.CommonConstruct, props: any, clusterName: string, serviceName: 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 elb 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} loadBalancer the loadbalancer reference
+     */
+    createElbWidget(id: string, scope: common.CommonConstruct, props: any, loadBalancer: 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 elasticache 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} cacheClusterId the elasticache cluster id
+     */
+    createCacheWidget(id: string, scope: common.CommonConstruct, props: any, cacheClusterId: 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 cloudwatch text widget
      * @param {string} id scoped id of the resource
@@ -75,6 +149,14 @@ export declare class CloudWatchManager {
      * @param metrics
      */
     createSingleValueWidget(id: string, scope: common.CommonConstruct, props: types.NumericWidgetProps, metrics: IMetric[]): cdk.aws_cloudwatch.SingleValueWidget;
+    /**
+     * @summary Method to create a cloudwatch guage widget
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which this resource is defined
+     * @param {types.GuageWidgetProps} props
+     * @param metrics
+     */
+    createGuageWidget(id: string, scope: common.CommonConstruct, props: types.GuageWidgetProps, metrics: IMetric[]): cdk.aws_cloudwatch.GaugeWidget;
     /**
      * @summary Method to create a cloudwatch graph widget
      * @param {string} id scoped id of the resource

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

@@ -35,6 +35,7 @@ var CloudWatchWidgetType;
 (function (CloudWatchWidgetType) {
     CloudWatchWidgetType["Text"] = "Text";
     CloudWatchWidgetType["SingleValue"] = "SingleValue";
+    CloudWatchWidgetType["Gauge"] = "Gauge";
     CloudWatchWidgetType["Graph"] = "Graph";
     CloudWatchWidgetType["AlarmStatus"] = "AlarmStatus";
     CloudWatchWidgetType["LogQuery"] = "LogQuery";
@@ -68,7 +69,7 @@ class CloudWatchManager {
      */
     createAlarmForExpression(id, scope, props) {
         if (!props)
-            throw `Alarm props undefined`;
+            throw `Alarm props undefined for ${id}`;
         if (!props.expression)
             throw `Could not find expression for Alarm props for id:${id}`;
         if (!props.metricProps)
@@ -102,7 +103,7 @@ class CloudWatchManager {
      */
     createAlarmForMetric(id, scope, props, metric) {
         if (!props)
-            throw `Alarm props undefined`;
+            throw `Alarm props undefined for ${id}`;
         const alarm = metric.createAlarm(scope, `${id}`, {
             alarmName: props.alarmName,
             alarmDescription: props.alarmDescription,
@@ -125,7 +126,7 @@ class CloudWatchManager {
      */
     createDashboard(id, scope, props, widgets) {
         if (!props)
-            throw `Dashboard props undefined`;
+            throw `Dashboard props undefined for ${id}`;
         const dashboard = new watch.Dashboard(scope, `${id}`, {
             dashboardName: props.dashboardName,
             periodOverride: props.periodOverride,
@@ -156,7 +157,7 @@ class CloudWatchManager {
      */
     createWidget(id, scope, props) {
         if (!props)
-            throw `Widget props undefined`;
+            throw `Widget props undefined for ${id}`;
         const metrics = this.determineMetrics(scope, props.metricProps);
         let alarms, logGroupNames = [];
         switch (props.type) {
@@ -164,6 +165,8 @@ class CloudWatchManager {
                 return this.createTextWidget(id, scope, props);
             case CloudWatchWidgetType.SingleValue:
                 return this.createSingleValueWidget(id, scope, props, metrics);
+            case CloudWatchWidgetType.Gauge:
+                return this.createGuageWidget(id, scope, props, metrics);
             case CloudWatchWidgetType.Graph:
                 return this.createGraphWidget(id, scope, props, metrics);
             case CloudWatchWidgetType.AlarmStatus:
@@ -173,9 +176,179 @@ class CloudWatchManager {
                 logGroupNames = props.logGroupNames.map((name) => `${name}-${scope.props.stage}`);
                 return this.createLogQueryWidget(id, scope, props, logGroupNames);
             default:
-                throw 'Unsupported widget type';
+                throw `Unsupported widget type ${props.type}`;
         }
     }
+    /**
+     * @summary Method to create a cloudfront distribution 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} distributionId the cloudfront distribution id
+     */
+    createCloudfrontDistributionWidget(id, scope, props, distributionId) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ distributionId: distributionId } })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create a step function 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} stateMachineArn the step function arn
+     */
+    createStateWidget(id, scope, props, stateMachineArn) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ stateMachineArn: stateMachineArn } })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create an event 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} eventBusName the event bus name
+     * @param {string} ruleName the event rule name
+     */
+    createEventWidget(id, scope, props, eventBusName, ruleName) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({
+                    ...metricProp,
+                    ...{ eventBusName: eventBusName, ruleName: ruleName },
+                })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create an api gateway 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} apiName the api name
+     */
+    createApiGatewayWidget(id, scope, props, apiName) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ apiName: apiName } })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create a lambda function 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} functionName the lambda function name
+     */
+    createLambdaWidget(id, scope, props, functionName) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ functionName: functionName } })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create an ecs cluster 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} clusterName the ecs cluster name
+     */
+    createEcsClusterWidget(id, scope, props, clusterName) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ clusterName: clusterName } })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create an ecs service 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} clusterName the ecs cluster name
+     * @param {string} serviceName the ecs service name
+     */
+    createEcsServiceWidget(id, scope, props, clusterName, serviceName) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({
+                    ...metricProp,
+                    ...{ clusterName: clusterName, serviceName: serviceName },
+                })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create an elb 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} loadBalancer the loadbalancer reference
+     */
+    createElbWidget(id, scope, props, loadBalancer) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ loadBalancer: loadBalancer } })),
+            },
+        });
+    }
+    /**
+     * @summary Method to create an elasticache 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} cacheClusterId the elasticache cluster id
+     */
+    createCacheWidget(id, scope, props, cacheClusterId) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const metricProps = props.metricProps;
+        return this.createWidget(id, scope, {
+            ...props,
+            ...{
+                metricProps: metricProps.map(metricProp => ({ ...metricProp, ...{ cacheClusterId: cacheClusterId } })),
+            },
+        });
+    }
     /**
      * @summary Method to create a cloudwatch text widget
      * @param {string} id scoped id of the resource
@@ -183,6 +356,8 @@ class CloudWatchManager {
      * @param {types.TextWidgetProps} props
      */
     createTextWidget(id, scope, props) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
         const widget = new watch.TextWidget({
             markdown: props.markdown,
             width: props.width,
@@ -200,10 +375,38 @@ class CloudWatchManager {
      * @param metrics
      */
     createSingleValueWidget(id, scope, props, metrics) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
         const widget = new watch.SingleValueWidget({
+            region: props.region ?? scope.props.region,
             metrics: metrics,
             setPeriodToTimeRange: props.setPeriodToTimeRange,
             fullPrecision: props.fullPrecision,
+            sparkline: props.sparkline,
+            title: props.title,
+            width: props.width,
+            height: props.height,
+        });
+        if (props.positionX && props.positionY)
+            widget.position(props.positionX, props.positionY);
+        return widget;
+    }
+    /**
+     * @summary Method to create a cloudwatch guage widget
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which this resource is defined
+     * @param {types.GuageWidgetProps} props
+     * @param metrics
+     */
+    createGuageWidget(id, scope, props, metrics) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
+        const widget = new watch.GaugeWidget({
+            region: props.region ?? scope.props.region,
+            metrics: metrics,
+            leftYAxis: props.leftYAxis,
+            statistic: props.statistic,
+            setPeriodToTimeRange: props.setPeriodToTimeRange,
             title: props.title,
             width: props.width,
             height: props.height,
@@ -221,7 +424,10 @@ class CloudWatchManager {
      * @param rightYMetrics
      */
     createGraphWidget(id, scope, props, leftYMetrics, rightYMetrics) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
         const widget = new watch.GraphWidget({
+            region: props.region ?? scope.props.region,
             left: leftYMetrics,
             right: rightYMetrics,
             leftAnnotations: props.leftAnnotations,
@@ -248,6 +454,8 @@ class CloudWatchManager {
      * @param {watch.IAlarm[]} alarms
      */
     createAlarmStatusWidget(id, scope, props, alarms) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
         const widget = new watch.AlarmStatusWidget({
             alarms: alarms,
             title: props.title,
@@ -266,7 +474,10 @@ class CloudWatchManager {
      * @param {string[]} logGroupNames
      */
     createLogQueryWidget(id, scope, props, logGroupNames) {
+        if (!props)
+            throw `Widget props undefined for ${id}`;
         const widget = new watch.LogQueryWidget({
+            region: props.region ?? scope.props.region,
             logGroupNames: logGroupNames,
             queryString: props.queryString,
             queryLines: props.queryLines,
@@ -293,7 +504,65 @@ class CloudWatchManager {
                     metricDimensions = {
                         ...metricProp.dimensionsMap,
                         ...{
-                            FunctionName: `${metricProp.functionName}-${scope.props.stage}`,
+                            FunctionName: `${metricProp.functionName}`,
+                        },
+                    };
+                }
+                if (metricProp.serviceName && metricProp.clusterName) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            ServiceName: `${metricProp.serviceName}`,
+                            ClusterName: `${metricProp.clusterName}`,
+                        },
+                    };
+                }
+                if (!metricProp.serviceName && metricProp.clusterName) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            ClusterName: `${metricProp.clusterName}`,
+                        },
+                    };
+                }
+                if (metricProp.serviceName && !metricProp.clusterName) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            ServiceName: `${metricProp.serviceName}`,
+                        },
+                    };
+                }
+                if (metricProp.loadBalancer) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            LoadBalancer: `${metricProp.loadBalancer}`,
+                        },
+                    };
+                }
+                if (metricProp.distributionId) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            Region: `Global`,
+                            DistributionId: `${metricProp.distributionId}`,
+                        },
+                    };
+                }
+                if (metricProp.apiName) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            ApiName: `${metricProp.apiName}`,
+                        },
+                    };
+                }
+                if (metricProp.cacheClusterId) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            CacheClusterId: `${metricProp.cacheClusterId}`,
                         },
                     };
                 }
@@ -301,7 +570,24 @@ class CloudWatchManager {
                     metricDimensions = {
                         ...metricProp.dimensionsMap,
                         ...{
-                            DBClusterIdentifier: `${metricProp.dbClusterIdentifier}-${scope.props.stage}`,
+                            DBClusterIdentifier: `${metricProp.dbClusterIdentifier}`,
+                        },
+                    };
+                }
+                if (metricProp.stateMachineArn) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            StateMachineArn: `${metricProp.stateMachineArn}`,
+                        },
+                    };
+                }
+                if (metricProp.eventBusName && metricProp.ruleName) {
+                    metricDimensions = {
+                        ...metricProp.dimensionsMap,
+                        ...{
+                            EventBusName: `${metricProp.eventBusName}`,
+                            RuleName: `${metricProp.ruleName}`,
                         },
                     };
                 }

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

@@ -55,7 +55,7 @@ class DynamodbManager {
      */
     createTable(id, scope, props) {
         if (!props)
-            throw `Table props undefined`;
+            throw `Table props undefined for ${id}`;
         const table = new dynamodb.Table(scope, `${id}`, {
             tableName: `${props.tableName}-${scope.props.stage}`,
             partitionKey: props.partitionKey,

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

@@ -58,7 +58,7 @@ class EcsManager {
      */
     createEcsCluster(id, scope, props, vpc) {
         if (!props)
-            throw `Ecs Cluster props undefined`;
+            throw `Ecs Cluster props undefined for ${id}`;
         const ecsCluster = new ecs.Cluster(scope, `${id}`, {
             clusterName: `${props.clusterName}-${scope.props.stage}`,
             vpc: vpc,
@@ -86,7 +86,7 @@ class EcsManager {
      */
     createEcsFargateTask(id, scope, props, cluster, role, logGroup, containerImage, environment, secrets) {
         if (!props)
-            throw `EcsTask props undefined`;
+            throw `EcsTask props undefined for ${id}`;
         const ecsTask = new ecs.TaskDefinition(scope, `${id}`, {
             compatibility: ecs.Compatibility.FARGATE,
             cpu: props.cpu,
@@ -133,9 +133,9 @@ class EcsManager {
      */
     createLoadBalancedFargateService(id, scope, props, cluster, logGroup) {
         if (!props)
-            throw `EcsLoadbalanced Fargate Serivice props undefined`;
+            throw `EcsLoadbalanced Fargate Serivice props undefined for ${id}`;
         if (!props.taskImageOptions)
-            throw `TaskImageOptions for EcsLoadbalanced Fargate Serivice props undefined`;
+            throw `TaskImageOptions for EcsLoadbalanced Fargate Serivice props undefined for ${id}`;
         const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(scope, `${id}-ecs-service`, {
             assignPublicIp: props.assignPublicIp ?? true,
             certificate: props.certificate,

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

@@ -58,7 +58,7 @@ class EksManager {
      */
     createEksDeployment(id, scope, props, image, vpc) {
         if (!props)
-            throw `EksCluster props undefined`;
+            throw `EksCluster props undefined for ${id}`;
         const appLabel = { app: `${id}`.toLowerCase() };
         const deployment = {
             apiVersion: 'apps/v1',