Github/comply
1
0
Fork 0
mirror of https://github.com/strongdm/comply synced 2024-11-25 00:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Add error handling in .dm file structure (#48)

Browse Source
This commit is contained in:
wallrony 2021-10-07 15:23:23 -03:00
parent 34c0105b47
commit ac11b307ec
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/model/fs.go
View File

@ -101,7 +101,7 @@ func ReadNarratives() ([]*Document, error) {
for _, f := range files { for _, f := range files {
n := &Document{} n := &Document{}
mdmd := loadMDMD(f.FullPath) mdmd, err := loadMDMD(f.FullPath)
err = yaml.Unmarshal([]byte(mdmd.yaml), &n) err = yaml.Unmarshal([]byte(mdmd.yaml), &n)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "unable to parse "+f.FullPath) return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
@ -126,7 +126,10 @@ func ReadProcedures() ([]*Procedure, error) {
for _, f := range files { for _, f := range files {
p := &Procedure{} p := &Procedure{}
mdmd := loadMDMD(f.FullPath) mdmd, err := loadMDMD(f.FullPath)
if err != nil {
return nil, err
}
err = yaml.Unmarshal([]byte(mdmd.yaml), &p) err = yaml.Unmarshal([]byte(mdmd.yaml), &p)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "unable to parse "+f.FullPath) return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
@ -151,7 +154,10 @@ func ReadPolicies() ([]*Document, error) {
for _, f := range files { for _, f := range files {
p := &Document{} p := &Document{}
mdmd := loadMDMD(f.FullPath) mdmd, err := loadMDMD(f.FullPath)
if err != nil {
return nil, err
}
err = yaml.Unmarshal([]byte(mdmd.yaml), &p) err = yaml.Unmarshal([]byte(mdmd.yaml), &p)
if err != nil { if err != nil {
return nil, errors.Wrap(err, "unable to parse "+f.FullPath) return nil, errors.Wrap(err, "unable to parse "+f.FullPath)
@ -171,7 +177,7 @@ type metadataMarkdown struct {
body string body string
} }
func loadMDMD(path string) metadataMarkdown { func loadMDMD(path string) (*metadataMarkdown, error) {
bytes, err := ioutil.ReadFile(path) bytes, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
panic(err) panic(err)
@ -183,9 +189,9 @@ func loadMDMD(path string) metadataMarkdown {
components = components[1:] components = components[1:]
} }
if len(components) == 1 { if len(components) == 1 {
panic(fmt.Sprintf("Malformed metadata markdown in %s, must be of the form: YAML\\n---\\nmarkdown content", path)) return nil, errors.New(fmt.Sprintf("Malformed metadata markdown in %s, must be of the form: YAML\\n---\\nmarkdown content", path))
} }
yaml := components[0] yaml := components[0]
body := strings.Join(components[1:], "---") body := strings.Join(components[1:], "---")
return metadataMarkdown{yaml, body} return &metadataMarkdown{yaml, body}, nil
} }