Skip to content

Commit 3e06a84

Browse files
PMM-7961 Updated expoter_shared version (#42)
1 parent 9279e96 commit 3e06a84

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

cmd/postgres_exporter/postgres_exporter_test.go

+3-7
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ import (
1818
// Hook up gocheck into the "go test" runner.
1919
func Test(t *testing.T) { TestingT(t) }
2020

21-
type FunctionalSuite struct {
22-
}
21+
type FunctionalSuite struct{}
2322

2423
var _ = Suite(&FunctionalSuite{})
2524

2625
func (s *FunctionalSuite) SetUpSuite(c *C) {
27-
2826
}
2927

3028
func (s *FunctionalSuite) TestSemanticVersionColumnDiscard(c *C) {
@@ -111,7 +109,7 @@ func (s *FunctionalSuite) TestEnvironmentSettingWithSecretsFiles(c *C) {
111109
c.Assert(err, IsNil)
112110
defer UnsetEnvironment(c, "DATA_SOURCE_URI")
113111

114-
var expected = "postgresql://custom_username$&+,%2F%3A;=%3F%40:custom_password$&+,%2F%3A;=%3F%40@localhost:5432/?sslmode=disable"
112+
expected := "postgresql://custom_username$&+,%2F%3A;=%3F%40:custom_password$&+,%2F%3A;=%3F%40@localhost:5432/?sslmode=disable"
115113

116114
dsn := getDataSources()
117115
if len(dsn) == 0 {
@@ -165,7 +163,7 @@ func (s *FunctionalSuite) TestEnvironmentSettingWithDnsAndSecrets(c *C) {
165163
// test DSN including SSL enabled
166164
func (s *FunctionalSuite) TestSSL(c *C) {
167165
// Thr driver doesn't support sslmode=prefer
168-
envDsn := "postgresql://root:root@localhost:5433/?sslmode=require"
166+
envDsn := "host=127.0.0.1 port=5433 user=root password=root database=postgres sslmode=require"
169167
err := os.Setenv("DATA_SOURCE_NAME", envDsn)
170168
c.Assert(err, IsNil)
171169
defer UnsetEnvironment(c, "DATA_SOURCE_NAME")
@@ -196,7 +194,6 @@ func (s *FunctionalSuite) TestSSL(c *C) {
196194

197195
db, err := sql.Open("postgres", dsn[0])
198196
c.Assert(err, IsNil)
199-
//v95 := semver.MustParse("9.5.0")
200197
version, err := postgresVersion(db)
201198
c.Assert(err, IsNil)
202199
if version < 90500 {
@@ -328,7 +325,6 @@ func UnsetEnvironment(c *C, d string) {
328325

329326
// test boolean metric type gets converted to float
330327
func (s *FunctionalSuite) TestBooleanConversionToValueAndString(c *C) {
331-
332328
type TestCase struct {
333329
input interface{}
334330
expectedString string

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/golang/protobuf v1.5.2 // indirect
99
github.com/google/go-querystring v1.1.0 // indirect
1010
github.com/lib/pq v1.9.0
11-
github.com/percona/exporter_shared v0.7.2
11+
github.com/percona/exporter_shared v0.7.3
1212
github.com/percona/postgres_exporter v0.4.6 // indirect
1313
github.com/prometheus/client_golang v1.10.0
1414
github.com/prometheus/client_model v0.2.0

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI
302302
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
303303
github.com/percona/exporter_shared v0.7.2 h1:8eNBht83bgFagdiIm3b4HbsOFc5du6OUBCUVenTumdw=
304304
github.com/percona/exporter_shared v0.7.2/go.mod h1:AWk9lgTPzI7tC5PzpeBGvhhqjSJNxpPNFaF7qLIJqmo=
305+
github.com/percona/exporter_shared v0.7.3 h1:TX4LisZ08jo8KIlekBTwPX13JlM6gOOKgmwg7QEf+r8=
306+
github.com/percona/exporter_shared v0.7.3/go.mod h1:AWk9lgTPzI7tC5PzpeBGvhhqjSJNxpPNFaF7qLIJqmo=
305307
github.com/percona/postgres_exporter v0.4.6 h1:/x0qAgP7fzmle/MS3sPKt+3FW94amnUqTJtlibgGNSk=
306308
github.com/percona/postgres_exporter v0.4.6/go.mod h1:n1QU5O3iehITC/jEOGg1G0U/yKalDDmQVrELcjDMafw=
307309
github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=

0 commit comments

Comments
 (0)