Skip to content

Commit 2af1e2d

Browse files
cq-botcq-bot
authored
fix(deps): Update module github.com/cloudquery/plugin-sdk/v4 to v4.5.2 (#272)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/cloudquery/plugin-sdk/v4](https://togithub.com/cloudquery/plugin-sdk) | require | patch | `v4.5.1` -> `v4.5.2` | --- ### Release Notes <details> <summary>cloudquery/plugin-sdk (github.com/cloudquery/plugin-sdk/v4)</summary> ### [`v4.5.2`](https://togithub.com/cloudquery/plugin-sdk/releases/tag/v4.5.2) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v4.5.1...v4.5.2) ##### Bug Fixes - Change `testdata.Generate` signature ([#&#8203;1153](https://togithub.com/cloudquery/plugin-sdk/issues/1153)) ([86e717a](https://togithub.com/cloudquery/plugin-sdk/commit/86e717a442c43c945239cbdcbc79ac4ece97c7c2)) - **deps:** Update github.com/cloudquery/arrow/go/v13 digest to [`5b83d4f`](https://togithub.com/cloudquery/plugin-sdk/commit/5b83d4f) ([#&#8203;1154](https://togithub.com/cloudquery/plugin-sdk/issues/1154)) ([8558dd1](https://togithub.com/cloudquery/plugin-sdk/commit/8558dd102d359159dec64ad099bc417c97cc1477)) - **deps:** Update module github.com/cloudquery/plugin-sdk/v4 to v4.5.1 ([#&#8203;1150](https://togithub.com/cloudquery/plugin-sdk/issues/1150)) ([b3f41b1](https://togithub.com/cloudquery/plugin-sdk/commit/b3f41b1620c912383e5ef83c0765af03d3224fc7)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi41Mi4zIiwidXBkYXRlZEluVmVyIjoiMzYuNTIuMyIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->
1 parent ab85d01 commit 2af1e2d

5 files changed

Lines changed: 33 additions & 50 deletions

File tree

‎csv/write_read_test.go‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/cloudquery/plugin-sdk/v4/plugin"
1414
"github.com/cloudquery/plugin-sdk/v4/schema"
1515
"github.com/google/uuid"
16+
"github.com/stretchr/testify/require"
1617
)
1718

1819
func TestWriteRead(t *testing.T) {
@@ -40,7 +41,7 @@ func TestWriteRead(t *testing.T) {
4041
StableTime: time.Date(2021, 1, 2, 0, 0, 0, 0, time.UTC),
4142
}
4243
tg := schema.NewTestDataGenerator()
43-
records := tg.Generate(table, opts)
44+
record := tg.Generate(table, opts)
4445

4546
cl, err := NewClient(tc.options...)
4647
if err != nil {
@@ -51,7 +52,7 @@ func TestWriteRead(t *testing.T) {
5152
writer := bufio.NewWriter(&b)
5253
reader := bufio.NewReader(&b)
5354

54-
if err := types.WriteAll(cl, writer, table, records); err != nil {
55+
if err := types.WriteAll(cl, writer, table, []arrow.Record{record}); err != nil {
5556
t.Fatal(err)
5657
}
5758
writer.Flush()
@@ -74,19 +75,13 @@ func TestWriteRead(t *testing.T) {
7475
readErr = cl.Read(byteReader, table, ch)
7576
close(ch)
7677
}()
77-
totalCount := 0
78+
received := make([]arrow.Record, 0, tc.outputCount)
7879
for got := range ch {
79-
if diff := plugin.RecordDiff(records[totalCount], got); diff != "" {
80-
t.Errorf("got diff: %s", diff)
81-
}
82-
totalCount++
83-
}
84-
if readErr != nil {
85-
t.Fatal(readErr)
86-
}
87-
if totalCount != tc.outputCount {
88-
t.Errorf("got %d row(s), want %d", totalCount, tc.outputCount)
80+
received = append(received, got)
8981
}
82+
require.Empty(t, plugin.RecordsDiff(table.ToArrowSchema(), []arrow.Record{record}, received))
83+
require.NoError(t, readErr)
84+
require.Equalf(t, tc.outputCount, len(received), "got %d row(s), want %d", len(received), tc.outputCount)
9085
})
9186
}
9287
}
@@ -101,7 +96,7 @@ func BenchmarkWrite(b *testing.B) {
10196
MaxRows: 1000,
10297
}
10398
tg := schema.NewTestDataGenerator()
104-
records := tg.Generate(table, opts)
99+
record := tg.Generate(table, opts)
105100

106101
cl, err := NewClient()
107102
if err != nil {
@@ -111,7 +106,7 @@ func BenchmarkWrite(b *testing.B) {
111106
writer := bufio.NewWriter(&buf)
112107
b.ResetTimer()
113108
for i := 0; i < b.N; i++ {
114-
if err := types.WriteAll(cl, writer, table, records); err != nil {
109+
if err := types.WriteAll(cl, writer, table, []arrow.Record{record}); err != nil {
115110
b.Fatal(err)
116111
}
117112

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.19
55
require (
66
github.com/apache/arrow/go/v13 v13.0.0-20230731205701-112f94971882
77
github.com/bradleyjkemp/cupaloy/v2 v2.8.0
8-
github.com/cloudquery/plugin-sdk/v4 v4.5.1
8+
github.com/cloudquery/plugin-sdk/v4 v4.5.2
99
github.com/goccy/go-json v0.10.2
1010
github.com/google/uuid v1.3.0
1111
github.com/stretchr/testify v1.8.4

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oM
88
github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
99
github.com/cloudquery/arrow/go/v13 v13.0.0-20230821001142-5b83d4f91697 h1:D6qQZxiBMSz7YiB3nokGxg7BF+46UMEk2lPJmcifJg0=
1010
github.com/cloudquery/arrow/go/v13 v13.0.0-20230821001142-5b83d4f91697/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc=
11-
github.com/cloudquery/plugin-sdk/v4 v4.5.1 h1:V6EfHkW6kyYVMSX2S/Fn1b+62bU1jegIuv16Koo2f98=
12-
github.com/cloudquery/plugin-sdk/v4 v4.5.1/go.mod h1:WNTjNp8CPDDSpJHOSaho+MUzntKO6czG6E+yvVe++aA=
11+
github.com/cloudquery/plugin-sdk/v4 v4.5.2 h1:evRxri2pw/+Iohu7RNXcjd1PZiZkaXUP0T8CgtgtXv4=
12+
github.com/cloudquery/plugin-sdk/v4 v4.5.2/go.mod h1:/2/9y6iODo8jOT0mrAp8K1eogr7+228cy53jK8aUCjY=
1313
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
1414
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1515
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

‎json/write_read_test.go‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/cloudquery/plugin-sdk/v4/plugin"
1414
"github.com/cloudquery/plugin-sdk/v4/schema"
1515
"github.com/google/uuid"
16+
"github.com/stretchr/testify/require"
1617
)
1718

1819
func TestWriteRead(t *testing.T) {
@@ -27,7 +28,7 @@ func TestWriteRead(t *testing.T) {
2728
StableTime: time.Date(2021, 1, 2, 0, 0, 0, 0, time.UTC),
2829
}
2930
tg := schema.NewTestDataGenerator()
30-
records := tg.Generate(table, opts)
31+
record := tg.Generate(table, opts)
3132

3233
cl, err := NewClient()
3334
if err != nil {
@@ -38,7 +39,7 @@ func TestWriteRead(t *testing.T) {
3839
writer := bufio.NewWriter(&b)
3940
reader := bufio.NewReader(&b)
4041

41-
if err := types.WriteAll(cl, writer, table, records); err != nil {
42+
if err := types.WriteAll(cl, writer, table, []arrow.Record{record}); err != nil {
4243
t.Fatal(err)
4344
}
4445
writer.Flush()
@@ -61,19 +62,13 @@ func TestWriteRead(t *testing.T) {
6162
readErr = cl.Read(byteReader, table, ch)
6263
close(ch)
6364
}()
64-
totalCount := 0
65+
received := make([]arrow.Record, 0, 2)
6566
for got := range ch {
66-
if diff := plugin.RecordDiff(records[totalCount], got); diff != "" {
67-
t.Fatalf("got diff: %s", diff)
68-
}
69-
totalCount++
70-
}
71-
if readErr != nil {
72-
t.Fatal(readErr)
73-
}
74-
if totalCount != 2 {
75-
t.Fatalf("expected 2 rows, got %d", totalCount)
67+
received = append(received, got)
7668
}
69+
require.Empty(t, plugin.RecordsDiff(table.ToArrowSchema(), []arrow.Record{record}, received))
70+
require.NoError(t, readErr)
71+
require.Equalf(t, 2, len(received), "got %d row(s), want %d", len(received), 2)
7772
}
7873

7974
func BenchmarkWrite(b *testing.B) {
@@ -86,7 +81,7 @@ func BenchmarkWrite(b *testing.B) {
8681
MaxRows: 1000,
8782
}
8883
tg := schema.NewTestDataGenerator()
89-
records := tg.Generate(table, opts)
84+
record := tg.Generate(table, opts)
9085

9186
cl, err := NewClient()
9287
if err != nil {
@@ -96,7 +91,7 @@ func BenchmarkWrite(b *testing.B) {
9691
writer := bufio.NewWriter(&buf)
9792
b.ResetTimer()
9893
for i := 0; i < b.N; i++ {
99-
if err := types.WriteAll(cl, writer, table, records); err != nil {
94+
if err := types.WriteAll(cl, writer, table, []arrow.Record{record}); err != nil {
10095
b.Fatal(err)
10196
}
10297
err = writer.Flush()

‎parquet/write_read_test.go‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"time"
99

1010
"github.com/apache/arrow/go/v13/arrow"
11-
"github.com/apache/arrow/go/v13/arrow/array"
1211
"github.com/cloudquery/filetypes/v4/types"
1312
"github.com/cloudquery/plugin-sdk/v4/plugin"
1413
"github.com/cloudquery/plugin-sdk/v4/schema"
14+
"github.com/stretchr/testify/require"
1515
)
1616

1717
func TestWriteRead(t *testing.T) {
@@ -25,7 +25,7 @@ func TestWriteRead(t *testing.T) {
2525
MaxRows: 2,
2626
}
2727
tg := schema.NewTestDataGenerator()
28-
records := tg.Generate(table, opts)
28+
record := tg.Generate(table, opts)
2929

3030
writer := bufio.NewWriter(&b)
3131
reader := bufio.NewReader(&b)
@@ -34,7 +34,7 @@ func TestWriteRead(t *testing.T) {
3434
if err != nil {
3535
t.Fatal(err)
3636
}
37-
if err := types.WriteAll(cl, writer, table, records); err != nil {
37+
if err := types.WriteAll(cl, writer, table, []arrow.Record{record}); err != nil {
3838
t.Fatal(err)
3939
}
4040
err = writer.Flush()
@@ -53,20 +53,13 @@ func TestWriteRead(t *testing.T) {
5353
readErr = cl.Read(byteReader, table, ch)
5454
close(ch)
5555
}()
56-
totalCount := 0
56+
received := make([]arrow.Record, 0, 2)
5757
for got := range ch {
58-
curr := records[totalCount]
59-
if !array.RecordApproxEqual(curr, got) {
60-
t.Fatalf("got diff (record %d): %s\n", totalCount, plugin.RecordDiff(records[totalCount], got))
61-
}
62-
totalCount++
63-
}
64-
if readErr != nil {
65-
t.Fatal(readErr)
66-
}
67-
if totalCount != 2 {
68-
t.Fatalf("expected 2 rows, got %d", totalCount)
58+
received = append(received, got)
6959
}
60+
require.Empty(t, plugin.RecordsDiff(table.ToArrowSchema(), []arrow.Record{record}, received))
61+
require.NoError(t, readErr)
62+
require.Equalf(t, 2, len(received), "got %d row(s), want %d", len(received), 2)
7063
}
7164

7265
func BenchmarkWrite(b *testing.B) {
@@ -79,7 +72,7 @@ func BenchmarkWrite(b *testing.B) {
7972
MaxRows: b.N,
8073
}
8174
tg := schema.NewTestDataGenerator()
82-
records := tg.Generate(table, opts)
75+
record := tg.Generate(table, opts)
8376

8477
cl, err := NewClient()
8578
if err != nil {
@@ -89,7 +82,7 @@ func BenchmarkWrite(b *testing.B) {
8982
writer := bufio.NewWriter(&buf)
9083
b.ResetTimer()
9184

92-
if err := types.WriteAll(cl, writer, table, records); err != nil {
85+
if err := types.WriteAll(cl, writer, table, []arrow.Record{record}); err != nil {
9386
b.Fatal(err)
9487
}
9588
err = writer.Flush()

0 commit comments

Comments
 (0)