undo reversion from rebase

pull/20945/head
Sarah Alsmiller 8 months ago
parent f2d9989eea
commit 4b6ceb39a8

@ -518,6 +518,9 @@ type LinkedService struct {
// SNI is the optional name to specify during the TLS handshake with a linked service // SNI is the optional name to specify during the TLS handshake with a linked service
SNI string `json:",omitempty"` SNI string `json:",omitempty"`
//DisableAutoHostRewrite disables terminating gateways auto host rewrite feature when set to true.
DisableAutoHostRewrite bool `json:",omitempty"`
acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"` acl.EnterpriseMeta `hcl:",squash" mapstructure:",squash"`
} }
@ -668,6 +671,7 @@ type GatewayService struct {
FromWildcard bool `json:",omitempty"` FromWildcard bool `json:",omitempty"`
ServiceKind GatewayServiceKind `json:",omitempty"` ServiceKind GatewayServiceKind `json:",omitempty"`
RaftIndex RaftIndex
AutoHostRewrite bool `json:",omitempty"`
} }
type GatewayServices []*GatewayService type GatewayServices []*GatewayService
@ -715,14 +719,15 @@ func (g *GatewayService) Clone() *GatewayService {
Port: g.Port, Port: g.Port,
Protocol: g.Protocol, Protocol: g.Protocol,
// See https://github.com/go101/go101/wiki/How-to-efficiently-clone-a-slice%3F // See https://github.com/go101/go101/wiki/How-to-efficiently-clone-a-slice%3F
Hosts: append(g.Hosts[:0:0], g.Hosts...), Hosts: append(g.Hosts[:0:0], g.Hosts...),
CAFile: g.CAFile, CAFile: g.CAFile,
CertFile: g.CertFile, CertFile: g.CertFile,
KeyFile: g.KeyFile, KeyFile: g.KeyFile,
SNI: g.SNI, SNI: g.SNI,
FromWildcard: g.FromWildcard, FromWildcard: g.FromWildcard,
RaftIndex: g.RaftIndex, RaftIndex: g.RaftIndex,
ServiceKind: g.ServiceKind, ServiceKind: g.ServiceKind,
AutoHostRewrite: g.AutoHostRewrite,
} }
} }

Loading…
Cancel
Save