(MAINT) fix imports and tests

Fixes references to old repo name and minor tweaks to tests.
puppetlabs-toy-chest · May 2, 2017 · a47f319 · a47f319
1 parent 2610440
commit a47f319
Show file tree

Hide file tree

Showing 37 changed files with 98 additions and 98 deletions.
diff --git a/capabilities/host/host.go b/capabilities/host/host.go
@@ -3,10 +3,10 @@ package host
 import (
 	"fmt"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/payloadfilter"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/payloadfilter"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 	gopsutilhost "github.com/shirou/gopsutil/host"
 )
 

diff --git a/capabilities/init.go b/capabilities/init.go
@@ -1,9 +1,9 @@
 package capabilities
 
 import (
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/host"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/label"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/ospackages"
+	"github.com/puppetlabs/lumogon/capabilities/host"
+	"github.com/puppetlabs/lumogon/capabilities/label"
+	"github.com/puppetlabs/lumogon/capabilities/ospackages"
 )
 
 // Init exists to allow capabilities init() functions to run when

diff --git a/capabilities/label/label.go b/capabilities/label/label.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/payloadfilter"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/payloadfilter"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 // Label contains a map of Docker labels

diff --git a/capabilities/ospackages/apk.go b/capabilities/ospackages/apk.go
@@ -1,11 +1,11 @@
 package ospackages
 
 import (
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/payloadfilter"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/payloadfilter"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 var apkDescription = `The apk capability returns all apk-managed package

diff --git a/capabilities/ospackages/dpkg.go b/capabilities/ospackages/dpkg.go
@@ -1,11 +1,11 @@
 package ospackages
 
 import (
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/payloadfilter"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/payloadfilter"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 var dpkgDescription = `The dpkg capability returns all dpkg-managed package

diff --git a/capabilities/ospackages/package.go b/capabilities/ospackages/package.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/utils"
 )
 
 func runPackageCmd(client dockeradapter.Harvester, containerID string, cmd []string) (map[string]string, error) {

diff --git a/capabilities/ospackages/package_test.go b/capabilities/ospackages/package_test.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 
 	dockertypes "github.com/docker/docker/api/types"
-	"github.com/puppetlabs/transparent-containers/cli/test/helper"
-	"github.com/puppetlabs/transparent-containers/cli/test/mocks"
+	"github.com/puppetlabs/lumogon/test/helper"
+	"github.com/puppetlabs/lumogon/test/mocks"
 )
 
 // Uses generic successful mock functions from packagehelpers_test.go

diff --git a/capabilities/ospackages/packagehelpers_test.go b/capabilities/ospackages/packagehelpers_test.go
@@ -6,7 +6,7 @@ import (
 	"context"
 
 	dockertypes "github.com/docker/docker/api/types"
-	"github.com/puppetlabs/transparent-containers/cli/test/mocks"
+	"github.com/puppetlabs/lumogon/test/mocks"
 )
 
 func successfulContainerExecCreateFn(ctx context.Context, containerID string, cmd []string, attachStdout bool, attachStderr bool) (dockertypes.IDResponse, error) {

diff --git a/capabilities/ospackages/rpm.go b/capabilities/ospackages/rpm.go
@@ -1,11 +1,11 @@
 package ospackages
 
 import (
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/payloadfilter"
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/payloadfilter"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 var rpmDescription = `The rpm capability returns all rpm-managed package

diff --git a/capabilities/registry/registry.go b/capabilities/registry/registry.go
@@ -6,10 +6,10 @@ import (
 
 	"os"
 
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
+	"github.com/puppetlabs/lumogon/utils"
 )
 
 // CapabilitiesRegistry contains a record of each registered capability

diff --git a/cmd/container.go b/cmd/container.go
@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"github.com/puppetlabs/transparent-containers/cli/scheduler"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/scheduler"
+	"github.com/puppetlabs/lumogon/types"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/describecapability.go b/cmd/describecapability.go
@@ -5,7 +5,7 @@ import (
 
 	"os"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/harvest.go b/cmd/harvest.go
@@ -3,11 +3,11 @@ package cmd
 import (
 	"os"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/harvester"
-	"github.com/puppetlabs/transparent-containers/cli/harvester/rpcreceiver"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/harvester"
+	"github.com/puppetlabs/lumogon/harvester/rpcreceiver"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/listcapabilities.go b/cmd/listcapabilities.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"os"
 
-	"github.com/puppetlabs/transparent-containers/cli/logging"
+	"github.com/puppetlabs/lumogon/logging"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

diff --git a/cmd/version.go b/cmd/version.go
@@ -6,8 +6,8 @@ import (
 
 	"fmt"
 
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/version"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/version"
 	"github.com/spf13/cobra"
 )
 

diff --git a/collector/collector.go b/collector/collector.go
@@ -7,12 +7,12 @@ import (
 
 	"encoding/json"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/storage"
-	"github.com/puppetlabs/transparent-containers/cli/types"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
-	"github.com/puppetlabs/transparent-containers/cli/version"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/storage"
+	"github.com/puppetlabs/lumogon/types"
+	"github.com/puppetlabs/lumogon/utils"
+	"github.com/puppetlabs/lumogon/version"
 )
 
 var mu sync.Mutex

diff --git a/collector/report.go b/collector/report.go
@@ -3,8 +3,8 @@ package collector
 import (
 	"time"
 
-	"github.com/puppetlabs/transparent-containers/cli/types"
-	"github.com/puppetlabs/transparent-containers/cli/version"
+	"github.com/puppetlabs/lumogon/types"
+	"github.com/puppetlabs/lumogon/version"
 )
 
 // NewReport gathers data from all capabilities

diff --git a/dockeradapter/dockeradapter.go b/dockeradapter/dockeradapter.go
@@ -7,8 +7,8 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/utils"
 )
 
 // Client is a Docker (currently local) ContainerRuntime

diff --git a/dockeradapter/filterdockerstream.go b/dockeradapter/filterdockerstream.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/puppetlabs/transparent-containers/cli/logging"
+	"github.com/puppetlabs/lumogon/logging"
 )
 
 const (

diff --git a/dockeradapter/filterdockerstream_test.go b/dockeradapter/filterdockerstream_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/puppetlabs/transparent-containers/cli/test/helper"
+	"github.com/puppetlabs/lumogon/test/helper"
 )
 
 var filterDockerStreamTests = []struct {

diff --git a/glide.yaml b/glide.yaml
@@ -1,4 +1,4 @@
-package: github.com/puppetlabs/transparent-containers/cli
+package: github.com/puppetlabs/lumogon
 import:
 - package: github.com/docker/docker
   subpackages:

diff --git a/harvester/attached.go b/harvester/attached.go
@@ -5,10 +5,10 @@ import (
 
 	"sync"
 
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/harvester/rpcreceiver"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/harvester/rpcreceiver"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 // RunAttachedHarvester handles gathering AttachedCapabilities from the target containers.

diff --git a/harvester/attachedcontainer.go b/harvester/attachedcontainer.go
@@ -7,10 +7,10 @@ import (
 	"os"
 
 	dockercontainer "github.com/docker/docker/api/types/container"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
+	"github.com/puppetlabs/lumogon/utils"
 )
 
 // AttachedContainer is a container attached to a running target container

diff --git a/harvester/containerreport.go b/harvester/containerreport.go
@@ -3,8 +3,8 @@ package harvester
 import (
 	"time"
 
-	"github.com/puppetlabs/transparent-containers/cli/types"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
+	"github.com/puppetlabs/lumogon/types"
+	"github.com/puppetlabs/lumogon/utils"
 )
 
 // GenerateContainerReport gathers capabilities data for a specific container

diff --git a/harvester/containerreport_test.go b/harvester/containerreport_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 func TestGenerateContainerReport(t *testing.T) {

diff --git a/harvester/dockerapi.go b/harvester/dockerapi.go
@@ -5,10 +5,10 @@ import (
 
 	"sync"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 // RunDockerAPIHarvester handles gathering DockerAPICapabilities from the target containers.

diff --git a/harvester/rpcreceiver/client.go b/harvester/rpcreceiver/client.go
@@ -4,8 +4,8 @@ import (
 	"log"
 	"net/rpc"
 
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 // SendResult submits the ContainerReport populated with the output from each

diff --git a/harvester/rpcreceiver/server.go b/harvester/rpcreceiver/server.go
@@ -7,8 +7,8 @@ import (
 
 	"fmt"
 
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
 )
 
 // Ack contains the reponse from the RPC Receiver server

diff --git a/lumogon.go b/lumogon.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities"
-	"github.com/puppetlabs/transparent-containers/cli/cmd"
+	"github.com/puppetlabs/lumogon/capabilities"
+	"github.com/puppetlabs/lumogon/cmd"
 )
 
 func main() {

diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go
@@ -6,13 +6,13 @@ import (
 
 	"sync"
 
-	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
-	"github.com/puppetlabs/transparent-containers/cli/collector"
-	"github.com/puppetlabs/transparent-containers/cli/dockeradapter"
-	"github.com/puppetlabs/transparent-containers/cli/harvester"
-	"github.com/puppetlabs/transparent-containers/cli/logging"
-	"github.com/puppetlabs/transparent-containers/cli/types"
-	"github.com/puppetlabs/transparent-containers/cli/utils"
+	"github.com/puppetlabs/lumogon/capabilities/registry"
+	"github.com/puppetlabs/lumogon/collector"
+	"github.com/puppetlabs/lumogon/dockeradapter"
+	"github.com/puppetlabs/lumogon/harvester"
+	"github.com/puppetlabs/lumogon/logging"
+	"github.com/puppetlabs/lumogon/types"
+	"github.com/puppetlabs/lumogon/utils"
 )
 
 // Scheduler runs in the Lumogon client container and handles gathering
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"os"
-    	"github.com/puppetlabs/transparent-containers/cli/capabilities/registry"
+    	"github.com/puppetlabs/lumogon/capabilities/registry"
     	"github.com/spf13/cobra"
     )
@@ Expand Down @@