luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

fix(check): added missing OSService props

This commit is contained in:
Alessandro De Blasis 2022-09-21 13:10:21 +01:00
parent 6471184754
commit 6e99434215
4 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent/structs/structs.go
View File

@ -1792,6 +1792,7 @@ type HealthCheckDefinition struct {
TCP string `json:",omitempty"`
UDP string `json:",omitempty"`
H2PING string `json:",omitempty"`
OSService string `json:",omitempty"`
H2PingUseTLS bool `json:",omitempty"`
Interval time.Duration `json:",omitempty"`
OutputMaxSize uint `json:",omitempty"`
@ -1943,6 +1944,7 @@ func (c *HealthCheck) CheckType() *CheckType {
TCP: c.Definition.TCP,
UDP: c.Definition.UDP,
H2PING: c.Definition.H2PING,
OSService: c.Definition.OSService,
H2PingUseTLS: c.Definition.H2PingUseTLS,
Interval: c.Definition.Interval,
DockerContainerID: c.Definition.DockerContainerID,

1
agent/txn_endpoint.go
View File

@ -275,6 +275,7 @@ func (s *HTTPHandlers) convertOps(resp http.ResponseWriter, req *http.Request) (
TCP: check.Definition.TCP,
GRPC: check.Definition.GRPC,
GRPCUseTLS: check.Definition.GRPCUseTLS,
OSService: check.Definition.OSService,
Interval: interval,
Timeout: timeout,
DeregisterCriticalServiceAfter: deregisterCriticalServiceAfter,

1
api/health.go
View File

@ -64,6 +64,7 @@ type HealthCheckDefinition struct {
TCP string
UDP string
GRPC string
OSService string
GRPCUseTLS bool
IntervalDuration time.Duration `json:"-"`
TimeoutDuration time.Duration `json:"-"`

2
proto/pbservice/healthcheck.gen.go
View File

@ -144,6 +144,7 @@ func HealthCheckDefinitionToStructs(s *HealthCheckDefinition, t *structs.HealthC
t.TCP = s.TCP
t.UDP = s.UDP
t.H2PING = s.H2PING
t.OSService = s.OSService
t.H2PingUseTLS = s.H2PingUseTLS
t.Interval = structs.DurationFromProto(s.Interval)
t.OutputMaxSize = uint(s.OutputMaxSize)
@ -172,6 +173,7 @@ func HealthCheckDefinitionFromStructs(t *structs.HealthCheckDefinition, s *Healt
s.TCP = t.TCP
s.UDP = t.UDP
s.H2PING = t.H2PING
s.OSService = t.OSService
s.H2PingUseTLS = t.H2PingUseTLS
s.Interval = structs.DurationToProto(t.Interval)
s.OutputMaxSize = uint32(t.OutputMaxSize)