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

Merge branch 'master' of https://github.com/camposer/comply into fix/infinite-build

Browse Source 
 Conflicts:
	fixtures/narratives/invalid-control.md
	fixtures/policies/invalid-access.md
	internal/model/fs.go
	internal/model/fs_test.go
This commit is contained in:
wallrony 2021-10-19 16:11:41 -03:00
commit 3d8652f497
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fixtures/policies/invalid-access.md
View File

@ -53,4 +53,3 @@ a. *When an employee changes roles within the organization:*
a. *Review of accounts and permissions:* a. *Review of accounts and permissions:*
i. Each month, IT and HR will review accounts and permission levels for accuracy. i. Each month, IT and HR will review accounts and permission levels for accuracy.

2
internal/model/fs.go
View File

@ -83,7 +83,6 @@ func ReadStandards() ([]*Standard, error) {
return nil, errors.Wrap(err, "unable to read "+f.FullPath) return nil, errors.Wrap(err, "unable to read "+f.FullPath)
} }
yaml.Unmarshal(sBytes, &s)
err = yaml.Unmarshal(sBytes, &s) err = yaml.Unmarshal(sBytes, &s)
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)
@ -127,6 +126,7 @@ func ReadNarratives() ([]*Document, error) {
func ReadProcedures() ([]*Procedure, error) { func ReadProcedures() ([]*Procedure, error) {
var procedures []*Procedure var procedures []*Procedure
files, err := path.Procedures() files, err := path.Procedures()
if err != nil { if err != nil {
return nil, errors.Wrap(err, "unable to enumerate paths") return nil, errors.Wrap(err, "unable to enumerate paths")
} }