Skip to content

Commit 9f82684

Browse files
sboulkourclaude
andcommitted
refactor: fold host settings translation into translateListenerHeaderSettings
Handle headers.host alongside the other HeaderSettings sub-fields instead of through a separate helper and call site. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Signed-off-by: Salim Boulkour <salim.boulkour@algolia.com>
1 parent f82d5e8 commit 9f82684

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

internal/gatewayapi/clienttrafficpolicy.go

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -697,11 +697,6 @@ func (t *Translator) translateClientTrafficPolicyForListener(
697697
// Translate Path Settings
698698
translatePathSettings(policy.Spec.Path, httpIR)
699699

700-
// Translate Host Settings
701-
if policy.Spec.Headers != nil {
702-
translateHostSettings(policy.Spec.Headers.Host, httpIR)
703-
}
704-
705700
// Translate HTTP1 Settings
706701
if err = translateHTTP1Settings(policy.Spec.HTTP1, connection, httpIR); err != nil {
707702
err = perr.WithMessage(err, "HTTP1")
@@ -844,18 +839,6 @@ func translatePathSettings(pathSettings *egv1a1.PathSettings, httpIR *ir.HTTPLis
844839
}
845840
}
846841

847-
func translateHostSettings(hostSettings *egv1a1.HostSettings, httpIR *ir.HTTPListener) {
848-
if hostSettings == nil {
849-
return
850-
}
851-
if hostSettings.StripTrailingHostDot == nil {
852-
return
853-
}
854-
httpIR.Host = &ir.HostSettings{
855-
StripTrailingHostDot: ptr.Deref(hostSettings.StripTrailingHostDot, false),
856-
}
857-
}
858-
859842
func buildClientTimeout(clientTimeout *egv1a1.ClientTimeout) (*ir.ClientTimeout, error) {
860843
// Return early if not set
861844
if clientTimeout == nil {
@@ -942,6 +925,12 @@ func translateListenerHeaderSettings(headerSettings *egv1a1.HeaderSettings, http
942925
}
943926
}
944927

928+
if headerSettings.Host != nil && headerSettings.Host.StripTrailingHostDot != nil {
929+
httpIR.Host = &ir.HostSettings{
930+
StripTrailingHostDot: ptr.Deref(headerSettings.Host.StripTrailingHostDot, false),
931+
}
932+
}
933+
945934
var errs error
946935

947936
if headerSettings.EarlyRequestHeaders != nil {

0 commit comments

Comments
 (0)