feat(hubspot): Upgrade to github.com/cloudquery/plugin-sdk/v2 (#10057)

candiduslynx · web-flow · commit 69ff2954f241 · 2023-04-14T11:30:47.000Z
Closes #10031
diff --git a/plugins/source/hubspot/client/client.go b/plugins/source/hubspot/client/client.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/clarkmcc/go-hubspot"
-	"github.com/cloudquery/plugin-sdk/plugins/source"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/specs"
+	"github.com/cloudquery/plugin-sdk/v2/plugins/source"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/specs"
 	"github.com/rs/zerolog"
 	"golang.org/x/time/rate"
 )
diff --git a/plugins/source/hubspot/client/multiplex.go b/plugins/source/hubspot/client/multiplex.go
@@ -1,6 +1,6 @@
 package client
 
-import "github.com/cloudquery/plugin-sdk/schema"
+import "github.com/cloudquery/plugin-sdk/v2/schema"
 
 func ObjectTypeMultiplex(objectTypes []string) func(schema.ClientMeta) []schema.ClientMeta {
 	return func(meta schema.ClientMeta) []schema.ClientMeta {
diff --git a/plugins/source/hubspot/client/resolvers.go b/plugins/source/hubspot/client/resolvers.go
@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func ResolveObjectType(_ context.Context, meta schema.ClientMeta, r *schema.Resource, _ schema.Column) error {
diff --git a/plugins/source/hubspot/go.mod b/plugins/source/hubspot/go.mod
@@ -4,40 +4,51 @@ go 1.19
 
 require (
 	github.com/clarkmcc/go-hubspot v0.0.0-20221010213350-20c2f9cbf936
-	github.com/cloudquery/plugin-sdk v1.45.0
+	github.com/cloudquery/plugin-sdk/v2 v2.1.0
 	github.com/rs/zerolog v1.29.0
 	golang.org/x/time v0.3.0
 )
 
-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/testify v1.8.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)
+// TODO: remove once the changes are merged to upstream
+replace github.com/apache/arrow/go/v12 => github.com/cloudquery/arrow/go/v12 v12.0.0-20230411134648-a5b71cd453c8
 
 require (
+	github.com/andybalholm/brotli v1.0.5 // indirect
+	github.com/apache/arrow/go/v12 v12.0.0-20230401212133-adf33cc43010 // indirect
+	github.com/apache/thrift v0.16.0 // indirect
 	github.com/getsentry/sentry-go v0.20.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/flatbuffers v2.0.8+incompatible // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
 	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/klauspost/asmfmt v1.3.2 // indirect
+	github.com/klauspost/compress v1.16.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
+	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/cobra v1.6.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/thoas/go-funk v0.9.3 // indirect
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect; indirect // indirect
-	golang.org/x/net v0.8.0 // indirect; indirect // indirect
+	github.com/zeebo/xxh3 v1.0.2 // indirect
+	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.9.0 // indirect
 	golang.org/x/oauth2 v0.4.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect; indirect // indirect
-	google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect; indirect // indirect
+	golang.org/x/sys v0.7.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect
 	google.golang.org/grpc v1.54.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/plugins/source/hubspot/go.sum b/plugins/source/hubspot/go.sum
diff --git a/plugins/source/hubspot/main.go b/plugins/source/hubspot/main.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/resources/plugin"
-	"github.com/cloudquery/plugin-sdk/serve"
+	"github.com/cloudquery/plugin-sdk/v2/serve"
 )
 
 const sentryDsn = "https://015fd88288884743b76b50d9dfc14130@o1396617.ingest.sentry.io/4504559739011072"
diff --git a/plugins/source/hubspot/resources/plugin/plugin.go b/plugins/source/hubspot/resources/plugin/plugin.go
@@ -3,9 +3,9 @@ package plugin
 import (
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/resources/services/crm"
-	"github.com/cloudquery/plugin-sdk/caser"
-	"github.com/cloudquery/plugin-sdk/plugins/source"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/caser"
+	"github.com/cloudquery/plugin-sdk/v2/plugins/source"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 var (
diff --git a/plugins/source/hubspot/resources/services/crm/companies.go b/plugins/source/hubspot/resources/services/crm/companies.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/companies"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Companies() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/companies_fetch.go b/plugins/source/hubspot/resources/services/crm/companies_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/companies"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchCompanies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/contacts.go b/plugins/source/hubspot/resources/services/crm/contacts.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/contacts"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Contacts() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/contacts_fetch.go b/plugins/source/hubspot/resources/services/crm/contacts_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/contacts"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchContacts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/deals.go b/plugins/source/hubspot/resources/services/crm/deals.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/deals"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Deals() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/deals_fetch.go b/plugins/source/hubspot/resources/services/crm/deals_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/deals"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchDeals(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/line_items.go b/plugins/source/hubspot/resources/services/crm/line_items.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/line_items"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func LineItems() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/line_items_fetch.go b/plugins/source/hubspot/resources/services/crm/line_items_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/line_items"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchLineItems(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/owners.go b/plugins/source/hubspot/resources/services/crm/owners.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/owners"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Owners() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/owners_fetch.go b/plugins/source/hubspot/resources/services/crm/owners_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/owners"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchOwners(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/pipelines.go b/plugins/source/hubspot/resources/services/crm/pipelines.go
@@ -3,8 +3,8 @@ package crm
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/pipelines"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Pipelines() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/pipelines_fetch.go b/plugins/source/hubspot/resources/services/crm/pipelines_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/pipelines"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchPipelines(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/products.go b/plugins/source/hubspot/resources/services/crm/products.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/products"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Products() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/products_fetch.go b/plugins/source/hubspot/resources/services/crm/products_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/products"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchProducts(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/quotes.go b/plugins/source/hubspot/resources/services/crm/quotes.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/quotes"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Quotes() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/quotes_fetch.go b/plugins/source/hubspot/resources/services/crm/quotes_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/quotes"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchQuotes(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {
diff --git a/plugins/source/hubspot/resources/services/crm/tickets.go b/plugins/source/hubspot/resources/services/crm/tickets.go
@@ -2,8 +2,8 @@ package crm
 
 import (
 	"github.com/clarkmcc/go-hubspot/generated/v3/tickets"
-	"github.com/cloudquery/plugin-sdk/schema"
-	"github.com/cloudquery/plugin-sdk/transformers"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
+	"github.com/cloudquery/plugin-sdk/v2/transformers"
 )
 
 func Tickets() *schema.Table {
diff --git a/plugins/source/hubspot/resources/services/crm/tickets_fetch.go b/plugins/source/hubspot/resources/services/crm/tickets_fetch.go
@@ -6,7 +6,7 @@ import (
 	"github.com/clarkmcc/go-hubspot"
 	"github.com/clarkmcc/go-hubspot/generated/v3/tickets"
 	"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func fetchTickets(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package client`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
`6`		`- "github.com/cloudquery/plugin-sdk/schema"`
	`6`	`+ "github.com/cloudquery/plugin-sdk/v2/schema"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func ResolveObjectType(_ context.Context, meta schema.ClientMeta, r *schema.Resource, _ schema.Column) error {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/cloudquery/cloudquery/plugins/source/hubspot/resources/plugin"`
`5`		`- "github.com/cloudquery/plugin-sdk/serve"`
	`5`	`+ "github.com/cloudquery/plugin-sdk/v2/serve"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`const sentryDsn = "https://[email protected]/4504559739011072"`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ package crm`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"github.com/clarkmcc/go-hubspot/generated/v3/companies"`
`5`		`- "github.com/cloudquery/plugin-sdk/schema"`
`6`		`- "github.com/cloudquery/plugin-sdk/transformers"`
	`5`	`+ "github.com/cloudquery/plugin-sdk/v2/schema"`
	`6`	`+ "github.com/cloudquery/plugin-sdk/v2/transformers"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func Companies() *schema.Table {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/clarkmcc/go-hubspot"`
`7`	`7`	`"github.com/clarkmcc/go-hubspot/generated/v3/companies"`
`8`	`8`	`"github.com/cloudquery/cloudquery/plugins/source/hubspot/client"`
`9`		`- "github.com/cloudquery/plugin-sdk/schema"`
	`9`	`+ "github.com/cloudquery/plugin-sdk/v2/schema"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`func fetchCompanies(ctx context.Context, meta schema.ClientMeta, parent *schema.Resource, res chan<- any) error {`