Skip to content

Commit 4545610

Browse files
authored
feat(snyk)!: Migrate to Apache Arrow type system (#11020)
Closes #10767 BEGIN_COMMIT_OVERRIDE feat: Update to use [Apache Arrow](https://arrow.apache.org/) type system (#11020) BREAKING-CHANGE: This release introduces an internal change to our type system to use [Apache Arrow](https://arrow.apache.org/). This should not have any visible breaking changes, however due to the size of the change we are introducing it under a major version bump to communicate that it might have some bugs that we weren't able to catch during our internal tests. If you encounter an issue during the upgrade, please submit a [bug report](https://github.com/cloudquery/cloudquery/issues/new/choose). You will also need to update destinations depending on which one you use: - Azure Blob Storage >= v3.2.0 - BigQuery >= v3.0.0 - ClickHouse >= v3.1.1 - DuckDB >= v1.1.6 - Elasticsearch >= v2.0.0 - File >= v3.2.0 - Firehose >= v2.0.2 - GCS >= v3.2.0 - Gremlin >= v2.1.10 - Kafka >= v3.0.1 - Meilisearch >= v2.0.1 - Microsoft SQL Server >= v4.2.0 - MongoDB >= v2.0.1 - MySQL >= v2.0.2 - Neo4j >= v3.0.0 - PostgreSQL >= v4.2.0 - S3 >= v4.4.0 - Snowflake >= v2.1.1 - SQLite >= v2.2.0 END_COMMIT_OVERRIDE
1 parent db76e85 commit 4545610

35 files changed

+193
-191
lines changed

plugins/source/snyk/client/client.go

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

99
"github.com/cloudquery/plugin-pb-go/specs"
10-
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
11-
"github.com/cloudquery/plugin-sdk/v2/schema"
10+
"github.com/cloudquery/plugin-sdk/v3/plugins/source"
11+
"github.com/cloudquery/plugin-sdk/v3/schema"
1212
"github.com/pavel-snyk/snyk-sdk-go/snyk"
1313
"github.com/rs/zerolog"
1414
)
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package client
22

3-
import "github.com/cloudquery/plugin-sdk/v2/schema"
3+
import (
4+
"github.com/apache/arrow/go/v13/arrow"
5+
"github.com/cloudquery/plugin-sdk/v3/schema"
6+
)
47

58
var OrganizationID = schema.Column{
6-
Name: "organization_id",
7-
Type: schema.TypeString,
8-
Resolver: ResolveOrganizationID,
9-
CreationOptions: schema.ColumnCreationOptions{
10-
PrimaryKey: true,
11-
NotNull: true,
12-
},
9+
Name: "organization_id",
10+
Type: arrow.BinaryTypes.String,
11+
PrimaryKey: true,
12+
NotNull: true,
13+
Resolver: ResolveOrganizationID,
1314
}

plugins/source/snyk/client/multiplexer.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/v2/schema"
4+
"github.com/cloudquery/plugin-sdk/v3/schema"
55
)
66

77
func SingleOrganization(meta schema.ClientMeta) []schema.ClientMeta {

plugins/source/snyk/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/v2/schema"
6+
"github.com/cloudquery/plugin-sdk/v3/schema"
77
)
88

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

plugins/source/snyk/client/testing.go

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

1111
"github.com/cloudquery/plugin-pb-go/specs"
12-
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
13-
"github.com/cloudquery/plugin-sdk/v2/schema"
12+
"github.com/cloudquery/plugin-sdk/v3/plugins/source"
13+
"github.com/cloudquery/plugin-sdk/v3/schema"
1414
"github.com/julienschmidt/httprouter"
1515
"github.com/pavel-snyk/snyk-sdk-go/snyk"
1616
"github.com/rs/zerolog"

plugins/source/snyk/go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ module github.com/cloudquery/cloudquery/plugins/source/snyk
33
go 1.19
44

55
require (
6+
github.com/apache/arrow/go/v13 v13.0.0-20230509040948-de6c3cd2b604
67
github.com/cloudquery/plugin-pb-go v1.0.8
7-
github.com/cloudquery/plugin-sdk/v2 v2.7.0
8+
github.com/cloudquery/plugin-sdk/v3 v3.6.4
89
github.com/google/uuid v1.3.0
910
github.com/julienschmidt/httprouter v1.3.0
1011
github.com/pavel-snyk/snyk-sdk-go v0.4.1
@@ -15,14 +16,14 @@ require (
1516

1617
replace (
1718
// TODO: remove once the changes are merged to upstream
18-
github.com/apache/arrow/go/v13 => github.com/cloudquery/arrow/go/v13 v13.0.0-20230509053643-898a79b1d3c8
19+
github.com/apache/arrow/go/v13 => github.com/cloudquery/arrow/go/v13 v13.0.0-20230526062000-b3fdc24ed8d6
1920
github.com/pavel-snyk/snyk-sdk-go => github.com/cloudquery/snyk-sdk-go v0.5.0
2021
)
2122

2223
require (
2324
github.com/andybalholm/brotli v1.0.5 // indirect
24-
github.com/apache/arrow/go/v13 v13.0.0-20230509040948-de6c3cd2b604 // indirect
2525
github.com/apache/thrift v0.16.0 // indirect
26+
github.com/cloudquery/plugin-sdk/v2 v2.7.0 // indirect
2627
github.com/davecgh/go-spew v1.1.1 // indirect
2728
github.com/getsentry/sentry-go v0.20.0 // indirect
2829
github.com/ghodss/yaml v1.0.0 // indirect
@@ -40,6 +41,7 @@ require (
4041
github.com/mattn/go-isatty v0.0.18 // indirect
4142
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
4243
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
44+
github.com/pierrec/lz4/v4 v4.1.15 // indirect
4345
github.com/pmezard/go-difflib v1.0.0 // indirect
4446
github.com/spf13/cast v1.5.0 // indirect
4547
github.com/spf13/cobra v1.6.1 // indirect

plugins/source/snyk/go.sum

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,14 @@ github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWR
4444
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
4545
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
4646
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
47-
github.com/cloudquery/arrow/go/v13 v13.0.0-20230509053643-898a79b1d3c8 h1:CmgLSEGQNLHpUQ5cU4L4aF7cuJZRnc1toIIWqC1gmPg=
48-
github.com/cloudquery/arrow/go/v13 v13.0.0-20230509053643-898a79b1d3c8/go.mod h1:/XatdE3kDIBqZKhZ7OBUHwP2jaASDFZHqF4puOWM8po=
47+
github.com/cloudquery/arrow/go/v13 v13.0.0-20230526062000-b3fdc24ed8d6 h1:pXLimp7SeA1AiRYANtNto/uJu5aMjeXC8zeMS4BV3dg=
48+
github.com/cloudquery/arrow/go/v13 v13.0.0-20230526062000-b3fdc24ed8d6/go.mod h1:/XatdE3kDIBqZKhZ7OBUHwP2jaASDFZHqF4puOWM8po=
4949
github.com/cloudquery/plugin-pb-go v1.0.8 h1:wn3GXhcNItcP+6wUUZuzUFbvdL59liKBO37/izMi+FQ=
5050
github.com/cloudquery/plugin-pb-go v1.0.8/go.mod h1:vAGA27psem7ZZNAY4a3S9TKuA/JDQWstjKcHPJX91Mc=
5151
github.com/cloudquery/plugin-sdk/v2 v2.7.0 h1:hRXsdEiaOxJtsn/wZMFQC9/jPfU1MeMK3KF+gPGqm7U=
5252
github.com/cloudquery/plugin-sdk/v2 v2.7.0/go.mod h1:pAX6ojIW99b/Vg4CkhnsGkRIzNaVEceYMR+Bdit73ug=
53+
github.com/cloudquery/plugin-sdk/v3 v3.6.4 h1:P4OkS5tJYkv3OqeL60DAVqXXbFQUyPKJ5YDtAgjl9b4=
54+
github.com/cloudquery/plugin-sdk/v3 v3.6.4/go.mod h1:3JrZXEULmGXpkOukVaRIzaA63d7TJr9Ukp6hemTjbtc=
5355
github.com/cloudquery/snyk-sdk-go v0.5.0 h1:aDA94/ix7ro4V1qh2mk3/XTaT2j37ETRkOaYUR2pHc8=
5456
github.com/cloudquery/snyk-sdk-go v0.5.0/go.mod h1:LRL1TRuuM925gnyGp54WtS9p8S4yJMd0oS4JpLg+n7Y=
5557
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
@@ -178,6 +180,7 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8D
178180
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
179181
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
180182
github.com/pierrec/lz4/v4 v4.1.15 h1:MO0/ucJhngq7299dKLwIMtgTfbkoSPF6AoMYDd8Q4q0=
183+
github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
181184
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
182185
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
183186
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

plugins/source/snyk/main.go

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

33
import (
44
"github.com/cloudquery/cloudquery/plugins/source/snyk/resources/plugin"
5-
"github.com/cloudquery/plugin-sdk/v2/serve"
5+
"github.com/cloudquery/plugin-sdk/v3/serve"
66
)
77

88
const sentryDSN = "https://[email protected]/4504333793165313"

plugins/source/snyk/resources/plugin/plugin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/cloudquery/cloudquery/plugins/source/snyk/resources/services/organization"
99
"github.com/cloudquery/cloudquery/plugins/source/snyk/resources/services/project"
1010
"github.com/cloudquery/cloudquery/plugins/source/snyk/resources/services/reporting"
11-
"github.com/cloudquery/plugin-sdk/v2/plugins/source"
12-
"github.com/cloudquery/plugin-sdk/v2/schema"
11+
"github.com/cloudquery/plugin-sdk/v3/plugins/source"
12+
"github.com/cloudquery/plugin-sdk/v3/schema"
1313
)
1414

1515
var Version = "Development"

plugins/source/snyk/resources/services/dependency/dependencies.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"fmt"
66

77
"github.com/cloudquery/cloudquery/plugins/source/snyk/client"
8-
"github.com/cloudquery/plugin-sdk/v2/schema"
9-
"github.com/cloudquery/plugin-sdk/v2/transformers"
8+
"github.com/cloudquery/plugin-sdk/v3/schema"
9+
"github.com/cloudquery/plugin-sdk/v3/transformers"
1010
"github.com/pavel-snyk/snyk-sdk-go/snyk"
1111
)
1212

0 commit comments

Comments
 (0)