feat: adds support for rules in YAML format

Removes CSV based rule examples Removes CSV automation for rules Add action to auto-transform when the YAML is edited Signed-off-by: Jennifer Power <[email protected]>
RedHatProductSecurity · Oct 12, 2023 · b07dcb0 · b07dcb0
1 parent 27bed2f
commit b07dcb0
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 75 deletions.
diff --git a/.github/workflows/transform-rules.yml b/.github/workflows/transform-rules.yml
@@ -0,0 +1,20 @@
+name: Transform Rules 
+on:
+  push:
+    paths:
+      - 'rules/**'
+
+jobs:
+  transform-rules:
+    name: Transform rules content
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Transform rules
+        id: transform
+        uses: jpower432/trestle-bot/actions/rules-transform@bug/single-rule-failure
+        with:
+          rules_view_path: "rules/"
+          file_pattern: "*.json,rules/*"
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -7,7 +7,7 @@ on:
     paths:
       - 'component-definitions/**'
       - 'markdown/components/**'
-      - 'data/**'
+
 jobs:
   test:
     name: Evaluate components
@@ -26,8 +26,6 @@ jobs:
           markdown_path: "markdown/components"
           oscal_model: "compdef"
           check_only: true
-      - name: CSV sanity check 
-        run: make check-csv
 
   call-autofix:
     needs: [test]

diff --git a/Makefile b/Makefile
@@ -18,19 +18,6 @@ update-subtree:
 ## Component Definition Custom tasks
 ############################################################################
 
-# $1 - config path
-define update-cd
-echo $(1)
-trestle task csv-to-oscal-cd -c $(1);
-endef
-
-update-cds:
-	@source $(SCRIPTS_DIR)/trestle.sh && $(foreach f,$(CONFIGS),$(call update-cd,$(f)))
-.PHONY: update-cd
-
-check-csv:
-	@bash scripts/csv_sanity_check.sh
-
 trestlebot-install:
 	@python3 -m pip install --upgrade pip setuptools && python3 -m pip install -r requirements.txt
 .PHONY: trestlebot-install
diff --git a/data/example.config b/data/example.config
diff --git a/data/example.csv b/data/example.csv
diff --git a/rules/example/Example/rule_1.yml b/rules/example/Example/rule_1.yml
@@ -0,0 +1,17 @@
+x-trestle-rule-info:
+  name: Test-rule_001
+  description: Ensure all of the services are running these tests
+  parameter:
+    name: prm_1
+    description: prm_1 description
+    alternative-values: {'default': '5%', '5pc': '5%', '10pc': '10%', '15pc': '15%', '20pc': '20%'}
+    default-value: '5%'
+  profile:
+    description: FedRAMP REV5 High Baseline
+    href: profiles/fedramp_rev5_high/profile.json
+    include-controls:
+      - id: ac-1
+x-trestle-component-info:
+  name: Example
+  description: Example Application
+  type: service
diff --git a/scripts/csv_sanity_check.sh b/scripts/csv_sanity_check.sh
diff --git a/scripts/get_config_updates.sh b/scripts/get_config_updates.sh