diff options
Diffstat (limited to 'vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr')
10 files changed, 31 insertions, 16 deletions
diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/GNUmakefile b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/GNUmakefile index 90232d2f0..6d0039ae5 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/GNUmakefile +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/GNUmakefile @@ -21,7 +21,7 @@ install:: $(BIN) .PHONY: test test:: $(BIN) - @make -C regression + @$(MAKE) -C regression .PHONY: world world:: diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/README.md b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/README.md index cc247afb5..e9914ffc1 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/README.md +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/README.md @@ -119,7 +119,7 @@ Options: Here are a few impractical examples to get you started: ```text -$ sockaddr eval 'GetDefaultInterfaces | sort "type,size" | include "RFC" "6890" | attr "address"' +$ sockaddr eval 'GetAllInterfaces | include "flags" "forwardable" | include "up" | sort "default,type,size" | include "RFC" "6890" | attr "address"' 172.14.6.167 $ sockaddr eval 'GetDefaultInterfaces | sort "type,size" | include "RFC" "6890" | limit 1 | join "address" " "' 172.14.6.167 @@ -133,7 +133,7 @@ $ sockaddr eval 'GetAllInterfaces | include "network" "172.14.6.0/24" | attr "ad 172.14.6.167 $ sockaddr eval 'GetPrivateInterfaces | join "type" " "' IPv4 IPv6 -$ sockaddr eval 'GetPublicInterfaces | include "flags" "up|forwardable" | join "address" " "' +$ sockaddr eval 'GetAllInterfaces | include "flags" "forwardable" | join "address" " "' 203.0.113.4 2001:0DB8::1 $ sockaddr eval 'GetAllInterfaces | include "name" "lo0" | include "type" "IPv6" | sort "address" | join "address" " "' 100:: fe80::1 @@ -147,6 +147,11 @@ $ cat <<'EOF' | sockaddr eval - {{. | include "name" "lo0" | include "type" "IPv6" | sort "address" | join "address" " "}} EOF 100:: fe80::1 +$ sockaddr eval 'GetPrivateInterfaces | include "flags" "forwardable|up" | include "type" "IPv4" | math "network" "+2" | attr "address"' +172.14.6.2 +$ cat <<'EOF' | sudo tee -a /etc/profile +export CONSUL_HTTP_ADDR="http://`sockaddr eval 'GetInterfaceIP \"eth0\"'`:8500" +EOF ``` ## `sockaddr rfc` diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr.out b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr.out index b836500e5..858f1516e 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr.out +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr.out @@ -1,4 +1,4 @@ -usage: sockaddr [--version] [--help] <command> [<args>] +Usage: sockaddr [--version] [--help] <command> [<args>] Available commands are: dump Parses input as an IP or interface name(s) and dumps various information diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-00.out b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-00.out index d638c462a..82f4f4e13 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-00.out +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-00.out @@ -10,6 +10,4 @@ Options: -s Silent, only return different exit codes Subcommands: - list Lists all known RFCs - diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-01.out b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-01.out index 555d039c8..82f4f4e13 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-01.out +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/expected/sockaddr_rfc-01.out @@ -8,3 +8,6 @@ Usage: sockaddr rfc [RFC Number] [IP Address] Options: -s Silent, only return different exit codes + +Subcommands: + list Lists all known RFCs diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/run_all.sh b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/run_all.sh index 4b6d8a746..9fa39ee9e 100755 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/run_all.sh +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/regression/run_all.sh @@ -1,11 +1,13 @@ #!/bin/sh -- +FIND=`/usr/bin/which 2> /dev/null gfind find | /usr/bin/grep -v ^no | /usr/bin/head -n 1` +XARGS=`/usr/bin/which 2> /dev/null gxargs xargs | /usr/bin/grep -v ^no | /usr/bin/head -n 1` set -e set -u num_cpus=$(getconf NPROCESSORS_ONLN) set +e -find . -name 'test_*.sh' -depth 1 | xargs -n1 -P${num_cpus} ./run_one.sh +${FIND} . -maxdepth 1 -name 'test_*.sh' -print0 | ${XARGS} -0 -n1 -P${num_cpus} ./run_one.sh set -e # rune_one.sh generates the .diff files diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/README.md b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/README.md index 1f69ccb20..dd211cf0e 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/README.md +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/README.md @@ -5,6 +5,7 @@ cli is the library that powers the CLI for [Packer](https://github.com/mitchellh/packer), [Serf](https://github.com/hashicorp/serf), [Consul](https://github.com/hashicorp/consul), +[Vault](https://github.com/hashicorp/vault), [Terraform](https://github.com/hashicorp/terraform), and [Nomad](https://github.com/hashicorp/nomad). diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/cli.go b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/cli.go index 353edb6c2..4a69d176d 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/cli.go +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/github.com/mitchellh/cli/cli.go @@ -120,7 +120,13 @@ func (c *CLI) Run() (int, error) { // Just show the version and exit if instructed. if c.IsVersion() && c.Version != "" { c.HelpWriter.Write([]byte(c.Version + "\n")) - return 1, nil + return 0, nil + } + + // Just print the help when only '-h' or '--help' is passed. + if c.IsHelp() && c.Subcommand() == "" { + c.HelpWriter.Write([]byte(c.HelpFunc(c.Commands) + "\n")) + return 0, nil } // Attempt to get the factory function for creating the command @@ -133,13 +139,13 @@ func (c *CLI) Run() (int, error) { command, err := raw.(CommandFactory)() if err != nil { - return 0, err + return 1, err } // If we've been instructed to just print the help, then print it if c.IsHelp() { c.commandHelp(command) - return 1, nil + return 0, nil } // If there is an invalid flag, then error @@ -454,7 +460,7 @@ const defaultHelpTemplate = ` {{.Help}}{{if gt (len .Subcommands) 0}} Subcommands: -{{ range $value := .Subcommands }} +{{- range $value := .Subcommands }} {{ $value.NameAligned }} {{ $value.Synopsis }}{{ end }} -{{ end }} +{{- end }} ` diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/vendor.json b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/vendor.json index 7514b1ac4..cc56af3f9 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/vendor.json +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/vendor/vendor.json @@ -27,10 +27,10 @@ "revisionTime": "2016-08-06T12:27:52Z" }, { - "checksumSHA1": "W6WsJ7dtBT0coA3S5FpGR0k4IEU=", + "checksumSHA1": "UP+pXl+ic9y6qrpZA5MqDIAuGfw=", "path": "github.com/mitchellh/cli", - "revision": "494eb006fe29e9dc75fea6da4df4818f7e046b73", - "revisionTime": "2017-02-08T07:23:55Z" + "revision": "ee8578a9c12a5bb9d55303b9665cc448772c81b8", + "revisionTime": "2017-03-28T05:23:52Z" }, { "checksumSHA1": "L3leymg2RT8hFl5uL+5KP/LpBkg=", diff --git a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/version.go b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/version.go index 32cac2d47..10da3e698 100644 --- a/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/version.go +++ b/vendor/github.com/hashicorp/go-sockaddr/cmd/sockaddr/version.go @@ -12,7 +12,7 @@ var ( ) // The main version number that is being run at the moment. -const Version = "0.1.0" +const Version = "0.2.0" // A pre-release marker for the version. If this is "" (empty string) // then it means that it is a final release. Otherwise, this is a pre-release |