feat: Adding recursion option while adding Policies from Path (#545)

Adding recursion in addPoliciesFromPath, default to false for backward
compatibility. Bumping CDK Version.

Fixes #526

---------

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: reste85

.projen/deps.json

@@ -4,7 +4,7 @@ const project = new CdklabsConstructLibrary({
   authorAddress: 'aws-avp-cdk-dev@amazon.com',
   description: 'L2 AWS CDK Constructs for Amazon Verified Permissions',
   keywords: ['cdk', 'aws-cdk', 'awscdk', 'aws', 'verified-permissions', 'authorization', 'verifiedpermissions'],
-  cdkVersion: '2.198.0',
+  cdkVersion: '2.234.1',
   defaultReleaseBranch: 'main',
   devDeps: ['cdklabs-projen-project-types'],
   bundledDeps: ['@cedar-policy/cedar-wasm@4.5.0'],
@@ -13,7 +13,7 @@ const project = new CdklabsConstructLibrary({
   majorVersion: 0,
   stability: 'experimental',
   releaseToNpm: true,
-  jsiiVersion: '5.7',
+  jsiiVersion: '5.9',
   private: false,
   enablePRAutoMerge: true,
   repositoryUrl: 'https://github.com/cdklabs/cdk-verified-permissions.git',

.projenrc.ts

@@ -443,21 +443,33 @@ export class PolicyStore extends PolicyStoreBase {
 
   /**
    * Takes in an absolute path to a directory containing .cedar files and adds the contents of each
-   * .cedar file as policies to this policy store. Parses the policies with cedar-wasm and, if the policy store has a schema,
+   * .cedar file as policies to this policy store (searching recursively if needed).
+   * Parses the policies with cedar-wasm and, if the policy store has a schema,
    * performs semantic validation of the policies as well.
    * @param absolutePath a string representing an absolute path to the directory containing your policies
+   * @param recursive a boolean representing whether or not to search the directory recursively for .cedar files
    * @returns An array of created Policy constructs.
    */
-  public addPoliciesFromPath(absolutePath: string): Policy[] {
+  public addPoliciesFromPath(absolutePath: string, recursive: boolean = false): Policy[] {
     if (!fs.statSync(absolutePath).isDirectory()) {
       throw new Error(
         `The path ${absolutePath} does not appear to be a directory`,
       );
     }
-    const policyFileNames = fs
-      .readdirSync(absolutePath)
-      .map((f) => path.join(absolutePath, f))
-      .filter((f) => !fs.statSync(f).isDirectory() && f.endsWith('.cedar'));
+
+    const policyFileNames: string[] = [];
+    const processDir = (dirPath: string) => {
+      const entries = fs.readdirSync(dirPath, { withFileTypes: true });
+      for (const entry of entries) {
+        const fullPath = path.join(dirPath, entry.name);
+        if (entry.isFile() && entry.name.endsWith('.cedar')) {
+          policyFileNames.push(fullPath);
+        } else if (entry.isDirectory() && recursive) {
+          processDir(fullPath);
+        }
+      }
+    };
+    processDir(absolutePath);
 
     if (this.validationSettings.mode === ValidationSettingsMode.STRICT) {
       if (!this.schema) {

API.md

@@ -603,6 +603,43 @@ describe('Policy store with policies from a path', () => {
     expect(Object.keys(policyDefns)).toHaveLength(8);
   });
 
+  test('Creating Policy Store and adding policies to it from a path with recursion', () => {
+    // GIVEN
+    const stack = new Stack(undefined, 'Stack');
+
+    // WHEN
+    const policyStore = new PolicyStore(stack, 'PolicyStore', {
+      validationSettings: {
+        mode: ValidationSettingsMode.STRICT,
+      },
+      schema: {
+        cedarJson: JSON.stringify(exampleSchema),
+      },
+      description: 'PhotoApp',
+    });
+
+    policyStore.addPoliciesFromPath(path.join(__dirname, 'test-policies', 'all-valid'), true);
+
+    // THEN
+    Template.fromStack(stack).hasResourceProperties(
+      'AWS::VerifiedPermissions::PolicyStore',
+      {
+        ValidationSettings: {
+          Mode: ValidationSettingsMode.STRICT,
+        },
+        DeletionProtection: {
+          Mode: DeletionProtectionMode.DISABLED,
+        },
+        Schema: {
+          CedarJson: JSON.stringify(exampleSchema),
+        },
+      },
+    );
+
+    const policyDefns = Template.fromStack(stack).findResources('AWS::VerifiedPermissions::Policy');
+    expect(Object.keys(policyDefns)).toHaveLength(9);
+  });
+
   test('fails if the path is not a directory', () => {
     // GIVEN
     const stack = new Stack(undefined, 'Stack');

package.json

@@ -0,0 +1,3 @@
+@cdkDescription("I am a description of a policy")
+@cdkId("IamAnIDButImNumberTwo")
+permit(principal, action, resource);