Skip to content

Commit fec1309

Browse files
candiduslynxcandiduslynx
authored
feat(tailscale): Upgrade to github.com/cloudquery/plugin-sdk/v2 (#9949)
Closes #9948
1 parent 4296a02 commit fec1309

21 files changed

+99
-61
lines changed

‎plugins/source/tailscale/client/client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
"net/http"
99
"net/url"
1010

11-
"github.com/cloudquery/plugin-sdk/plugins/source"
12-
"github.com/cloudquery/plugin-sdk/schema"
13-
"github.com/cloudquery/plugin-sdk/specs"
11+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
12+
"github.com/cloudquery/plugin-sdk/v2/schema"
13+
"github.com/cloudquery/plugin-sdk/v2/specs"
1414
"github.com/rs/zerolog"
1515
"github.com/tailscale/tailscale-client-go/tailscale"
1616
)

‎plugins/source/tailscale/client/resolvers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package client
33
import (
44
"context"
55

6-
"github.com/cloudquery/plugin-sdk/schema"
6+
"github.com/cloudquery/plugin-sdk/v2/schema"
77
)
88

99
func ResolveTailnet(_ context.Context, meta schema.ClientMeta, resource *schema.Resource, c schema.Column) error {

‎plugins/source/tailscale/client/testing.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/cloudquery/plugin-sdk/plugins/source"
10-
"github.com/cloudquery/plugin-sdk/schema"
11-
"github.com/cloudquery/plugin-sdk/specs"
9+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
10+
"github.com/cloudquery/plugin-sdk/v2/schema"
11+
"github.com/cloudquery/plugin-sdk/v2/specs"
1212
"github.com/julienschmidt/httprouter"
1313
"github.com/rs/zerolog"
1414
)

‎plugins/source/tailscale/client/transformers.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package client
33
import (
44
"reflect"
55

6-
"github.com/cloudquery/plugin-sdk/schema"
7-
"github.com/cloudquery/plugin-sdk/transformers"
6+
"github.com/cloudquery/plugin-sdk/v2/schema"
7+
"github.com/cloudquery/plugin-sdk/v2/transformers"
88
"github.com/tailscale/tailscale-client-go/tailscale"
99
)
1010

‎plugins/source/tailscale/go.mod‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,52 @@ module github.com/cloudquery/cloudquery/plugins/source/tailscale
33
go 1.19
44

55
require (
6-
github.com/cloudquery/plugin-sdk v1.45.0
6+
github.com/cloudquery/plugin-sdk/v2 v2.1.0
77
github.com/julienschmidt/httprouter v1.3.0
88
github.com/rs/zerolog v1.29.0
99
github.com/tailscale/tailscale-client-go v1.8.0
1010
)
1111

12-
require (
13-
github.com/davecgh/go-spew v1.1.1 // indirect
14-
github.com/pmezard/go-difflib v1.0.0 // indirect
15-
github.com/stretchr/testify v1.8.2 // indirect
16-
gopkg.in/yaml.v3 v3.0.1 // indirect
17-
)
18-
19-
require (
20-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect; indirect // indirect
21-
golang.org/x/sync v0.1.0 // indirect
22-
)
12+
// TODO: remove once the changes are merged to upstream
13+
replace github.com/apache/arrow/go/v12 => github.com/cloudquery/arrow/go/v12 v12.0.0-20230411134648-a5b71cd453c8
2314

2415
require (
16+
github.com/andybalholm/brotli v1.0.5 // indirect
17+
github.com/apache/arrow/go/v12 v12.0.0-20230401212133-adf33cc43010 // indirect
18+
github.com/apache/thrift v0.16.0 // indirect
2519
github.com/getsentry/sentry-go v0.20.0 // indirect
2620
github.com/ghodss/yaml v1.0.0 // indirect
21+
github.com/goccy/go-json v0.9.11 // indirect
2722
github.com/golang/protobuf v1.5.3 // indirect
23+
github.com/golang/snappy v0.0.4 // indirect
24+
github.com/google/flatbuffers v2.0.8+incompatible // indirect
2825
github.com/google/uuid v1.3.0 // indirect
2926
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
3027
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
3128
github.com/inconshreveable/mousetrap v1.1.0 // indirect
29+
github.com/klauspost/asmfmt v1.3.2 // indirect
30+
github.com/klauspost/compress v1.16.0 // indirect
31+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
3232
github.com/kr/pretty v0.3.1 // indirect
3333
github.com/mattn/go-colorable v0.1.13 // indirect
3434
github.com/mattn/go-isatty v0.0.18 // indirect
35+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
36+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
3537
github.com/spf13/cast v1.5.0 // indirect
3638
github.com/spf13/cobra v1.6.1 // indirect
3739
github.com/spf13/pflag v1.0.5 // indirect
38-
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect; indirect // indirect
40+
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a // indirect
3941
github.com/thoas/go-funk v0.9.3 // indirect
40-
golang.org/x/net v0.8.0 // indirect; indirect // indirect
41-
golang.org/x/sys v0.6.0 // indirect
42-
golang.org/x/text v0.8.0 // indirect
43-
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect; indirect // indirect
42+
github.com/zeebo/xxh3 v1.0.2 // indirect
43+
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
44+
golang.org/x/mod v0.8.0 // indirect
45+
golang.org/x/net v0.9.0 // indirect
46+
golang.org/x/sync v0.1.0 // indirect
47+
golang.org/x/sys v0.7.0 // indirect
48+
golang.org/x/text v0.9.0 // indirect
49+
golang.org/x/tools v0.6.0 // indirect
50+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
51+
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect
4452
google.golang.org/grpc v1.54.0 // indirect
4553
google.golang.org/protobuf v1.30.0 // indirect
4654
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)