Rename the baseline markdown files (#354)

* Rename the baseline markdown files * Remove unused var
cisagov · Aug 26, 2024 · 60f51f3 · 60f51f3
1 parent 6873d70
commit 60f51f3
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 15 deletions.
diff --git a/baselines/README.md b/baselines/README.md
@@ -1,11 +1,11 @@
 Individual baselines can be visited directly at the links below:
 
-- [Common Controls](/baselines/Common%20Controls%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Gmail](/baselines/Gmail%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Google Calendar](/baselines/Google%20Calendar%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Google Chat](/baselines/Google%20Chat%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Google Classroom](/baselines/Google%20Classroom%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Google Drive and Docs](/baselines/Google%20Drive%20and%20Docs%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Google Meet](/baselines/Google%20Meet%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Google Sites](/baselines/Google%20Sites%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
-- [Groups for Business](/baselines/Groups%20for%20Business%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md)
+- [Common Controls](/baselines/commoncontrols.md)
+- [Gmail](/baselines/gmail.md)
+- [Google Calendar](/baselines/calendar.md)
+- [Google Chat](/baselines/chat.md)
+- [Google Classroom](/baselines/classroom.md)
+- [Google Drive and Docs](/baselines/drive.md)
+- [Google Meet](/baselines/meet.md)
+- [Google Sites](/baselines/sites.md)
+- [Groups for Business](/baselines/groups.md)
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/calendar.md b/...ble Secure Configuration Baseline v0.2.md → baselines/calendar.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/chat.md b/...ble Secure Configuration Baseline v0.2.md → baselines/chat.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/classroom.md b/...ble Secure Configuration Baseline v0.2.md → baselines/classroom.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/commoncontrols.md b/...ble Secure Configuration Baseline v0.2.md → baselines/commoncontrols.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/drive.md b/...ble Secure Configuration Baseline v0.2.md → baselines/drive.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/gmail.md b/...ble Secure Configuration Baseline v0.2.md → baselines/gmail.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/groups.md b/...ble Secure Configuration Baseline v0.2.md → baselines/groups.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/meet.md b/...ble Secure Configuration Baseline v0.2.md → baselines/meet.md
diff --git a/...ble Secure Configuration Baseline v0.2.md → baselines/sites.md b/...ble Secure Configuration Baseline v0.2.md → baselines/sites.md
diff --git a/docs/authentication/OAuth.md b/docs/authentication/OAuth.md
@@ -31,7 +31,7 @@ Only complete this section if not authenticating via [Service Account](/docs/aut
 with an account with the necessary privileges and click allow.
 
 ## Add the Oauth App to the allowlist
-If you've limited application access to Google's APIs in your organization, the [Common Controls: App Access to Google APIs](/baselines/Common%20Controls%20Minimum%20Viable%20Secure%20Configuration%20Baseline%20v0.2.md#10-app-access-to-google-apis) baseline covers this topic, follow the directions below to allowlist the OAuth app.
+If you've limited application access to Google's APIs in your organization, the [Common Controls: App Access to Google APIs](/baselines/commoncontrols.md#10-app-access-to-google-apis) baseline covers this topic, follow the directions below to allowlist the OAuth app.
 
 1. Login to https://console.cloud.google.com
 2. Navigate to the appropriate project

diff --git a/scubagoggles/reporter/md_parser.py b/scubagoggles/reporter/md_parser.py
@@ -21,9 +21,9 @@ def read_baseline_docs(baseline_path:pathlib.Path, prod_to_fullname:dict):
     # map baseline short name i.e gmail to markdown file name
     # assumes the product fullname is in the markdown file name
     prod_to_baselinemd = {}
-    for product, fullname in prod_to_fullname.items():
+    for product in prod_to_fullname.keys():
         for baseline in baseline_md:
-            if fullname in baseline:
+            if product in baseline:
                 prod_to_baselinemd[product] = baseline
 
     # create a dict containing Policy Group and Individual policies

diff --git a/scubagoggles/reporter/reporter.py b/scubagoggles/reporter/reporter.py
@@ -267,7 +267,6 @@ def rego_json_to_ind_reports(self, test_results: list, out_path: str) -> list:
         ind_report_name = product_capitalized + "Report"
         fragments = []
         json_data = []
-        baseline_version = '0.2'
         tool_version = '0.2.0'
         github_url = self._github_url
         report_stats = {
@@ -357,9 +356,9 @@ def rego_json_to_ind_reports(self, test_results: list, out_path: str) -> list:
                                     'Criticality': test['Criticality'],
                                     'Details': details})
             markdown_group_name = "-".join(baseline_group['GroupName'].split())
+            md_basename = "commoncontrols" if self._product == "rules" else self._product
             group_reference_url = f'{github_url}/blob/v{tool_version}/baselines/'\
-            f'{self._full_name} Minimum Viable Secure Configuration '\
-            f'Baseline v{baseline_version}.md#'\
+            f'{md_basename}.md#'\
             f'{baseline_group["GroupNumber"]}-{markdown_group_name}'
             group_reference_url_spacing = "%20".join(group_reference_url.split())
             markdown_link = fr'<a href="{group_reference_url_spacing}" target="_blank"\>'\