refactor(config): remove GetConfig and its last uses

0xERR0R · Nov 23, 2023 · e4be0c0 · e4be0c0
1 parent 23359d1
commit e4be0c0
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 25 deletions.
diff --git a/config/config.go b/config/config.go
@@ -538,14 +538,6 @@ func (cfg *Config) migrate(logger *logrus.Entry) bool {
 	return usesDepredOpts
 }
 
-// GetConfig returns the current config
-func GetConfig() *Config {
-	cfgLock.RLock()
-	defer cfgLock.RUnlock()
-
-	return config
-}
-
 // ConvertPort converts string representation into a valid port (0 - 65535)
 func ConvertPort(in string) (uint16, error) {
 	const (

diff --git a/config/config_test.go b/config/config_test.go
@@ -799,8 +799,6 @@ func defaultTestFileConfig() {
 	Expect(config.Caching.MinCachingTime).Should(BeZero())
 
 	Expect(config.MinTLSServeVer).Should(Equal("1.3"))
-
-	Expect(GetConfig()).Should(Not(BeNil()))
 }
 
 func writeConfigYml(tmpDir *helpertest.TmpFolder) *helpertest.TmpFile {

diff --git a/resolver/bootstrap.go b/resolver/bootstrap.go
@@ -124,7 +124,7 @@ func (b *Bootstrap) resolveUpstream(ctx context.Context, r Resolver, host string
 		ctx, cancel := context.WithTimeout(ctx, b.timeout)
 		defer cancel()
 
-		return b.systemResolver.LookupIP(ctx, config.GetConfig().ConnectIPVersion.Net(), host)
+		return b.systemResolver.LookupIP(ctx, b.connectIPVersion.Net(), host)
 	}
 
 	if ips, ok := b.bootstraped[r]; ok {

diff --git a/resolver/strict_resolver_test.go b/resolver/strict_resolver_test.go
@@ -61,8 +61,6 @@ var _ = Describe("StrictResolver", Label("strictResolver"), func() {
 		sut, err = NewStrictResolver(ctx, sutConfig, bootstrap)
 	})
 
-	config.GetConfig().Upstreams.Timeout = config.Duration(time.Second)
-
 	Describe("IsEnabled", func() {
 		It("is true", func() {
 			Expect(sut.IsEnabled()).Should(BeTrue())
@@ -167,9 +165,10 @@ var _ = Describe("StrictResolver", Label("strictResolver"), func() {
 				})
 				When("first upstream exceeds upstreamTimeout", func() {
 					BeforeEach(func() {
+						timeout := sut.cfg.Timeout.ToDuration()
 						testUpstream1 := NewMockUDPUpstreamServer().WithAnswerFn(func(request *dns.Msg) (response *dns.Msg) {
 							response, err := util.NewMsgWithAnswer("example.com", 123, A, "123.124.122.1")
-							time.Sleep(time.Duration(config.GetConfig().Upstreams.Timeout) + 2*time.Second)
+							time.Sleep(2 * timeout)
 
 							Expect(err).To(Succeed())
 
@@ -195,9 +194,10 @@ var _ = Describe("StrictResolver", Label("strictResolver"), func() {
 				})
 				When("all upstreams exceed upsteamTimeout", func() {
 					BeforeEach(func() {
+						timeout := sut.cfg.Timeout.ToDuration()
 						testUpstream1 := NewMockUDPUpstreamServer().WithAnswerFn(func(request *dns.Msg) (response *dns.Msg) {
 							response, err := util.NewMsgWithAnswer("example.com", 123, A, "123.124.122.1")
-							time.Sleep(config.GetConfig().Upstreams.Timeout.ToDuration() + 2*time.Second)
+							time.Sleep(2 * timeout)
 
 							Expect(err).To(Succeed())
 
@@ -207,7 +207,7 @@ var _ = Describe("StrictResolver", Label("strictResolver"), func() {
 
 						testUpstream2 := NewMockUDPUpstreamServer().WithAnswerFn(func(request *dns.Msg) (response *dns.Msg) {
 							response, err := util.NewMsgWithAnswer("example.com", 123, A, "123.124.122.2")
-							time.Sleep(config.GetConfig().Upstreams.Timeout.ToDuration() + 2*time.Second)
+							time.Sleep(2 * timeout)
 
 							Expect(err).To(Succeed())
 

diff --git a/server/server.go b/server/server.go
@@ -56,8 +56,8 @@ func logger() *logrus.Entry {
 	return log.PrefixedLog("server")
 }
 
-func minTLSVersion() uint16 {
-	minTLSVer := config.GetConfig().MinTLSServeVer
+func minTLSVersion(cfg *config.Config) uint16 {
+	minTLSVer := cfg.MinTLSServeVer
 	switch minTLSVer {
 	case "1.2":
 		return tls.VersionTLS12
@@ -210,7 +210,7 @@ func createServers(cfg *config.Config, cert tls.Certificate) ([]*dns.Server, err
 		addServers(createUDPServer, cfg.Ports.DNS),
 		addServers(createTCPServer, cfg.Ports.DNS),
 		addServers(func(address string) (*dns.Server, error) {
-			return createTLSServer(address, cert)
+			return createTLSServer(cfg, address, cert)
 		}, cfg.Ports.TLS))
 
 	return dnsServers, err.ErrorOrNil()
@@ -245,14 +245,14 @@ func newListeners(proto string, addresses config.ListenConfig) ([]net.Listener,
 	return listeners, nil
 }
 
-func createTLSServer(address string, cert tls.Certificate) (*dns.Server, error) {
+func createTLSServer(cfg *config.Config, address string, cert tls.Certificate) (*dns.Server, error) {
 	return &dns.Server{
 		Addr: address,
 		Net:  "tcp-tls",
 		//nolint:gosec
 		TLSConfig: &tls.Config{
 			Certificates: []tls.Certificate{cert},
-			MinVersion:   minTLSVersion(),
+			MinVersion:   minTLSVersion(cfg),
 			CipherSuites: tlsCipherSuites(),
 		},
 		Handler: dns.NewServeMux(),
@@ -524,7 +524,7 @@ func (s *Server) Start(ctx context.Context, errCh chan<- error) {
 				WriteTimeout:      writeTimeout,
 				//nolint:gosec
 				TLSConfig: &tls.Config{
-					MinVersion:   minTLSVersion(),
+					MinVersion:   minTLSVersion(s.cfg),
 					CipherSuites: tlsCipherSuites(),
 					Certificates: []tls.Certificate{s.cert},
 				},

diff --git a/server/server_test.go b/server/server_test.go
@@ -179,9 +179,6 @@ var _ = BeforeSuite(func() {
 		},
 	}
 
-	// Hacky but needed to update the global since we still have code that reads it
-	*config.GetConfig() = *cfg
-
 	// create server
 	sut, err = NewServer(ctx, cfg)
 	Expect(err).Should(Succeed())