Restructure steampipe repo to use pkg folder. Closes #2204

bk/.gitattributes

@@ -0,0 +1 @@
+**/*.sp linguist-language=HCL

bk/.gitignore

@@ -0,0 +1,34 @@
+# Editor cache and lock files
+*.swp
+*.swo
+.idea/
+.vscode/
+.DS_Store
+
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Dashboard UI
+/ui/dashboard/.idea
+/ui/dashboard/.vscode
+/ui/dashboard/build
+/ui/dashboard/node_modules
+/ui/dashboard/output
+/ui/dashboard/yarn-debug.log*
+/ui/dashboard/yarn-error.log*
+
+# Dist directory is created by goreleaser
+/dist

bk/.gitmodules

@@ -0,0 +1,9 @@
+[submodule "tests/acceptance/lib/bats"]
+	path = tests/acceptance/lib/bats
+	url = https://github.com/sstephenson/bats
+[submodule "tests/acceptance/lib/bats-assert"]
+	path = tests/acceptance/lib/bats-assert
+	url = https://github.com/ztombol/bats-assert
+[submodule "tests/acceptance/lib/bats-support"]
+	path = tests/acceptance/lib/bats-support
+	url = https://github.com/ztombol/bats-support

cmd/check.go

@@ -16,17 +16,17 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/contexthelpers"
-	"github.com/turbot/steampipe/control"
-	"github.com/turbot/steampipe/control/controldisplay"
-	"github.com/turbot/steampipe/control/controlexecute"
-	"github.com/turbot/steampipe/control/controlstatus"
-	"github.com/turbot/steampipe/display"
-	"github.com/turbot/steampipe/statushooks"
-	"github.com/turbot/steampipe/utils"
-	"github.com/turbot/steampipe/workspace"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/contexthelpers"
+	"github.com/turbot/steampipe/pkg/control"
+	"github.com/turbot/steampipe/pkg/control/controldisplay"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlstatus"
+	"github.com/turbot/steampipe/pkg/display"
+	"github.com/turbot/steampipe/pkg/statushooks"
+	"github.com/turbot/steampipe/pkg/utils"
+	"github.com/turbot/steampipe/pkg/workspace"
 )
 
 func checkCmd() *cobra.Command {

cmd/completion.go

@@ -6,8 +6,8 @@ import (
 	"runtime"
 
 	"github.com/spf13/cobra"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
 )
 
 func generateCompletionScriptsCmd() *cobra.Command {

cmd/dashboard.go

@@ -6,20 +6,20 @@ import (
 	"log"
 	"os"
 
-	"github.com/turbot/steampipe/statushooks"
-	"github.com/turbot/steampipe/workspace"
+	"github.com/turbot/steampipe/pkg/statushooks"
+	"github.com/turbot/steampipe/pkg/workspace"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
 	"github.com/turbot/steampipe-plugin-sdk/v3/logging"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/contexthelpers"
-	"github.com/turbot/steampipe/dashboard"
-	"github.com/turbot/steampipe/dashboard/dashboardassets"
-	"github.com/turbot/steampipe/dashboard/dashboardserver"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/contexthelpers"
+	"github.com/turbot/steampipe/pkg/dashboard"
+	"github.com/turbot/steampipe/pkg/dashboard/dashboardassets"
+	"github.com/turbot/steampipe/pkg/dashboard/dashboardserver"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 func dashboardCmd() *cobra.Command {

cmd/mod.go

@@ -7,13 +7,13 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/filepaths"
-	"github.com/turbot/steampipe/modinstaller"
-	"github.com/turbot/steampipe/steampipeconfig/modconfig"
-	"github.com/turbot/steampipe/steampipeconfig/parse"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/filepaths"
+	"github.com/turbot/steampipe/pkg/modinstaller"
+	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
+	"github.com/turbot/steampipe/pkg/steampipeconfig/parse"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 // mod management commands

cmd/plugin.go

@@ -12,18 +12,18 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/db/db_local"
-	"github.com/turbot/steampipe/display"
-	"github.com/turbot/steampipe/ociinstaller"
-	"github.com/turbot/steampipe/ociinstaller/versionfile"
-	"github.com/turbot/steampipe/plugin"
-	"github.com/turbot/steampipe/statefile"
-	"github.com/turbot/steampipe/statushooks"
-	"github.com/turbot/steampipe/steampipeconfig"
-	"github.com/turbot/steampipe/steampipeconfig/modconfig"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/db/db_local"
+	"github.com/turbot/steampipe/pkg/display"
+	"github.com/turbot/steampipe/pkg/ociinstaller"
+	"github.com/turbot/steampipe/pkg/ociinstaller/versionfile"
+	"github.com/turbot/steampipe/pkg/plugin"
+	"github.com/turbot/steampipe/pkg/statefile"
+	"github.com/turbot/steampipe/pkg/statushooks"
+	"github.com/turbot/steampipe/pkg/steampipeconfig"
+	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 //  Plugin management commands

cmd/plugin_manager.go

@@ -13,13 +13,13 @@ import (
 	"github.com/hashicorp/go-hclog"
 	"github.com/spf13/cobra"
 	"github.com/turbot/steampipe-plugin-sdk/v3/logging"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/connectionwatcher"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/filepaths"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/connectionwatcher"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/filepaths"
+	"github.com/turbot/steampipe/pkg/steampipeconfig"
+	"github.com/turbot/steampipe/pkg/utils"
 	"github.com/turbot/steampipe/pluginmanager"
-	"github.com/turbot/steampipe/steampipeconfig"
-	"github.com/turbot/steampipe/utils"
 )
 
 func pluginManagerCmd() *cobra.Command {

cmd/query.go

@@ -11,15 +11,15 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/interactive"
-	"github.com/turbot/steampipe/query"
-	"github.com/turbot/steampipe/query/queryexecute"
-	"github.com/turbot/steampipe/statushooks"
-	"github.com/turbot/steampipe/steampipeconfig/modconfig"
-	"github.com/turbot/steampipe/utils"
-	"github.com/turbot/steampipe/workspace"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/interactive"
+	"github.com/turbot/steampipe/pkg/query"
+	"github.com/turbot/steampipe/pkg/query/queryexecute"
+	"github.com/turbot/steampipe/pkg/statushooks"
+	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
+	"github.com/turbot/steampipe/pkg/utils"
+	"github.com/turbot/steampipe/pkg/workspace"
 )
 
 func queryCmd() *cobra.Command {

cmd/root.go

@@ -14,17 +14,17 @@ import (
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
 	"github.com/turbot/steampipe-plugin-sdk/v3/logging"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/filepaths"
-	"github.com/turbot/steampipe/migrate"
-	"github.com/turbot/steampipe/ociinstaller/versionfile"
-	"github.com/turbot/steampipe/statefile"
-	"github.com/turbot/steampipe/statushooks"
-	"github.com/turbot/steampipe/steampipeconfig"
-	"github.com/turbot/steampipe/task"
-	"github.com/turbot/steampipe/utils"
-	"github.com/turbot/steampipe/version"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/filepaths"
+	"github.com/turbot/steampipe/pkg/migrate"
+	"github.com/turbot/steampipe/pkg/ociinstaller/versionfile"
+	"github.com/turbot/steampipe/pkg/statefile"
+	"github.com/turbot/steampipe/pkg/statushooks"
+	"github.com/turbot/steampipe/pkg/steampipeconfig"
+	"github.com/turbot/steampipe/pkg/task"
+	"github.com/turbot/steampipe/pkg/utils"
+	"github.com/turbot/steampipe/pkg/version"
 )
 
 var exitCode int

cmd/service.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/turbot/steampipe/dashboard/dashboardserver"
-	"github.com/turbot/steampipe/statushooks"
+	"github.com/turbot/steampipe/pkg/dashboard/dashboardserver"
+	"github.com/turbot/steampipe/pkg/statushooks"
 
 	"os"
 	"os/signal"
@@ -17,12 +17,12 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/db/db_local"
-	"github.com/turbot/steampipe/display"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/db/db_local"
+	"github.com/turbot/steampipe/pkg/display"
+	"github.com/turbot/steampipe/pkg/utils"
 	"github.com/turbot/steampipe/pluginmanager"
-	"github.com/turbot/steampipe/utils"
 )
 
 func serviceCmd() *cobra.Command {

cmd/variable.go

@@ -6,11 +6,11 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/display"
-	"github.com/turbot/steampipe/utils"
-	"github.com/turbot/steampipe/workspace"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/display"
+	"github.com/turbot/steampipe/pkg/utils"
+	"github.com/turbot/steampipe/pkg/workspace"
 )
 
 //  Variable management commands

main.go

@@ -11,8 +11,8 @@ import (
 	filehelpers "github.com/turbot/go-kit/files"
 	"github.com/turbot/go-kit/helpers"
 	"github.com/turbot/steampipe/cmd"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 var exitCode int

pkg/cloud/connection_string.go

@@ -7,10 +7,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/turbot/steampipe/steampipeconfig"
+	"github.com/turbot/steampipe/pkg/steampipeconfig"
 
 	"github.com/spf13/viper"
-	"github.com/turbot/steampipe/constants"
+	"github.com/turbot/steampipe/pkg/constants"
 )
 
 const actorAPI = "/api/v1/actor"

pkg/cmdconfig/builder.go

@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 type CmdBuilder struct {

pkg/cmdconfig/connection_string.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 
 	"github.com/spf13/viper"
-	"github.com/turbot/steampipe/cloud"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/steampipeconfig"
+	"github.com/turbot/steampipe/pkg/cloud"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/steampipeconfig"
 )
 
 func GetCloudMetadata() (*steampipeconfig.CloudMetadata, error) {

pkg/cmdconfig/viper.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/types"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/filepaths"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/filepaths"
 )
 
 // Viper fetches the global viper instance

pkg/connectionwatcher/config_map.go

@@ -1,8 +1,8 @@
 package connectionwatcher
 
 import (
+	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
 	pb "github.com/turbot/steampipe/pluginmanager/grpc/proto"
-	"github.com/turbot/steampipe/steampipeconfig/modconfig"
 )
 
 func NewConnectionConfigMap(connectionMap map[string]*modconfig.Connection) map[string]*pb.ConnectionConfig {

pkg/connectionwatcher/connection_watcher.go

@@ -7,13 +7,13 @@ import (
 	"github.com/fsnotify/fsnotify"
 	filehelpers "github.com/turbot/go-kit/files"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/cmdconfig"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/db/db_local"
-	"github.com/turbot/steampipe/filepaths"
+	"github.com/turbot/steampipe/pkg/cmdconfig"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/db/db_local"
+	"github.com/turbot/steampipe/pkg/filepaths"
+	"github.com/turbot/steampipe/pkg/steampipeconfig"
+	"github.com/turbot/steampipe/pkg/utils"
 	pb "github.com/turbot/steampipe/pluginmanager/grpc/proto"
-	"github.com/turbot/steampipe/steampipeconfig"
-	"github.com/turbot/steampipe/utils"
 )
 
 type ConnectionWatcher struct {

pkg/constants/dashboard.go

@@ -3,7 +3,7 @@ package constants
 import (
 	"fmt"
 
-	"github.com/turbot/steampipe/version"
+	"github.com/turbot/steampipe/pkg/version"
 )
 
 const (

pkg/constants/db.go

@@ -3,7 +3,7 @@ package constants
 import (
 	"fmt"
 
-	"github.com/turbot/steampipe/schema"
+	"github.com/turbot/steampipe/pkg/schema"
 )
 
 // dbClient constants

pkg/constants/runtime/execution_id.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 var (

pkg/control/controldisplay/color_scheme.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 
 	"github.com/logrusorgru/aurora"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/utils"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/utils"
 )
 
 type colorFunc func(interface{}) aurora.Value

pkg/control/controldisplay/control.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/spf13/viper"
 	typehelpers "github.com/turbot/go-kit/types"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type ControlRenderer struct {

pkg/control/controldisplay/csv.go

@@ -3,7 +3,7 @@ package controldisplay
 import (
 	"github.com/turbot/go-kit/helpers"
 	typehelpers "github.com/turbot/go-kit/types"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type CSVRenderer struct {

pkg/control/controldisplay/dimensions.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/logrusorgru/aurora"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type DimensionsRenderer struct {

pkg/control/controldisplay/error.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/constants"
+	"github.com/turbot/steampipe/pkg/constants"
 )
 
 type ErrorRenderer struct {

pkg/control/controldisplay/export_template.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/turbot/steampipe/filepaths"
+	"github.com/turbot/steampipe/pkg/filepaths"
 )
 
 type ExportTemplate struct {

pkg/control/controldisplay/formatter.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"strings"
 
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 var ErrFormatterNotFound = errors.New("Formatter not found")

pkg/control/controldisplay/formatter_fs.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/turbot/steampipe/filepaths"
+	"github.com/turbot/steampipe/pkg/filepaths"
 )
 
 //go:embed templates/*

pkg/control/controldisplay/formatter_template.go

@@ -8,9 +8,9 @@ import (
 	"text/template"
 
 	"github.com/spf13/viper"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
-	"github.com/turbot/steampipe/version"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/version"
 )
 
 type TemplateRenderConfig struct {

pkg/control/controldisplay/formatter_template_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/otiai10/copy"
-	"github.com/turbot/steampipe/filepaths"
+	"github.com/turbot/steampipe/pkg/filepaths"
 )
 
 type Testcase struct {

pkg/control/controldisplay/formatter_test.go

@@ -9,9 +9,9 @@ package controldisplay
 
 // 	jsonpatch "github.com/evanphx/json-patch"
 // 	"github.com/spf13/viper"
-// 	"github.com/turbot/steampipe/constants"
-// 	"github.com/turbot/steampipe/control/controlexecute"
-// 	"github.com/turbot/steampipe/steampipeconfig/modconfig"
+// 	"github.com/turbot/steampipe/pkg/constants"
+// 	"github.com/turbot/steampipe/pkg/control/controlexecute"
+// 	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
 // )
 
 // var rootBenchmark = modconfig.Benchmark{}

pkg/control/controldisplay/formatter_text.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/karrick/gows"
 	"github.com/spf13/viper"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 const MaxColumns = 200

pkg/control/controldisplay/group.go

@@ -5,8 +5,8 @@ import (
 	"log"
 	"strings"
 
-	"github.com/turbot/steampipe/control/controlexecute"
-	"github.com/turbot/steampipe/steampipeconfig/modconfig"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/steampipeconfig/modconfig"
 )
 
 type GroupRenderer struct {

pkg/control/controldisplay/group_heading.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/constants"
+	"github.com/turbot/steampipe/pkg/constants"
 )
 
 type GroupHeadingRenderer struct {

pkg/control/controldisplay/result.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/viper"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 const minReasonWidth = 10

pkg/control/controldisplay/result_columns.go

@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type CsvColumnPair struct {

pkg/control/controldisplay/summary.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type SummaryRenderer struct {

pkg/control/controldisplay/summary_severity.go

@@ -2,7 +2,7 @@ package controldisplay
 
 import (
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type SummarySeverityRenderer struct {

pkg/control/controldisplay/summary_severity_row.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type SummarySeverityRowRenderer struct {

pkg/control/controldisplay/summary_status_row.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 	"golang.org/x/text/language"
 	"golang.org/x/text/message"
 )

pkg/control/controldisplay/summary_total_row.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type SummaryTotalRowRenderer struct {

pkg/control/controldisplay/table.go

@@ -4,8 +4,8 @@ import (
 	"strings"
 
 	"github.com/spf13/viper"
-	"github.com/turbot/steampipe/constants"
-	"github.com/turbot/steampipe/control/controlexecute"
+	"github.com/turbot/steampipe/pkg/constants"
+	"github.com/turbot/steampipe/pkg/control/controlexecute"
 )
 
 type TableRenderer struct {