Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 1 1 2 all of construct #1545

Closed
wants to merge 83 commits into from
Closed

Fix 1 1 2 all of construct #1545

wants to merge 83 commits into from

Conversation

degenaro
Copy link
Collaborator

Types of changes

  • Hot fix (emergency fix and release)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation (change which affects the documentation site)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Release (develop -> main)

Quality assurance (all should be covered).

  • My code follows the code style of this project.
  • Documentation for my change is up to date?
  • My PR meets testing requirements.
  • All new and existing tests passed.
  • All commits are signed-off.

Summary

Key links:

Before you merge

  • Ensure it is a 'squash commit' if not a release.
  • Ensure CI is currently passing
  • Check sonar. If you are working for a fork a maintainer will reach out, if required.

AleJo2995 and others added 30 commits March 14, 2024 13:44
@AleJo2995
feat: support for latest OSCAL Version upgrade
9fd49b7 
Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com>
@degenaro
fix: hack component schema, moving metadata location to same as other
01308d9 
models

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: add large line-length specification to pyptroject.toml for
24546ef 
datamodel-codegen

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
doc: discourse on changes made.
765507f 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix - automate schema metadata relocation in comp-def
8d4e0c1 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: undo fwd refs
9c3fd6b 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: HowMany
16d6589 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: update gen_oscal.md with info on automated schema relocations
2a575b6 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: isolate schema fixup code
864b2d0 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: preprocess improved move metadata & assign Type4
8df1582 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix implementations move to common issues
1c73a4f 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
OSCAL_VERSION 1.1.2
fe281ba 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
dynamic year for copyright
e7ced90 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: reorder by name pre-processing; some post-processing (hacking)
7bfe0e4 
397 failed, 738 passed, 3 skipped, 34 warnings, 68 errors

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: code format/lint
218e698 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
hack: reduce failed/errors
5093381 
386 failed, 785 passed, 3 skipped, 34 warnings, 32 errors

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: hack for EmailAddressDatatype
dee1fb2 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: issue hack warning/info
a39eb59 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: handle special case of "id: TokenDatatype" in catalog
d3d20e9 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: introduce schema patching and employ for email-address and
b909846 
parameter-selection

Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: handle RiskStatus properly when applying renaming
d4bfffa 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
code format & lint
5619001 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: validation error for Base64
5a6b70b 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix AttributeError: module 'trestle.oscal.ssp' has no attribute 'Status'
58e9cbd 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix AttributeError: 'StringDatatype' object has no attribute 'strip'
9840bb7 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix Origin vs. Origin1
9df356a 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
Add Observation to assessment_results from common
3b2909d 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix value is not a valid enumeration member
10146a8 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: import__test.py::test_import_wrong_oscal_version
abe2f37 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
patch schemas to rename “status” to “objectiveStatus” to avoid conflict
d298150 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
degenaro and others added 28 commits April 24, 2024 15:44
@degenaro
ExternalScheme and DocumentScheme valid values
4b1ac63 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
DefinedComponentType valid values
6688b5c 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
SystemComponentType valid values
3d1852e 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
code comments
4b78003 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
simplify pre-process code
d44d973 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
simplify
10713c3 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
remove unused code
117dcd9 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
replace deprecated pkg_resources with importlib_resources
3a92bb0 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
Add python 3.10 to matrix
6db8376 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
python 3.9, 3.10, 3.11
1693bad 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
flake8 fix?
c4e077b 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
rename trestle.core.commands.author.profile to prof - lint shadow issue
2d75912 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
update docs for change from author profile -> prof
825e6d2 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
add comments explaining refs creation in schema preprocessing
d068a91 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
switch to pydantic latest version, but force v1 interface use for now
98fc9c7 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: remedy 17 test warning by removing semantic release install
2836d87 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
make sonar happy
6b7d52f 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
make sonar happy
a74b770 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
make sonar happy
6deadcf 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
use trestle.oscal.common.HowMany.one
09298c7 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
supported versions of python are 3.9, 3.10. 3.11
dc3f82d 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
reduce some duplication, as per reviewer's comments.
ff13675 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: remove unused parameters, per reviewer comments.
8872552 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
revise imports per reviewer suggestion.
becb408 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
2.7.0
95ee9ef 
Automatically generated by python-semantic-release
@degenaro
restore python-semantic-release==7.33.2 to cfg (at old level, for now)
73d505f 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
Remove "We've moved" from README
75b3ef4 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro
fix: remove (most) allOf constructs
5f3781d 
Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com>
@degenaro degenaro closed this May 17, 2024
@degenaro degenaro deleted the fix-1-1-2-allOf-construct branch May 17, 2024 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@degenaro @AleJo2995