fix wrongly updated comments on DNSSetting export

client/internal/dns/file_linux.go

@@ -49,7 +49,7 @@ func (f *fileConfigurator) applyDNSConfig(config HostDNSConfig) error {
 				return fmt.Errorf("unable to configure DNS for this peer using file manager without a Primary nameserver group. Restoring the original file return err: %s", err)
 			}
 		}
-		return fmt.Errorf("unable to configure DNS for this peer using file manager without a nameserver group with all Domains configured")
+		return fmt.Errorf("unable to configure DNS for this peer using file manager without a nameserver group with all domains configured")
 	}
 
 	if !backupFileExist {
@@ -83,7 +83,7 @@ func (f *fileConfigurator) applyDNSConfig(config HostDNSConfig) error {
 		return fmt.Errorf("got an creating resolver file %s. Error: %s", defaultResolvConfPath, err)
 	}
 
-	log.Infof("created a NetBird managed %s file with your DNS settings. Added %d search Domains. Search list: %s", defaultResolvConfPath, len(searchDomainList), searchDomainList)
+	log.Infof("created a NetBird managed %s file with your DNS settings. Added %d search domains. Search list: %s", defaultResolvConfPath, len(searchDomainList), searchDomainList)
 	return nil
 }
 
@@ -177,7 +177,7 @@ func originalDNSConfigs(resolvconfFile string) (searchDomains, nameServers, othe
 			continue
 		}
 
-		if strings.HasPrefix(line, "Domain") {
+		if strings.HasPrefix(line, "domain") {
 			continue
 		}
 
@@ -233,15 +233,15 @@ func validateAndFillSearchDomains(initialLineChars int, s *[]string, vs []string
 		tmpCharsNumber := initialLineChars + 1 + len(sd)
 		if tmpCharsNumber > fileMaxLineCharsLimit {
 			// lets log all skipped Domains
-			log.Infof("search list line is larger than %d characters. Skipping append of %s Domain", fileMaxLineCharsLimit, sd)
+			log.Infof("search list line is larger than %d characters. Skipping append of %s domain", fileMaxLineCharsLimit, sd)
 			continue
 		}
 
 		initialLineChars = tmpCharsNumber
 
 		if len(*s) >= fileMaxNumberOfSearchDomains {
 			// lets log all skipped Domains
-			log.Infof("already appended %d Domains to search list. Skipping append of %s Domain", fileMaxNumberOfSearchDomains, sd)
+			log.Infof("already appended %d domains to search list. Skipping append of %s domain", fileMaxNumberOfSearchDomains, sd)
 			continue
 		}
 		*s = append(*s, sd)

client/internal/dns/file_linux_test.go

@@ -10,7 +10,7 @@ func Test_mergeSearchDomains(t *testing.T) {
 	originDomains := []string{"a", "b"}
 	mergedDomains := mergeSearchDomains(searchDomains, originDomains)
 	if len(mergedDomains) != 4 {
-		t.Errorf("invalid len of result Domains: %d, want: %d", len(mergedDomains), 4)
+		t.Errorf("invalid len of result domains: %d, want: %d", len(mergedDomains), 4)
 	}
 }
 
@@ -19,7 +19,7 @@ func Test_mergeSearchTooMuchDomains(t *testing.T) {
 	originDomains := []string{"h", "i"}
 	mergedDomains := mergeSearchDomains(searchDomains, originDomains)
 	if len(mergedDomains) != 6 {
-		t.Errorf("invalid len of result Domains: %d, want: %d", len(mergedDomains), 6)
+		t.Errorf("invalid len of result domains: %d, want: %d", len(mergedDomains), 6)
 	}
 }
 
@@ -28,7 +28,7 @@ func Test_mergeSearchTooMuchDomainsInOrigin(t *testing.T) {
 	originDomains := []string{"c", "d", "e", "f", "g"}
 	mergedDomains := mergeSearchDomains(searchDomains, originDomains)
 	if len(mergedDomains) != 6 {
-		t.Errorf("invalid len of result Domains: %d, want: %d", len(mergedDomains), 6)
+		t.Errorf("invalid len of result domains: %d, want: %d", len(mergedDomains), 6)
 	}
 }
 
@@ -37,15 +37,15 @@ func Test_mergeSearchTooLongDomain(t *testing.T) {
 	originDomains := []string{"b"}
 	mergedDomains := mergeSearchDomains(searchDomains, originDomains)
 	if len(mergedDomains) != 1 {
-		t.Errorf("invalid len of result Domains: %d, want: %d", len(mergedDomains), 1)
+		t.Errorf("invalid len of result domains: %d, want: %d", len(mergedDomains), 1)
 	}
 
 	searchDomains = []string{"b"}
 	originDomains = []string{getLongLine()}
 
 	mergedDomains = mergeSearchDomains(searchDomains, originDomains)
 	if len(mergedDomains) != 1 {
-		t.Errorf("invalid len of result Domains: %d, want: %d", len(mergedDomains), 1)
+		t.Errorf("invalid len of result domains: %d, want: %d", len(mergedDomains), 1)
 	}
 }
 

client/internal/dns/host_darwin.go

@@ -81,7 +81,7 @@ func (s *systemConfigurator) applyDNSConfig(config HostDNSConfig) error {
 	if len(matchDomains) != 0 {
 		err = s.addMatchDomains(matchKey, strings.Join(matchDomains, " "), config.ServerIP, config.ServerPort)
 	} else {
-		log.Infof("removing match Domains from the system")
+		log.Infof("removing match domains from the system")
 		err = s.removeKeyFromSystemConfig(matchKey)
 	}
 	if err != nil {
@@ -92,7 +92,7 @@ func (s *systemConfigurator) applyDNSConfig(config HostDNSConfig) error {
 	if len(searchDomains) != 0 {
 		err = s.addSearchDomains(searchKey, strings.Join(searchDomains, " "), config.ServerIP, config.ServerPort)
 	} else {
-		log.Infof("removing search Domains from the system")
+		log.Infof("removing search domains from the system")
 		err = s.removeKeyFromSystemConfig(searchKey)
 	}
 	if err != nil {
@@ -110,7 +110,7 @@ func (s *systemConfigurator) restoreHostDNS() error {
 		if strings.Contains(key, matchSuffix) {
 			keyType = "match"
 		}
-		log.Infof("removing %s Domains from system", keyType)
+		log.Infof("removing %s domains from system", keyType)
 	}
 	if s.primaryServiceID != "" {
 		lines += buildRemoveKeyOperation(getKeyWithInput(primaryServiceSetupKeyFormat, s.primaryServiceID))
@@ -143,7 +143,7 @@ func (s *systemConfigurator) addSearchDomains(key, domains string, ip string, po
 		return err
 	}
 
-	log.Infof("added %d search Domains to the state. Domain list: %s", len(strings.Split(domains, " ")), domains)
+	log.Infof("added %d search domains to the state. Domain list: %s", len(strings.Split(domains, " ")), domains)
 
 	s.createdKeys[key] = struct{}{}
 
@@ -156,7 +156,7 @@ func (s *systemConfigurator) addMatchDomains(key, domains, dnsServer string, por
 		return err
 	}
 
-	log.Infof("added %d match Domains to the state. Domain list: %s", len(strings.Split(domains, " ")), domains)
+	log.Infof("added %d match domains to the state. Domain list: %s", len(strings.Split(domains, " ")), domains)
 
 	s.createdKeys[key] = struct{}{}
 
@@ -178,7 +178,7 @@ func (s *systemConfigurator) addDNSState(state, domains, dnsServer string, port
 
 	_, err := runSystemConfigCommand(stdinCommands)
 	if err != nil {
-		return fmt.Errorf("got error while applying state for Domains %s, error: %s", domains, err)
+		return fmt.Errorf("got error while applying state for domains %s, error: %s", domains, err)
 	}
 	return nil
 }

client/internal/dns/host_windows.go

@@ -135,7 +135,7 @@ func (r *registryConfigurator) addDNSMatchPolicy(domains []string, ip string) er
 		return fmt.Errorf("unable to set registry value for %s, error: %s", dnsPolicyConfigConfigOptionsKey, err)
 	}
 
-	log.Infof("added %d match Domains to the state. Domain list: %s", len(domains), domains)
+	log.Infof("added %d match domains to the state. Domain list: %s", len(domains), domains)
 
 	return nil
 }
@@ -152,10 +152,10 @@ func (r *registryConfigurator) restoreHostDNS() error {
 func (r *registryConfigurator) updateSearchDomains(domains []string) error {
 	err := r.setInterfaceRegistryKeyStringValue(interfaceConfigSearchListKey, strings.Join(domains, ","))
 	if err != nil {
-		return fmt.Errorf("adding search Domain failed with error: %s", err)
+		return fmt.Errorf("adding search domain failed with error: %s", err)
 	}
 
-	log.Infof("updated the search Domains in the registry with %d Domains. Domain list: %s", len(domains), domains)
+	log.Infof("updated the search domains in the registry with %d domains. Domain list: %s", len(domains), domains)
 
 	return nil
 }

client/internal/dns/local_test.go

@@ -75,7 +75,7 @@ func TestLocalResolver_ServeDNS(t *testing.T) {
 
 			answerString := responseMSG.Answer[0].String()
 			if !strings.Contains(answerString, testCase.inputRecord.Name) {
-				t.Fatalf("answer doesn't contain the same Domain name: \nWant: %s\nGot:%s", testCase.name, answerString)
+				t.Fatalf("answer doesn't contain the same domain name: \nWant: %s\nGot:%s", testCase.name, answerString)
 			}
 			if !strings.Contains(answerString, dns.Type(testCase.inputRecord.Type).String()) {
 				t.Fatalf("answer doesn't contain the correct type: \nWant: %s\nGot:%s", dns.Type(testCase.inputRecord.Type).String(), answerString)

client/internal/dns/network_manager_linux.go

@@ -145,7 +145,7 @@ func (n *networkManagerDbusConfigurator) applyDNSConfig(config HostDNSConfig) er
 	connSettings[networkManagerDbusIPv4Key][networkManagerDbusDNSPriorityKey] = dbus.MakeVariant(priority)
 	connSettings[networkManagerDbusIPv4Key][networkManagerDbusDNSSearchKey] = dbus.MakeVariant(newDomainList)
 
-	log.Infof("adding %d search Domains and %d match Domains. Search list: %s , Match list: %s", len(searchDomains), len(matchDomains), searchDomains, matchDomains)
+	log.Infof("adding %d search domains and %d match domains. Search list: %s , Match list: %s", len(searchDomains), len(matchDomains), searchDomains, matchDomains)
 	err = n.reApplyConnectionSettings(connSettings, configVersion)
 	if err != nil {
 		return fmt.Errorf("got an error while reapplying the connection with new settings, error: %s", err)

client/internal/dns/resolvconf_linux.go

@@ -46,7 +46,7 @@ func (r *resolvconf) applyDNSConfig(config HostDNSConfig) error {
 		if err != nil {
 			log.Error(err)
 		}
-		return fmt.Errorf("unable to configure DNS for this peer using resolvconf manager without a nameserver group with all Domains configured")
+		return fmt.Errorf("unable to configure DNS for this peer using resolvconf manager without a nameserver group with all domains configured")
 	}
 
 	searchDomainList := searchDomains(config)
@@ -62,7 +62,7 @@ func (r *resolvconf) applyDNSConfig(config HostDNSConfig) error {
 		return err
 	}
 
-	log.Infof("added %d search Domains. Search list: %s", len(searchDomainList), searchDomainList)
+	log.Infof("added %d search domains. Search list: %s", len(searchDomainList), searchDomainList)
 	return nil
 }
 

client/internal/dns/server.go

@@ -344,7 +344,7 @@ func (s *DefaultServer) buildUpstreamHandlerUpdate(nameServerGroups []*nbdns.Nam
 			continue
 		}
 
-		// when upstream fails to resolve Domain several times over all it servers
+		// when upstream fails to resolve domain several times over all it servers
 		// it will calls this hook to exclude self from the configuration and
 		// reapply DNS settings, but it not touch the original configuration and serial number
 		// because it is temporal deactivation until next try
@@ -364,13 +364,13 @@ func (s *DefaultServer) buildUpstreamHandlerUpdate(nameServerGroups []*nbdns.Nam
 
 		if len(nsGroup.Domains) == 0 {
 			handler.stop()
-			return nil, fmt.Errorf("received a non primary nameserver group with an empty Domain list")
+			return nil, fmt.Errorf("received a non primary nameserver group with an empty domain list")
 		}
 
 		for _, domain := range nsGroup.Domains {
 			if domain == "" {
 				handler.stop()
-				return nil, fmt.Errorf("received a nameserver group with an empty Domain element")
+				return nil, fmt.Errorf("received a nameserver group with an empty domain element")
 			}
 			muxUpdates = append(muxUpdates, muxUpdate{
 				domain:  domain,

client/internal/dns/server_test.go

@@ -567,7 +567,7 @@ func TestDNSServerUpstreamDeactivateCallback(t *testing.T) {
 	}
 	got := strings.Join(domains, ",")
 	if expected != got {
-		t.Errorf("expected Domains list: %q, got %q", expected, got)
+		t.Errorf("expected domains list: %q, got %q", expected, got)
 	}
 
 	reactivate()
@@ -581,7 +581,7 @@ func TestDNSServerUpstreamDeactivateCallback(t *testing.T) {
 	}
 	got = strings.Join(domains, ",")
 	if expected != got {
-		t.Errorf("expected Domains list: %q, got %q", expected, domainsUpdate)
+		t.Errorf("expected domains list: %q, got %q", expected, domainsUpdate)
 	}
 }
 

client/internal/dns/service_listener.go

@@ -173,7 +173,7 @@ func (s *serviceViaListener) evalListenAddress() (string, int, error) {
 }
 
 // shouldApplyPortFwd decides whether to apply eBPF program to capture DNS traffic on port 53.
-// This is needed because on some operating systems if we start a DNS server not on a default port 53, the Domain name
+// This is needed because on some operating systems if we start a DNS server not on a default port 53, the domain name
 // resolution won't work.
 // So, in case we are running on Linux and picked a non-default port (53) we should fall back to the eBPF solution that will capture
 // traffic on port 53 and forward it to a local DNS server running on 5053.

client/internal/dns/systemd_linux.go

@@ -132,7 +132,7 @@ func (s *systemdDbusConfigurator) applyDNSConfig(config HostDNSConfig) error {
 		log.Infof("removing %s:%d as main DNS forwarder for this peer", config.ServerIP, config.ServerPort)
 	}
 
-	log.Infof("adding %d search Domains and %d match Domains. Search list: %s , Match list: %s", len(searchDomains), len(matchDomains), searchDomains, matchDomains)
+	log.Infof("adding %d search domains and %d match domains. Search list: %s , Match list: %s", len(searchDomains), len(matchDomains), searchDomains, matchDomains)
 	err = s.setDomainsForInterface(domainsInput)
 	if err != nil {
 		log.Error(err)
@@ -143,7 +143,7 @@ func (s *systemdDbusConfigurator) applyDNSConfig(config HostDNSConfig) error {
 func (s *systemdDbusConfigurator) setDomainsForInterface(domainsInput []systemdDbusLinkDomainsInput) error {
 	err := s.callLinkMethod(systemdDbusSetDomainsMethodSuffix, domainsInput)
 	if err != nil {
-		return fmt.Errorf("setting Domains configuration failed with error: %s", err)
+		return fmt.Errorf("setting domains configuration failed with error: %s", err)
 	}
 	return s.flushCaches()
 }