Skip to content

Commit

Permalink
Merge pull request #75 from usnistgov/structure-oscal-content
Browse files Browse the repository at this point in the history
Structure oscal content into develop branch
  • Loading branch information
iMichaela authored May 16, 2024
2 parents 7e40518 + da13a3c commit 70d1696
Show file tree
Hide file tree
Showing 118 changed files with 28,848 additions and 41,575 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/generate_leveraged.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,26 @@ on:
pull_request: {}
jobs:
partial_ssp:

runs-on: ubuntu-20.04
defaults:
run:
working-directory: .
steps:

- name: Check out repository code.
uses: actions/checkout@v3

- uses: actions/setup-python@v4
with:
python-version: '3.10'

- name: Check environment.
run: |
ls -ltra
python --version
pip --version
- name: Install dependencies.
run: |
pip install -r requirements.txt
Expand All @@ -33,6 +38,7 @@ jobs:
- name: Execute script.
run: |
python oscal_leveraged.py
- name: Save SSP.
uses: actions/upload-artifact@v3
with:
Expand Down
23 changes: 19 additions & 4 deletions .github/workflows/generate_ssp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,48 @@ on:
- develop
- main
pull_request: {}

jobs:

partial_ssp:
runs-on: ubuntu-20.04

defaults:
run:
working-directory: .

steps:
- name: Check out repository code.
- name: Check-Out Repository Code into Virtual Environment.
uses: actions/checkout@v3
- uses: actions/setup-python@v4

- name: Perform Python SetUp in the Virtual Environment.
uses: actions/setup-python@v4
with:
python-version: '3.10'
- name: Check environment.
python-version: '3.11'

- name: Post-SetUp Virtual Environment Checkup.
run: |
ls -ltra
python --version
pip --version
- name: Install dependencies.
run: |
pip install -r requirements.txt
# - name: Run tests.
# run: |
# pytest

- name: Execute script.
run: |
python oscal.py
- name: Save SSP.
uses: actions/upload-artifact@v3
with:
name: artifact-ssp
path: SSP.output.yaml

validate_oscal:
runs-on: ubuntu-20.04
if: ${{ github.ref_name == 'main' || github.ref_name == 'develop' || github.ref_name == 'feature-doc-templates' }}
Expand All @@ -47,20 +58,24 @@ jobs:
- name: Checkout
uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
id: checkout

- name: Setup Java
uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c
with:
distribution: adopt
java-version: 11

- name: Download SSP.
uses: actions/download-artifact@v3
with:
name: artifact-ssp

- name: Run oscal-cli Validation.
uses: oscal-club/[email protected]
id: validation
with:
args: ssp validate SSP.output.yaml

- name: Validation Result
shell: bash
run: |
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
.DS_Store
.vscode/*
*.pyc
__pycache__/
draft-*
*.output.*
*.output.*
# Ignore virtual environments
.venv*
.pyenv*
.env*
oscal-cli.txt
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,15 @@
# blossom-oscal
OSCAL content that supports the BloSS@M project.


## Using local git-actions with NEKTOS/ACT
- BASH is preferred by ACT as zsh has some known issues
- Specify DOCKER_HOST location for Rancher or other alternative containerization tool. It informs Nektos/ACT to use current DOCKER_HOST in non-Docker configuration on MacOS. Alternative OS Guidance can be found [here](https://nektosact.com/usage/custom_engine.html)
```
export DOCKER_HOST=$(docker context inspect --format '{{.Endpoints.docker.Host}}')
```

- To list actions available:
```
act -l
```
62 changes: 0 additions & 62 deletions blossom-docs/NIST_blossom_moderate_profile.json

This file was deleted.

Loading

0 comments on commit 70d1696

Please sign in to comment.