Skip to content

Commit

Permalink
Adapt healthcheck to new metal-lib. (#553)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gerrit91
Gerrit91 authored Aug 5, 2024
1 parent 5a5b2e4 commit c05e3f3
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 106 deletions.
14 changes: 7 additions & 7 deletions cmd/metal-api/internal/datastore/health.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/metal-stack/metal-lib/rest"
"github.com/metal-stack/metal-lib/pkg/healthstatus"
r "gopkg.in/rethinkdb/rethinkdb-go.v6"
)

Expand All @@ -13,18 +13,18 @@ func (rs *RethinkStore) ServiceName() string {
}

// Check implements the health interface and tests if the database is healthy.
func (rs *RethinkStore) Check(ctx context.Context) (rest.HealthResult, error) {
func (rs *RethinkStore) Check(ctx context.Context) (healthstatus.HealthResult, error) {
var version string

returnStatus := func(err error) (rest.HealthResult, error) {
returnStatus := func(err error) (healthstatus.HealthResult, error) {
if err != nil {
return rest.HealthResult{
Status: rest.HealthStatusUnhealthy,
return healthstatus.HealthResult{
Status: healthstatus.HealthStatusUnhealthy,
}, err
}

return rest.HealthResult{
Status: rest.HealthStatusHealthy,
return healthstatus.HealthResult{
Status: healthstatus.HealthStatusHealthy,
Message: fmt.Sprintf("connected to rethinkdb version: %s", version),
}, nil
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/metal-api/internal/datastore/health_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import (
"context"
"testing"

"github.com/metal-stack/metal-lib/rest"
"github.com/metal-stack/metal-lib/pkg/healthstatus"
"github.com/stretchr/testify/require"
)

func TestRethinkStore_Health(t *testing.T) {
result, err := sharedDS.Check(context.Background())
require.NoError(t, err)
require.Equal(t, rest.HealthStatusHealthy, result.Status)
require.Equal(t, healthstatus.HealthStatusHealthy, result.Status)
require.Contains(t, result.Message, "connected to rethinkdb version: rethinkdb")
}
14 changes: 7 additions & 7 deletions cmd/metal-api/internal/ipam/ipam.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"

"github.com/metal-stack/metal-api/cmd/metal-api/internal/metal"
"github.com/metal-stack/metal-lib/rest"
"github.com/metal-stack/metal-lib/pkg/healthstatus"

"connectrpc.com/connect"
goipam "github.com/metal-stack/go-ipam"
Expand All @@ -29,7 +29,7 @@ type IPAMer interface {
PrefixUsage(ctx context.Context, cidr string) (*metal.NetworkUsage, error)
PrefixesOverlapping(existingPrefixes metal.Prefixes, newPrefixes metal.Prefixes) error
// Required for healthcheck
Check(ctx context.Context) (rest.HealthResult, error)
Check(ctx context.Context) (healthstatus.HealthResult, error)
ServiceName() string
}

Expand Down Expand Up @@ -174,17 +174,17 @@ func (i *ipam) ServiceName() string {
return "ipam"
}

func (i *ipam) Check(ctx context.Context) (rest.HealthResult, error) {
func (i *ipam) Check(ctx context.Context) (healthstatus.HealthResult, error) {
resp, err := i.ip.Version(ctx, connect.NewRequest(&apiv1.VersionRequest{}))

if err != nil {
return rest.HealthResult{
Status: rest.HealthStatusUnhealthy,
return healthstatus.HealthResult{
Status: healthstatus.HealthStatusUnhealthy,
}, err
}

return rest.HealthResult{
Status: rest.HealthStatusHealthy,
return healthstatus.HealthResult{
Status: healthstatus.HealthStatusHealthy,
Message: fmt.Sprintf("connected to ipam service version:%q", resp.Msg.Revision),
}, nil
}
46 changes: 23 additions & 23 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
connectrpc.com/connect v1.16.2
github.com/Masterminds/semver/v3 v3.2.1
github.com/avast/retry-go/v4 v4.6.0
github.com/aws/aws-sdk-go v1.54.6
github.com/aws/aws-sdk-go v1.55.5
github.com/dustin/go-humanize v1.0.1
github.com/emicklei/go-restful-openapi/v2 v2.10.2
github.com/emicklei/go-restful/v3 v3.12.1
Expand All @@ -18,21 +18,21 @@ require (
github.com/juanfont/headscale v0.22.3
github.com/klauspost/connect-compress/v2 v2.0.0
github.com/looplab/fsm v1.0.2
github.com/metal-stack/go-ipam v1.14.3
github.com/metal-stack/go-ipam v1.14.5
github.com/metal-stack/masterdata-api v0.11.4
github.com/metal-stack/metal-lib v0.17.2
github.com/metal-stack/security v0.8.0
github.com/metal-stack/metal-lib v0.18.0
github.com/metal-stack/security v0.8.1
github.com/metal-stack/v v1.0.3
github.com/nsqio/go-nsq v1.1.0
github.com/prometheus/client_golang v1.19.1
github.com/samber/lo v1.39.0
github.com/samber/lo v1.46.0
github.com/spf13/cobra v1.8.1
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
github.com/testcontainers/testcontainers-go v0.31.0
github.com/testcontainers/testcontainers-go v0.32.0
github.com/undefinedlabs/go-mpatch v1.0.7
golang.org/x/crypto v0.25.0
golang.org/x/sync v0.7.0
golang.org/x/sync v0.8.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gopkg.in/rethinkdb/rethinkdb-go.v6 v6.2.2
Expand All @@ -55,15 +55,15 @@ require (
filippo.io/edwards25519 v1.1.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/Microsoft/hcsshim v0.12.4 // indirect
github.com/Microsoft/hcsshim v0.12.5 // indirect
github.com/akutz/memconn v0.1.0 // indirect
github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/containerd v1.7.19 // indirect
github.com/containerd/containerd v1.7.20 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/containerd/platforms v0.2.1 // indirect
github.com/coreos/go-oidc/v3 v3.10.0 // indirect
Expand All @@ -75,7 +75,7 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v26.1.4+incompatible // indirect
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
Expand Down Expand Up @@ -140,8 +140,8 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/sys/user v0.1.0 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/user v0.2.0 // indirect
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
Expand All @@ -163,7 +163,7 @@ require (
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/puzpuzpuz/xsync/v2 v2.5.1 // indirect
github.com/redis/go-redis/v9 v9.5.4 // indirect
github.com/redis/go-redis/v9 v9.6.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/rs/zerolog v1.33.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
Expand All @@ -187,11 +187,11 @@ require (
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.2 // indirect
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
go.mongodb.org/mongo-driver v1.16.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
Expand All @@ -201,15 +201,15 @@ require (
go.uber.org/zap v1.27.0 // indirect
go4.org/mem v0.0.0-20240501181205-ae6ca9944745 // indirect
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.5.0 // indirect; indirecct
golang.org/x/time v0.6.0 // indirect; indirecct
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf // indirect
gopkg.in/cenkalti/backoff.v2 v2.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
Expand Down
Loading

0 comments on commit c05e3f3

Please sign in to comment.