Merge branch 'main' into cs3

Enterprise-CMCS · Aug 6, 2024 · 8fdf265 · 8fdf265
2 parents d496d4c + 23088b5
commit 8fdf265
Show file tree

Hide file tree

Showing 6 changed files with 677 additions and 597 deletions.
diff --git a/lib/local-aspects/iam-path/index.ts b/lib/local-aspects/iam-path/index.ts
@@ -1,7 +1,6 @@
 import { IAspect } from "aws-cdk-lib";
 import { IConstruct } from "constructs";
 import * as iam from "aws-cdk-lib/aws-iam";
-import { isCfnRole, isCfnUser, isCfnGroup } from "shared-utils";
 
 export class IamPathAspect implements IAspect {
   private readonly iamPath: string;
@@ -11,16 +10,19 @@ export class IamPathAspect implements IAspect {
   }
 
   public visit(node: IConstruct): void {
-    if (node instanceof iam.Role && isCfnRole(node.node.defaultChild)) {
-      node.node.defaultChild?.addPropertyOverride("Path", this.iamPath);
+    if (node instanceof iam.Role) {
+      const roleResource = node.node.defaultChild as iam.CfnRole;
+      roleResource.addPropertyOverride("Path", this.iamPath);
     }
 
-    if (node instanceof iam.User && isCfnUser(node.node.defaultChild)) {
-      node.node.defaultChild.addPropertyOverride("Path", this.iamPath);
+    if (node instanceof iam.User) {
+      const userResource = node.node.defaultChild as iam.CfnUser;
+      userResource.addPropertyOverride("Path", this.iamPath);
     }
 
-    if (node instanceof iam.Group && isCfnGroup(node.node.defaultChild)) {
-      node.node.defaultChild.addPropertyOverride("Path", this.iamPath);
+    if (node instanceof iam.Group) {
+      const groupResource = node.node.defaultChild as iam.CfnGroup;
+      groupResource.addPropertyOverride("Path", this.iamPath);
     }
   }
 }
diff --git a/lib/local-aspects/iam-permissions-boundary/index.ts b/lib/local-aspects/iam-permissions-boundary/index.ts
@@ -1,7 +1,6 @@
 import { IAspect } from "aws-cdk-lib";
 import { IConstruct } from "constructs";
 import * as iam from "aws-cdk-lib/aws-iam";
-import { isCfnRole } from "shared-utils";
 
 export class IamPermissionsBoundaryAspect implements IAspect {
   private readonly permissionsBoundaryArn: string;
@@ -11,11 +10,9 @@ export class IamPermissionsBoundaryAspect implements IAspect {
   }
 
   public visit(node: IConstruct): void {
-    if (node instanceof iam.Role && isCfnRole(node.node.defaultChild)) {
-      node.node.defaultChild.addPropertyOverride(
-        "PermissionsBoundary",
-        this.permissionsBoundaryArn,
-      );
+    if (node instanceof iam.Role) {
+      const roleResource = node.node.defaultChild as iam.CfnRole;
+      roleResource.addPropertyOverride("Path", this.permissionsBoundaryArn);
     }
   }
 }