enable to specify -a muti times instead of use conmma

Author: wafuwafu13

check-dns/README.md

@@ -19,12 +19,12 @@ check-dns -H example.com -s 8.8.8.8
 Check IP-ADDRESS DNS server returns  
 If DNS server returns 1.1.1.1 and 2.2.2.2
 ```
--a 1.1.1.1, 2.2.2.2          -> OK  
--a 1.1.1.1, 2.2.2.2, 3.3.3.3 -> WARNING  
--a 1.1.1.1                   -> WARNING  
--a 1.1.1.1, 3.3.3.3          -> WARNING  
--a 3.3.3.3                   -> CRITICAL  
--a 3.3.3.3, 4.4.4.4, 5.5.5.5 -> CRITICAL  
+-a 1.1.1.1 -a 2.2.2.2            -> OK  
+-a 1.1.1.1 -a 2.2.2.2 -a 3.3.3.3 -> WARNING  
+-a 1.1.1.1                       -> WARNING  
+-a 1.1.1.1 -a 3.3.3.3            -> WARNING  
+-a 3.3.3.3                       -> CRITICAL  
+-a 3.3.3.3 -a 4.4.4.4 -a 5.5.5.5 -> CRITICAL  
 ```
 ```
 check-dns -H example.com -s 8.8.8.8 -a 93.184.216.34
@@ -69,7 +69,7 @@ command = ["check-dns", "-H", "example.com", "-s", "8.8.8.8"]
   -q, --querytype=        DNS record query type where TYPE =(A, AAAA, SRV, TXT, MX, ANY) (default: A)
   -c, --queryclass=       DNS record class type where TYPE =(IN, CS, CH, HS, NONE, ANY) (default: IN)
       --norec             Set not recursive mode
-  -a, --expected-address= IP-ADDRESS you expect the DNS server to return. If multiple addresses are returned at once, you have to match the whole string of addresses separated with commas
+  -a, --expected-address= IP-ADDRESS you expect the DNS server to return. If multiple addresses are returned at once, you have to specify whole string of addresses
 ```
 
 ## For more information

check-dns/lib/check_dns.go

@@ -13,13 +13,13 @@ import (
 )
 
 type dnsOpts struct {
-	Host            string `short:"H" long:"host" required:"true" description:"The name or address you want to query"`
-	Server          string `short:"s" long:"server" description:"DNS server you want to use for the lookup"`
-	Port            int    `short:"p" long:"port" default:"53" description:"Port number you want to use"`
-	QueryType       string `short:"q" long:"querytype" default:"A" description:"DNS record query type where TYPE =(A, AAAA, SRV, TXT, MX, ANY)"`
-	QueryClass      string `short:"c" long:"queryclass" default:"IN" description:"DNS record class type where TYPE =(IN, CS, CH, HS, NONE, ANY)"`
-	Norec           bool   `long:"norec" description:"Set not recursive mode"`
-	ExpectedAddress string `short:"a" long:"expected-address" description:"IP-ADDRESS you expect the DNS server to return. If multiple addresses are returned at once, you have to match the whole string of addresses separated with commas"`
+	Host            string   `short:"H" long:"host" required:"true" description:"The name or address you want to query"`
+	Server          string   `short:"s" long:"server" description:"DNS server you want to use for the lookup"`
+	Port            int      `short:"p" long:"port" default:"53" description:"Port number you want to use"`
+	QueryType       string   `short:"q" long:"querytype" default:"A" description:"DNS record query type where TYPE =(A, AAAA, SRV, TXT, MX, ANY)"`
+	QueryClass      string   `short:"c" long:"queryclass" default:"IN" description:"DNS record class type where TYPE =(IN, CS, CH, HS, NONE, ANY)"`
+	Norec           bool     `long:"norec" description:"Set not recursive mode"`
+	ExpectedAddress []string `short:"a" long:"expected-address" description:"IP-ADDRESS you expect the DNS server to return. If multiple addresses are returned at once, you have to specify whole string of addresses"`
 }
 
 // Do the plugin
@@ -86,18 +86,17 @@ func (opts *dnsOpts) run() *checkers.Checker {
 		5: --expected-address 3.3.3.3                   -> CRITICAL
 		6: --expected-address 3.3.3.3, 4.4.4.4, 5.5.5.5 -> CRITICAL
 	**/
-	if opts.ExpectedAddress != "" {
-		expectedAddress := strings.Split(opts.ExpectedAddress, ",")
+	if len(opts.ExpectedAddress) != 0 {
 		match := 0
-		for _, v := range expectedAddress {
+		for _, v := range opts.ExpectedAddress {
 			for _, answer := range r.Answer {
 				if strings.Contains(answer.String(), strings.TrimSpace(v)) {
 					match += 1
 				}
 			}
 		}
 		if match == len(r.Answer) {
-			if len(expectedAddress) == len(r.Answer) { // case 1
+			if len(opts.ExpectedAddress) == len(r.Answer) { // case 1
 				checkSt = checkers.OK
 			} else { // case 2
 				checkSt = checkers.WARNING

check-dns/lib/check_dns_test.go

@@ -99,12 +99,12 @@ func TestCheckDns(t *testing.T) {
 			[]string{"status: NXDOMAIN"},
 		},
 		{
-			[]string{"-H", "a.root-servers.net", "-s", "8.8.8.8", "-a", "198.41.0.3,198.41.0.4"},
+			[]string{"-H", "a.root-servers.net", "-s", "8.8.8.8", "-a", "198.41.0.3", "-a", "198.41.0.4"},
 			checkers.WARNING,
 			[]string{"status: NOERROR", "198.41.0.4"},
 		},
 		{
-			[]string{"-H", "a.root-servers.net", "-s", "8.8.8.8", "-a", "198.41.0.3,    198.41.0.4"},
+			[]string{"-H", "a.root-servers.net", "-s", "8.8.8.8", "-a", "198.41.0.3", "-a", "   198.41.0.4   "},
 			checkers.WARNING,
 			[]string{"status: NOERROR", "198.41.0.4"},
 		},