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.

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

Rename config to opencontrol #207

Merged
merged 8 commits into from
Jul 26, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move parse for opencontrol to root of package
it reads better now as `opencontrol.Parse`
  • Loading branch information
jcscottiii committed Jul 25, 2016

Verified

This commit was signed with the committer’s verified signature.
simeonschaub Simeon David Schaub
commit 0360ecac478986a7ec4bf59934779f075fee6675
4 changes: 2 additions & 2 deletions commands/get/get.go
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ package get

import (
"github.com/opencontrol/compliance-masonry/lib/common"
"github.com/opencontrol/compliance-masonry/lib/opencontrol/versions"
"github.com/opencontrol/compliance-masonry/lib/opencontrol/versions/base"
"github.com/opencontrol/compliance-masonry/lib/opencontrol/parser"
"github.com/opencontrol/compliance-masonry/lib/opencontrol"
)

// Get will retrieve all of the resources for the schemas and the resources for all the dependent schemas.
@@ -14,7 +14,7 @@ func Get(destination string, configData []byte, worker *base.Worker) error {
return common.ErrNoDataToParse
}
// Parse it.
configSchema, err := versions.Parse(parser.Parser{}, configData)
configSchema, err := opencontrol.Parse(parser.Parser{}, configData)
if err != nil {
return err
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package versions_test
package opencontrol_test

import (
. "github.com/onsi/ginkgo"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package versions
package opencontrol

import (
"errors"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package versions_test
package opencontrol_test

import (
. "github.com/opencontrol/compliance-masonry/lib/opencontrol/versions"
. "github.com/opencontrol/compliance-masonry/lib/opencontrol"

. "github.com/onsi/ginkgo"
"github.com/opencontrol/compliance-masonry/lib/opencontrol/versions/base"
4 changes: 2 additions & 2 deletions lib/opencontrol/resources/getter.go
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@ import (
"os"
"path/filepath"
"github.com/opencontrol/compliance-masonry/lib/opencontrol/versions/base"
"github.com/opencontrol/compliance-masonry/lib/opencontrol/versions"
"github.com/opencontrol/compliance-masonry/lib/common"
"github.com/opencontrol/compliance-masonry/lib/opencontrol"
)

// ResourceGetter is an interface for how to get and place local and remote resources.
@@ -76,7 +76,7 @@ func (g vcsAndLocalFSGetter) GetRemoteResources(destination string, subfolder st
if err != nil {
return err
}
schema, err := versions.Parse(worker.Parser, configBytes)
schema, err := opencontrol.Parse(worker.Parser, configBytes)
if err != nil {
return err
}