Update all references to use github.com/turbot/steampipe-plugin-sdk/v2.

Closes #272
turbot · Feb 14, 2022 · 39eba0e · 39eba0e
1 parent b5e7800
commit 39eba0e
Show file tree

Hide file tree

Showing 37 changed files with 66 additions and 66 deletions.
diff --git a/cache/index_bucket.go b/cache/index_bucket.go
@@ -3,7 +3,7 @@ package cache
 import (
 	"log"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 // IndexBucket contains index items for all cache results for a given table and qual set

diff --git a/cache/index_item.go b/cache/index_item.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 // IndexItem stores the columns and cached index for a single cached query result

diff --git a/cache/query_cache.go b/cache/query_cache.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/dgraph-io/ristretto"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 // TODO do not use unsafe quals use quals map and  remove key column qual logic

diff --git a/cache/query_cache_pending.go b/cache/query_cache_pending.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 const pendingQueryTimeout = 90 * time.Second

diff --git a/cache/query_result.go b/cache/query_result.go
@@ -1,7 +1,7 @@
 package cache
 
 import (
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 type QueryCacheResult struct {

diff --git a/grpc/pluginClient.go b/grpc/pluginClient.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	pluginshared "github.com/turbot/steampipe-plugin-sdk/grpc/shared"
-	"github.com/turbot/steampipe-plugin-sdk/logging"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	pluginshared "github.com/turbot/steampipe-plugin-sdk/v2/grpc/shared"
+	"github.com/turbot/steampipe-plugin-sdk/v2/logging"
 )
 
 // PluginClient is the client object used by clients of the plugin

diff --git a/grpc/pluginServer.go b/grpc/pluginServer.go
@@ -4,9 +4,9 @@ import (
 	"github.com/turbot/go-kit/helpers"
 
 	"github.com/hashicorp/go-plugin"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	pluginshared "github.com/turbot/steampipe-plugin-sdk/grpc/shared"
-	"github.com/turbot/steampipe-plugin-sdk/version"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	pluginshared "github.com/turbot/steampipe-plugin-sdk/v2/grpc/shared"
+	"github.com/turbot/steampipe-plugin-sdk/v2/version"
 )
 
 type PluginSchema struct {

diff --git a/grpc/quals.go b/grpc/quals.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 const (

diff --git a/grpc/shared/grpc.go b/grpc/shared/grpc.go
@@ -3,7 +3,7 @@ package shared
 import (
 	"context"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 // GRPCClient is an implementation of

diff --git a/grpc/shared/interface.go b/grpc/shared/interface.go
@@ -5,7 +5,7 @@ import (
 	"context"
 
 	"github.com/hashicorp/go-plugin"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 	"google.golang.org/grpc"
 )
 

diff --git a/plugin/column.go b/plugin/column.go
@@ -1,8 +1,8 @@
 package plugin
 
 import (
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/transform"
 )
 
 // Column is a struct representing a column defintion

diff --git a/plugin/connection_config.go b/plugin/connection_config.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/hcl/v2/hclparse"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/schema"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/schema"
 	"github.com/zclconf/go-cty/cty/gocty"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/plugin/connection_config_test.go b/plugin/connection_config_test.go
@@ -3,7 +3,7 @@ package plugin
 import (
 	"fmt"
 
-	"github.com/turbot/steampipe-plugin-sdk/plugin/schema"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/schema"
 
 	"reflect"
 	"testing"

diff --git a/plugin/connection_config_validate.go b/plugin/connection_config_validate.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/turbot/go-kit/helpers"
 
-	"github.com/turbot/steampipe-plugin-sdk/plugin/schema"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/schema"
 )
 
 // Validate validates the connection config

diff --git a/plugin/connection_config_validate_test.go b/plugin/connection_config_validate_test.go
@@ -3,7 +3,7 @@ package plugin
 import (
 	"fmt"
 
-	"github.com/turbot/steampipe-plugin-sdk/plugin/schema"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/schema"
 
 	"reflect"
 	"testing"

diff --git a/plugin/context.go b/plugin/context.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/turbot/steampipe-plugin-sdk/plugin/context_key"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/context_key"
 
 	"github.com/hashicorp/go-hclog"
 )

diff --git a/plugin/key_column.go b/plugin/key_column.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/gertd/go-pluralize"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 const (

diff --git a/plugin/key_column_qual.go b/plugin/key_column_qual.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/turbot/steampipe-plugin-sdk/plugin/quals"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/quals"
 
 	"github.com/turbot/go-kit/helpers"
 )

diff --git a/plugin/key_column_qual_map.go b/plugin/key_column_qual_map.go
@@ -5,11 +5,11 @@ import (
 	"log"
 	"strings"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/quals"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/quals"
 )
 
 // KeyColumnQualMap is a map of KeyColumnQuals keyed by column name

diff --git a/plugin/key_column_qual_value_map.go b/plugin/key_column_qual_value_map.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 // KeyColumnEqualsQualMap is a map of column name to qual value, used to represent a map of any equals quals

diff --git a/plugin/key_column_slice.go b/plugin/key_column_slice.go
@@ -3,7 +3,7 @@ package plugin
 import (
 	"strings"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 type KeyColumnSlice []*KeyColumn

diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -11,14 +11,14 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/cache"
-	connection_manager "github.com/turbot/steampipe-plugin-sdk/connection"
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/logging"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/context_key"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/os_specific"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v2/cache"
+	connection_manager "github.com/turbot/steampipe-plugin-sdk/v2/connection"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/logging"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/context_key"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/os_specific"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/transform"
 )
 
 const (

diff --git a/plugin/plugin_test.go b/plugin/plugin_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 type validateTest struct {

diff --git a/plugin/quals/qual.go b/plugin/quals/qual.go
@@ -1,7 +1,7 @@
 package quals
 
 import (
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 // Qual is a struct which represents a database qual in a more easily digestible form that proto.Qual

diff --git a/plugin/query_context.go b/plugin/query_context.go
@@ -1,7 +1,7 @@
 package plugin
 
 import (
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 type QueryContext struct {

diff --git a/plugin/query_data.go b/plugin/query_data.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/turbot/go-kit/helpers"
 	typehelpers "github.com/turbot/go-kit/types"
-	connection_manager "github.com/turbot/steampipe-plugin-sdk/connection"
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/logging"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/quals"
+	connection_manager "github.com/turbot/steampipe-plugin-sdk/v2/connection"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/logging"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/quals"
 )
 
 const itemBufferSize = 100

diff --git a/plugin/row.go b/plugin/row.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/logging"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/context_key"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/logging"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/context_key"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )

diff --git a/plugin/serve.go b/plugin/serve.go
@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/hashicorp/go-hclog"
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
-	"github.com/turbot/steampipe-plugin-sdk/logging"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/context_key"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/logging"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/context_key"
 )
 
 // ServeOpts are the configurations to serve a plugin.

diff --git a/plugin/table.go b/plugin/table.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/transform"
 )
 
 type MatrixItemFunc func(context.Context, *Connection) []map[string]interface{}

diff --git a/plugin/table_column.go b/plugin/table_column.go
@@ -10,8 +10,8 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	"github.com/turbot/go-kit/helpers"
 	"github.com/turbot/go-kit/types"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/transform"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/transform"
 )
 
 // get the column object with the given name

diff --git a/plugin/table_fetch.go b/plugin/table_fetch.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/gertd/go-pluralize"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
-	"github.com/turbot/steampipe-plugin-sdk/logging"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/context_key"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/quals"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/logging"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/context_key"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/quals"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/plugin/table_schema.go b/plugin/table_schema.go
@@ -3,7 +3,7 @@ package plugin
 import (
 	"fmt"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 const ContextColumnName = "_ctx"

diff --git a/plugin/table_test.go b/plugin/table_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 //// isGet ////

diff --git a/plugin/table_validate.go b/plugin/table_validate.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stevenle/topsort"
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
 )
 
 func (t *Table) validate(name string, requiredColumns []*Column) []string {

diff --git a/plugin/transform/column_transforms.go b/plugin/transform/column_transforms.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	"github.com/turbot/steampipe-plugin-sdk/plugin/quals"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/quals"
 )
 
 // TransformData is the input to a transform function.

diff --git a/plugin/transform/primitives.go b/plugin/transform/primitives.go
@@ -10,7 +10,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/turbot/steampipe-plugin-sdk/grpc"
+	"github.com/turbot/steampipe-plugin-sdk/v2/grpc"
 
 	"github.com/ghodss/yaml"
 	"github.com/iancoleman/strcase"

diff --git a/plugin/transform/transform_call.go b/plugin/transform/transform_call.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/turbot/go-kit/helpers"
-	"github.com/turbot/steampipe-plugin-sdk/plugin/context_key"
+	"github.com/turbot/steampipe-plugin-sdk/v2/plugin/context_key"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"log"
     	"time"
-    	"github.com/turbot/steampipe-plugin-sdk/grpc/proto"
+    	"github.com/turbot/steampipe-plugin-sdk/v2/grpc/proto"
     )
     const pendingQueryTimeout = 90 * time.Second
@@ Expand Down @@