feat: refactor and update resource prefix aspect (#42)

* Refactor and update resource prefix aspect * Remove empty CFN stage prefixer * Fix dependency versions after bumping cdk verison * Cleanup tests for cfn prefixers Co-authored-by: Stephen Robinson <[email protected]>
techfromsage · Feb 11, 2022 · ed85e88 · ed85e88
1 parent 7386401
commit ed85e88
Show file tree

Hide file tree

Showing 21 changed files with 538 additions and 889 deletions.
diff --git a/examples/container-lambda-worker/package-lock.json b/examples/container-lambda-worker/package-lock.json
diff --git a/examples/container-lambda-worker/package.json b/examples/container-lambda-worker/package.json
@@ -24,6 +24,8 @@
     "@aws-cdk/core": "1.143.0",
     "@aws-cdk/aws-ec2": "1.143.0",
     "@aws-cdk/aws-sns": "1.143.0",
+    "@aws-cdk/aws-iam": "1.143.0",
+    "@aws-cdk/aws-lambda": "1.143.0",
     "cdk-ecr-deployment": "1.0.2",
     "source-map-support": "^0.5.16"
   }

diff --git a/examples/simple-authenticated-api/package-lock.json b/examples/simple-authenticated-api/package-lock.json
diff --git a/examples/simple-lambda-worker/package-lock.json b/examples/simple-lambda-worker/package-lock.json
diff --git a/lib/aspects/resource_prefixer/prefixers/apigatewayv2_cfn_api_prefixer.ts b/lib/aspects/resource_prefixer/prefixers/apigatewayv2_cfn_api_prefixer.ts
@@ -1,5 +1,5 @@
 import { CfnApi } from "@aws-cdk/aws-apigatewayv2";
-import { IConstruct } from "@aws-cdk/core";
+import { IConstruct, CfnResource, Annotations } from "@aws-cdk/core";
 import {
   CfnResourcePrefixer,
   CfnResourcePrefixerBase,
@@ -10,9 +10,11 @@ export class Apigatewayv2CfnApiPrefixer
   implements CfnResourcePrefixer
 {
   constructor(node: IConstruct, resourcePrefix: string) {
-    if (!(node instanceof CfnApi)) {
-      throw new Error(
-        "Specified node is not an instance of CfnApi and cannot be prefixed using this prefixer"
+    if (
+      !((node as CfnResource).cfnResourceType === CfnApi.CFN_RESOURCE_TYPE_NAME)
+    ) {
+      Annotations.of(node).addError(
+        "Node is not a CfnApi and cannot be prefixed using this prefixer"
       );
     }
     super(node, resourcePrefix);

diff --git a/lib/aspects/resource_prefixer/prefixers/apigatewayv2_cfn_stage_prefixer.ts b/lib/aspects/resource_prefixer/prefixers/apigatewayv2_cfn_stage_prefixer.ts
diff --git a/lib/aspects/resource_prefixer/prefixers/dynamodb_cfn_table_prefixer.ts b/lib/aspects/resource_prefixer/prefixers/dynamodb_cfn_table_prefixer.ts
@@ -1,5 +1,5 @@
 import { CfnTable } from "@aws-cdk/aws-dynamodb";
-import { IConstruct } from "@aws-cdk/core";
+import { IConstruct, CfnResource, Annotations } from "@aws-cdk/core";
 import {
   CfnResourcePrefixer,
   CfnResourcePrefixerBase,
@@ -10,9 +10,14 @@ export class DynamoDbCfnTablePrefixer
   implements CfnResourcePrefixer
 {
   constructor(node: IConstruct, resourcePrefix: string) {
-    if (!(node instanceof CfnTable)) {
-      throw new Error(
-        "Specified node is not an instance of CfnTable and cannot be prefixed using this prefixer"
+    if (
+      !(
+        (node as CfnResource).cfnResourceType ===
+        CfnTable.CFN_RESOURCE_TYPE_NAME
+      )
+    ) {
+      Annotations.of(node).addError(
+        "Node is not a CfnTable and cannot be prefixed using this prefixer"
       );
     }
     super(node, resourcePrefix);

diff --git a/lib/aspects/resource_prefixer/prefixers/ec2_cfn_security_group_prefixer.ts b/lib/aspects/resource_prefixer/prefixers/ec2_cfn_security_group_prefixer.ts
@@ -1,5 +1,5 @@
 import { CfnSecurityGroup } from "@aws-cdk/aws-ec2";
-import { IConstruct } from "@aws-cdk/core";
+import { IConstruct, CfnResource, Annotations } from "@aws-cdk/core";
 import {
   CfnResourcePrefixer,
   CfnResourcePrefixerBase,
@@ -10,9 +10,14 @@ export class Ec2CfnSecurityGroupPrefixer
   implements CfnResourcePrefixer
 {
   constructor(node: IConstruct, resourcePrefix: string) {
-    if (!(node instanceof CfnSecurityGroup)) {
-      throw new Error(
-        "Specified node is not an instance of CfnSecurityGroup and cannot be prefixed using this prefixer"
+    if (
+      !(
+        (node as CfnResource).cfnResourceType ===
+        CfnSecurityGroup.CFN_RESOURCE_TYPE_NAME
+      )
+    ) {
+      Annotations.of(node).addError(
+        "Node is not a CfnSecurityGroup and cannot be prefixed using this prefixer"
       );
     }
     super(node, resourcePrefix);