Skip to content

Commit 11600bd

Browse files
candiduslynxcandiduslynx
authored
feat(gitlab): Upgrade to github.com/cloudquery/plugin-sdk/v2 (#10053)
Closes #10027
1 parent 44744e8 commit 11600bd

26 files changed

+99
-57
lines changed

‎plugins/source/gitlab/client/client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/cloudquery/plugin-sdk/plugins/source"
8-
"github.com/cloudquery/plugin-sdk/schema"
9-
"github.com/cloudquery/plugin-sdk/specs"
7+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
8+
"github.com/cloudquery/plugin-sdk/v2/schema"
9+
"github.com/cloudquery/plugin-sdk/v2/specs"
1010
"github.com/rs/zerolog"
1111
"github.com/xanzy/go-gitlab"
1212
)

‎plugins/source/gitlab/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 ResolveURL(_ context.Context, meta schema.ClientMeta, r *schema.Resource, col schema.Column) error {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/cloudquery/plugin-sdk/plugins/source"
13-
"github.com/cloudquery/plugin-sdk/schema"
14-
"github.com/cloudquery/plugin-sdk/specs"
12+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
13+
"github.com/cloudquery/plugin-sdk/v2/schema"
14+
"github.com/cloudquery/plugin-sdk/v2/specs"
1515
"github.com/julienschmidt/httprouter"
1616
"github.com/rs/zerolog"
1717
"github.com/xanzy/go-gitlab"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"net"
55
"reflect"
66

7-
"github.com/cloudquery/plugin-sdk/schema"
8-
"github.com/cloudquery/plugin-sdk/transformers"
7+
"github.com/cloudquery/plugin-sdk/v2/schema"
8+
"github.com/cloudquery/plugin-sdk/v2/transformers"
99
"github.com/xanzy/go-gitlab"
1010
)
1111

‎plugins/source/gitlab/go.mod‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,57 @@ module github.com/cloudquery/cloudquery/plugins/source/gitlab
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/xanzy/go-gitlab v0.74.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-
)
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
1814

1915
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
2019
github.com/getsentry/sentry-go v0.20.0 // indirect
2120
github.com/ghodss/yaml v1.0.0 // indirect
21+
github.com/goccy/go-json v0.9.11 // indirect
2222
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
2325
github.com/google/go-querystring v1.1.0 // indirect
2426
github.com/google/uuid v1.3.0 // indirect
2527
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
2628
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
2729
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
2830
github.com/hashicorp/go-hclog v1.2.2 // indirect
29-
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect; indirect // indirect
31+
github.com/hashicorp/go-retryablehttp v0.7.2 // indirect
3032
github.com/inconshreveable/mousetrap v1.1.0 // indirect
33+
github.com/klauspost/asmfmt v1.3.2 // indirect
34+
github.com/klauspost/compress v1.16.0 // indirect
35+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
3136
github.com/mattn/go-colorable v0.1.13 // indirect
3237
github.com/mattn/go-isatty v0.0.18 // indirect
38+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
39+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
3340
github.com/spf13/cast v1.5.0 // indirect
3441
github.com/spf13/cobra v1.6.1 // indirect
3542
github.com/spf13/pflag v1.0.5 // indirect
3643
github.com/thoas/go-funk v0.9.3 // indirect
37-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect; indirect // indirect
38-
golang.org/x/net v0.8.0 // indirect; indirect // indirect
44+
github.com/zeebo/xxh3 v1.0.2 // indirect
45+
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
46+
golang.org/x/mod v0.8.0 // indirect
47+
golang.org/x/net v0.9.0 // indirect
3948
golang.org/x/oauth2 v0.4.0 // indirect
4049
golang.org/x/sync v0.1.0 // indirect
41-
golang.org/x/sys v0.6.0 // indirect
42-
golang.org/x/text v0.8.0 // indirect
50+
golang.org/x/sys v0.7.0 // indirect
51+
golang.org/x/text v0.9.0 // indirect
4352
golang.org/x/time v0.3.0 // indirect
53+
golang.org/x/tools v0.6.0 // indirect
54+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
4455
google.golang.org/appengine v1.6.7 // indirect
45-
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect; indirect // indirect
56+
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect
4657
google.golang.org/grpc v1.54.0 // indirect
4758
google.golang.org/protobuf v1.30.0 // indirect
4859
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)