Skip to content

Commit

Permalink
Merge pull request #47 from jpower432/chore/remove-vendor
Browse files Browse the repository at this point in the history
chore: remove the vendor directory and references to it
  • Loading branch information
jpower432 authored Dec 7, 2023
2 parents d76a344 + 62e9443 commit 9136c71
Show file tree
Hide file tree
Showing 47 changed files with 10 additions and 1,998 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-new.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
with:
python-version: 3.8
- name: Install Trestlebot
run: make trestlebot-install
run: python3 -m pip install --upgrade pip setuptools && python3 -m pip install -r requirements.txt
- name: Create new profile with imports
run: |
python3 scripts/set_default_profile.py --import_path "${IMPORT_TYPE}s/${IMPORT_NAME}/${IMPORT_TYPE}.json" \
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/update-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on: workflow_dispatch
env:
FEDRAMP_PROFILE_NAME: "fedramp_rev5_high"
NIST_CATALOG_NAME: "nist_rev5_800_53"
FEDRAMP_REPO_REF: "master"
NIST_REPO_REF: "690f517daaf3a6cbb4056d3cde6eae2756765620"

jobs:
update:
Expand All @@ -28,18 +30,18 @@ jobs:
with:
python-version: 3.8
- name: Install Trestle
run: make trestle-install
run: python3 -m pip install --upgrade pip setuptools && python3 -m pip install -r requirements.txt
- name: Update catalogs
run: |
rm -rf "catalogs/${NIST_CATALOG_NAME}"
trestle import -f https://raw.githubusercontent.com/usnistgov/oscal-content/master/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json -o "${NIST_CATALOG_NAME}"
trestle import -f "https://raw.githubusercontent.com/usnistgov/oscal-content/${NIST_REPO_REF}/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json" -o "${NIST_CATALOG_NAME}"
- name: Update profiles
run: |
rm -rf "profiles/${FEDRAMP_PROFILE_NAME}"
trestle import -f https://raw.githubusercontent.com/GSA/fedramp-automation/master/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile.json -o "${FEDRAMP_PROFILE_NAME}"
trestle import -f "https://raw.githubusercontent.com/GSA/fedramp-automation/${FEDRAMP_REPO_REF}/dist/content/rev5/baselines/json/FedRAMP_rev5_HIGH-baseline_profile.json" -o "${FEDRAMP_PROFILE_NAME}"
trestle href --name "${FEDRAMP_PROFILE_NAME}" -hr "trestle://catalogs/${NIST_CATALOG_NAME}/catalog.json"
- name: Update content
uses: RedHatProductSecurity/trestle-bot/actions/autosync@v0.3.0
uses: RedHatProductSecurity/trestle-bot/actions/autosync@v0.4.2
with:
markdown_path: "markdown/profiles"
oscal_model: "profile"
Expand Down
4 changes: 1 addition & 3 deletions .mega-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,4 @@ ENABLE_LINTERS:
DISABLE_ERRORS_LINTERS:
- MAKEFILE_CHECKMAKE
- REPOSITORY_KICS
- BASH_SHELLCHECK

FILTER_REGEX_EXCLUDE: (vendor/)
- BASH_SHELLCHECK
29 changes: 0 additions & 29 deletions Makefile

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Some the directories in this repository are managed through automated processes

- catalogs: This stores OSCAL Catalogs installed in the trestle workspace.
- profiles (FedRAMP only) - This stores OSCAL Profiles installed in the trestle workspace.
- vendor - This stores automation managed in a central repository that is vendored in.


For information on how this data is managed, see the [FAQs](./docs/faqs.md).

Expand Down
6 changes: 1 addition & 5 deletions docs/faqs.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ A: This is managed through GitHub Actions. The workflow file is located [here](.

Q: How do I update FedRAMP profiles in this workspace?

A: This is managed through GitHub Actions. The workflow file is located [here](../.github/workflows/update-fedramp.yml). It can be run [manually](https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow).

Q: How do I update the vendor directory?

A: The vendor directory is managed as a git subtree. To pull the latest commit from main on the [`oscal-automation-libs`](https://github.com/RedHatProductSecurity/oscal-automation-libs.git) repository, run `make update-subtree`.
A: This is managed through GitHub Actions. The workflow file is located [here](../.github/workflows/update-fedramp.yml). It can be run [manually](https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow).
2 changes: 0 additions & 2 deletions vendor/.flake8

This file was deleted.

29 changes: 0 additions & 29 deletions vendor/.github/workflows/linters.yml

This file was deleted.

162 changes: 0 additions & 162 deletions vendor/.gitignore

This file was deleted.

13 changes: 0 additions & 13 deletions vendor/.mega-linter.yml

This file was deleted.

1 change: 0 additions & 1 deletion vendor/CODEOWNERS

This file was deleted.

28 changes: 0 additions & 28 deletions vendor/Containerfile

This file was deleted.

Loading

0 comments on commit 9136c71

Please sign in to comment.