From f40af5396531cf257ff0130142d55f115d86ffcc Mon Sep 17 00:00:00 2001 From: Kwitsch Date: Mon, 20 Nov 2023 22:00:48 +0000 Subject: [PATCH 1/6] ECSConfig -> ECS --- config/config.go | 2 +- config/ecs.go | 8 ++++---- config/ecs_test.go | 8 ++++---- resolver/ecs_resolver.go | 4 ++-- resolver/ecs_resolver_test.go | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/config/config.go b/config/config.go index 0b885e65b..bcc9db8cc 100644 --- a/config/config.go +++ b/config/config.go @@ -211,7 +211,7 @@ type Config struct { FqdnOnly FqdnOnlyConfig `yaml:"fqdnOnly"` Filtering FilteringConfig `yaml:"filtering"` Ede EdeConfig `yaml:"ede"` - ECS ECSConfig `yaml:"ecs"` + ECS ECS `yaml:"ecs"` SUDN SUDNConfig `yaml:"specialUseDomains"` // Deprecated options diff --git a/config/ecs.go b/config/ecs.go index 042098d54..936a57fb8 100644 --- a/config/ecs.go +++ b/config/ecs.go @@ -42,8 +42,8 @@ func (x *ECSv6Mask) UnmarshalText(text []byte) error { return nil } -// ECSConfig is the configuration of the ECS resolver -type ECSConfig struct { +// ECS is the configuration of the ECS resolver +type ECS struct { UseAsClient bool `yaml:"useAsClient" default:"false"` Forward bool `yaml:"forward" default:"false"` IPv4Mask ECSv4Mask `yaml:"ipv4Mask" default:"0"` @@ -51,12 +51,12 @@ type ECSConfig struct { } // IsEnabled returns true if the ECS resolver is enabled -func (c *ECSConfig) IsEnabled() bool { +func (c *ECS) IsEnabled() bool { return c.UseAsClient || c.Forward || c.IPv4Mask > 0 || c.IPv6Mask > 0 } // LogConfig logs the configuration -func (c *ECSConfig) LogConfig(logger *logrus.Entry) { +func (c *ECS) LogConfig(logger *logrus.Entry) { logger.Infof("Use as client = %t", c.UseAsClient) logger.Infof("Forward = %t", c.Forward) logger.Infof("IPv4 netmask = %d", c.IPv4Mask) diff --git a/config/ecs_test.go b/config/ecs_test.go index 372ccc055..b6165c6eb 100644 --- a/config/ecs_test.go +++ b/config/ecs_test.go @@ -8,9 +8,9 @@ import ( "gopkg.in/yaml.v2" ) -var _ = Describe("ECSConfig", func() { +var _ = Describe("ECS", func() { var ( - c ECSConfig + c ECS err error ) @@ -26,7 +26,7 @@ var _ = Describe("ECSConfig", func() { }) }) - When("UseEcsAsClient is true", func() { + When("UseAsClient is true", func() { BeforeEach(func() { c.UseAsClient = true }) @@ -36,7 +36,7 @@ var _ = Describe("ECSConfig", func() { }) }) - When("ForwardEcs is true", func() { + When("Forward is true", func() { BeforeEach(func() { c.Forward = true }) diff --git a/resolver/ecs_resolver.go b/resolver/ecs_resolver.go index 9a2415500..16086ebf3 100644 --- a/resolver/ecs_resolver.go +++ b/resolver/ecs_resolver.go @@ -31,13 +31,13 @@ type ECSMask interface { // ECSResolver is responsible for adding the EDNS Client Subnet information as EDNS0 option. type ECSResolver struct { - configurable[*config.ECSConfig] + configurable[*config.ECS] NextResolver typed } // NewECSResolver creates new resolver instance which adds the subnet information as EDNS0 option -func NewECSResolver(cfg config.ECSConfig) ChainedResolver { +func NewECSResolver(cfg config.ECS) ChainedResolver { return &ECSResolver{ configurable: withConfig(&cfg), typed: withType("extended_client_subnet"), diff --git a/resolver/ecs_resolver_test.go b/resolver/ecs_resolver_test.go index b10efb774..7d6507d8e 100644 --- a/resolver/ecs_resolver_test.go +++ b/resolver/ecs_resolver_test.go @@ -19,7 +19,7 @@ import ( var _ = Describe("EcsResolver", func() { var ( sut *ECSResolver - sutConfig config.ECSConfig + sutConfig config.ECS m *mockResolver mockAnswer *dns.Msg err error From 743229a3b4f620bfe982291ed39c8babd10d5e9f Mon Sep 17 00:00:00 2001 From: Kwitsch Date: Mon, 20 Nov 2023 22:05:11 +0000 Subject: [PATCH 2/6] EdeConfig -> EDE --- config/config.go | 4 ++-- resolver/ede_resolver.go | 4 ++-- resolver/ede_resolver_test.go | 6 +++--- server/server.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/config.go b/config/config.go index bcc9db8cc..3146f2749 100644 --- a/config/config.go +++ b/config/config.go @@ -210,7 +210,7 @@ type Config struct { HostsFile HostsFileConfig `yaml:"hostsFile"` FqdnOnly FqdnOnlyConfig `yaml:"fqdnOnly"` Filtering FilteringConfig `yaml:"filtering"` - Ede EdeConfig `yaml:"ede"` + EDE EDE `yaml:"ede"` ECS ECS `yaml:"ecs"` SUDN SUDNConfig `yaml:"specialUseDomains"` @@ -275,7 +275,7 @@ type RedisConfig struct { type ( FqdnOnlyConfig = toEnable - EdeConfig = toEnable + EDE = toEnable ) type toEnable struct { diff --git a/resolver/ede_resolver.go b/resolver/ede_resolver.go index f6b507ff0..6e70043cd 100644 --- a/resolver/ede_resolver.go +++ b/resolver/ede_resolver.go @@ -9,14 +9,14 @@ import ( // A EdeResolver is responsible for adding the reason for the response as EDNS0 option type EdeResolver struct { - configurable[*config.EdeConfig] + configurable[*config.EDE] NextResolver typed } // NewEdeResolver creates new resolver instance which adds the reason for // the response as EDNS0 option to the response if it is enabled in the configuration -func NewEdeResolver(cfg config.EdeConfig) *EdeResolver { +func NewEdeResolver(cfg config.EDE) *EdeResolver { return &EdeResolver{ configurable: withConfig(&cfg), typed: withType("extended_error_code"), diff --git a/resolver/ede_resolver_test.go b/resolver/ede_resolver_test.go index cad90600b..5741c4fd2 100644 --- a/resolver/ede_resolver_test.go +++ b/resolver/ede_resolver_test.go @@ -21,7 +21,7 @@ import ( var _ = Describe("EdeResolver", func() { var ( sut *EdeResolver - sutConfig config.EdeConfig + sutConfig config.EDE m *mockResolver mockAnswer *dns.Msg ) @@ -52,7 +52,7 @@ var _ = Describe("EdeResolver", func() { When("ede is disabled", func() { BeforeEach(func() { - sutConfig = config.EdeConfig{ + sutConfig = config.EDE{ Enable: false, } }) @@ -79,7 +79,7 @@ var _ = Describe("EdeResolver", func() { When("ede is enabled", func() { BeforeEach(func() { - sutConfig = config.EdeConfig{ + sutConfig = config.EDE{ Enable: true, } }) diff --git a/server/server.go b/server/server.go index a091b6f35..4cd129f4e 100644 --- a/server/server.go +++ b/server/server.go @@ -417,7 +417,7 @@ func createQueryResolver( resolver.NewFqdnOnlyResolver(cfg.FqdnOnly), resolver.NewECSResolver(cfg.ECS), clientNames, - resolver.NewEdeResolver(cfg.Ede), + resolver.NewEdeResolver(cfg.EDE), resolver.NewQueryLoggingResolver(ctx, cfg.QueryLog), resolver.NewMetricsResolver(cfg.Prometheus), resolver.NewRewriterResolver(cfg.CustomDNS.RewriterConfig, resolver.NewCustomDNSResolver(cfg.CustomDNS)), From 6a816e8779394fc0c7787ea6ce7ced66fe5e69ad Mon Sep 17 00:00:00 2001 From: Kwitsch Date: Mon, 20 Nov 2023 22:10:04 +0000 Subject: [PATCH 3/6] EdeResolver -> EDEResolver --- resolver/ede_resolver.go | 14 +++++++------- resolver/ede_resolver_test.go | 4 ++-- server/server.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resolver/ede_resolver.go b/resolver/ede_resolver.go index 6e70043cd..740d81221 100644 --- a/resolver/ede_resolver.go +++ b/resolver/ede_resolver.go @@ -7,17 +7,17 @@ import ( "github.com/miekg/dns" ) -// A EdeResolver is responsible for adding the reason for the response as EDNS0 option -type EdeResolver struct { +// A EDEResolver is responsible for adding the reason for the response as EDNS0 option +type EDEResolver struct { configurable[*config.EDE] NextResolver typed } -// NewEdeResolver creates new resolver instance which adds the reason for +// NewEDEResolver creates new resolver instance which adds the reason for // the response as EDNS0 option to the response if it is enabled in the configuration -func NewEdeResolver(cfg config.EDE) *EdeResolver { - return &EdeResolver{ +func NewEDEResolver(cfg config.EDE) *EDEResolver { + return &EDEResolver{ configurable: withConfig(&cfg), typed: withType("extended_error_code"), } @@ -25,7 +25,7 @@ func NewEdeResolver(cfg config.EDE) *EdeResolver { // Resolve adds the reason as EDNS0 option to the response of the next resolver // if it is enabled in the configuration -func (r *EdeResolver) Resolve(request *model.Request) (*model.Response, error) { +func (r *EDEResolver) Resolve(request *model.Request) (*model.Response, error) { if !r.cfg.Enable { return r.next.Resolve(request) } @@ -41,7 +41,7 @@ func (r *EdeResolver) Resolve(request *model.Request) (*model.Response, error) { } // addExtraReasoning adds the reason for the response as EDNS0 option -func (r *EdeResolver) addExtraReasoning(res *model.Response) { +func (r *EDEResolver) addExtraReasoning(res *model.Response) { infocode := res.RType.ToExtendedErrorCode() if infocode == dns.ExtendedErrorCodeOther { diff --git a/resolver/ede_resolver_test.go b/resolver/ede_resolver_test.go index 5741c4fd2..4c0036c32 100644 --- a/resolver/ede_resolver_test.go +++ b/resolver/ede_resolver_test.go @@ -20,7 +20,7 @@ import ( var _ = Describe("EdeResolver", func() { var ( - sut *EdeResolver + sut *EDEResolver sutConfig config.EDE m *mockResolver mockAnswer *dns.Msg @@ -46,7 +46,7 @@ var _ = Describe("EdeResolver", func() { }, nil) } - sut = NewEdeResolver(sutConfig) + sut = NewEDEResolver(sutConfig) sut.Next(m) }) diff --git a/server/server.go b/server/server.go index 4cd129f4e..b68fd8c41 100644 --- a/server/server.go +++ b/server/server.go @@ -417,7 +417,7 @@ func createQueryResolver( resolver.NewFqdnOnlyResolver(cfg.FqdnOnly), resolver.NewECSResolver(cfg.ECS), clientNames, - resolver.NewEdeResolver(cfg.EDE), + resolver.NewEDEResolver(cfg.EDE), resolver.NewQueryLoggingResolver(ctx, cfg.QueryLog), resolver.NewMetricsResolver(cfg.Prometheus), resolver.NewRewriterResolver(cfg.CustomDNS.RewriterConfig, resolver.NewCustomDNSResolver(cfg.CustomDNS)), From 5dfee67504e14bd95b403ba1edc0e6bf1b72f84a Mon Sep 17 00:00:00 2001 From: Kwitsch Date: Mon, 20 Nov 2023 22:12:52 +0000 Subject: [PATCH 4/6] SUDNConfig -> SUDN --- config/config.go | 2 +- config/sudn.go | 8 ++++---- config/sudn_test.go | 4 ++-- resolver/sudn_resolver.go | 14 +++++++------- resolver/sudn_resolver_test.go | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/config.go b/config/config.go index 3146f2749..8c6fba187 100644 --- a/config/config.go +++ b/config/config.go @@ -212,7 +212,7 @@ type Config struct { Filtering FilteringConfig `yaml:"filtering"` EDE EDE `yaml:"ede"` ECS ECS `yaml:"ecs"` - SUDN SUDNConfig `yaml:"specialUseDomains"` + SUDN SUDN `yaml:"specialUseDomains"` // Deprecated options Deprecated struct { diff --git a/config/sudn.go b/config/sudn.go index bf18a05c4..6f65bb060 100644 --- a/config/sudn.go +++ b/config/sudn.go @@ -4,8 +4,8 @@ import ( "github.com/sirupsen/logrus" ) -// SUDNConfig configuration for Special Use Domain Names -type SUDNConfig struct { +// SUDN configuration for Special Use Domain Names +type SUDN struct { // These are "recommended for private use" but not mandatory. // If a user wishes to use one, it will most likely be via conditional // upstream or custom DNS, which come before SUDN in the resolver chain. @@ -14,12 +14,12 @@ type SUDNConfig struct { } // IsEnabled implements `config.Configurable`. -func (c *SUDNConfig) IsEnabled() bool { +func (c *SUDN) IsEnabled() bool { // The Special Use RFCs are always active return true } // LogConfig implements `config.Configurable`. -func (c *SUDNConfig) LogConfig(logger *logrus.Entry) { +func (c *SUDN) LogConfig(logger *logrus.Entry) { logger.Debugf("rfc6762-appendixG = %v", c.RFC6762AppendixG) } diff --git a/config/sudn_test.go b/config/sudn_test.go index 350efa12f..705ebdd05 100644 --- a/config/sudn_test.go +++ b/config/sudn_test.go @@ -6,14 +6,14 @@ import ( ) var _ = Describe("SUDNConfig", func() { - var cfg SUDNConfig + var cfg SUDN suiteBeforeEach() BeforeEach(func() { var err error - cfg, err = WithDefaults[SUDNConfig]() + cfg, err = WithDefaults[SUDN]() Expect(err).Should(Succeed()) }) diff --git a/resolver/sudn_resolver.go b/resolver/sudn_resolver.go index f70c51a5f..adf1cce03 100644 --- a/resolver/sudn_resolver.go +++ b/resolver/sudn_resolver.go @@ -9,7 +9,7 @@ import ( "github.com/miekg/dns" ) -type sudnHandler = func(request *model.Request, cfg *config.SUDNConfig) *model.Response +type sudnHandler = func(request *model.Request, cfg *config.SUDN) *model.Response //nolint:gochecknoglobals var ( @@ -89,10 +89,10 @@ var ( type SpecialUseDomainNamesResolver struct { NextResolver typed - configurable[*config.SUDNConfig] + configurable[*config.SUDN] } -func NewSpecialUseDomainNamesResolver(cfg config.SUDNConfig) *SpecialUseDomainNamesResolver { +func NewSpecialUseDomainNamesResolver(cfg config.SUDN) *SpecialUseDomainNamesResolver { return &SpecialUseDomainNamesResolver{ typed: withType("special_use_domains"), configurable: withConfig(&cfg), @@ -134,11 +134,11 @@ func newSUDNResponse(response *model.Request, rcode int) *model.Response { return newResponse(response, rcode, model.ResponseTypeSPECIAL, "Special-Use Domain Name") } -func sudnNXDomain(request *model.Request, _ *config.SUDNConfig) *model.Response { +func sudnNXDomain(request *model.Request, _ *config.SUDN) *model.Response { return newSUDNResponse(request, dns.RcodeNameError) } -func sudnLocalhost(request *model.Request, cfg *config.SUDNConfig) *model.Response { +func sudnLocalhost(request *model.Request, cfg *config.SUDN) *model.Response { q := request.Req.Question[0] var rr dns.RR @@ -165,7 +165,7 @@ func sudnLocalhost(request *model.Request, cfg *config.SUDNConfig) *model.Respon return response } -func sudnRFC6762AppendixG(request *model.Request, cfg *config.SUDNConfig) *model.Response { +func sudnRFC6762AppendixG(request *model.Request, cfg *config.SUDN) *model.Response { if !cfg.RFC6762AppendixG { return nil } @@ -173,7 +173,7 @@ func sudnRFC6762AppendixG(request *model.Request, cfg *config.SUDNConfig) *model return sudnNXDomain(request, cfg) } -func sudnHomeArpa(request *model.Request, cfg *config.SUDNConfig) *model.Response { +func sudnHomeArpa(request *model.Request, cfg *config.SUDN) *model.Response { if request.Req.Question[0].Qtype == dns.TypeDS { // DS queries must be forwarded return nil diff --git a/resolver/sudn_resolver_test.go b/resolver/sudn_resolver_test.go index 1c004b203..d4a747be7 100644 --- a/resolver/sudn_resolver_test.go +++ b/resolver/sudn_resolver_test.go @@ -17,7 +17,7 @@ import ( var _ = Describe("SudnResolver", Label("sudnResolver"), func() { var ( sut *SpecialUseDomainNamesResolver - sutConfig config.SUDNConfig + sutConfig config.SUDN m *mockResolver ) @@ -30,7 +30,7 @@ var _ = Describe("SudnResolver", Label("sudnResolver"), func() { BeforeEach(func() { var err error - sutConfig, err = config.WithDefaults[config.SUDNConfig]() + sutConfig, err = config.WithDefaults[config.SUDN]() Expect(err).Should(Succeed()) }) From d41afe8a3b3c4d054250765a6a9e8831bc2f015b Mon Sep 17 00:00:00 2001 From: Kwitsch Date: Mon, 20 Nov 2023 22:15:35 +0000 Subject: [PATCH 5/6] FqdnOnlyConfig -> FQDNOnly --- config/config.go | 6 +++--- config/config_test.go | 2 +- resolver/fqdn_only_resolver.go | 4 ++-- resolver/fqdn_only_resolver_test.go | 6 +++--- server/server.go | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/config.go b/config/config.go index 8c6fba187..90c1ff16f 100644 --- a/config/config.go +++ b/config/config.go @@ -208,7 +208,7 @@ type Config struct { KeyFile string `yaml:"keyFile"` BootstrapDNS BootstrapDNSConfig `yaml:"bootstrapDns"` HostsFile HostsFileConfig `yaml:"hostsFile"` - FqdnOnly FqdnOnlyConfig `yaml:"fqdnOnly"` + FQDNOnly FQDNOnly `yaml:"fqdnOnly"` Filtering FilteringConfig `yaml:"filtering"` EDE EDE `yaml:"ede"` ECS ECS `yaml:"ecs"` @@ -274,8 +274,8 @@ type RedisConfig struct { } type ( - FqdnOnlyConfig = toEnable - EDE = toEnable + FQDNOnly = toEnable + EDE = toEnable ) type toEnable struct { diff --git a/config/config_test.go b/config/config_test.go index e59c2076b..06b982833 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -791,7 +791,7 @@ func defaultTestFileConfig() { Expect(config.Blocking.BlockTTL).Should(Equal(Duration(time.Minute))) Expect(config.Blocking.Loading.RefreshPeriod).Should(Equal(Duration(2 * time.Hour))) Expect(config.Filtering.QueryTypes).Should(HaveLen(2)) - Expect(config.FqdnOnly.Enable).Should(BeTrue()) + Expect(config.FQDNOnly.Enable).Should(BeTrue()) Expect(config.Caching.MaxCachingTime).Should(BeZero()) Expect(config.Caching.MinCachingTime).Should(BeZero()) diff --git a/resolver/fqdn_only_resolver.go b/resolver/fqdn_only_resolver.go index 25093f4b7..137b55236 100644 --- a/resolver/fqdn_only_resolver.go +++ b/resolver/fqdn_only_resolver.go @@ -10,12 +10,12 @@ import ( ) type FqdnOnlyResolver struct { - configurable[*config.FqdnOnlyConfig] + configurable[*config.FQDNOnly] NextResolver typed } -func NewFqdnOnlyResolver(cfg config.FqdnOnlyConfig) *FqdnOnlyResolver { +func NewFqdnOnlyResolver(cfg config.FQDNOnly) *FqdnOnlyResolver { return &FqdnOnlyResolver{ configurable: withConfig(&cfg), typed: withType("fqdn_only"), diff --git a/resolver/fqdn_only_resolver_test.go b/resolver/fqdn_only_resolver_test.go index 7838cc349..aab89e4b8 100644 --- a/resolver/fqdn_only_resolver_test.go +++ b/resolver/fqdn_only_resolver_test.go @@ -14,7 +14,7 @@ import ( var _ = Describe("FqdnOnlyResolver", func() { var ( sut *FqdnOnlyResolver - sutConfig config.FqdnOnlyConfig + sutConfig config.FQDNOnly m *mockResolver mockAnswer *dns.Msg ) @@ -54,7 +54,7 @@ var _ = Describe("FqdnOnlyResolver", func() { When("Fqdn only is enabled", func() { BeforeEach(func() { - sutConfig = config.FqdnOnlyConfig{Enable: true} + sutConfig = config.FQDNOnly{Enable: true} }) It("Should delegate to next resolver if request query is fqdn", func() { Expect(sut.Resolve(newRequest("example.com", A))). @@ -100,7 +100,7 @@ var _ = Describe("FqdnOnlyResolver", func() { When("Fqdn only is disabled", func() { BeforeEach(func() { - sutConfig = config.FqdnOnlyConfig{Enable: false} + sutConfig = config.FQDNOnly{Enable: false} }) It("Should delegate to next resolver if request query is fqdn", func() { Expect(sut.Resolve(newRequest("example.com", A))). diff --git a/server/server.go b/server/server.go index b68fd8c41..cb3730a80 100644 --- a/server/server.go +++ b/server/server.go @@ -414,7 +414,7 @@ func createQueryResolver( r = resolver.Chain( resolver.NewFilteringResolver(cfg.Filtering), - resolver.NewFqdnOnlyResolver(cfg.FqdnOnly), + resolver.NewFqdnOnlyResolver(cfg.FQDNOnly), resolver.NewECSResolver(cfg.ECS), clientNames, resolver.NewEDEResolver(cfg.EDE), From 36a7a9dfbc9985198a8495f411d7453efaec34af Mon Sep 17 00:00:00 2001 From: Kwitsch Date: Mon, 20 Nov 2023 22:17:23 +0000 Subject: [PATCH 6/6] FqdnOnlyResolver -> FQDNOnlyResolver --- resolver/fqdn_only_resolver.go | 8 ++++---- resolver/fqdn_only_resolver_test.go | 4 ++-- server/server.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resolver/fqdn_only_resolver.go b/resolver/fqdn_only_resolver.go index 137b55236..5a81a11bf 100644 --- a/resolver/fqdn_only_resolver.go +++ b/resolver/fqdn_only_resolver.go @@ -9,20 +9,20 @@ import ( "github.com/miekg/dns" ) -type FqdnOnlyResolver struct { +type FQDNOnlyResolver struct { configurable[*config.FQDNOnly] NextResolver typed } -func NewFqdnOnlyResolver(cfg config.FQDNOnly) *FqdnOnlyResolver { - return &FqdnOnlyResolver{ +func NewFQDNOnlyResolver(cfg config.FQDNOnly) *FQDNOnlyResolver { + return &FQDNOnlyResolver{ configurable: withConfig(&cfg), typed: withType("fqdn_only"), } } -func (r *FqdnOnlyResolver) Resolve(request *model.Request) (*model.Response, error) { +func (r *FQDNOnlyResolver) Resolve(request *model.Request) (*model.Response, error) { if r.IsEnabled() { domainFromQuestion := util.ExtractDomain(request.Req.Question[0]) if !strings.Contains(domainFromQuestion, ".") { diff --git a/resolver/fqdn_only_resolver_test.go b/resolver/fqdn_only_resolver_test.go index aab89e4b8..713d155ea 100644 --- a/resolver/fqdn_only_resolver_test.go +++ b/resolver/fqdn_only_resolver_test.go @@ -13,7 +13,7 @@ import ( var _ = Describe("FqdnOnlyResolver", func() { var ( - sut *FqdnOnlyResolver + sut *FQDNOnlyResolver sutConfig config.FQDNOnly m *mockResolver mockAnswer *dns.Msg @@ -30,7 +30,7 @@ var _ = Describe("FqdnOnlyResolver", func() { }) JustBeforeEach(func() { - sut = NewFqdnOnlyResolver(sutConfig) + sut = NewFQDNOnlyResolver(sutConfig) m = &mockResolver{} m.On("Resolve", mock.Anything).Return(&Response{Res: mockAnswer}, nil) sut.Next(m) diff --git a/server/server.go b/server/server.go index cb3730a80..5cfb3f2f2 100644 --- a/server/server.go +++ b/server/server.go @@ -414,7 +414,7 @@ func createQueryResolver( r = resolver.Chain( resolver.NewFilteringResolver(cfg.Filtering), - resolver.NewFqdnOnlyResolver(cfg.FQDNOnly), + resolver.NewFQDNOnlyResolver(cfg.FQDNOnly), resolver.NewECSResolver(cfg.ECS), clientNames, resolver.NewEDEResolver(cfg.EDE),