From 01c4b4fc43fa1ac2336b45aa101928790ebc1f15 Mon Sep 17 00:00:00 2001 From: kaidaguerre Date: Mon, 14 Feb 2022 15:31:13 +0000 Subject: [PATCH] Update steampipe-plugin-sdk version to v3. Closes #1445 --- cmd/plugin_manager.go | 2 +- cmd/report.go | 2 +- cmd/root.go | 2 +- control/controlexecute/control_run.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- pluginmanager/lifecycle.go | 2 +- pluginmanager/plugin_manager.go | 2 +- pluginmanager/plugin_manager_client.go | 2 +- report/reportassets/ensure.go | 2 +- steampipeconfig/connection_plugin.go | 6 +++--- steampipeconfig/connection_schemas.go | 2 +- steampipeconfig/connection_updates.go | 4 ++-- steampipeconfig/connection_validation.go | 2 +- steampipeconfig/load_config.go | 2 +- steampipeconfig/load_mod.go | 2 +- steampipeconfig/parse/parser.go | 2 +- steampipeconfig/parse/prepared_statement.go | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/plugin_manager.go b/cmd/plugin_manager.go index ba4b0af8..fd659eff 100644 --- a/cmd/plugin_manager.go +++ b/cmd/plugin_manager.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/spf13/cobra" - "github.com/turbot/steampipe-plugin-sdk/logging" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" "github.com/turbot/steampipe/cmdconfig" "github.com/turbot/steampipe/connectionwatcher" "github.com/turbot/steampipe/constants" diff --git a/cmd/report.go b/cmd/report.go index b6525b1b..fc03191b 100644 --- a/cmd/report.go +++ b/cmd/report.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/viper" "github.com/turbot/go-kit/helpers" - "github.com/turbot/steampipe-plugin-sdk/logging" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" "github.com/turbot/steampipe/cmdconfig" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/contexthelpers" diff --git a/cmd/root.go b/cmd/root.go index 7b50f78f..55102f9e 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -12,7 +12,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" "github.com/turbot/go-kit/helpers" - "github.com/turbot/steampipe-plugin-sdk/logging" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" "github.com/turbot/steampipe/cmdconfig" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/filepaths" diff --git a/control/controlexecute/control_run.go b/control/controlexecute/control_run.go index f3b324d9..13cb2755 100644 --- a/control/controlexecute/control_run.go +++ b/control/controlexecute/control_run.go @@ -9,7 +9,7 @@ import ( "time" typehelpers "github.com/turbot/go-kit/types" - "github.com/turbot/steampipe-plugin-sdk/grpc" + "github.com/turbot/steampipe-plugin-sdk/v3/grpc" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/db/db_common" "github.com/turbot/steampipe/query/queryresult" diff --git a/go.mod b/go.mod index 0302a501..222c4269 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,6 @@ require ( github.com/spf13/viper v1.10.1 github.com/stevenle/topsort v0.0.0-20130922064739-8130c1d7596b github.com/turbot/go-kit v0.3.0 - github.com/turbot/steampipe-plugin-sdk v1.9.0-rc.0 github.com/xlab/treeprint v1.1.0 github.com/zclconf/go-cty v1.10.0 github.com/zclconf/go-cty-yaml v1.0.2 @@ -71,6 +70,7 @@ require ( github.com/prometheus/client_golang v1.7.1 // indirect github.com/prometheus/procfs v0.6.0 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect + github.com/turbot/steampipe-plugin-sdk/v3 v3.0.0-rc.2 github.com/yusufpapurcu/wmi v1.2.2 // indirect golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect golang.org/x/mod v0.5.1 // indirect diff --git a/go.sum b/go.sum index 00965b81..3d62ac8d 100644 --- a/go.sum +++ b/go.sum @@ -1020,8 +1020,8 @@ github.com/turbot/go-kit v0.3.0 h1:o4zZIO1ovdmJ2bHWOdXnnt8jJMIDGqYSkZvBREzFeMQ= github.com/turbot/go-kit v0.3.0/go.mod h1:SBdPRngbEfYubiR81iAVtO43oPkg1+ASr+XxvgbH7/k= github.com/turbot/go-prompt v0.2.6-steampipe.0.20211124090719-0709bc8d8ce2 h1:mydbzShy5MB1XMDu2S4DocAo8/Jl8vRmEa37FvpY2jY= github.com/turbot/go-prompt v0.2.6-steampipe.0.20211124090719-0709bc8d8ce2/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw= -github.com/turbot/steampipe-plugin-sdk v1.9.0-rc.0 h1:lRFK+PgwQUa21BhJ7OYLPziC9fe7IActPQGaS5U3xPo= -github.com/turbot/steampipe-plugin-sdk v1.9.0-rc.0/go.mod h1:76H3wr6KB6t+kDS38EEOZAsw61Ie/q7/IV9X0kv5NjI= +github.com/turbot/steampipe-plugin-sdk/v3 v3.0.0-rc.2 h1:woqd0itPN3z+ZPHca6p2bn8IERuGZ5WPRNe2Iayrx08= +github.com/turbot/steampipe-plugin-sdk/v3 v3.0.0-rc.2/go.mod h1:0OTMTiw6plqZv4egsy3yAPJW23/ZcZVekuEtr65eWng= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= diff --git a/pluginmanager/lifecycle.go b/pluginmanager/lifecycle.go index 3c398ce3..e178429f 100644 --- a/pluginmanager/lifecycle.go +++ b/pluginmanager/lifecycle.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/turbot/steampipe-plugin-sdk/logging" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" "github.com/turbot/steampipe/filepaths" pb "github.com/turbot/steampipe/pluginmanager/grpc/proto" pluginshared "github.com/turbot/steampipe/pluginmanager/grpc/shared" diff --git a/pluginmanager/plugin_manager.go b/pluginmanager/plugin_manager.go index fb073f29..06430531 100644 --- a/pluginmanager/plugin_manager.go +++ b/pluginmanager/plugin_manager.go @@ -11,7 +11,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" "github.com/turbot/go-kit/helpers" - sdkshared "github.com/turbot/steampipe-plugin-sdk/grpc/shared" + sdkshared "github.com/turbot/steampipe-plugin-sdk/v3/grpc/shared" pb "github.com/turbot/steampipe/pluginmanager/grpc/proto" pluginshared "github.com/turbot/steampipe/pluginmanager/grpc/shared" "github.com/turbot/steampipe/utils" diff --git a/pluginmanager/plugin_manager_client.go b/pluginmanager/plugin_manager_client.go index 30957265..b388ad1b 100644 --- a/pluginmanager/plugin_manager_client.go +++ b/pluginmanager/plugin_manager_client.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - "github.com/turbot/steampipe-plugin-sdk/logging" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" pb "github.com/turbot/steampipe/pluginmanager/grpc/proto" pluginshared "github.com/turbot/steampipe/pluginmanager/grpc/shared" ) diff --git a/report/reportassets/ensure.go b/report/reportassets/ensure.go index 34173368..c5bcb0c3 100644 --- a/report/reportassets/ensure.go +++ b/report/reportassets/ensure.go @@ -7,7 +7,7 @@ import ( "os" "github.com/turbot/go-kit/helpers" - "github.com/turbot/steampipe-plugin-sdk/logging" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/filepaths" "github.com/turbot/steampipe/ociinstaller" diff --git a/steampipeconfig/connection_plugin.go b/steampipeconfig/connection_plugin.go index c3e68c3a..56746a16 100644 --- a/steampipeconfig/connection_plugin.go +++ b/steampipeconfig/connection_plugin.go @@ -9,9 +9,9 @@ import ( "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-plugin" - sdkgrpc "github.com/turbot/steampipe-plugin-sdk/grpc" - sdkproto "github.com/turbot/steampipe-plugin-sdk/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/logging" + sdkgrpc "github.com/turbot/steampipe-plugin-sdk/v3/grpc" + sdkproto "github.com/turbot/steampipe-plugin-sdk/v3/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v3/logging" "github.com/turbot/steampipe/pluginmanager" "github.com/turbot/steampipe/pluginmanager/grpc/proto" pluginshared "github.com/turbot/steampipe/pluginmanager/grpc/shared" diff --git a/steampipeconfig/connection_schemas.go b/steampipeconfig/connection_schemas.go index 665d55f6..cb7f8795 100644 --- a/steampipeconfig/connection_schemas.go +++ b/steampipeconfig/connection_schemas.go @@ -1,7 +1,7 @@ package steampipeconfig import ( - "github.com/turbot/steampipe-plugin-sdk/plugin" + "github.com/turbot/steampipe-plugin-sdk/v3/plugin" "github.com/turbot/steampipe/steampipeconfig/modconfig" ) diff --git a/steampipeconfig/connection_updates.go b/steampipeconfig/connection_updates.go index 029e2d74..9c79552b 100644 --- a/steampipeconfig/connection_updates.go +++ b/steampipeconfig/connection_updates.go @@ -6,8 +6,8 @@ import ( "sort" "strings" - "github.com/turbot/steampipe-plugin-sdk/grpc/proto" - "github.com/turbot/steampipe-plugin-sdk/plugin" + "github.com/turbot/steampipe-plugin-sdk/v3/grpc/proto" + "github.com/turbot/steampipe-plugin-sdk/v3/plugin" "github.com/turbot/steampipe/steampipeconfig/modconfig" "github.com/turbot/steampipe/utils" ) diff --git a/steampipeconfig/connection_validation.go b/steampipeconfig/connection_validation.go index 3c83b2b9..202512ae 100644 --- a/steampipeconfig/connection_validation.go +++ b/steampipeconfig/connection_validation.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/turbot/go-kit/helpers" - sdkversion "github.com/turbot/steampipe-plugin-sdk/version" + sdkversion "github.com/turbot/steampipe-plugin-sdk/v3/version" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/utils" ) diff --git a/steampipeconfig/load_config.go b/steampipeconfig/load_config.go index 12d0e871..557263db 100644 --- a/steampipeconfig/load_config.go +++ b/steampipeconfig/load_config.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/hcl/v2" filehelpers "github.com/turbot/go-kit/files" "github.com/turbot/go-kit/helpers" - "github.com/turbot/steampipe-plugin-sdk/plugin" + "github.com/turbot/steampipe-plugin-sdk/v3/plugin" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/filepaths" "github.com/turbot/steampipe/schema" diff --git a/steampipeconfig/load_mod.go b/steampipeconfig/load_mod.go index b73e2887..7ff40047 100644 --- a/steampipeconfig/load_mod.go +++ b/steampipeconfig/load_mod.go @@ -13,7 +13,7 @@ import ( filehelpers "github.com/turbot/go-kit/files" "github.com/turbot/go-kit/helpers" - "github.com/turbot/steampipe-plugin-sdk/plugin" + "github.com/turbot/steampipe-plugin-sdk/v3/plugin" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/steampipeconfig/modconfig" "github.com/turbot/steampipe/steampipeconfig/parse" diff --git a/steampipeconfig/parse/parser.go b/steampipeconfig/parse/parser.go index a4246af8..fdd82dce 100644 --- a/steampipeconfig/parse/parser.go +++ b/steampipeconfig/parse/parser.go @@ -12,7 +12,7 @@ import ( "github.com/hashicorp/hcl/v2/hclparse" "github.com/hashicorp/hcl/v2/hclsyntax" "github.com/hashicorp/hcl/v2/json" - "github.com/turbot/steampipe-plugin-sdk/plugin" + "github.com/turbot/steampipe-plugin-sdk/v3/plugin" "github.com/turbot/steampipe/constants" "github.com/turbot/steampipe/filepaths" "github.com/turbot/steampipe/steampipeconfig/modconfig" diff --git a/steampipeconfig/parse/prepared_statement.go b/steampipeconfig/parse/prepared_statement.go index c9301b40..889e3480 100644 --- a/steampipeconfig/parse/prepared_statement.go +++ b/steampipeconfig/parse/prepared_statement.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/hcl/v2" "github.com/hashicorp/hcl/v2/hclsyntax" - "github.com/turbot/steampipe-plugin-sdk/plugin" + "github.com/turbot/steampipe-plugin-sdk/v3/plugin" "github.com/turbot/steampipe/steampipeconfig/modconfig" )