Skip to content

Commit 1f67986

Browse files
author
Marcos Lorenzo
authored
Merge pull request ml0renz0#3 from mlorenzo-stratio/upgrade
Upgrade go.mod
2 parents 4eb3f64 + 0d8325a commit 1f67986

File tree

700 files changed

+78259
-22600
lines changed

Some content is hidden

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

700 files changed

+78259
-22600
lines changed

go.mod

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,45 @@ module github.com/mlorenzo-stratio/openldap_exporter
33
go 1.18
44

55
require (
6-
github.com/go-kit/log v0.2.0
7-
github.com/prometheus/client_golang v1.12.1
8-
github.com/prometheus/exporter-toolkit v0.7.3
9-
github.com/sirupsen/logrus v1.8.1
10-
github.com/urfave/cli/v2 v2.4.0
11-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
6+
github.com/go-kit/log v0.2.1
7+
github.com/prometheus/client_golang v1.14.0
8+
github.com/prometheus/exporter-toolkit v0.8.2
9+
github.com/sirupsen/logrus v1.9.0
10+
github.com/urfave/cli/v2 v2.24.4
11+
golang.org/x/sync v0.1.0
1212
gopkg.in/ldap.v2 v2.5.1
1313
)
1414

1515
require (
16-
github.com/BurntSushi/toml v0.3.1 // indirect
16+
github.com/BurntSushi/toml v1.2.1 // indirect
1717
github.com/beorn7/perks v1.0.1 // indirect
18-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
19-
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
20-
github.com/go-logfmt/logfmt v0.5.1 // indirect
18+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
19+
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
20+
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
21+
github.com/go-logfmt/logfmt v0.6.0 // indirect
2122
github.com/golang/protobuf v1.5.2 // indirect
2223
github.com/jpillora/backoff v1.0.0 // indirect
23-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
24+
github.com/json-iterator/go v1.1.12 // indirect
25+
github.com/kr/pretty v0.3.1 // indirect
26+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
27+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
28+
github.com/modern-go/reflect2 v1.0.2 // indirect
2429
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
25-
github.com/pkg/errors v0.9.1 // indirect
26-
github.com/prometheus/client_model v0.2.0 // indirect
27-
github.com/prometheus/common v0.32.1 // indirect
28-
github.com/prometheus/procfs v0.7.3 // indirect
30+
github.com/prometheus/client_model v0.3.0 // indirect
31+
github.com/prometheus/common v0.40.0 // indirect
32+
github.com/prometheus/procfs v0.9.0 // indirect
2933
github.com/russross/blackfriday/v2 v2.1.0 // indirect
30-
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272 // indirect
31-
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect
32-
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
33-
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
34-
golang.org/x/text v0.3.7 // indirect
35-
google.golang.org/appengine v1.6.6 // indirect
36-
google.golang.org/protobuf v1.27.1 // indirect
34+
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
35+
golang.org/x/crypto v0.6.0 // indirect
36+
golang.org/x/net v0.7.0 // indirect
37+
golang.org/x/oauth2 v0.5.0 // indirect
38+
golang.org/x/sys v0.5.0 // indirect
39+
golang.org/x/text v0.7.0 // indirect
40+
google.golang.org/appengine v1.6.7 // indirect
41+
google.golang.org/protobuf v1.28.1 // indirect
3742
gopkg.in/asn1-ber.v1 v1.5.4 // indirect
3843
gopkg.in/yaml.v2 v2.4.0 // indirect
44+
gopkg.in/yaml.v3 v3.0.1 // indirect
3945
)
4046

4147
replace gopkg.in/asn1-ber.v1 => github.com/go-asn1-ber/asn1-ber v1.5.4

go.sum

Lines changed: 66 additions & 465 deletions
Large diffs are not rendered by default.

server.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ func showVersion(w http.ResponseWriter, r *http.Request) {
4848

4949
func (s *Server) Start() error {
5050
s.logger.WithField("addr", s.server.Addr).Info("starting http listener")
51-
err := web.ListenAndServe(s.server, s.cfgPath, kitlog.LoggerFunc(s.adaptor))
51+
serverAddress := []string{s.server.Addr}
52+
useSystemdSocket := false
53+
var flags web.FlagConfig = web.FlagConfig{
54+
WebListenAddresses: &serverAddress,
55+
WebSystemdSocket: &useSystemdSocket,
56+
WebConfigFile: &s.cfgPath,
57+
}
58+
err := web.ListenAndServe(s.server, &flags, kitlog.LoggerFunc(s.adaptor))
5259
if errors.Is(err, http.ErrServerClosed) {
5360
return nil
5461
}

vendor/github.com/BurntSushi/toml/.gitignore

Lines changed: 2 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/BurntSushi/toml/.travis.yml

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

vendor/github.com/BurntSushi/toml/COMPATIBLE

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

vendor/github.com/BurntSushi/toml/Makefile

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

0 commit comments

Comments
 (0)