1797 allow local definition of asset type prop values

[Arminta-Jenkins-NIST]

Committer Notes

asset-type will now allow-other values making the property less strictive

{Please provide a brief description of what this PR accomplishes. Be sure to reference any issues addressed. If the PR is a work-in-progress submitted for early review, please include [WIP] at the beginning of the title or mark the PR as DRAFT.}

All Submissions:

• Have you selected the correct base branch per Contributing guidance?
• Have you set "Allow edits and access to secrets by maintainers"?
• Have you checked to ensure there aren't other open Pull Requests for the same update/change?
• Have you squashed any non-relevant commits and commit messages? [instructions]
• Do all automated CI/CD checks pass?

By submitting a pull request, you are agreeing to provide this contribution under the CC0 1.0 Universal public domain dedication.

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

Changes to Core Features:

• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your core changes, as applicable?
• Have you included examples of how to use your new feature(s)?
• Have you updated all OSCAL website and readme documentation affected by the changes you made? Changes to the OSCAL website can be made in the docs/content directory of your branch.

[wendellpiez]

It looks like a bunch of other changes are committed to this PR - it should be probably be targeting develop or another branch, not main? (@aj-stein-nist can advise)

[aj-stein-nist]

@Arminta-Jenkins-NIST did you push up the commit after editing the branch? I can't rebase to develop because this branch is the same as develop, perhaps you're missing the commit where you edited the requisite files?

[aj-stein-nist]

Thanks for pushing this up and doing a quick synchronous review. I provided some changes I would recommend.

[aj-stein-nist]

@Arminta-Jenkins-NIST tomorrow I am going to have to help you reconfigure this branch on your computer. I will rebase it for you now.

[aj-stein-nist]

Hi @Arminta-Jenkins-NIST, can you confirm if you made changes locally but forgot to push them up? I see you 👍ed some comments and resolved them, but changes are not in the PR, so it is possible you did not do git push origin HEAD or similar after pushing the changes locally. Let me know today if you need help.

[Arminta-Jenkins-NIST]

@aj-stein-nist I thought I did everything properly. However, yesterday's peering session with @iMichaela on issue #1798 showed there are issues with my local setup. It is still unclear to me what went wrong.