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

Feature CP 43 - Recovered Object #408

Merged
merged 13 commits into from
Aug 22, 2022
Merged

Feature CP 43 - Recovered Object #408

merged 13 commits into from
Aug 22, 2022

Conversation

cyberinvestigationexpress
Copy link
Contributor

@cyberinvestigationexpress cyberinvestigationexpress commented Jun 30, 2022 •
edited by ajnelson-nist
Loading

Pull request instructions

Implement CP-43 based on 2018 community approved proposal for Representing Recoverability of Unallocated Files.

This Pull Request resolves all requirements of Issue #251.

Coordination

  • Tracking in Jira ticket OC-119
  • Pull request is against correct branch
  • CI passes in (CASE/UCO) feature branch
  • CI passes in (CASE/UCO) current unstable branch (22da00c)
  • CI passes in CASE current unstable branch tracking UCO's unstable as submodule (skipped - additive change)
  • Impact on SHACL validation reviewed for CASE-Examples
  • Impact on SHACL validation remediated for CASE-Examples
  • Impact on SHACL validation reviewed for casework.github.io
  • Impact on SHACL validation remediated for casework.github.io (N/A)
  • Solutions Approval vote occurred, passing, on 2022-08-16

b0bkaT and others added 5 commits April 27, 2022 09:53
@b0bkaT
Merge pull request #368 from ucoProject/hotfix-CDOTSC-1
6443beb 
Fix website link in CONTRIBUTE.md
@b0bkaT
Merge pull request #366 from ucoProject/hotfix-CDOTSC-5
0318c9b 
Add issue templates
@b0bkaT
Merge pull request #402 from ucoProject/Release-0.9.0
3165bd6 
Release 0.9.0
@cyberinvestigationexpress
Update observable.ttl
f6c966d 
Define UnallocatedRecoverabilityFacet
@cyberinvestigationexpress
Update vocabulary.ttl
76a30a0 
Define UnallocatedRecoverabilityStatusVocab
@cyberinvestigationexpress cyberinvestigationexpress linked an issue Jul 16, 2022 that may be closed by this pull request
Representing Recoverability of Unallocated Files #251
Closed
@ajnelson-nist
Copy link
Contributor

Testing in CASE-Examples showed there are a couple more PropertyShapes per DatatypeProperty that need to be added in order to finish encoding the UCO semi-open vocabulary validation mechanism. Reviews should probably check for the drafting.ttl file within CASE-Examples PR 83.

Also, this PR looks like it wasn't started from the right state. Let's discuss in the morning.

ajnelson-nist added a commit to casework/CASE-Examples that referenced this pull request Jul 27, 2022
@ajnelson-nist
Transcribe and update proposed concepts from UCO PR
4a31112 
The file `drafting.ttl` contains the contents of UCO PR 408, transcribed
for the purpose of SHACL review.

As SHACL review occurred, two more shapes per datatype property were
added to account for validation according to the UCO semi-open
vocabulary design.  See Change Proposal 100 from UCO 0.8.0's release
page to understand this enforcement mechanism.

JSON-LD Knowledge Base concepts in this example were modified to use the
`drafting:` prefix instead of the under-proposal `observable:` and
`vocabulary:`-prefixed concepts.

A follow-on patch will regenerate Make-managed files.

References:
* ucoProject/UCO#408
* https://unifiedcyberontology.org/releases/0.8.0/

Signed-off-by: Alex Nelson <[email protected]>
@cyberinvestigationexpress
Update observable.ttl
cdbe88d 
Edited name UnallocatedRecoverability to RecoveredObject
@cyberinvestigationexpress
Update vocabulary.ttl
053501b 
Edited name UnallocatedRecoverability to RecoveredObject
@cyberinvestigationexpress
Update vocabulary.ttl
c60bc77
@ajnelson-nist
Merge branch 'develop' into Feature-CP-43
4132416
@ajnelson-nist
Normalize
8c70f20 
References:
* [UCO OC-119] (CP-43) Represent recoverability of unallocated files

Signed-off-by: Alex Nelson <[email protected]>
@ajnelson-nist
Fix syntax
0aef1f9 
References:
* [UCO OC-119] (CP-43) Represent recoverability of unallocated files

Signed-off-by: Alex Nelson <[email protected]>
@ajnelson-nist
Normalize
7a98f09 
References:
* [UCO OC-119] (CP-43) Represent recoverability of unallocated files

Signed-off-by: Alex Nelson <[email protected]>
@ajnelson-nist
Fix semi-open vocabulary patterns and add RecoveredObject class
a12aed4 
The semi-open vocabulary pattern is in conformance with the OWL
enforcement designed in Issue 406.

The imported concepts match the state of CASE-Examples PR 90.

References:
* [UCO OC-119] (CP-43) Represent recoverability of unallocated files
* casework/CASE-Examples#90
* #406

Signed-off-by: Alex Nelson <[email protected]>
@ajnelson-nist
Copy link
Contributor

Re:

Also, this PR looks like it wasn't started from the right state. Let's discuss in the morning.

This PR's branch should have been started from develop, but we've had enough accidents in starting from master that I think we're past trying to keep that branch history pattern clean.

@ajnelson-nist ajnelson-nist changed the title Feature CP 43 Feature CP 43 - Recovered Object Aug 11, 2022
@ajnelson-nist ajnelson-nist assigned b0bkaT and ajnelson-nist and unassigned b0bkaT Aug 17, 2022
@ajnelson-nist ajnelson-nist added this to the UCO 1.0.0 milestone Aug 18, 2022
@ajnelson-nist
Copy link
Contributor

This will have a merge conflict with the resolution of Issue #435 , due to addition of a new vocabulary.

@ajnelson-nist
Copy link
Contributor

Converting to draft while checking for CASE unstable branch impact.

@ajnelson-nist ajnelson-nist marked this pull request as draft August 22, 2022 14:27
@ajnelson-nist
Copy link
Contributor

After discussion with @b0bkaT , purely-additive changes have less need to undergo the CASE unstable review. This is ready to merge.

@ajnelson-nist ajnelson-nist marked this pull request as ready for review August 22, 2022 14:31
@b0bkaT b0bkaT merged commit 1b22960 into develop Aug 22, 2022
@ajnelson-nist ajnelson-nist deleted the Feature-CP-43 branch August 22, 2022 15:54
@ajnelson-nist ajnelson-nist mentioned this pull request Aug 22, 2022
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajnelson-nist ajnelson-nist ajnelson-nist approved these changes

Assignees

@b0bkaT b0bkaT

Labels
None yet
Projects
None yet
Milestone
UCO 1.0.0
Development

Successfully merging this pull request may close these issues.

Representing Recoverability of Unallocated Files
3 participants
@cyberinvestigationexpress @ajnelson-nist @b0bkaT