From 2fc9c7bcef5ea8521b93929477d56d0bdee1a684 Mon Sep 17 00:00:00 2001 From: Brandt Keller Date: Sun, 30 Jun 2024 22:11:32 +0000 Subject: [PATCH] chore(oscal): update oscal for validation --- .github/actions/save-logs/action.yaml | 1 + compliance/oscal-component.yaml | 14 +++++++------- tasks/test.yaml | 11 ++++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/actions/save-logs/action.yaml b/.github/actions/save-logs/action.yaml index 58e9bda84..418e48200 100644 --- a/.github/actions/save-logs/action.yaml +++ b/.github/actions/save-logs/action.yaml @@ -44,3 +44,4 @@ runs: /tmp/debug-*.log /tmp/uds-containerd-logs /tmp/k3d-uds-*.log + /tmp/oscal-assessment-results.yaml diff --git a/compliance/oscal-component.yaml b/compliance/oscal-component.yaml index 20e835f57..ecb88933e 100644 --- a/compliance/oscal-component.yaml +++ b/compliance/oscal-component.yaml @@ -14,13 +14,13 @@ component-definition: rel: website import-component-definitions: - - href: 'file://../src/grafana/oscal-component.yaml' - - href: 'file://../src/istio/oscal-component.yaml' - - href: 'file://../src/loki/oscal-component.yaml' - - href: 'file://../src/neuvector/oscal-component.yaml' - - href: 'file://../src/prometheus-stack/oscal-component.yaml' - - href: 'file://../src/promtail/oscal-component.yaml' - - href: 'file://../src/velero/oscal-component.yaml' + - href: 'file://./../src/grafana/oscal-component.yaml' + - href: 'file://./../src/istio/oscal-component.yaml' + - href: 'file://./../src/loki/oscal-component.yaml' + - href: 'file://./../src/neuvector/oscal-component.yaml' + - href: 'file://./../src/prometheus-stack/oscal-component.yaml' + - href: 'file://./../src/promtail/oscal-component.yaml' + - href: 'file://./../src/velero/oscal-component.yaml' capabilities: - uuid: 857dcaf8-9080-4cf0-8029-8a03fcdde2df diff --git a/tasks/test.yaml b/tasks/test.yaml index ea97df0b6..f553127e8 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -15,11 +15,6 @@ tasks: - description: "Validate the package" cmd: uds run -f src/${UDS_PKG}/tasks.yaml validate --no-progress - - task: compliance:validate - with: - oscalfile: ./compliance/oscal-component.yaml - assessment_results: ./compliance/oscal-assessment-results.yaml - - name: validate-packages description: "Validated all packages" # loop through each src/* package and run the validate.yaml task @@ -37,6 +32,12 @@ tasks: - task: create:k3d-standard-bundle - task: deploy:k3d-standard-bundle - task: validate-packages + - task: compliance:validate + with: + oscalfile: ./compliance/oscal-component.yaml + assessment_results: ./compliance/oscal-assessment-results.yaml + - description: copy assessment file to log location + cmd: cp ./compliance/oscal-assessment-results.yaml /tmp/oscal-assessment-results.yaml - name: uds-core-upgrade description: "Test an upgrade from the latest released UDS Core package to current branch"