Skip to content

Commit b15a546

Browse files
candiduslynxcandiduslynx
authored
feat(terraform): Upgrade to github.com/cloudquery/plugin-sdk/v2 (#9979)
Closes #9978
1 parent 7bf2226 commit b15a546

File tree

11 files changed

+87
-46
lines changed

11 files changed

+87
-46
lines changed

‎plugins/source/terraform/client/client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"errors"
66
"fmt"
77

8-
"github.com/cloudquery/plugin-sdk/plugins/source"
9-
"github.com/cloudquery/plugin-sdk/schema"
10-
"github.com/cloudquery/plugin-sdk/specs"
8+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
9+
"github.com/cloudquery/plugin-sdk/v2/schema"
10+
"github.com/cloudquery/plugin-sdk/v2/specs"
1111
"github.com/rs/zerolog"
1212
)
1313

‎plugins/source/terraform/client/multiplexers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package client
22

3-
import "github.com/cloudquery/plugin-sdk/schema"
3+
import "github.com/cloudquery/plugin-sdk/v2/schema"
44

55
// BackendMultiplex add the ability to handle multiple backends in the same fetch
66
func BackendMultiplex(meta schema.ClientMeta) []schema.ClientMeta {

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

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

10-
"github.com/cloudquery/plugin-sdk/plugins/source"
11-
"github.com/cloudquery/plugin-sdk/schema"
12-
"github.com/cloudquery/plugin-sdk/specs"
10+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
11+
"github.com/cloudquery/plugin-sdk/v2/schema"
12+
"github.com/cloudquery/plugin-sdk/v2/specs"
1313
"github.com/golang/mock/gomock"
1414
"github.com/rs/zerolog"
1515
)

‎plugins/source/terraform/go.mod‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,24 @@ require (
99
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.61
1010
github.com/aws/aws-sdk-go-v2/service/s3 v1.31.2
1111
github.com/aws/aws-sdk-go-v2/service/sts v1.18.8
12-
github.com/cloudquery/plugin-sdk v1.45.0
12+
github.com/cloudquery/plugin-sdk/v2 v2.1.0
1313
github.com/golang/mock v1.6.0
1414
github.com/rs/zerolog v1.29.0
1515
)
1616

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

2520
require (
21+
github.com/andybalholm/brotli v1.0.5 // indirect
22+
github.com/apache/arrow/go/v12 v12.0.0-20230401212133-adf33cc43010 // indirect
23+
github.com/apache/thrift v0.16.0 // indirect
2624
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 // indirect
27-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2 // indirect; indirect // indirect
25+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.2 // indirect
2826
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.32 // indirect
2927
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.26 // indirect
30-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33 // indirect; indirect // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.24 // indirect; indirect // indirect
28+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.33 // indirect
29+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.24 // indirect
3230
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 // indirect
3331
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.27 // indirect
3432
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.26 // indirect
@@ -38,23 +36,36 @@ require (
3836
github.com/aws/smithy-go v1.13.5 // indirect
3937
github.com/getsentry/sentry-go v0.20.0 // indirect
4038
github.com/ghodss/yaml v1.0.0 // indirect
39+
github.com/goccy/go-json v0.9.11 // indirect
4140
github.com/golang/protobuf v1.5.3 // indirect
41+
github.com/golang/snappy v0.0.4 // indirect
42+
github.com/google/flatbuffers v2.0.8+incompatible // indirect
4243
github.com/google/uuid v1.3.0 // indirect
4344
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
4445
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
4546
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4647
github.com/jmespath/go-jmespath v0.4.0 // indirect
48+
github.com/klauspost/asmfmt v1.3.2 // indirect
49+
github.com/klauspost/compress v1.16.0 // indirect
50+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
4751
github.com/mattn/go-colorable v0.1.13 // indirect
4852
github.com/mattn/go-isatty v0.0.18 // indirect
53+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
54+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
4955
github.com/spf13/cast v1.5.0 // indirect
5056
github.com/spf13/cobra v1.6.1 // indirect
5157
github.com/spf13/pflag v1.0.5 // indirect
5258
github.com/thoas/go-funk v0.9.3 // indirect
53-
golang.org/x/net v0.8.0 // indirect; indirect // indirect
59+
github.com/zeebo/xxh3 v1.0.2 // indirect
60+
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
61+
golang.org/x/mod v0.8.0 // indirect
62+
golang.org/x/net v0.9.0 // indirect
5463
golang.org/x/sync v0.1.0 // indirect
55-
golang.org/x/sys v0.6.0 // indirect
56-
golang.org/x/text v0.8.0 // indirect
57-
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect; indirect // indirect
64+
golang.org/x/sys v0.7.0 // indirect
65+
golang.org/x/text v0.9.0 // indirect
66+
golang.org/x/tools v0.6.0 // indirect
67+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
68+
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect
5869
google.golang.org/grpc v1.54.0 // indirect
5970
google.golang.org/protobuf v1.30.0 // indirect
6071
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)