add udp reachable check (#545)

* add udp reachable check add integration test for udp * refactor for how variable creating
goss-org · Feb 17, 2020 · 81d5f15 · 81d5f15
1 parent 09b559d
commit 81d5f15
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 3 deletions.
diff --git a/integration-tests/goss/alpine3/goss-expected-q.yaml b/integration-tests/goss/alpine3/goss-expected-q.yaml
@@ -19,6 +19,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: false

diff --git a/integration-tests/goss/alpine3/goss-expected.yaml b/integration-tests/goss/alpine3/goss-expected.yaml
@@ -26,6 +26,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: false

diff --git a/integration-tests/goss/centos7/goss-expected-q.yaml b/integration-tests/goss/centos7/goss-expected-q.yaml
@@ -19,6 +19,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: true

diff --git a/integration-tests/goss/centos7/goss-expected.yaml b/integration-tests/goss/centos7/goss-expected.yaml
@@ -26,6 +26,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: true

diff --git a/integration-tests/goss/generate_goss.sh b/integration-tests/goss/generate_goss.sh
@@ -24,6 +24,8 @@ goss a "${args[@]}" package $package foobar vim-tiny
 
 goss a "${args[@]}" addr --timeout 1s google.com:443 google.com:22
 
+goss a "${args[@]}" addr --timeout 1s udp://8.8.8.8:53
+
 goss a "${args[@]}" port tcp:80 tcp6:80 9999
 
 goss a "${args[@]}" service $package foobar

diff --git a/integration-tests/goss/precise/goss-expected-q.yaml b/integration-tests/goss/precise/goss-expected-q.yaml
@@ -19,6 +19,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: true

diff --git a/integration-tests/goss/precise/goss-expected.yaml b/integration-tests/goss/precise/goss-expected.yaml
@@ -26,6 +26,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: true

diff --git a/integration-tests/goss/wheezy/goss-expected-q.yaml b/integration-tests/goss/wheezy/goss-expected-q.yaml
@@ -19,6 +19,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: true

diff --git a/integration-tests/goss/wheezy/goss-expected.yaml b/integration-tests/goss/wheezy/goss-expected.yaml
@@ -26,6 +26,9 @@ addr:
   tcp://google.com:443:
     reachable: true
     timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
 port:
   tcp:80:
     listening: true

diff --git a/system/addr.go b/system/addr.go
@@ -40,10 +40,12 @@ func (a *DefAddr) Exists() (bool, error) { return a.Reachable() }
 func (a *DefAddr) Reachable() (bool, error) {
 	network, address := splitAddress(a.address)
 
-	localAddr := &net.TCPAddr{
-		IP: net.ParseIP(a.LocalAddress),
+	var localAddr net.Addr
+	if network == "udp" {
+		localAddr = &net.UDPAddr{IP: net.ParseIP(a.LocalAddress)}
+	} else {
+		localAddr = &net.TCPAddr{IP: net.ParseIP(a.LocalAddress)}
 	}
-
 	d := net.Dialer{LocalAddr: localAddr, Timeout: time.Duration(a.Timeout) * time.Millisecond}
 	conn, err := d.Dial(network, address)
 	if err != nil {