Skip to content

Commit 2b4e15b

Browse files
authored
Merge pull request #577 from turbot/v2.1.x
Release steampipe-postgres-fdw v2.1.0
2 parents c7fad62 + b7dc535 commit 2b4e15b

21 files changed

+126
-117
lines changed

.github/workflows/buildimage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Setup Golang
4444
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
4545
with:
46-
go-version: 1.22
46+
go-version: 1.24
4747

4848
- name: Fetching Go Cache Paths
4949
id: go-cache-paths
@@ -162,7 +162,7 @@ jobs:
162162
- name: Setup Golang
163163
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
164164
with:
165-
go-version: 1.22
165+
go-version: 1.24
166166

167167
- name: Fetching Go Cache Paths
168168
id: go-cache-paths
@@ -248,7 +248,7 @@ jobs:
248248
- name: Setup GoLang
249249
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
250250
with:
251-
go-version: 1.22
251+
go-version: 1.24
252252

253253
- name: Fetching Go Cache Paths
254254
id: go-cache-paths
@@ -333,7 +333,7 @@ jobs:
333333
- name: Setup GoLang
334334
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
335335
with:
336-
go-version: 1.22
336+
go-version: 1.24
337337

338338
- name: Fetching Go Cache Paths
339339
id: go-cache-paths

.github/workflows/test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Set up Go
1414
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
1515
with:
16-
go-version: 1.22
16+
go-version: 1.24
1717

1818
- name: golangci-lint
1919
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
@@ -30,7 +30,7 @@ jobs:
3030
- name: Set up Go
3131
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
3232
with:
33-
go-version: 1.22
33+
go-version: 1.24
3434

3535
- name: Checkout Steampipe
3636
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -65,17 +65,19 @@ jobs:
6565
ls /home/runner/work/steampipe-postgres-fdw/steampipe-postgres-fdw
6666
cd /home/runner/work/steampipe-postgres-fdw/steampipe-postgres-fdw/steampipe
6767
go get
68-
go build -o /home/runner/steampipe
68+
go build -o /home/runner/steampipe -ldflags "-X main.version=0.0.0-dev.0"
6969
7070
- name: Run steampipe
7171
run: |
72+
steampipe --version
7273
steampipe query "select 1 as col"
7374
7475
- name: Checkout FDW
7576
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7677
with:
7778
repository: turbot/steampipe-postgres-fdw
7879
path: steampipe-postgres-fdw
80+
ref: ${{ github.event.ref }}
7981

8082
- name: Setup apt-get
8183
run: |-
@@ -131,7 +133,9 @@ jobs:
131133
bats-version: 1.2.1
132134

133135
- name: Install Chaos plugin from registry
134-
run: steampipe plugin install chaos
136+
run: |
137+
steampipe query "select 1 as a"
138+
steampipe plugin install chaos
135139
136140
- name: Go install jd
137141
run: |

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## v2.1.0 [2025-07-09]
2+
_Whats new_
3+
- Bump module to v2 and update Go version to 1.24.
4+
5+
_Bug fixes_
6+
- Fix build failure caused by incorrect %s format verb for metadataCount (int). ([#566](https://github.com/turbot/steampipe-postgres-fdw/pull/566))
7+
18
## v2.0.0 [2025-06-11]
29
_Breaking changes_
310
- Increased minimum required `glibc` version to `2.34` due to upgrading the Linux build environment from Ubuntu 20.04 to Ubuntu 22.04 GitHub runners. As a result, the FDW no longer supports older Linux distributions such as Ubuntu 20.04 and Amazon Linux 2.

exec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"sync"
2323
"unsafe"
2424

25-
"github.com/turbot/steampipe-postgres-fdw/hub"
26-
"github.com/turbot/steampipe-postgres-fdw/types"
25+
"github.com/turbot/steampipe-postgres-fdw/v2/hub"
26+
"github.com/turbot/steampipe-postgres-fdw/v2/types"
2727
)
2828

2929
type ExecState struct {

fdw.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ package main
99
#include "nodes/pg_list.h"
1010
#include "utils/timestamp.h"
1111
12-
static Name deserializeDeparsedSortListCell(ListCell *lc);
13-
1412
*/
1513
import "C"
1614

@@ -28,11 +26,11 @@ import (
2826
"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
2927
"github.com/turbot/steampipe-plugin-sdk/v5/logging"
3028
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
31-
"github.com/turbot/steampipe-postgres-fdw/hub"
32-
"github.com/turbot/steampipe-postgres-fdw/types"
33-
"github.com/turbot/steampipe-postgres-fdw/version"
34-
"github.com/turbot/steampipe/pkg/cmdconfig"
35-
"github.com/turbot/steampipe/pkg/constants"
29+
"github.com/turbot/steampipe-postgres-fdw/v2/hub"
30+
"github.com/turbot/steampipe-postgres-fdw/v2/types"
31+
"github.com/turbot/steampipe-postgres-fdw/v2/version"
32+
"github.com/turbot/steampipe/v2/pkg/cmdconfig"
33+
"github.com/turbot/steampipe/v2/pkg/constants"
3634
)
3735

3836
var logger hclog.Logger

go.mod

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module github.com/turbot/steampipe-postgres-fdw
1+
module github.com/turbot/steampipe-postgres-fdw/v2
22

3-
go 1.23.2
3+
go 1.24
44

55
toolchain go1.24.1
66

@@ -10,20 +10,20 @@ require (
1010
github.com/hashicorp/go-hclog v1.6.3
1111
github.com/hashicorp/go-version v1.7.0 // indirect
1212
github.com/turbot/go-kit v1.3.0
13-
github.com/turbot/steampipe v1.1.3
14-
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.5
13+
github.com/turbot/steampipe-plugin-sdk/v5 v5.12.0
1514
go.opentelemetry.io/otel v1.35.0
1615
google.golang.org/protobuf v1.36.6
1716
)
1817

1918
require (
2019
github.com/Masterminds/semver/v3 v3.3.1
21-
github.com/turbot/pipe-fittings/v2 v2.3.6
20+
github.com/turbot/pipe-fittings/v2 v2.5.0
21+
github.com/turbot/steampipe/v2 v2.1.0-rc.2
2222
go.opentelemetry.io/otel/metric v1.35.0
2323
)
2424

2525
require (
26-
cel.dev/expr v0.20.0 // indirect
26+
cel.dev/expr v0.23.0 // indirect
2727
cloud.google.com/go v0.120.0 // indirect
2828
cloud.google.com/go/auth v0.15.0 // indirect
2929
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
@@ -32,7 +32,7 @@ require (
3232
cloud.google.com/go/monitoring v1.24.0 // indirect
3333
cloud.google.com/go/storage v1.51.0 // indirect
3434
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
35-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.26.0 // indirect
35+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.27.0 // indirect
3636
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
3737
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
3838
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
@@ -52,7 +52,7 @@ require (
5252
github.com/aws/smithy-go v1.22.3 // indirect
5353
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
5454
github.com/briandowns/spinner v1.23.2 // indirect
55-
github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
55+
github.com/cncf/xds/go v0.0.0-20250326154945-ae57f3c0d45f // indirect
5656
github.com/containerd/errdefs v1.0.0 // indirect
5757
github.com/containerd/log v0.1.0 // indirect
5858
github.com/containerd/platforms v0.2.1 // indirect
@@ -66,12 +66,12 @@ require (
6666
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
6767
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6868
github.com/go-git/go-billy/v5 v5.6.2 // indirect
69-
github.com/go-git/go-git/v5 v5.15.0 // indirect
69+
github.com/go-git/go-git/v5 v5.16.2 // indirect
7070
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
7171
github.com/go-playground/locales v0.14.1 // indirect
7272
github.com/go-playground/universal-translator v0.18.1 // indirect
7373
github.com/go-playground/validator/v10 v10.25.0 // indirect
74-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
74+
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
7575
github.com/goccy/go-yaml v1.16.0 // indirect
7676
github.com/golang/mock v1.6.0 // indirect
7777
github.com/google/s2a-go v0.1.9 // indirect
@@ -106,18 +106,18 @@ require (
106106
github.com/ulikunitz/xz v0.5.12 // indirect
107107
github.com/zeebo/errs v1.4.0 // indirect
108108
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
109-
go.opentelemetry.io/contrib/detectors/gcp v1.34.0 // indirect
109+
go.opentelemetry.io/contrib/detectors/gcp v1.35.0 // indirect
110110
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
111111
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
112112
go.uber.org/mock v0.4.0 // indirect
113113
go.uber.org/multierr v1.11.0 // indirect
114-
golang.org/x/mod v0.24.0 // indirect
115-
golang.org/x/term v0.31.0 // indirect
114+
golang.org/x/mod v0.25.0 // indirect
115+
golang.org/x/term v0.32.0 // indirect
116116
golang.org/x/time v0.11.0 // indirect
117-
golang.org/x/tools v0.31.0 // indirect
117+
golang.org/x/tools v0.33.0 // indirect
118118
google.golang.org/api v0.227.0 // indirect
119-
google.golang.org/genproto/googleapis/api v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
120-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
119+
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
120+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
121121
gopkg.in/warnings.v0 v0.1.2 // indirect
122122
oras.land/oras-go/v2 v2.5.0 // indirect
123123
sigs.k8s.io/yaml v1.4.0 // indirect
@@ -138,7 +138,7 @@ require (
138138
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
139139
github.com/dustin/go-humanize v1.0.1 // indirect
140140
github.com/fatih/color v1.18.0 // indirect
141-
github.com/fsnotify/fsnotify v1.8.0 // indirect
141+
github.com/fsnotify/fsnotify v1.9.0 // indirect
142142
github.com/gertd/go-pluralize v0.2.1
143143
github.com/ghodss/yaml v1.0.0 // indirect
144144
github.com/go-logr/logr v1.4.2 // indirect
@@ -190,7 +190,7 @@ require (
190190
github.com/spf13/afero v1.14.0 // indirect
191191
github.com/spf13/cast v1.7.1 // indirect
192192
github.com/spf13/pflag v1.0.6 // indirect
193-
github.com/spf13/viper v1.20.0 // indirect
193+
github.com/spf13/viper v1.20.1 // indirect
194194
github.com/stevenle/topsort v0.2.0 // indirect
195195
github.com/subosito/gotenv v1.6.0 // indirect
196196
github.com/tklauser/go-sysconf v0.3.15 // indirect
@@ -207,15 +207,15 @@ require (
207207
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
208208
go.opentelemetry.io/otel/trace v1.35.0 // indirect
209209
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
210-
golang.org/x/crypto v0.37.0 // indirect
210+
golang.org/x/crypto v0.38.0 // indirect
211211
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
212-
golang.org/x/net v0.39.0 // indirect
212+
golang.org/x/net v0.40.0 // indirect
213213
golang.org/x/oauth2 v0.28.0 // indirect
214-
golang.org/x/sync v0.13.0 // indirect
215-
golang.org/x/sys v0.32.0 // indirect
216-
golang.org/x/text v0.24.0 // indirect
214+
golang.org/x/sync v0.15.0 // indirect
215+
golang.org/x/sys v0.33.0 // indirect
216+
golang.org/x/text v0.26.0 // indirect
217217
google.golang.org/genproto v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
218-
google.golang.org/grpc v1.72.1 // indirect
218+
google.golang.org/grpc v1.73.0 // indirect
219219
gopkg.in/yaml.v2 v2.4.0 // indirect
220220
gopkg.in/yaml.v3 v3.0.1 // indirect
221221
)

0 commit comments

Comments
 (0)