Update import paths for new file structure

opencontrol · Jun 5, 2018 · e470074 · e470074
1 parent 1584f6e
commit e470074
Show file tree

Hide file tree

Showing 62 changed files with 104 additions and 104 deletions.
diff --git a/cmd/compliance-masonry/compliance-masonry.go b/cmd/compliance-masonry/compliance-masonry.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 
 	"github.com/codegangsta/cli"
-	"github.com/opencontrol/compliance-masonry/commands/docs"
-	"github.com/opencontrol/compliance-masonry/commands/docs/gitbook"
-	"github.com/opencontrol/compliance-masonry/commands/get"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/docs"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/docs/gitbook"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/get"
 	"github.com/opencontrol/compliance-masonry/tools/constants"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 	"github.com/opencontrol/compliance-masonry/version"

diff --git a/cmd/compliance-masonry/diff.go b/cmd/compliance-masonry/diff.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/codegangsta/cli"
-	"github.com/opencontrol/compliance-masonry/commands/diff"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/diff"
 	"github.com/tg/gosortmap"
 )
 

diff --git a/examples/example.go b/examples/example.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/opencontrol/compliance-masonry/lib"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"io"
 	"os"
 )

diff --git a/examples/example_test.go b/examples/example_test.go
@@ -5,8 +5,8 @@ import (
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gbytes"
 	. "github.com/onsi/gomega/gexec"
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	"github.com/opencontrol/compliance-masonry/lib/common/mocks"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common/mocks"
 	"github.com/stretchr/testify/assert"
 	"os"
 	"os/exec"

diff --git a/pkg/cli/diff/inventory.go b/pkg/cli/diff/inventory.go
@@ -2,8 +2,8 @@ package diff
 
 import (
 	"fmt"
-	"github.com/opencontrol/compliance-masonry/lib"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"github.com/opencontrol/compliance-masonry/tools/certifications"
 )
 

diff --git a/pkg/cli/diff/inventory_test.go b/pkg/cli/diff/inventory_test.go
@@ -1,7 +1,7 @@
 package diff_test
 
 import (
-	. "github.com/opencontrol/compliance-masonry/commands/diff"
+	. "github.com/opencontrol/compliance-masonry/pkg/cli/diff"
 
 	"errors"
 	. "github.com/onsi/ginkgo"

diff --git a/pkg/cli/docs/docs.go b/pkg/cli/docs/docs.go
@@ -3,7 +3,7 @@ package docs
 import (
 	"os"
 
-	"github.com/opencontrol/compliance-masonry/commands/docs/gitbook"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/docs/gitbook"
 	"github.com/opencontrol/compliance-masonry/tools/certifications"
 )
 

diff --git a/pkg/cli/docs/docs_test.go b/pkg/cli/docs/docs_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	. "github.com/opencontrol/compliance-masonry/commands/docs"
-	"github.com/opencontrol/compliance-masonry/commands/docs/gitbook"
+	. "github.com/opencontrol/compliance-masonry/pkg/cli/docs"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/docs/gitbook"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"

diff --git a/pkg/cli/docs/gitbook/gitbook.go b/pkg/cli/docs/gitbook/gitbook.go
@@ -5,8 +5,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/opencontrol/compliance-masonry/lib"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 )
 

diff --git a/pkg/cli/docs/gitbook/gitbookCertification.go b/pkg/cli/docs/gitbook/gitbookCertification.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 )
 
 func (openControl *OpenControlGitBook) getResponsibleRole(text string, component common.Component) string {

diff --git a/pkg/cli/docs/gitbook/gitbookCertification_test.go b/pkg/cli/docs/gitbook/gitbookCertification_test.go
@@ -8,7 +8,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/opencontrol/compliance-masonry/lib"
+	"github.com/opencontrol/compliance-masonry/pkg/lib"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 )
 

diff --git a/pkg/cli/docs/gitbook/gitbookComponents_test.go b/pkg/cli/docs/gitbook/gitbookComponents_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/blang/semver"
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	v2 "github.com/opencontrol/compliance-masonry/lib/components/versions/2_0_0"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
+	v2 "github.com/opencontrol/compliance-masonry/pkg/lib/components/versions/2_0_0"
 )
 
 type componentExportTest struct {

diff --git a/pkg/cli/docs/gitbook/gitbookSummaries.go b/pkg/cli/docs/gitbook/gitbookSummaries.go
@@ -2,7 +2,7 @@ package gitbook
 
 import (
 	"fmt"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"io/ioutil"
 	"path/filepath"
 	"strings"

diff --git a/pkg/cli/docs/gitbook/gitbookSummaries_test.go b/pkg/cli/docs/gitbook/gitbookSummaries_test.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/opencontrol/compliance-masonry/lib"
+	"github.com/opencontrol/compliance-masonry/pkg/lib"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 )
 

diff --git a/pkg/cli/get/get.go b/pkg/cli/get/get.go
@@ -1,9 +1,9 @@
 package get
 
 import (
-	"github.com/opencontrol/compliance-masonry/commands/get/resources"
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	"github.com/opencontrol/compliance-masonry/lib/opencontrol"
+	"github.com/opencontrol/compliance-masonry/pkg/cli/get/resources"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/opencontrol"
 )
 
 // Get will retrieve all of the resources for the schemas and the resources for all the dependent schemas.

diff --git a/pkg/cli/get/resources/downloader.go b/pkg/cli/get/resources/downloader.go
@@ -1,7 +1,7 @@
 package resources
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"github.com/opencontrol/compliance-masonry/tools/vcs"
 )
 

diff --git a/pkg/cli/get/resources/downloader_test.go b/pkg/cli/get/resources/downloader_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/extensions/table"
-	commonMocks "github.com/opencontrol/compliance-masonry/lib/common/mocks"
+	commonMocks "github.com/opencontrol/compliance-masonry/pkg/lib/common/mocks"
 	"github.com/opencontrol/compliance-masonry/tools/vcs/mocks"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/pkg/cli/get/resources/getter.go b/pkg/cli/get/resources/getter.go
@@ -1,8 +1,8 @@
 package resources
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	"github.com/opencontrol/compliance-masonry/lib/opencontrol"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/opencontrol"
 	"github.com/opencontrol/compliance-masonry/tools/constants"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 	"github.com/opencontrol/compliance-masonry/tools/mapset"

diff --git a/pkg/cli/get/resources/getter_test.go b/pkg/cli/get/resources/getter_test.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
-	resmocks "github.com/opencontrol/compliance-masonry/commands/get/resources/mocks"
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	"github.com/opencontrol/compliance-masonry/lib/common/mocks"
-	"github.com/opencontrol/compliance-masonry/lib/opencontrol"
-	parserMocks "github.com/opencontrol/compliance-masonry/lib/opencontrol/mocks"
+	resmocks "github.com/opencontrol/compliance-masonry/pkg/cli/get/resources/mocks"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common/mocks"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/opencontrol"
+	parserMocks "github.com/opencontrol/compliance-masonry/pkg/lib/opencontrol/mocks"
 	"github.com/opencontrol/compliance-masonry/tools/constants"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 	fsmocks "github.com/opencontrol/compliance-masonry/tools/fs/mocks"

diff --git a/pkg/cli/get/resources/mocks/Downloader.go b/pkg/cli/get/resources/mocks/Downloader.go
@@ -2,7 +2,7 @@ package mocks
 
 import "github.com/stretchr/testify/mock"
 
-import "github.com/opencontrol/compliance-masonry/lib/common"
+import "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 
 // Downloader is an autogenerated mock type for the Downloader type
 type Downloader struct {

diff --git a/pkg/cli/get/resources/mocks/Getter.go b/pkg/cli/get/resources/mocks/Getter.go
@@ -1,7 +1,7 @@
 package mocks
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"github.com/opencontrol/compliance-masonry/tools/constants"
 	"github.com/stretchr/testify/mock"
 )

diff --git a/pkg/lib/README.md b/pkg/lib/README.md
@@ -8,8 +8,8 @@ This package (and the sub packages) are the only packages that should
 be imported by external projects. This lib package is very helpful for
 those writing plugins to extend the functionality of Masonry.
 
-Additionally, 1) the `lib/common` package contains all the interfaces for
-workspace information and 2) the `lib/common/mocks` contains all the
+Additionally, 1) the `pkg/lib/common` package contains all the interfaces for
+workspace information and 2) the `pkg/lib/common/mocks` contains all the
 mocks to help with tests.
 
 The idea is once you run the `get` command and all the resources
@@ -27,7 +27,7 @@ Workspace is the representation of your working space with all the
 resources gathered together.
 - How to obtain a workspace:
   ```go
-  import "github.com/opencontrol/compliance-masonry/lib"
+  import "github.com/opencontrol/compliance-masonry/pkg/lib"
 
   // some other code
 
@@ -66,13 +66,13 @@ rather a post-processed map of data to help quickly getting component
 data for a particular control name - standard name combination.
 
 ### Mock generation
-The `lib/common/mocks` is a package that is auto-generated via
+The `pkg/lib/common/mocks` is a package that is auto-generated via
  [`mockery`](https://github.com/vektra/mockery). Follow the
  instructions there to install `mockery`.
 
  Whenever a modification is made to an existing interface or a new 
  interface is created, you should use mockery to (re)generate the mock
- while inside the `lib/common` folder.
+ while inside the `pkg/lib/common` folder.
 
 ```sh
 mockery -name NameOfInterface

diff --git a/pkg/lib/certifications.go b/pkg/lib/certifications.go
@@ -1,8 +1,8 @@
 package lib
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/certifications"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/certifications"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 )
 
 // LoadCertification struct loads certifications into a Certification struct

diff --git a/pkg/lib/certifications/certification.go b/pkg/lib/certifications/certification.go
@@ -1,8 +1,8 @@
 package certifications
 
 import (
-	v1_0_0 "github.com/opencontrol/compliance-masonry/lib/certifications/versions/1_0_0"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	v1_0_0 "github.com/opencontrol/compliance-masonry/pkg/lib/certifications/versions/1_0_0"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
 )

diff --git a/pkg/lib/certifications/certification_test.go b/pkg/lib/certifications/certification_test.go
@@ -1,9 +1,9 @@
 package certifications_test
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/certifications"
-	v1_0_0 "github.com/opencontrol/compliance-masonry/lib/certifications/versions/1_0_0"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/certifications"
+	v1_0_0 "github.com/opencontrol/compliance-masonry/pkg/lib/certifications/versions/1_0_0"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"github.com/stretchr/testify/assert"
 	"path/filepath"
 	"testing"

diff --git a/pkg/lib/certifications/versions/1_0_0/certification_test.go b/pkg/lib/certifications/versions/1_0_0/certification_test.go
@@ -1,7 +1,7 @@
 package certification_test
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/certifications/versions/1_0_0"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/certifications/versions/1_0_0"
 	"testing"
 )
 

diff --git a/pkg/lib/common/mocks/Certification.go b/pkg/lib/common/mocks/Certification.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // Certification is an autogenerated mock type for the Certification type

diff --git a/pkg/lib/common/mocks/Component.go b/pkg/lib/common/mocks/Component.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 import semver "github.com/blang/semver"
 

diff --git a/pkg/lib/common/mocks/Control.go b/pkg/lib/common/mocks/Control.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // Control is an autogenerated mock type for the Control type

diff --git a/pkg/lib/common/mocks/OpenControl.go b/pkg/lib/common/mocks/OpenControl.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // OpenControl is an autogenerated mock type for the OpenControl type

diff --git a/pkg/lib/common/mocks/RemoteSource.go b/pkg/lib/common/mocks/RemoteSource.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // RemoteSource is an autogenerated mock type for the RemoteSource type

diff --git a/pkg/lib/common/mocks/Satisfies.go b/pkg/lib/common/mocks/Satisfies.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // Satisfies is an autogenerated mock type for the Satisfies type

diff --git a/pkg/lib/common/mocks/Section.go b/pkg/lib/common/mocks/Section.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // Section is an autogenerated mock type for the Section type

diff --git a/pkg/lib/common/mocks/Standard.go b/pkg/lib/common/mocks/Standard.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // Standard is an autogenerated mock type for the Standard type

diff --git a/pkg/lib/common/mocks/Workspace.go b/pkg/lib/common/mocks/Workspace.go
@@ -1,6 +1,6 @@
 package mocks
 
-import common "github.com/opencontrol/compliance-masonry/lib/common"
+import common "github.com/opencontrol/compliance-masonry/pkg/lib/common"
 import mock "github.com/stretchr/testify/mock"
 
 // Workspace is an autogenerated mock type for the Workspace type

diff --git a/pkg/lib/common/verifications_test.go b/pkg/lib/common/verifications_test.go
@@ -1,7 +1,7 @@
 package common_test
 
 import (
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"testing"
 )
 

diff --git a/pkg/lib/components.go b/pkg/lib/components.go
@@ -5,8 +5,8 @@ import (
 
 	"fmt"
 
-	"github.com/opencontrol/compliance-masonry/lib/common"
-	"github.com/opencontrol/compliance-masonry/lib/components"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/components"
 )
 
 // componentsMap struct is a thread-safe structure mapping for components

diff --git a/pkg/lib/components/component.go b/pkg/lib/components/component.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/blang/semver"
-	"github.com/opencontrol/compliance-masonry/lib/common"
+	"github.com/opencontrol/compliance-masonry/pkg/lib/common"
 	"github.com/opencontrol/compliance-masonry/tools/constants"
 	"github.com/opencontrol/compliance-masonry/tools/fs"
 	"path/filepath"