Skip to content

Commit 709c234

Browse files
committed
Use GetEmptyAggregatorError from steampipe
v1.7.0-rc.2
1 parent 5071baf commit 709c234

File tree

5 files changed

+11
-30
lines changed

5 files changed

+11
-30
lines changed

go.mod

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,24 @@ require (
88
github.com/hashicorp/go-hclog v1.5.0
99
github.com/hashicorp/go-version v1.6.0 // indirect
1010
github.com/turbot/go-kit v0.6.0-alpha.1
11-
github.com/turbot/steampipe v0.20.0-alpha.6
11+
// async_refresh
12+
github.com/turbot/steampipe v1.7.0-rc.0.0.20230427143948-32b222151c67
1213
github.com/turbot/steampipe-plugin-sdk/v5 v5.4.0-rc.1
1314
go.opentelemetry.io/otel v1.10.0
1415
google.golang.org/protobuf v1.30.0
1516
)
1617

17-
require go.opentelemetry.io/otel/metric v0.30.0
18+
require (
19+
github.com/Masterminds/semver/v3 v3.2.1
20+
go.opentelemetry.io/otel/metric v0.30.0
21+
)
1822

1923
require (
2024
cloud.google.com/go v0.107.0 // indirect
2125
cloud.google.com/go/compute v1.15.1 // indirect
2226
cloud.google.com/go/compute/metadata v0.2.3 // indirect
2327
cloud.google.com/go/iam v0.8.0 // indirect
2428
cloud.google.com/go/storage v1.27.0 // indirect
25-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2629
github.com/aws/aws-sdk-go v1.44.183 // indirect
2730
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
2831
github.com/briandowns/spinner v1.23.0 // indirect
@@ -179,5 +182,4 @@ replace (
179182
github.com/deislabs/oras => github.com/oras-project/oras v0.9.0
180183
github.com/docker/distribution => github.com/distribution/distribution v2.7.1+incompatible
181184
github.com/docker/docker => github.com/moby/moby v20.10.17+incompatible
182-
183185
)

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -902,8 +902,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
902902
github.com/tombuildsstuff/giovanni v0.15.1/go.mod h1:0TZugJPEtqzPlMpuJHYfXY6Dq2uLPrXf98D2XQSxNbA=
903903
github.com/turbot/go-kit v0.6.0-alpha.1 h1:mm1QpkwknuJQfA7oKzyzMiDRx5GsKlzxwsNa7n+Ttj4=
904904
github.com/turbot/go-kit v0.6.0-alpha.1/go.mod h1:oP9gLk6bETL4nkEuujZZbOlcv9jnHQlf7DYcI/+Ke8Q=
905-
github.com/turbot/steampipe v0.20.0-alpha.6 h1:jaDPTHKZyTzmyzV9wuthpO5a/evAVyWH9JMwBz5ntKg=
906-
github.com/turbot/steampipe v0.20.0-alpha.6/go.mod h1:hhpIN8ARXlBEqhrt5o4+5Y1cnXMT6C7ll+OxLp7hYXU=
905+
github.com/turbot/steampipe v1.7.0-rc.0.0.20230427143948-32b222151c67 h1:M6uDo97Mh7PTEu0IOuYMHSwLYB5sZHgowlO47u4bz/o=
906+
github.com/turbot/steampipe v1.7.0-rc.0.0.20230427143948-32b222151c67/go.mod h1:hhpIN8ARXlBEqhrt5o4+5Y1cnXMT6C7ll+OxLp7hYXU=
907907
github.com/turbot/steampipe-plugin-sdk/v5 v5.4.0-rc.1 h1:X1mJovPJLyCiLDe12CN+XLoXica0elNz0LltSShn/WI=
908908
github.com/turbot/steampipe-plugin-sdk/v5 v5.4.0-rc.1/go.mod h1:bfvdKaLwemr13EPOMbnr7/hOQOO7m4oM7HnVMdNotgY=
909909
github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=

hub/errors.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

hub/hub.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package hub
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"log"
78
"os"
@@ -503,7 +504,7 @@ func (h *Hub) startScanForConnection(connectionName string, table string, qualMa
503504
connectionNames = connectionConfig.GetResolveConnectionNames()
504505
// if there are no connections, do not proceed
505506
if len(connectionNames) == 0 {
506-
return nil, getEmptyAggregatorError(connectionConfig)
507+
return nil, errors.New(connectionConfig.GetEmptyAggregatorError())
507508
}
508509
}
509510

version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var fdwVersion = "1.7.0"
1515
// A pre-release marker for the version. If this is "" (empty string)
1616
// then it means that it is a final release. Otherwise, this is a pre-release
1717
// such as "dev" (in development), "beta", "rc1", etc.
18-
var prerelease = "rc.1"
18+
var prerelease = "rc.2"
1919

2020
// FdwVersion is an instance of semver.Version. This has the secondary
2121
// benefit of verifying during tests and init time that our version is a

0 commit comments

Comments
 (0)