lula2 0.2.1 → 0.3.1

package/dist/cli/server/websocketServer.js

@@ -380,7 +380,10 @@ var init_fileStore = __esm({
         const controlId = mapping.control_id;
         const family = this.getControlFamily(controlId);
         const familyDir = join2(this.mappingsDir, family);
-        const mappingFile = join2(familyDir, `${controlId}-mappings.yaml`);
+        const mappingFile = join2(
+          familyDir,
+          `${controlId.replace(/[^a-zA-Z0-9-]/g, "_")}-mappings.yaml`
+        );
         if (!existsSync2(familyDir)) {
           mkdirSync(familyDir, { recursive: true });
         }
@@ -478,7 +481,10 @@ var init_fileStore = __esm({
         for (const [controlId, controlMappings] of mappingsByControl) {
           const family = this.getControlFamily(controlId);
           const familyDir = join2(this.mappingsDir, family);
-          const mappingFile = join2(familyDir, `${controlId}-mappings.yaml`);
+          const mappingFile = join2(
+            familyDir,
+            `${controlId.replace(/[^a-zA-Z0-9-]/g, "_")}-mappings.yaml`
+          );
           if (!existsSync2(familyDir)) {
             mkdirSync(familyDir, { recursive: true });
           }
@@ -1776,7 +1782,9 @@ var init_spreadsheetRoutes = __esm({
             uiType = "long_text";
           }
           let category = frontendConfig?.category || "custom";
-          if (!frontendConfig) {
+          if (justificationFields.includes(fieldName)) {
+            category = "mappings";
+          } else if (!frontendConfig) {
             if (fieldName.includes("status") || fieldName.includes("state")) {
               category = "compliance";
             } else if (fieldName.includes("title") || fieldName.includes("name") || fieldName.includes("description")) {
@@ -1804,8 +1812,8 @@ var init_spreadsheetRoutes = __esm({
             // Control ID is always first
             category: isControlIdField ? "core" : category,
             // Control ID is always core
-            tab: isControlIdField ? "overview" : frontendConfig?.tab || void 0
-            // Control ID is always in overview
+            tab: isControlIdField ? "overview" : justificationFields.includes(fieldName) ? "mappings" : frontendConfig?.tab || void 0
+            // Use frontend config or default
           };
           if (uiType === "select") {
             fieldDef.options = Array.from(metadata.uniqueValues).sort();
@@ -1868,7 +1876,7 @@ var init_spreadsheetRoutes = __esm({
               if (fieldName === "family") return;
               if (justificationFields.includes(fieldName) && control[fieldName] !== void 0 && control[fieldName] !== null) {
                 justificationContents.push(control[fieldName]);
-                return;
+                filteredControl[fieldName] = control[fieldName];
               }
               const isInFrontendSchema = frontendFieldSchema?.some((f) => f.fieldName === fieldName);
               const isInFieldsMetadata = fields.hasOwnProperty(fieldName);
@@ -2266,7 +2274,7 @@ var WebSocketManager = class {
                     totalCommits: controlHistory.totalCommits,
                     commits: controlHistory.commits?.length || 0
                   });
-                  const mappingFilename = `${control.id}-mappings.yaml`;
+                  const mappingFilename = `${control.id.replace(/[^a-zA-Z0-9-]/g, "_")}-mappings.yaml`;
                   const mappingPath = join5(currentPath2, "mappings", family, mappingFilename);
                   let mappingHistory = { commits: [], totalCommits: 0 };
                   if (existsSync4(mappingPath)) {

package/dist/index.html

@@ -6,10 +6,10 @@
 		<link rel="icon" href="/lula.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		
-		<link rel="modulepreload" href="/_app/immutable/entry/start.8aoHS084.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/ByYV7ZA-.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/start.68S9ad6U.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/Ds14DLx0.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/Cby0Z7eP.js">
-		<link rel="modulepreload" href="/_app/immutable/entry/app.fwEu_ZMM.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/app.XLGRlmCF.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DsnmJJEf.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DqsOU3kV.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/CoF2vljD.js">
@@ -19,15 +19,15 @@
 		<div style="display: contents">
 			<script>
 				{
-					__sveltekit_fjsoc9 = {
+					__sveltekit_6f9em3 = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.8aoHS084.js"),
-						import("/_app/immutable/entry/app.fwEu_ZMM.js")
+						import("/_app/immutable/entry/start.68S9ad6U.js"),
+						import("/_app/immutable/entry/app.XLGRlmCF.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});

package/dist/index.js

@@ -1952,7 +1952,10 @@ var init_fileStore = __esm({
         const controlId = mapping.control_id;
         const family = this.getControlFamily(controlId);
         const familyDir = join2(this.mappingsDir, family);
-        const mappingFile = join2(familyDir, `${controlId}-mappings.yaml`);
+        const mappingFile = join2(
+          familyDir,
+          `${controlId.replace(/[^a-zA-Z0-9-]/g, "_")}-mappings.yaml`
+        );
         if (!existsSync2(familyDir)) {
           mkdirSync(familyDir, { recursive: true });
         }
@@ -2050,7 +2053,10 @@ var init_fileStore = __esm({
         for (const [controlId, controlMappings] of mappingsByControl) {
           const family = this.getControlFamily(controlId);
           const familyDir = join2(this.mappingsDir, family);
-          const mappingFile = join2(familyDir, `${controlId}-mappings.yaml`);
+          const mappingFile = join2(
+            familyDir,
+            `${controlId.replace(/[^a-zA-Z0-9-]/g, "_")}-mappings.yaml`
+          );
           if (!existsSync2(familyDir)) {
             mkdirSync(familyDir, { recursive: true });
           }
@@ -3348,7 +3354,9 @@ var init_spreadsheetRoutes = __esm({
             uiType = "long_text";
           }
           let category = frontendConfig?.category || "custom";
-          if (!frontendConfig) {
+          if (justificationFields.includes(fieldName)) {
+            category = "mappings";
+          } else if (!frontendConfig) {
             if (fieldName.includes("status") || fieldName.includes("state")) {
               category = "compliance";
             } else if (fieldName.includes("title") || fieldName.includes("name") || fieldName.includes("description")) {
@@ -3376,8 +3384,8 @@ var init_spreadsheetRoutes = __esm({
             // Control ID is always first
             category: isControlIdField ? "core" : category,
             // Control ID is always core
-            tab: isControlIdField ? "overview" : frontendConfig?.tab || void 0
-            // Control ID is always in overview
+            tab: isControlIdField ? "overview" : justificationFields.includes(fieldName) ? "mappings" : frontendConfig?.tab || void 0
+            // Use frontend config or default
           };
           if (uiType === "select") {
             fieldDef.options = Array.from(metadata.uniqueValues).sort();
@@ -3440,7 +3448,7 @@ var init_spreadsheetRoutes = __esm({
               if (fieldName === "family") return;
               if (justificationFields.includes(fieldName) && control[fieldName] !== void 0 && control[fieldName] !== null) {
                 justificationContents.push(control[fieldName]);
-                return;
+                filteredControl[fieldName] = control[fieldName];
               }
               const isInFrontendSchema = frontendFieldSchema?.some((f) => f.fieldName === fieldName);
               const isInFieldsMetadata = fields.hasOwnProperty(fieldName);
@@ -4713,7 +4721,7 @@ var WebSocketManager = class {
                     totalCommits: controlHistory.totalCommits,
                     commits: controlHistory.commits?.length || 0
                   });
-                  const mappingFilename = `${control.id}-mappings.yaml`;
+                  const mappingFilename = `${control.id.replace(/[^a-zA-Z0-9-]/g, "_")}-mappings.yaml`;
                   const mappingPath = join5(currentPath2, "mappings", family, mappingFilename);
                   let mappingHistory = { commits: [], totalCommits: 0 };
                   if (existsSync6(mappingPath)) {
@@ -5246,6 +5254,7 @@ var closingBody = `
 ---
 
 <sub>**Tip:** Customize your compliance reviews with <a href="https://github.com/defenseunicorns/lula.git" class="Link--inTextBlock" target="_blank" rel="noopener noreferrer">Lula</a>.</sub>`;
+var LULA_SIGNATURE = "<!-- LULA_SIGNATURE:v1 -->";
 async function postFinding(params) {
   const { octokit, postMode, owner, repo, pull_number, body } = params;
   if (postMode === "comment") {
@@ -5355,7 +5364,8 @@ function crawlCommand() {
     const pr = await octokit.pulls.get({ owner, repo, pull_number });
     const prBranch = pr.data.head.ref;
     const { data: files } = await octokit.pulls.listFiles({ owner, repo, pull_number });
-    let commentBody = `## Lula Compliance Overview
+    let commentBody = `${LULA_SIGNATURE}
+## Lula Compliance Overview
 
 Please review the changes to ensure they meet compliance standards.
 
@@ -5366,7 +5376,6 @@ Lula reviewed ${files.length} files changed that affect compliance.
 `;
     for (const file of files) {
       if (file.status === "added") continue;
-      console.log(`Commenting regarding \`${file.filename}\`.`);
       try {
         const [oldText, newText] = await Promise.all([
           fetchRawFileViaAPI({ octokit, owner, repo, path: file.filename, ref: "main" }),
@@ -5374,6 +5383,7 @@ Lula reviewed ${files.length} files changed that affect compliance.
         ]);
         const changedBlocks = getChangedBlocks(oldText, newText);
         for (const block of changedBlocks) {
+          console.log(`Commenting regarding \`${file.filename}\`.`);
           leavePost = true;
           commentBody += `
 
@@ -5393,6 +5403,12 @@ Lula reviewed ${files.length} files changed that affect compliance.
         console.error(`Error processing ${file.filename}: ${err}`);
       }
     }
+    if (opts.postMode === "comment") {
+      await deleteOldIssueComments({ octokit, owner, repo, pull_number });
+    } else {
+      await dismissOldReviews({ octokit, owner, repo, pull_number });
+      await deleteOldReviewComments({ octokit, owner, repo, pull_number });
+    }
     if (leavePost) {
       await postFinding({
         octokit,
@@ -5414,6 +5430,90 @@ ${commentBody + closingBody}
     }
   });
 }
+async function deleteOldIssueComments({
+  octokit,
+  owner,
+  repo,
+  pull_number
+}) {
+  let page = 1;
+  while (true) {
+    const { data: comments } = await octokit.issues.listComments({
+      owner,
+      repo,
+      issue_number: pull_number,
+      per_page: 100,
+      page
+    });
+    if (!comments.length) break;
+    for (const c of comments) {
+      const hasSignature = (c.body ?? "").includes(LULA_SIGNATURE);
+      if (hasSignature) {
+        await octokit.issues.deleteComment({ owner, repo, comment_id: c.id });
+        break;
+      }
+    }
+    page++;
+  }
+}
+async function deleteOldReviewComments({
+  octokit,
+  owner,
+  repo,
+  pull_number
+}) {
+  let page = 1;
+  while (true) {
+    const { data: reviewComments } = await octokit.pulls.listReviewComments({
+      owner,
+      repo,
+      pull_number,
+      per_page: 100,
+      page
+    });
+    if (!reviewComments.length) break;
+    for (const rc of reviewComments) {
+      const hasSignature = (rc.body ?? "").includes(LULA_SIGNATURE);
+      if (hasSignature) {
+        await octokit.pulls.deleteReviewComment({ owner, repo, comment_id: rc.id });
+        break;
+      }
+    }
+    page++;
+  }
+}
+async function dismissOldReviews({
+  octokit,
+  owner,
+  repo,
+  pull_number
+}) {
+  let page = 1;
+  while (true) {
+    const { data: reviews } = await octokit.pulls.listReviews({
+      owner,
+      repo,
+      pull_number,
+      per_page: 100,
+      page
+    });
+    if (!reviews.length) break;
+    for (const r of reviews) {
+      const hasSignature = (r.body ?? "").includes(LULA_SIGNATURE);
+      if (hasSignature) {
+        await octokit.pulls.dismissReview({
+          owner,
+          repo,
+          pull_number,
+          review_id: r.id,
+          message: "Superseded by a new Lula compliance review."
+        });
+        break;
+      }
+    }
+    page++;
+  }
+}
 
 // index.ts
 var program = new Command2();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lula2",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "A tool for managing compliance as code in your GitHub repositories.",
   "bin": {
     "lula2": "./dist/lula2"

package/dist/_app/immutable/entry/start.8aoHS084.js

@@ -1 +0,0 @@
-import{l as o,a as r}from"../chunks/ByYV7ZA-.js";export{o as load_css,r as start};