From 1cc59bd0cf3f39cef3778c82b2122a1bfaf12923 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Wed, 10 Mar 2021 11:56:07 -0500 Subject: [PATCH] Merge pull request #9851 from panascais-forks/fix-wan-ipv6-key Fix advertise_addr_wan_ipv6 configuration key --- .changelog/9851.txt | 3 +++ agent/config/config.go | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .changelog/9851.txt diff --git a/.changelog/9851.txt b/.changelog/9851.txt new file mode 100644 index 0000000000..4e1338a652 --- /dev/null +++ b/.changelog/9851.txt @@ -0,0 +1,3 @@ +```release-note:bug +config: correct config key from `advertise_addr_ipv6` to `advertise_addr_wan_ipv6` +``` diff --git a/agent/config/config.go b/agent/config/config.go index 3e0710380b..da03d69038 100644 --- a/agent/config/config.go +++ b/agent/config/config.go @@ -4,9 +4,10 @@ import ( "encoding/json" "fmt" - "github.com/hashicorp/consul/lib/decode" "github.com/hashicorp/hcl" "github.com/mitchellh/mapstructure" + + "github.com/hashicorp/consul/lib/decode" ) const ( @@ -141,7 +142,7 @@ type Config struct { AdvertiseAddrLANIPv6 *string `json:"advertise_addr_ipv6,omitempty" hcl:"advertise_addr_ipv6" mapstructure:"advertise_addr_ipv6"` AdvertiseAddrWAN *string `json:"advertise_addr_wan,omitempty" hcl:"advertise_addr_wan" mapstructure:"advertise_addr_wan"` AdvertiseAddrWANIPv4 *string `json:"advertise_addr_wan_ipv4,omitempty" hcl:"advertise_addr_wan_ipv4" mapstructure:"advertise_addr_wan_ipv4"` - AdvertiseAddrWANIPv6 *string `json:"advertise_addr_wan_ipv6,omitempty" hcl:"advertise_addr_wan_ipv6" mapstructure:"advertise_addr_ipv6"` + AdvertiseAddrWANIPv6 *string `json:"advertise_addr_wan_ipv6,omitempty" hcl:"advertise_addr_wan_ipv6" mapstructure:"advertise_addr_wan_ipv6"` AutoConfig AutoConfigRaw `json:"auto_config,omitempty" hcl:"auto_config" mapstructure:"auto_config"` Autopilot Autopilot `json:"autopilot,omitempty" hcl:"autopilot" mapstructure:"autopilot"` BindAddr *string `json:"bind_addr,omitempty" hcl:"bind_addr" mapstructure:"bind_addr"`