Update the toRuby Process (#25)

* Updated the toRuby to prevent from setting empty tags to nil Signed-off-by: George Dias <[email protected]> * allow severity and satisifies to have nil values on the tag Signed-off-by: Emily Rodriguez <[email protected]> --------- Signed-off-by: George Dias <[email protected]> Signed-off-by: Emily Rodriguez <[email protected]> Co-authored-by: Emily Rodriguez <[email protected]>
mitre · Apr 21, 2023 · 27b9148 · 27b9148
1 parent 868f1fc
commit 27b9148
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/objects/control.ts b/src/objects/control.ts
@@ -200,7 +200,6 @@ export default class Control {
         } else {
           result += `  ref ${escapeQuotes(ref.ref?.toString() || '')}, url: ${escapeQuotes(ref.url || '')}`
         }
-
       });
     }
 
@@ -228,7 +227,14 @@ export default class Control {
           result += `  tag ${tag}: ${escapeQuotes(value)}\n`;
         }
       } else {
-        result += `  tag ${tag}: nil\n`;
+        const nilTagList = ['severity', 'satisfies']
+        if (nilTagList.includes(tag)) {
+          result += `  tag ${tag}: nil\n`;
+        }
+        else {
+          result += `  tag '${tag}'\n`;
+        }
+        if (verbose) {logger.info(`${this.id} does not have a value for tag: ${tag}`);}
       }
     });
 

diff --git a/test/sample_data/controls-cookstyle/inputs-interpolation/SV-204392.rb b/test/sample_data/controls-cookstyle/inputs-interpolation/SV-204392.rb
@@ -45,8 +45,8 @@
   tag cci: ['CCI-001494', 'CCI-001496', 'CCI-002165', 'CCI-002235']
   tag nist: ['AU-9', 'AU-9 (3)', 'AC-3 (4)', 'AC-6 (10)']
   tag subsystems: ['permissions', 'package', 'rpm']
-  tag host: nil
-  tag container: nil
+  tag 'host'
+  tag 'container'
 
   if input('disable_slow_controls')
     describe "This control consistently takes a long time to run and has been disabled

diff --git a/test/tests/control.spec.ts b/test/tests/control.spec.ts
@@ -17,9 +17,11 @@ TEST_USE_CASES.set('V-93149','should properly write a control with special chara
 describe('The control functionality', () => {
   const cookstyle_profile = processInSpecProfile(fs.readFileSync('test/sample_data/inspec/json/cookstyle-controls-profile.json', 'utf-8'))
 
+  const allKeys =[ ...TEST_USE_CASES.keys() ];
   cookstyle_profile.controls.forEach(control => {
-    // Write the new control to the controls folder
-    fs.writeFileSync(path.join('test/sample_data/', 'controls-test-results', `${control.id}.rb`), control.toRuby(true))
+    if (allKeys.includes(control.id)) {
+      fs.writeFileSync(path.join('test/sample_data/', 'controls-test-results', `${control.id}.rb`), control.toRuby(true))
+    }
   })
 
   // These checks are comparing what the function "toRuby" is outputting with a small sample profile created from