From fee6c7a7b6798e2994826c522cc4f12e7042f716 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Mon, 2 May 2022 09:35:25 -0700 Subject: [PATCH] Fixup missed config entry Signed-off-by: Mark Anderson --- agent/structs/config_entry_mesh.go | 4 ---- api/config_entry_mesh.go | 10 +++++++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/agent/structs/config_entry_mesh.go b/agent/structs/config_entry_mesh.go index be02735490..980b81ca5f 100644 --- a/agent/structs/config_entry_mesh.go +++ b/agent/structs/config_entry_mesh.go @@ -35,10 +35,6 @@ type MeshTLSConfig struct { Outgoing *MeshDirectionalTLSConfig `json:",omitempty"` } -type MeshHTTPConfig struct { - SanitizeXForwardedClientCert bool `json:",omitempty"` -} - type MeshDirectionalTLSConfig struct { TLSMinVersion types.TLSVersion `json:",omitempty" alias:"tls_min_version"` TLSMaxVersion types.TLSVersion `json:",omitempty" alias:"tls_max_version"` diff --git a/api/config_entry_mesh.go b/api/config_entry_mesh.go index 30fab166c5..406e87dfc8 100644 --- a/api/config_entry_mesh.go +++ b/api/config_entry_mesh.go @@ -1,6 +1,8 @@ package api -import "encoding/json" +import ( + "encoding/json" +) // MeshConfigEntry manages the global configuration for all service mesh // proxies. @@ -19,6 +21,8 @@ type MeshConfigEntry struct { TLS *MeshTLSConfig `json:",omitempty"` + HTTP *MeshHTTPConfig `json:",omitempty"` + Meta map[string]string `json:",omitempty"` // 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"` } +type MeshHTTPConfig struct { + SanitizeXForwardedClientCert bool `alias:"sanitize_x_forwarded_client_cert"` +} + func (e *MeshConfigEntry) GetKind() string { return MeshConfig } func (e *MeshConfigEntry) GetName() string { return MeshConfigMesh } func (e *MeshConfigEntry) GetPartition() string { return e.Partition }