Skip to content

Commit 3743d31

Browse files
Merge pull request #540 from jacobweinstock/basic-grcp-server-smoke-test
Tink Server: Add basic smoke test for gRPC server:
2 parents 42e5ad1 + 848badd commit 3743d31

File tree

5 files changed

+667
-32
lines changed

5 files changed

+667
-32
lines changed

cmd/tink-server/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"github.com/tinkerbell/tink/db"
1919
rpcServer "github.com/tinkerbell/tink/grpc-server"
2020
httpServer "github.com/tinkerbell/tink/http-server"
21+
"github.com/tinkerbell/tink/metrics"
2122
)
2223

2324
var (
@@ -133,6 +134,7 @@ func NewRootCommand(config *DaemonConfig, logger log.Logger) *cobra.Command {
133134
// the most aggressive way we have to guarantee that
134135
// the old way works as before.
135136
config.PopulateFromLegacyEnvVar()
137+
metrics.SetupMetrics(config.Facility, logger)
136138

137139
logger.Info("starting version " + version)
138140

go.mod

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ require (
1010
github.com/golang/protobuf v1.5.2
1111
github.com/google/go-cmp v0.5.6
1212
github.com/google/uuid v1.2.0
13-
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
13+
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
1414
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1515
github.com/grpc-ecosystem/grpc-gateway v1.16.0
1616
github.com/jedib0t/go-pretty v4.3.0+incompatible
17-
github.com/lib/pq v1.2.1-0.20191011153232-f91d3411e481
18-
github.com/mattn/go-isatty v0.0.12 // indirect
17+
github.com/ktr0731/evans v0.10.0
18+
github.com/lib/pq v1.10.1
1919
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
2020
github.com/packethost/pkg v0.0.0-20200903155310-0433e0605550
2121
github.com/pkg/errors v0.9.1
2222
github.com/prometheus/client_golang v1.11.0
2323
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351
24-
github.com/sirupsen/logrus v1.8.1
2524
github.com/spf13/cobra v1.2.1
2625
github.com/spf13/pflag v1.0.5
2726
github.com/spf13/viper v1.8.1

0 commit comments

Comments
 (0)