Fix IPv6 address parsing (#79)

goss-org · Apr 28, 2016 · 009cf8b · 009cf8b
1 parent 24fb168
commit 009cf8b
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -30,10 +30,10 @@ coverage:
 	#xdg-open /tmp/coverage.html
 
 release/goss-linux-386:
-	CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags "-X main.version=$(TRAVIS_TAG)" -o release/$(cmd)-linux-386 $(exe)
+	CGO_ENABLED=0 GOOS=linux GOARCH=386 go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o release/$(cmd)-linux-386 $(exe)
 	goupx $@
 release/goss-linux-amd64:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=$(TRAVIS_TAG)" -o release/$(cmd)-linux-amd64 $(exe)
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o release/$(cmd)-linux-amd64 $(exe)
 	goupx $@
 build: release/goss-linux-386 release/goss-linux-amd64
 

diff --git a/glide.yaml b/glide.yaml
@@ -5,7 +5,7 @@ import:
   - package: github.com/mitchellh/go-ps
     ref:     e6c6068076470196af082b1ff896e24a51a87b2a
   - package: github.com/aelsabbahy/GOnetstat
-    ref:     2907f74398ebea717cab8187513bee184b1fdd26
+    ref:     edf89f784e0876818dc19f7744a16742a0a66f16
   - package: github.com/codegangsta/cli
     ref:     70e3fa51ebed95df8c0fbe1519c1c1f9bc16bb13
   - package: github.com/godbus/dbus

diff --git a/integration-tests/goss/alpine3/goss-expected.json b/integration-tests/goss/alpine3/goss-expected.json
@@ -41,7 +41,7 @@
         "tcp6:80": {
             "listening": true,
             "ip": [
-                "0000:0000:0000:0000:0000:0000:0000:0000"
+                "::"
             ]
         },
         "tcp:80": {

diff --git a/integration-tests/goss/alpine3/goss.json b/integration-tests/goss/alpine3/goss.json
@@ -59,7 +59,7 @@
     "port": {
         "tcp6:80": {
             "listening": true,
-            "ip": ["0000:0000:0000:0000:0000:0000:0000:0000"]
+            "ip": ["::"]
         }
     },
     "gossfile": {

diff --git a/integration-tests/goss/centos6/goss-aa-expected.json b/integration-tests/goss/centos6/goss-aa-expected.json
@@ -11,7 +11,7 @@
         "tcp6:80": {
             "listening": true,
             "ip": [
-                "0000:0000:0000:0000:0000:0000:0000:0000"
+                "::"
             ]
         }
     },

diff --git a/integration-tests/goss/centos6/goss-expected.json b/integration-tests/goss/centos6/goss-expected.json
@@ -41,7 +41,7 @@
         "tcp6:80": {
             "listening": true,
             "ip": [
-                "0000:0000:0000:0000:0000:0000:0000:0000"
+                "::"
             ]
         },
         "tcp:80": {

diff --git a/integration-tests/goss/centos6/goss.json b/integration-tests/goss/centos6/goss.json
@@ -59,7 +59,7 @@
     "port": {
         "tcp6:80": {
             "listening": true,
-            "ip": ["0000:0000:0000:0000:0000:0000:0000:0000"]
+            "ip": ["::"]
         }
     },
     "gossfile": {

diff --git a/integration-tests/goss/wheezy/goss-aa-expected.json b/integration-tests/goss/wheezy/goss-aa-expected.json
@@ -11,7 +11,7 @@
         "tcp6:80": {
             "listening": true,
             "ip": [
-                "0000:0000:0000:0000:0000:0000:0000:0000"
+                "::"
             ]
         }
     },

diff --git a/integration-tests/goss/wheezy/goss-expected.json b/integration-tests/goss/wheezy/goss-expected.json
@@ -41,7 +41,7 @@
         "tcp6:80": {
             "listening": true,
             "ip": [
-                "0000:0000:0000:0000:0000:0000:0000:0000"
+                "::"
             ]
         },
         "tcp:80": {

diff --git a/integration-tests/goss/wheezy/goss.json b/integration-tests/goss/wheezy/goss.json
@@ -59,7 +59,7 @@
     "port": {
         "tcp6:80": {
             "listening": true,
-            "ip": ["0000:0000:0000:0000:0000:0000:0000:0000"]
+            "ip": ["::"]
         }
     },
     "gossfile": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ @@
             "tcp6:80": {
                 "listening": true,
                 "ip": [
-                    "0000:0000:0000:0000:0000:0000:0000:0000"
+                    "::"
                 ]
             }
         },
@@ Expand Down @@