Skip to content

Commit f3d2df2

Browse files
kaidaguerrekaidaguerre
committed
Update to work with sdk version 5 and dynamic updating of dynamic schemas. Closes #259 
1 parent fafff31 commit f3d2df2

18 files changed

+344
-152
lines changed

‎fdw.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ import (
1616
"time"
1717
"unsafe"
1818

19-
"github.com/turbot/steampipe-postgres-fdw/version"
20-
2119
"github.com/hashicorp/go-hclog"
22-
"github.com/turbot/steampipe-plugin-sdk/v4/logging"
20+
"github.com/turbot/steampipe-plugin-sdk/v5/logging"
2321
"github.com/turbot/steampipe-postgres-fdw/hub"
2422
"github.com/turbot/steampipe-postgres-fdw/types"
23+
"github.com/turbot/steampipe-postgres-fdw/version"
2524
"github.com/turbot/steampipe/pkg/constants"
2625
)
2726

‎go.mod

+45-24
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ require (
77
github.com/golang/protobuf v1.5.2
88
github.com/hashicorp/go-hclog v1.3.1
99
github.com/hashicorp/go-version v1.6.0 // indirect
10-
github.com/turbot/go-kit v0.5.0-rc.1
11-
github.com/turbot/steampipe v0.17.0-rc.1
12-
github.com/turbot/steampipe-plugin-sdk/v4 v4.1.7
13-
go.opentelemetry.io/otel v1.9.0
10+
github.com/turbot/go-kit v0.5.0-rc.4
11+
github.com/turbot/steampipe v1.7.0-rc.0.0.20221125145649-f101adca7164
12+
github.com/turbot/steampipe-plugin-sdk/v5 v5.0.0
13+
go.opentelemetry.io/otel v1.10.0
1414
google.golang.org/protobuf v1.28.1
1515
)
1616

@@ -19,6 +19,29 @@ require (
1919
go.opentelemetry.io/otel/metric v0.30.0
2020
)
2121

22+
require (
23+
cloud.google.com/go v0.104.0 // indirect
24+
cloud.google.com/go/compute v1.12.1 // indirect
25+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
26+
cloud.google.com/go/iam v0.3.0 // indirect
27+
cloud.google.com/go/storage v1.23.0 // indirect
28+
github.com/aws/aws-sdk-go v1.37.0 // indirect
29+
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
30+
github.com/googleapis/enterprise-certificate-proxy v0.2.0 // indirect
31+
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
32+
github.com/googleapis/go-type-adapters v1.0.0 // indirect
33+
github.com/hashicorp/go-getter v1.6.2 // indirect
34+
github.com/hashicorp/go-safetemp v1.0.0 // indirect
35+
github.com/jackc/pgx/v5 v5.1.1 // indirect
36+
github.com/jackc/puddle/v2 v2.1.2 // indirect
37+
github.com/jmespath/go-jmespath v0.4.0 // indirect
38+
github.com/klauspost/compress v1.11.2 // indirect
39+
github.com/ulikunitz/xz v0.5.8 // indirect
40+
go.uber.org/atomic v1.10.0 // indirect
41+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
42+
google.golang.org/api v0.102.0 // indirect
43+
)
44+
2245
require (
2346
github.com/Machiel/slugify v1.0.1 // indirect
2447
github.com/Microsoft/go-winio v0.5.0 // indirect
@@ -57,17 +80,17 @@ require (
5780
github.com/gogo/protobuf v1.3.2 // indirect
5881
github.com/golang/glog v1.0.0 // indirect
5982
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
60-
github.com/google/go-cmp v0.5.8 // indirect
83+
github.com/google/go-cmp v0.5.9 // indirect
6184
github.com/google/uuid v1.3.0 // indirect
6285
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
6386
github.com/hashicorp/errwrap v1.1.0 // indirect
6487
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6588
github.com/hashicorp/go-multierror v1.1.1 // indirect
66-
github.com/hashicorp/go-plugin v1.4.5 // indirect
89+
github.com/hashicorp/go-plugin v1.4.6 // indirect
6790
github.com/hashicorp/go-retryablehttp v0.5.2 // indirect
6891
github.com/hashicorp/go-uuid v1.0.1 // indirect
6992
github.com/hashicorp/hcl v1.0.0 // indirect
70-
github.com/hashicorp/hcl/v2 v2.14.1 // indirect
93+
github.com/hashicorp/hcl/v2 v2.15.0 // indirect
7194
github.com/hashicorp/terraform v0.15.1 // indirect
7295
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
7396
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
@@ -78,9 +101,6 @@ require (
78101
github.com/jackc/pgpassfile v1.0.0 // indirect
79102
github.com/jackc/pgproto3/v2 v2.3.1 // indirect
80103
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
81-
github.com/jackc/pgtype v1.12.0 // indirect
82-
github.com/jackc/pgx/v4 v4.17.2 // indirect
83-
github.com/jackc/puddle v1.3.0 // indirect
84104
github.com/karrick/gows v0.3.0 // indirect
85105
github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
86106
github.com/magiconair/properties v1.8.6 // indirect
@@ -111,11 +131,11 @@ require (
111131
github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
112132
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
113133
github.com/sirupsen/logrus v1.9.0 // indirect
114-
github.com/spf13/afero v1.8.2 // indirect
134+
github.com/spf13/afero v1.9.2 // indirect
115135
github.com/spf13/cast v1.5.0 // indirect
116136
github.com/spf13/jwalterweatherman v1.1.0 // indirect
117137
github.com/spf13/pflag v1.0.5 // indirect
118-
github.com/spf13/viper v1.13.0 // indirect
138+
github.com/spf13/viper v1.14.0 // indirect
119139
github.com/stevenle/topsort v0.0.0-20130922064739-8130c1d7596b // indirect
120140
github.com/subosito/gotenv v1.4.1 // indirect
121141
github.com/tklauser/go-sysconf v0.3.9 // indirect
@@ -125,8 +145,8 @@ require (
125145
github.com/vmihailenco/tagparser v0.1.1 // indirect
126146
github.com/xlab/treeprint v1.1.0 // indirect
127147
github.com/yusufpapurcu/wmi v1.2.2 // indirect
128-
github.com/zclconf/go-cty v1.11.1 // indirect
129-
github.com/zclconf/go-cty-yaml v1.0.2 // indirect
148+
github.com/zclconf/go-cty v1.12.1 // indirect
149+
github.com/zclconf/go-cty-yaml v1.0.3 // indirect
130150
go.opencensus.io v0.23.0 // indirect
131151
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
132152
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0 // indirect
@@ -135,19 +155,19 @@ require (
135155
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.7.0 // indirect
136156
go.opentelemetry.io/otel/sdk v1.7.0 // indirect
137157
go.opentelemetry.io/otel/sdk/metric v0.30.0 // indirect
138-
go.opentelemetry.io/otel/trace v1.9.0 // indirect
158+
go.opentelemetry.io/otel/trace v1.10.0 // indirect
139159
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
140-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
141-
golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf // indirect
142-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
143-
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
144-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
145-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
146-
golang.org/x/sys v0.0.0-20220908164124-27713097b956 // indirect
160+
golang.org/x/crypto v0.1.0 // indirect
161+
golang.org/x/exp v0.0.0-20221109205753-fc8884afc316 // indirect
162+
golang.org/x/mod v0.6.0 // indirect
163+
golang.org/x/net v0.1.0 // indirect
164+
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
165+
golang.org/x/sync v0.1.0 // indirect
166+
golang.org/x/sys v0.1.0 // indirect
147167
golang.org/x/text v0.4.0 // indirect
148168
google.golang.org/appengine v1.6.7 // indirect
149-
google.golang.org/genproto v0.0.0-20220720214146-176da50484ac // indirect
150-
google.golang.org/grpc v1.50.1 // indirect
169+
google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect
170+
google.golang.org/grpc v1.51.0 // indirect
151171
gopkg.in/ini.v1 v1.67.0 // indirect
152172
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
153173
gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
@@ -161,4 +181,5 @@ replace (
161181
github.com/deislabs/oras => github.com/oras-project/oras v0.9.0
162182
github.com/docker/distribution => github.com/distribution/distribution v2.7.1+incompatible
163183
github.com/docker/docker => github.com/moby/moby v20.10.17+incompatible
184+
github.com/turbot/steampipe => /Users/kai/Dev/github/turbot/steampipe
164185
)

0 commit comments

Comments
 (0)