Skip to content

Commit da2f3ec

Browse files
pskrbasupskrbasu
authored
Upgrade to pipe-fittings v2, go-kit v1 (#4485)
1 parent d72aaeb commit da2f3ec

File tree

131 files changed

+470
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+470
-352
lines changed

‎cmd/completion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"runtime"
77

88
"github.com/spf13/cobra"
9-
"github.com/turbot/pipe-fittings/constants"
9+
"github.com/turbot/pipe-fittings/v2/constants"
1010
"github.com/turbot/steampipe/pkg/cmdconfig"
1111
)
1212

‎cmd/login.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/spf13/cobra"
1111
"github.com/spf13/viper"
12-
pconstants "github.com/turbot/pipe-fittings/constants"
13-
"github.com/turbot/pipe-fittings/pipes"
12+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
13+
"github.com/turbot/pipe-fittings/v2/pipes"
1414
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
1515
"github.com/turbot/steampipe/pkg/cmdconfig"
1616
"github.com/turbot/steampipe/pkg/constants"

‎cmd/plugin.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import (
1313
"github.com/spf13/cobra"
1414
"github.com/spf13/viper"
1515
"github.com/turbot/go-kit/helpers"
16-
pconstants "github.com/turbot/pipe-fittings/constants"
17-
"github.com/turbot/pipe-fittings/contexthelpers"
18-
perror_helpers "github.com/turbot/pipe-fittings/error_helpers"
19-
putils "github.com/turbot/pipe-fittings/ociinstaller"
20-
pplugin "github.com/turbot/pipe-fittings/plugin"
21-
"github.com/turbot/pipe-fittings/querydisplay"
22-
"github.com/turbot/pipe-fittings/utils"
23-
"github.com/turbot/pipe-fittings/versionfile"
16+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
17+
"github.com/turbot/pipe-fittings/v2/contexthelpers"
18+
perror_helpers "github.com/turbot/pipe-fittings/v2/error_helpers"
19+
putils "github.com/turbot/pipe-fittings/v2/ociinstaller"
20+
pplugin "github.com/turbot/pipe-fittings/v2/plugin"
21+
"github.com/turbot/pipe-fittings/v2/querydisplay"
22+
"github.com/turbot/pipe-fittings/v2/utils"
23+
"github.com/turbot/pipe-fittings/v2/versionfile"
2424
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
2525
"github.com/turbot/steampipe/pkg/cmdconfig"
2626
"github.com/turbot/steampipe/pkg/constants"

‎cmd/query.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ import (
55
"context"
66
"fmt"
77
"os"
8+
"slices"
89
"strings"
910

1011
"github.com/spf13/cobra"
1112
"github.com/spf13/viper"
1213
"github.com/thediveo/enumflag/v2"
1314
"github.com/turbot/go-kit/helpers"
14-
pconstants "github.com/turbot/pipe-fittings/constants"
15-
"github.com/turbot/pipe-fittings/contexthelpers"
16-
"github.com/turbot/pipe-fittings/utils"
15+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
16+
"github.com/turbot/pipe-fittings/v2/contexthelpers"
17+
"github.com/turbot/pipe-fittings/v2/utils"
1718
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
1819
"github.com/turbot/steampipe/pkg/cmdconfig"
1920
"github.com/turbot/steampipe/pkg/constants"
@@ -168,7 +169,7 @@ func validateQueryArgs(ctx context.Context, args []string) error {
168169

169170
validOutputFormats := []string{constants.OutputFormatLine, constants.OutputFormatCSV, constants.OutputFormatTable, constants.OutputFormatJSON, constants.OutputFormatSnapshot, constants.OutputFormatSnapshotShort, constants.OutputFormatNone}
170171
output := viper.GetString(pconstants.ArgOutput)
171-
if !helpers.StringSliceContains(validOutputFormats, output) {
172+
if !slices.Contains(validOutputFormats, output) {
172173
exitCode = constants.ExitCodeInsufficientOrWrongInputs
173174
return sperr.New("invalid output format: '%s', must be one of [%s]", output, strings.Join(validOutputFormats, ", "))
174175
}

‎cmd/root.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/spf13/cobra"
1010
"github.com/spf13/viper"
1111
filehelpers "github.com/turbot/go-kit/files"
12-
"github.com/turbot/pipe-fittings/app_specific"
13-
"github.com/turbot/pipe-fittings/constants"
14-
"github.com/turbot/pipe-fittings/utils"
12+
"github.com/turbot/pipe-fittings/v2/app_specific"
13+
"github.com/turbot/pipe-fittings/v2/constants"
14+
"github.com/turbot/pipe-fittings/v2/utils"
1515
"github.com/turbot/steampipe/pkg/error_helpers"
1616
"github.com/turbot/steampipe/pkg/statushooks"
1717
"github.com/turbot/steampipe/pkg/version"

‎cmd/service.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/spf13/cobra"
1515
"github.com/spf13/viper"
1616
"github.com/turbot/go-kit/helpers"
17-
pconstants "github.com/turbot/pipe-fittings/constants"
18-
"github.com/turbot/pipe-fittings/querydisplay"
19-
putils "github.com/turbot/pipe-fittings/utils"
17+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
18+
"github.com/turbot/pipe-fittings/v2/querydisplay"
19+
putils "github.com/turbot/pipe-fittings/v2/utils"
2020
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
2121
"github.com/turbot/steampipe/pkg/cmdconfig"
2222
"github.com/turbot/steampipe/pkg/constants"

‎go.mod

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
module github.com/turbot/steampipe
22

3-
go 1.22.4
3+
go 1.23.1
4+
5+
toolchain go1.23.3
46

57
replace (
68
github.com/c-bata/go-prompt => github.com/turbot/go-prompt v0.2.6-steampipe.0.0.20221028122246-eb118ec58d50
7-
// github.com/turbot/pipe-fittings => ../pipe-fittings
9+
// github.com/turbot/pipe-fittings/v2 => ../pipe-fittings
810

911
)
1012

@@ -40,9 +42,9 @@ require (
4042
github.com/spf13/pflag v1.0.5
4143
github.com/spf13/viper v1.19.0
4244
github.com/thediveo/enumflag/v2 v2.0.5
43-
github.com/turbot/go-kit v0.10.0-rc.0
44-
github.com/turbot/pipe-fittings v1.6.0
45-
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.0
45+
github.com/turbot/go-kit v1.0.0
46+
github.com/turbot/pipe-fittings/v2 v2.1.1
47+
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.3
4648
github.com/turbot/terraform-components v0.0.0-20231213122222-1f3526cab7a7
4749
github.com/zclconf/go-cty v1.14.4 // indirect
4850
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
@@ -87,9 +89,9 @@ require (
8789
github.com/containerd/log v0.1.0 // indirect
8890
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
8991
github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
90-
github.com/dgraph-io/ristretto v0.1.1 // indirect
92+
github.com/dgraph-io/ristretto v0.2.0 // indirect
9193
github.com/dlclark/regexp2 v1.4.0 // indirect
92-
github.com/dustin/go-humanize v1.0.0 // indirect
94+
github.com/dustin/go-humanize v1.0.1 // indirect
9395
github.com/eko/gocache/lib/v4 v4.1.6 // indirect
9496
github.com/eko/gocache/store/bigcache/v4 v4.2.1 // indirect
9597
github.com/eko/gocache/store/ristretto/v4 v4.2.1 // indirect
@@ -105,7 +107,6 @@ require (
105107
github.com/go-playground/universal-translator v0.18.1 // indirect
106108
github.com/go-playground/validator/v10 v10.20.0 // indirect
107109
github.com/goccy/go-yaml v1.11.2 // indirect
108-
github.com/golang/glog v1.2.1 // indirect
109110
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
110111
github.com/golang/mock v1.6.0 // indirect
111112
github.com/golang/protobuf v1.5.4 // indirect
@@ -153,7 +154,6 @@ require (
153154
github.com/prometheus/client_model v0.3.0 // indirect
154155
github.com/prometheus/common v0.37.0 // indirect
155156
github.com/rivo/uniseg v0.2.0 // indirect
156-
github.com/robfig/cron/v3 v3.0.1 // indirect
157157
github.com/rs/xid v1.5.0 // indirect
158158
github.com/sagikazarmark/locafero v0.4.0 // indirect
159159
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -165,8 +165,8 @@ require (
165165
github.com/subosito/gotenv v1.6.0 // indirect
166166
github.com/tklauser/numcpus v0.3.0 // indirect
167167
github.com/tkrajina/go-reflector v0.5.6 // indirect
168-
github.com/turbot/pipes-sdk-go v0.9.1 // indirect
169-
github.com/turbot/steampipe-plugin-code v0.7.0 // indirect
168+
github.com/turbot/pipes-sdk-go v0.12.0 // indirect
169+
github.com/turbot/steampipe-plugin-code v1.0.1-alpha.1 // indirect
170170
github.com/ulikunitz/xz v0.5.10 // indirect
171171
github.com/xlab/treeprint v1.2.0 // indirect
172172
github.com/zclconf/go-cty-yaml v1.0.3 // indirect

‎go.sum

+16-21
Original file line numberDiff line numberDiff line change
@@ -302,14 +302,14 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
302302
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
303303
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
304304
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
305-
github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
306-
github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
307-
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
308-
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
305+
github.com/dgraph-io/ristretto v0.2.0 h1:XAfl+7cmoUDWW/2Lx8TGZQjjxIQ2Ley9DSf52dru4WE=
306+
github.com/dgraph-io/ristretto v0.2.0/go.mod h1:8uBHCU/PBV4Ag0CJrP47b9Ofby5dqWNh4FicAdoqFNU=
307+
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
308+
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
309309
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
310310
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
311-
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
312-
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
311+
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
312+
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
313313
github.com/eko/gocache/lib/v4 v4.1.6 h1:5WWIGISKhE7mfkyF+SJyWwqa4Dp2mkdX8QsZpnENqJI=
314314
github.com/eko/gocache/lib/v4 v4.1.6/go.mod h1:HFxC8IiG2WeRotg09xEnPD72sCheJiTSr4Li5Ameg7g=
315315
github.com/eko/gocache/store/bigcache/v4 v4.2.1 h1:xf9R5HZqmrfT4+NzlJPQJQUWftfWW06FHbjz4IEjE08=
@@ -389,8 +389,6 @@ github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7a
389389
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
390390
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
391391
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
392-
github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=
393-
github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
394392
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
395393
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
396394
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -705,8 +703,6 @@ github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5
705703
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
706704
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
707705
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
708-
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
709-
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
710706
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
711707
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
712708
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
@@ -775,18 +771,18 @@ github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2bi
775771
github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
776772
github.com/tkrajina/go-reflector v0.5.6 h1:hKQ0gyocG7vgMD2M3dRlYN6WBBOmdoOzJ6njQSepKdE=
777773
github.com/tkrajina/go-reflector v0.5.6/go.mod h1:ECbqLgccecY5kPmPmXg1MrHW585yMcDkVl6IvJe64T4=
778-
github.com/turbot/go-kit v0.10.0-rc.0 h1:kd+jp2ibbIV33Hc8SsMAN410Dl9Pz6SJ40axbKUlSoA=
779-
github.com/turbot/go-kit v0.10.0-rc.0/go.mod h1:fFQqR59I5z5JeeBLfK1PjSifn4Oprs3NiQx0CxeSJxs=
774+
github.com/turbot/go-kit v1.0.0 h1:TeVYepMyPMpiQ8GxmZcth9h1CzKRshWK+X9JGKAnXOo=
775+
github.com/turbot/go-kit v1.0.0/go.mod h1:vPk4gTUM8HhYGdzfKKLrPeZgnjLVBin41uqxjHScz6k=
780776
github.com/turbot/go-prompt v0.2.6-steampipe.0.0.20221028122246-eb118ec58d50 h1:zs87uA6QZsYLk4RRxDOIxt8ro/B2V6HzoMWm05Lo7ao=
781777
github.com/turbot/go-prompt v0.2.6-steampipe.0.0.20221028122246-eb118ec58d50/go.mod h1:vFnjEGDIIA/Lib7giyE4E9c50Lvl8j0S+7FVlAwDAVw=
782-
github.com/turbot/pipe-fittings v1.6.0 h1:sn4OJPQQR0fggKMNUuyvShJipZG/Ze5jR48Hl12Eokg=
783-
github.com/turbot/pipe-fittings v1.6.0/go.mod h1:1nlRVh18QkYy9eq5pW9gpnoE2VgnQW0Y2zKzrH8Q4kI=
784-
github.com/turbot/pipes-sdk-go v0.9.1 h1:2yRojY2wymvJn6NQyE6A0EDFV267MNe+yDLxPVvsBwM=
785-
github.com/turbot/pipes-sdk-go v0.9.1/go.mod h1:Mb+KhvqqEdRbz/6TSZc2QWDrMa5BN3E4Xw+gPt2TRkc=
786-
github.com/turbot/steampipe-plugin-code v0.7.0 h1:SROYIo/TI/Q/YNfXK+sAIS71umypUFm1Uz851TmoJkM=
787-
github.com/turbot/steampipe-plugin-code v0.7.0/go.mod h1:GvdjncWum4sZNmR0iM03SKkIzl7aZKAFtIsyAR+z4YI=
788-
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.0 h1:/X81yp9eLp4qhkXTbbYgxASvMViWUc49LHEoH93LZqo=
789-
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.0/go.mod h1:xXCv6EDYQSKBTblEDra3nI9ZuVBnaeVJzsNTQzFngFI=
778+
github.com/turbot/pipe-fittings/v2 v2.1.1 h1:sV6bviX7WH3zivi45n29+ui+I9tJLlFNCNA2rOpw6/U=
779+
github.com/turbot/pipe-fittings/v2 v2.1.1/go.mod h1:mGFH8dfDQOdv+d1fNL2r3ex+qlnVrTi3xGKZRVxoCEU=
780+
github.com/turbot/pipes-sdk-go v0.12.0 h1:esbbR7bALa5L8n/hqroMPaQSSo3gNM/4X0iTmHa3D6U=
781+
github.com/turbot/pipes-sdk-go v0.12.0/go.mod h1:Mb+KhvqqEdRbz/6TSZc2QWDrMa5BN3E4Xw+gPt2TRkc=
782+
github.com/turbot/steampipe-plugin-code v1.0.1-alpha.1 h1:mN0k0SGAN0pqPh92QZfJIzFzXuz6TiMALnLLLgCqnTI=
783+
github.com/turbot/steampipe-plugin-code v1.0.1-alpha.1/go.mod h1:Dhkl99FVa9eHbBbHgyy0Zf6jj7eVjZZujyqore+RHmQ=
784+
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.3 h1:/b+ZUVydvkvjtNB0LbzVkDoWy/GB0qrucAxiUg4yznM=
785+
github.com/turbot/steampipe-plugin-sdk/v5 v5.11.3/go.mod h1:zI1JuJjVV+tiqK1MbOfEfeyHJzONRQh/NEYVXEOyd4o=
790786
github.com/turbot/terraform-components v0.0.0-20231213122222-1f3526cab7a7 h1:qDMxFVd8Zo0rIhnEBdCIbR+T6WgjwkxpFZMN8zZmmjg=
791787
github.com/turbot/terraform-components v0.0.0-20231213122222-1f3526cab7a7/go.mod h1:5hzpfalEjfcJWp9yq75/EZoEu2Mzm34eJAPm3HOW2tw=
792788
github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
@@ -1072,7 +1068,6 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
10721068
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10731069
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10741070
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1075-
golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10761071
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10771072
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10781073
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=

‎main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/hashicorp/go-version"
1313
_ "github.com/jackc/pgx/v5/stdlib"
1414
"github.com/turbot/go-kit/helpers"
15-
"github.com/turbot/pipe-fittings/utils"
15+
"github.com/turbot/pipe-fittings/v2/utils"
1616
"github.com/turbot/steampipe/cmd"
1717
"github.com/turbot/steampipe/pkg/cmdconfig"
1818
"github.com/turbot/steampipe/pkg/constants"

‎pkg/cmdconfig/app_specific.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package cmdconfig
22

33
import (
4-
pfilepaths "github.com/turbot/pipe-fittings/filepaths"
54
"os"
65

6+
pfilepaths "github.com/turbot/pipe-fittings/v2/filepaths"
7+
78
"github.com/turbot/go-kit/files"
8-
"github.com/turbot/pipe-fittings/app_specific"
9-
"github.com/turbot/pipe-fittings/error_helpers"
9+
"github.com/turbot/pipe-fittings/v2/app_specific"
10+
"github.com/turbot/pipe-fittings/v2/error_helpers"
1011
"github.com/turbot/steampipe/pkg/constants"
1112
"github.com/turbot/steampipe/pkg/version"
1213
)

‎pkg/cmdconfig/builder.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"github.com/spf13/cobra"
77
"github.com/spf13/pflag"
88
"github.com/spf13/viper"
9-
pconstants "github.com/turbot/pipe-fittings/constants"
10-
"github.com/turbot/pipe-fittings/utils"
9+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
10+
"github.com/turbot/pipe-fittings/v2/utils"
1111
"github.com/turbot/steampipe/pkg/constants"
1212
)
1313

‎pkg/cmdconfig/cmd_hooks.go

+18-11
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,31 @@ import (
44
"bytes"
55
"context"
66
"fmt"
7-
pfilepaths "github.com/turbot/pipe-fittings/filepaths"
87
"io"
98
"log"
109
"os"
1110
"runtime/debug"
11+
"slices"
1212
"strings"
1313
"time"
1414

15+
pfilepaths "github.com/turbot/pipe-fittings/v2/filepaths"
16+
1517
"github.com/fatih/color"
1618
"github.com/hashicorp/go-hclog"
1719
"github.com/mattn/go-isatty"
1820
"github.com/spf13/cobra"
1921
"github.com/spf13/viper"
2022
filehelpers "github.com/turbot/go-kit/files"
21-
"github.com/turbot/go-kit/helpers"
2223
"github.com/turbot/go-kit/logging"
23-
"github.com/turbot/pipe-fittings/app_specific"
24-
pconstants "github.com/turbot/pipe-fittings/constants"
25-
perror_helpers "github.com/turbot/pipe-fittings/error_helpers"
26-
"github.com/turbot/pipe-fittings/parse"
27-
"github.com/turbot/pipe-fittings/pipes"
28-
"github.com/turbot/pipe-fittings/utils"
29-
"github.com/turbot/pipe-fittings/versionfile"
30-
"github.com/turbot/pipe-fittings/workspace_profile"
24+
"github.com/turbot/pipe-fittings/v2/app_specific"
25+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
26+
perror_helpers "github.com/turbot/pipe-fittings/v2/error_helpers"
27+
"github.com/turbot/pipe-fittings/v2/parse"
28+
"github.com/turbot/pipe-fittings/v2/pipes"
29+
"github.com/turbot/pipe-fittings/v2/utils"
30+
"github.com/turbot/pipe-fittings/v2/versionfile"
31+
"github.com/turbot/pipe-fittings/v2/workspace_profile"
3132
sdklogging "github.com/turbot/steampipe-plugin-sdk/v5/logging"
3233
"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
3334
"github.com/turbot/steampipe-plugin-sdk/v5/sperr"
@@ -314,6 +315,12 @@ func getWorkspaceProfileLoader(ctx context.Context) (*parse.WorkspaceProfileLoad
314315
return nil, err
315316
}
316317

318+
// TODO look at unifying this with `GetWorkspaceProfileLoader` func in pipe-fittings/v2/cmdconfig
319+
// https://github.com/turbot/steampipe/issues/4486
320+
if err = loader.Load(); err != nil {
321+
return nil, err
322+
}
323+
317324
return loader, nil
318325
}
319326

@@ -322,7 +329,7 @@ func getWorkspaceProfileLoader(ctx context.Context) (*parse.WorkspaceProfileLoad
322329
func validateConfig() perror_helpers.ErrorAndWarnings {
323330
var res = perror_helpers.ErrorAndWarnings{}
324331
telemetry := viper.GetString(pconstants.ArgTelemetry)
325-
if !helpers.StringSliceContains(constants.TelemetryLevels, telemetry) {
332+
if !slices.Contains(constants.TelemetryLevels, telemetry) {
326333
res.Error = sperr.New(`invalid value of 'telemetry' (%s), must be one of: %s`, telemetry, strings.Join(constants.TelemetryLevels, ", "))
327334
return res
328335
}

‎pkg/cmdconfig/diagnostics.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"encoding/json"
55
"fmt"
66
"os"
7+
"slices"
78
"sort"
89
"strings"
910

1011
"github.com/spf13/viper"
11-
"github.com/turbot/go-kit/helpers"
1212
"github.com/turbot/steampipe/pkg/constants"
1313
"github.com/turbot/steampipe/pkg/error_helpers"
1414
)
@@ -22,7 +22,7 @@ func DisplayConfig() {
2222
}
2323
diagnostics = strings.ToLower(diagnostics)
2424
configFormats := []string{"config", "config_json"}
25-
if !helpers.StringSliceContains(configFormats, diagnostics) {
25+
if !slices.Contains(configFormats, diagnostics) {
2626
error_helpers.ShowWarning("invalid value for STEAMPIPE_CONFIG_DUMP, expected values: config,config_json")
2727
return
2828
}

‎pkg/cmdconfig/validate.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77

88
"github.com/spf13/viper"
99
filehelpers "github.com/turbot/go-kit/files"
10-
pconstants "github.com/turbot/pipe-fittings/constants"
11-
"github.com/turbot/pipe-fittings/pipes"
12-
"github.com/turbot/pipe-fittings/steampipeconfig"
10+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
11+
"github.com/turbot/pipe-fittings/v2/pipes"
12+
"github.com/turbot/pipe-fittings/v2/steampipeconfig"
1313
"github.com/turbot/steampipe/pkg/error_helpers"
1414
)
1515

‎pkg/cmdconfig/viper.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ package cmdconfig
22

33
import (
44
"fmt"
5-
pfilepaths "github.com/turbot/pipe-fittings/filepaths"
65
"log"
76
"os"
87

8+
pfilepaths "github.com/turbot/pipe-fittings/v2/filepaths"
9+
910
"github.com/spf13/cobra"
1011
"github.com/spf13/viper"
1112
filehelpers "github.com/turbot/go-kit/files"
1213
"github.com/turbot/go-kit/types"
13-
pconstants "github.com/turbot/pipe-fittings/constants"
14-
"github.com/turbot/pipe-fittings/parse"
15-
"github.com/turbot/pipe-fittings/workspace_profile"
14+
pconstants "github.com/turbot/pipe-fittings/v2/constants"
15+
"github.com/turbot/pipe-fittings/v2/parse"
16+
"github.com/turbot/pipe-fittings/v2/workspace_profile"
1617
"github.com/turbot/steampipe/pkg/constants"
1718
)
1819

0 commit comments

Comments
 (0)