status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixup missed config entry 

Signed-off-by: Mark Anderson <manderson@hashicorp.com>
This commit is contained in:
Mark Anderson 2022-05-02 09:35:25 -07:00
parent d7e7cb09dc
commit fee6c7a7b6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agent/structs/config_entry_mesh.go
View File

@ -35,10 +35,6 @@ type MeshTLSConfig struct {
Outgoing *MeshDirectionalTLSConfig `json:",omitempty"` Outgoing *MeshDirectionalTLSConfig `json:",omitempty"`
} }
type MeshHTTPConfig struct {
SanitizeXForwardedClientCert bool `json:",omitempty"`
}
type MeshDirectionalTLSConfig struct { type MeshDirectionalTLSConfig struct {
TLSMinVersion types.TLSVersion `json:",omitempty" alias:"tls_min_version"` TLSMinVersion types.TLSVersion `json:",omitempty" alias:"tls_min_version"`
TLSMaxVersion types.TLSVersion `json:",omitempty" alias:"tls_max_version"` TLSMaxVersion types.TLSVersion `json:",omitempty" alias:"tls_max_version"`

10
api/config_entry_mesh.go
View File

@ -1,6 +1,8 @@
package api package api
import "encoding/json" import (
"encoding/json"
)
// MeshConfigEntry manages the global configuration for all service mesh // MeshConfigEntry manages the global configuration for all service mesh
// proxies. // proxies.
@ -19,6 +21,8 @@ type MeshConfigEntry struct {
TLS *MeshTLSConfig `json:",omitempty"` TLS *MeshTLSConfig `json:",omitempty"`
HTTP *MeshHTTPConfig `json:",omitempty"`
Meta map[string]string `json:",omitempty"` Meta map[string]string `json:",omitempty"`
// CreateIndex is the Raft index this entry was created at. This is a // CreateIndex is the Raft index this entry was created at. This is a
@ -46,6 +50,10 @@ type MeshDirectionalTLSConfig struct {
CipherSuites []string `json:",omitempty" alias:"cipher_suites"` CipherSuites []string `json:",omitempty" alias:"cipher_suites"`
} }
type MeshHTTPConfig struct {
SanitizeXForwardedClientCert bool `alias:"sanitize_x_forwarded_client_cert"`
}
func (e *MeshConfigEntry) GetKind() string { return MeshConfig } func (e *MeshConfigEntry) GetKind() string { return MeshConfig }
func (e *MeshConfigEntry) GetName() string { return MeshConfigMesh } func (e *MeshConfigEntry) GetName() string { return MeshConfigMesh }
func (e *MeshConfigEntry) GetPartition() string { return e.Partition } func (e *MeshConfigEntry) GetPartition() string { return e.Partition }