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

candiduslynx · web-flow · commit 0c888af214f2 · 2023-04-14T10:45:28.000Z
Closes #10040
diff --git a/plugins/source/salesforce/client/client.go b/plugins/source/salesforce/client/client.go
@@ -10,9 +10,9 @@ import (
 	"net/url"
 	"time"
 
-	"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"
 )
 
diff --git a/plugins/source/salesforce/client/multiplexers.go b/plugins/source/salesforce/client/multiplexers.go
@@ -3,7 +3,7 @@ package client
 import (
 	"strings"
 
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 var unsupportedObjects = map[string]bool{
diff --git a/plugins/source/salesforce/client/testing.go b/plugins/source/salesforce/client/testing.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"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/gorilla/mux"
 	"github.com/rs/zerolog"
 )
diff --git a/plugins/source/salesforce/go.mod b/plugins/source/salesforce/go.mod
@@ -3,38 +3,49 @@ module github.com/cloudquery/cloudquery/plugins/source/salesforce
 go 1.19
 
 require (
-	github.com/cloudquery/plugin-sdk v1.45.0
+	github.com/cloudquery/plugin-sdk/v2 v2.1.0
 	github.com/gorilla/mux v1.8.0
 	github.com/rs/zerolog v1.29.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
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // 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/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/sync v0.1.0 // indirect
-	golang.org/x/sys v0.6.0 // indirect
-	golang.org/x/text v0.8.0 // 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/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/salesforce/go.sum b/plugins/source/salesforce/go.sum
diff --git a/plugins/source/salesforce/main.go b/plugins/source/salesforce/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"github.com/cloudquery/cloudquery/plugins/source/salesforce/resources/plugin"
 
-	"github.com/cloudquery/plugin-sdk/serve"
+	"github.com/cloudquery/plugin-sdk/v2/serve"
 )
 
 const sentryDsn = "https://77af2b07ee5c45519f17f2f6314421c4@o1396617.ingest.sentry.io/4504390800310272"
diff --git a/plugins/source/salesforce/resources/plugin/plugin.go b/plugins/source/salesforce/resources/plugin/plugin.go
@@ -3,8 +3,8 @@ package plugin
 import (
 	"github.com/cloudquery/cloudquery/plugins/source/salesforce/client"
 	"github.com/cloudquery/cloudquery/plugins/source/salesforce/resources/services"
-	"github.com/cloudquery/plugin-sdk/plugins/source"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/plugins/source"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 var (
diff --git a/plugins/source/salesforce/resources/services/objects.go b/plugins/source/salesforce/resources/services/objects.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/cloudquery/cloudquery/plugins/source/salesforce/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 func rawResolver(_ context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error {
diff --git a/plugins/source/salesforce/resources/services/objects_fetch.go b/plugins/source/salesforce/resources/services/objects_fetch.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/cloudquery/cloudquery/plugins/source/salesforce/client"
-	"github.com/cloudquery/plugin-sdk/schema"
+	"github.com/cloudquery/plugin-sdk/v2/schema"
 )
 
 var notSupportedBulkObjects = map[string]bool{

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package client`
`3`	`3`	`import (`
`4`	`4`	`"strings"`
`5`	`5`
`6`		`- "github.com/cloudquery/plugin-sdk/schema"`
	`6`	`+ "github.com/cloudquery/plugin-sdk/v2/schema"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`var unsupportedObjects = map[string]bool{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"github.com/cloudquery/cloudquery/plugins/source/salesforce/resources/plugin"`
`5`	`5`
`6`		`- "github.com/cloudquery/plugin-sdk/serve"`
	`6`	`+ "github.com/cloudquery/plugin-sdk/v2/serve"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`const sentryDsn = "https://[email protected]/4504390800310272"`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"github.com/cloudquery/cloudquery/plugins/source/salesforce/client"`
`7`		`- "github.com/cloudquery/plugin-sdk/schema"`
	`7`	`+ "github.com/cloudquery/plugin-sdk/v2/schema"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`func rawResolver(_ context.Context, meta schema.ClientMeta, r *schema.Resource, c schema.Column) error {`