Skip to content

Commit 96ed31e

Browse files
candiduslynxcandiduslynx
authored
feat(oracledb): Upgrade to github.com/cloudquery/plugin-sdk/v2 (#10166)
Closes #10165
1 parent dc9e0d5 commit 96ed31e

File tree

12 files changed

+126
-57
lines changed

12 files changed

+126
-57
lines changed

‎.github/pr_labeler.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ okta:
8686
- plugins/source/okta/**/*
8787
oracle:
8888
- plugins/source/oracle/**/*
89+
oracledb:
90+
- plugins/source/oracledb/**/*
8991
pagerduty:
9092
- plugins/source/pagerduty/**/*
9193
plausible:

‎plugins/source/oracledb/client/client.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"database/sql"
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
// Import the oracle driver

‎plugins/source/oracledb/client/list_tables.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"sort"
77
"strings"
88

9-
"github.com/cloudquery/plugin-sdk/schema"
9+
"github.com/cloudquery/plugin-sdk/v2/schema"
1010
)
1111

1212
type column struct {

‎plugins/source/oracledb/client/sync.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"strings"
77
"time"
88

9-
"github.com/cloudquery/plugin-sdk/plugins/source"
10-
"github.com/cloudquery/plugin-sdk/schema"
9+
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
10+
"github.com/cloudquery/plugin-sdk/v2/schema"
1111
"golang.org/x/sync/errgroup"
1212
)
1313

‎plugins/source/oracledb/client/transformer.go‎

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

33
import (
4-
"github.com/cloudquery/plugin-sdk/schema"
4+
"github.com/cloudquery/plugin-sdk/v2/schema"
55
)
66

77
// this is used for tests

‎plugins/source/oracledb/client/types.go‎

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

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

99
func SQLType(t schema.ValueType) string {

‎plugins/source/oracledb/go.mod‎

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,55 @@ module github.com/cloudquery/cloudquery/plugins/source/oracledb
33
go 1.19
44

55
require (
6-
github.com/cloudquery/plugin-sdk v1.44.0
6+
github.com/apache/arrow/go/v12 v12.0.0-20230401212133-adf33cc43010
7+
github.com/cloudquery/plugin-sdk/v2 v2.3.7
8+
github.com/google/uuid v1.3.0
79
github.com/rs/zerolog v1.29.0
8-
github.com/stretchr/testify v1.8.2
9-
)
10-
11-
require (
1210
github.com/sijms/go-ora/v2 v2.6.16
11+
github.com/stretchr/testify v1.8.2
1312
golang.org/x/sync v0.1.0
1413
)
1514

15+
// TODO: remove once the changes are merged to upstream
16+
replace github.com/apache/arrow/go/v12 => github.com/cloudquery/arrow/go/v12 v12.0.0-20230417154311-f9add0212acd
17+
1618
require (
19+
github.com/andybalholm/brotli v1.0.5 // indirect
20+
github.com/apache/thrift v0.16.0 // indirect
1721
github.com/davecgh/go-spew v1.1.1 // indirect
18-
github.com/getsentry/sentry-go v0.18.0 // indirect
22+
github.com/getsentry/sentry-go v0.20.0 // indirect
1923
github.com/ghodss/yaml v1.0.0 // indirect
20-
github.com/golang/protobuf v1.5.2 // indirect
21-
github.com/google/uuid v1.3.0 // indirect
24+
github.com/goccy/go-json v0.9.11 // indirect
25+
github.com/golang/protobuf v1.5.3 // indirect
26+
github.com/golang/snappy v0.0.4 // indirect
27+
github.com/google/flatbuffers v2.0.8+incompatible // indirect
2228
github.com/grpc-ecosystem/go-grpc-middleware/providers/zerolog/v2 v2.0.0-rc.3 // indirect
2329
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect
2430
github.com/inconshreveable/mousetrap v1.1.0 // indirect
31+
github.com/klauspost/asmfmt v1.3.2 // indirect
32+
github.com/klauspost/compress v1.16.0 // indirect
33+
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
2534
github.com/kr/pretty v0.3.1 // indirect
2635
github.com/mattn/go-colorable v0.1.13 // indirect
27-
github.com/mattn/go-isatty v0.0.17 // indirect
36+
github.com/mattn/go-isatty v0.0.18 // indirect
37+
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
38+
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
2839
github.com/pmezard/go-difflib v1.0.0 // indirect
2940
github.com/spf13/cast v1.5.0 // indirect
3041
github.com/spf13/cobra v1.6.1 // indirect
3142
github.com/spf13/pflag v1.0.5 // indirect
3243
github.com/thoas/go-funk v0.9.3 // indirect
33-
golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect
34-
golang.org/x/net v0.7.0 // indirect
35-
golang.org/x/sys v0.5.0 // indirect
36-
golang.org/x/text v0.7.0 // indirect
37-
google.golang.org/genproto v0.0.0-20230227214838-9b19f0bdc514 // indirect
38-
google.golang.org/grpc v1.53.0 // indirect
39-
google.golang.org/protobuf v1.28.1 // 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
48+
golang.org/x/sys v0.7.0 // indirect
49+
golang.org/x/text v0.9.0 // indirect
50+
golang.org/x/tools v0.6.0 // indirect
51+
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
52+
google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect
53+
google.golang.org/grpc v1.54.0 // indirect
54+
google.golang.org/protobuf v1.30.0 // indirect
4055
gopkg.in/yaml.v2 v2.4.0 // indirect
4156
gopkg.in/yaml.v3 v3.0.1 // indirect
4257
)

0 commit comments

Comments
 (0)