Skip to content

Commit

Permalink
Fix compilation issues around Prose handling
Browse files Browse the repository at this point in the history
We will have to re-implement Prose manipulation later on. Project will be better
served if we just remove the current implementation and re-implement once the
project compiles with the latest oscal.
  • Loading branch information
isimluk committed Feb 4, 2020
1 parent 483a3a3 commit 8f4f307
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 445 deletions.
4 changes: 1 addition & 3 deletions impl/implementation.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,8 +379,6 @@ func getSubControlIDFromParam(paramID string) string {

func getGuidanceFromPart(part *catalog.Prose) []string {
var guidance []string
for _, p := range part.P {
guidance = append(guidance, p.Raw)
}
guidance = append(guidance, part.Raw)
return guidance
}
4 changes: 1 addition & 3 deletions types/oscal/catalog/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ func NewPart(id, title, narrative string) Part {
return Part{
Id: id,
Title: Title(title),
Prose: &Prose{
P: []P{P{Raw: narrative}},
},
Prose: &Prose{Raw: narrative},
}
}

Expand Down
7 changes: 7 additions & 0 deletions types/oscal/catalog/import.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package catalog

import (
"github.com/docker/oscalkit/types/oscal/nominal_catalog"
)

type Prose = nominal_catalog.Prose
Loading

0 comments on commit 8f4f307

Please sign in to comment.