From 9dcc51e0d18555e24412b62001743612f2437d55 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Sat, 2 Apr 2016 12:17:18 -0700 Subject: [PATCH 1/4] build: test against go 1.5 and 1.6 --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07494db3..62ee8cde 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,9 @@ language: go -sudo: false matrix: include: - - go: 1.4 - install: - - go get golang.org/x/tools/cmd/cover - - go get golang.org/x/tools/cmd/vet - go: 1.5 + env: GO15VENDOREXPERIMENT=1 + - go: 1.6 script: - ./test From ba952da3017c3d3f1a844e4a244332a640ed8a29 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Sat, 2 Apr 2016 12:26:12 -0700 Subject: [PATCH 2/4] vendor: move from Godeps --- Godeps/Godeps.json | 46 ------------------- Godeps/Readme | 5 -- Godeps/_workspace/.gitignore | 2 - config/config.go | 2 +- config/validate/validate.go | 2 +- .../metadata/cloudsigma/server_context.go | 2 +- datasource/vmware/vmware_amd64.go | 6 +-- system/networkd.go | 2 +- system/systemd.go | 2 +- vendor.manifest | 11 +++++ .../github.com/cloudsigma/cepgo/.gitignore | 0 .../github.com/cloudsigma/cepgo/LICENSE | 0 .../github.com/cloudsigma/cepgo/README.md | 0 .../github.com/cloudsigma/cepgo/cepgo.go | 2 +- .../github.com/cloudsigma/cepgo/cepgo_test.go | 0 .../github.com/coreos/go-systemd/dbus/dbus.go | 2 +- .../coreos/go-systemd/dbus/dbus_test.go | 0 .../coreos/go-systemd/dbus/methods.go | 2 +- .../coreos/go-systemd/dbus/methods_test.go | 2 +- .../coreos/go-systemd/dbus/properties.go | 2 +- .../github.com/coreos/go-systemd/dbus/set.go | 0 .../coreos/go-systemd/dbus/set_test.go | 0 .../coreos/go-systemd/dbus/subscription.go | 2 +- .../go-systemd/dbus/subscription_set.go | 0 .../go-systemd/dbus/subscription_set_test.go | 0 .../go-systemd/dbus/subscription_test.go | 0 .../github.com/coreos/yaml/LICENSE | 0 .../github.com/coreos/yaml/LICENSE.libyaml | 0 .../github.com/coreos/yaml/README.md | 0 .../github.com/coreos/yaml/apic.go | 0 .../github.com/coreos/yaml/decode.go | 0 .../github.com/coreos/yaml/decode_test.go | 0 .../github.com/coreos/yaml/emitterc.go | 0 .../github.com/coreos/yaml/encode.go | 0 .../github.com/coreos/yaml/encode_test.go | 0 .../github.com/coreos/yaml/parserc.go | 0 .../github.com/coreos/yaml/readerc.go | 0 .../github.com/coreos/yaml/resolve.go | 0 .../github.com/coreos/yaml/scannerc.go | 0 .../github.com/coreos/yaml/sorter.go | 0 .../github.com/coreos/yaml/suite_test.go | 0 .../github.com/coreos/yaml/writerc.go | 0 .../github.com/coreos/yaml/yaml.go | 0 .../github.com/coreos/yaml/yamlh.go | 0 .../github.com/coreos/yaml/yamlprivateh.go | 0 .../dotcloud/docker/pkg/netlink/MAINTAINERS | 0 .../dotcloud/docker/pkg/netlink/netlink.go | 0 .../docker/pkg/netlink/netlink_linux.go | 0 .../docker/pkg/netlink/netlink_unsupported.go | 0 .../github.com/guelfey/go.dbus/LICENSE | 0 .../guelfey/go.dbus/README.markdown | 0 .../github.com/guelfey/go.dbus/auth.go | 0 .../guelfey/go.dbus/auth_external.go | 0 .../github.com/guelfey/go.dbus/auth_sha1.go | 0 .../github.com/guelfey/go.dbus/call.go | 0 .../github.com/guelfey/go.dbus/conn.go | 0 .../github.com/guelfey/go.dbus/conn_darwin.go | 0 .../github.com/guelfey/go.dbus/conn_other.go | 0 .../github.com/guelfey/go.dbus/conn_test.go | 0 .../github.com/guelfey/go.dbus/dbus.go | 0 .../github.com/guelfey/go.dbus/decoder.go | 0 .../github.com/guelfey/go.dbus/doc.go | 0 .../github.com/guelfey/go.dbus/encoder.go | 0 .../guelfey/go.dbus/examples_test.go | 0 .../github.com/guelfey/go.dbus/export.go | 0 .../guelfey/go.dbus/introspect/call.go | 2 +- .../guelfey/go.dbus/introspect/introspect.go | 0 .../go.dbus/introspect/introspectable.go | 2 +- .../github.com/guelfey/go.dbus/message.go | 0 .../github.com/guelfey/go.dbus/prop/prop.go | 4 +- .../github.com/guelfey/go.dbus/proto_test.go | 0 .../github.com/guelfey/go.dbus/sig.go | 0 .../github.com/guelfey/go.dbus/sig_test.go | 0 .../guelfey/go.dbus/transport_darwin.go | 0 .../guelfey/go.dbus/transport_generic.go | 0 .../guelfey/go.dbus/transport_unix.go | 0 .../guelfey/go.dbus/transport_unix_test.go | 0 .../guelfey/go.dbus/transport_unixcred.go | 0 .../github.com/guelfey/go.dbus/variant.go | 0 .../guelfey/go.dbus/variant_lexer.go | 0 .../guelfey/go.dbus/variant_parser.go | 0 .../guelfey/go.dbus/variant_test.go | 0 .../github.com/sigma/bdoor/LICENSE | 0 .../github.com/sigma/bdoor/README | 0 .../github.com/sigma/bdoor/check.go | 0 .../github.com/sigma/vmw-guestinfo/CDDL.txt | 0 .../github.com/sigma/vmw-guestinfo/LGPL.txt | 0 .../github.com/sigma/vmw-guestinfo/LICENSE | 0 .../github.com/sigma/vmw-guestinfo/README | 0 .../sigma/vmw-guestinfo/bridge/backdoor.c | 0 .../sigma/vmw-guestinfo/bridge/backdoor_386.c | 0 .../vmw-guestinfo/bridge/backdoor_amd64.c | 0 .../sigma/vmw-guestinfo/bridge/bridge.go | 0 .../sigma/vmw-guestinfo/bridge/message.c | 0 .../sigma/vmw-guestinfo/examples/main.go | 4 +- .../sigma/vmw-guestinfo/include/backdoor.h | 0 .../sigma/vmw-guestinfo/include/backdoorInt.h | 0 .../vmw-guestinfo/include/backdoor_def.h | 0 .../vmw-guestinfo/include/backdoor_types.h | 0 .../vmw-guestinfo/include/community_source.h | 0 .../vmw-guestinfo/include/guest_msg_def.h | 0 .../sigma/vmw-guestinfo/include/message.h | 0 .../sigma/vmw-guestinfo/include/vm_assert.h | 0 .../vmw-guestinfo/include/vm_basic_types.h | 0 .../sigma/vmw-guestinfo/include/vmware.h | 0 .../sigma/vmw-guestinfo/message/message.go | 2 +- .../sigma/vmw-guestinfo/rpcout/rpcout.go | 2 +- .../sigma/vmw-guestinfo/rpcvmx/rpcvmx.go | 2 +- .../sigma/vmw-guestinfo/vmcheck/vmcheck.go | 2 +- .../github.com/sigma/vmw-ovflib/README | 0 .../github.com/sigma/vmw-ovflib/ovf.go | 0 .../github.com/sigma/vmw-ovflib/ovf_test.go | 0 .../github.com/tarm/goserial/LICENSE | 0 .../github.com/tarm/goserial/README.md | 0 .../github.com/tarm/goserial/basic_test.go | 0 .../github.com/tarm/goserial/serial.go | 0 .../github.com/tarm/goserial/serial_linux.go | 0 .../github.com/tarm/goserial/serial_posix.go | 0 .../tarm/goserial/serial_windows.go | 0 119 files changed, 35 insertions(+), 77 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/Readme delete mode 100644 Godeps/_workspace/.gitignore create mode 100644 vendor.manifest rename {Godeps/_workspace/src => vendor}/github.com/cloudsigma/cepgo/.gitignore (100%) rename {Godeps/_workspace/src => vendor}/github.com/cloudsigma/cepgo/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/cloudsigma/cepgo/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/cloudsigma/cepgo/cepgo.go (98%) rename {Godeps/_workspace/src => vendor}/github.com/cloudsigma/cepgo/cepgo_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/dbus.go (96%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/dbus_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/methods.go (99%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/methods_test.go (98%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/properties.go (98%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/set.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/set_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/subscription.go (98%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/subscription_set.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/subscription_set_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/go-systemd/dbus/subscription_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/LICENSE.libyaml (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/apic.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/decode.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/decode_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/emitterc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/encode.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/encode_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/parserc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/readerc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/resolve.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/scannerc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/sorter.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/suite_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/writerc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/yaml.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/yamlh.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/coreos/yaml/yamlprivateh.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS (100%) rename {Godeps/_workspace/src => vendor}/github.com/dotcloud/docker/pkg/netlink/netlink.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/README.markdown (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/auth.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/auth_external.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/auth_sha1.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/call.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/conn.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/conn_darwin.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/conn_other.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/conn_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/dbus.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/decoder.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/doc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/encoder.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/examples_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/export.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/introspect/call.go (86%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/introspect/introspect.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/introspect/introspectable.go (95%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/message.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/prop/prop.go (97%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/proto_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/sig.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/sig_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/transport_darwin.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/transport_generic.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/transport_unix.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/transport_unix_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/transport_unixcred.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/variant.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/variant_lexer.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/variant_parser.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/guelfey/go.dbus/variant_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/bdoor/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/bdoor/README (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/bdoor/check.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/CDDL.txt (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/LGPL.txt (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/README (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/backdoor.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/bridge.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/message.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/examples/main.go (67%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoor.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoorInt.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoor_def.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoor_types.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/community_source.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/message.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_assert.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmware.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/message/message.go (93%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go (94%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go (94%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go (68%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-ovflib/README (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-ovflib/ovf.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-ovflib/ovf_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/README.md (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/basic_test.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/serial.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/serial_linux.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/serial_posix.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/tarm/goserial/serial_windows.go (100%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 77c04271..00000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "ImportPath": "github.com/coreos/coreos-cloudinit", - "GoVersion": "go1.3.3", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "github.com/cloudsigma/cepgo", - "Rev": "1bfc4895bf5c4d3b599f3f6ee142299488c8739b" - }, - { - "ImportPath": "github.com/coreos/go-systemd/dbus", - "Rev": "4fbc5060a317b142e6c7bfbedb65596d5f0ab99b" - }, - { - "ImportPath": "github.com/coreos/yaml", - "Rev": "6b16a5714269b2f70720a45406b1babd947a17ef" - }, - { - "ImportPath": "github.com/dotcloud/docker/pkg/netlink", - "Comment": "v0.11.1-359-g55d41c3e21e1", - "Rev": "55d41c3e21e1593b944c06196ffb2ac57ab7f653" - }, - { - "ImportPath": "github.com/guelfey/go.dbus", - "Rev": "f6a3a2366cc39b8479cadc499d3c735fb10fbdda" - }, - { - "ImportPath": "github.com/tarm/goserial", - "Rev": "cdabc8d44e8e84f58f18074ae44337e1f2f375b9" - }, - { - "ImportPath": "github.com/sigma/vmw-guestinfo", - "Rev": "95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903" - }, - { - "ImportPath": "github.com/sigma/vmw-ovflib", - "Rev": "56b4f44581cac03d17d8270158bdfd0942ffe790" - }, - { - "ImportPath": "github.com/sigma/bdoor", - "Rev": "babf2a4017b020d4ce04e8167076186e82645dd1" - } - ] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53d..00000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore deleted file mode 100644 index f037d684..00000000 --- a/Godeps/_workspace/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/pkg -/bin diff --git a/config/config.go b/config/config.go index 94dfe51f..ede380b4 100644 --- a/config/config.go +++ b/config/config.go @@ -21,7 +21,7 @@ import ( "strings" "unicode" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/yaml" + "github.com/coreos/yaml" ) // CloudConfig encapsulates the entire cloud-config configuration file and maps diff --git a/config/validate/validate.go b/config/validate/validate.go index d8bd1e5d..cf668cf7 100644 --- a/config/validate/validate.go +++ b/config/validate/validate.go @@ -23,7 +23,7 @@ import ( "github.com/coreos/coreos-cloudinit/config" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/yaml" + "github.com/coreos/yaml" ) var ( diff --git a/datasource/metadata/cloudsigma/server_context.go b/datasource/metadata/cloudsigma/server_context.go index 855ae97f..0c3924cc 100644 --- a/datasource/metadata/cloudsigma/server_context.go +++ b/datasource/metadata/cloudsigma/server_context.go @@ -26,7 +26,7 @@ import ( "github.com/coreos/coreos-cloudinit/datasource" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/cloudsigma/cepgo" + "github.com/cloudsigma/cepgo" ) const ( diff --git a/datasource/vmware/vmware_amd64.go b/datasource/vmware/vmware_amd64.go index a9b504a1..b719c5e2 100644 --- a/datasource/vmware/vmware_amd64.go +++ b/datasource/vmware/vmware_amd64.go @@ -21,9 +21,9 @@ import ( "github.com/coreos/coreos-cloudinit/pkg" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-ovflib" + "github.com/sigma/vmw-guestinfo/rpcvmx" + "github.com/sigma/vmw-guestinfo/vmcheck" + "github.com/sigma/vmw-ovflib" ) type ovfWrapper struct { diff --git a/system/networkd.go b/system/networkd.go index 2b33af24..ed9c1a5a 100644 --- a/system/networkd.go +++ b/system/networkd.go @@ -23,7 +23,7 @@ import ( "github.com/coreos/coreos-cloudinit/config" "github.com/coreos/coreos-cloudinit/network" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink" + "github.com/dotcloud/docker/pkg/netlink" ) func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { diff --git a/system/systemd.go b/system/systemd.go index a5f643e8..190b9e77 100644 --- a/system/systemd.go +++ b/system/systemd.go @@ -23,7 +23,7 @@ import ( "path" "strings" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus" + "github.com/coreos/go-systemd/dbus" "github.com/coreos/coreos-cloudinit/config" ) diff --git a/vendor.manifest b/vendor.manifest new file mode 100644 index 00000000..c7e212b8 --- /dev/null +++ b/vendor.manifest @@ -0,0 +1,11 @@ +# If you manipulate the contents of vendor/, amend this accordingly. +# pkg version +github.com/cloudsigma/cepgo 1bfc4895bf5c4d3b599f3f6ee142299488c8739b +github.com/coreos/go-systemd/dbus 4fbc5060a317b142e6c7bfbedb65596d5f0ab99b +github.com/coreos/yaml 6b16a5714269b2f70720a45406b1babd947a17ef +github.com/dotcloud/docker/pkg/netlink 55d41c3e21e1593b944c06196ffb2ac57ab7f653 +github.com/guelfey/go.dbus f6a3a2366cc39b8479cadc499d3c735fb10fbdda +github.com/tarm/goserial cdabc8d44e8e84f58f18074ae44337e1f2f375b9 +github.com/sigma/vmw-guestinfo 95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 +github.com/sigma/vmw-ovflib 56b4f44581cac03d17d8270158bdfd0942ffe790 +github.com/sigma/bdoor babf2a4017b020d4ce04e8167076186e82645dd1 diff --git a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/.gitignore b/vendor/github.com/cloudsigma/cepgo/.gitignore similarity index 100% rename from Godeps/_workspace/src/github.com/cloudsigma/cepgo/.gitignore rename to vendor/github.com/cloudsigma/cepgo/.gitignore diff --git a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/LICENSE b/vendor/github.com/cloudsigma/cepgo/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/cloudsigma/cepgo/LICENSE rename to vendor/github.com/cloudsigma/cepgo/LICENSE diff --git a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/README.md b/vendor/github.com/cloudsigma/cepgo/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/cloudsigma/cepgo/README.md rename to vendor/github.com/cloudsigma/cepgo/README.md diff --git a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo.go b/vendor/github.com/cloudsigma/cepgo/cepgo.go similarity index 98% rename from Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo.go rename to vendor/github.com/cloudsigma/cepgo/cepgo.go index ce2deeb4..5250bcc0 100644 --- a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo.go +++ b/vendor/github.com/cloudsigma/cepgo/cepgo.go @@ -48,7 +48,7 @@ import ( "fmt" "runtime" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/tarm/goserial" + "github.com/tarm/goserial" ) const ( diff --git a/Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo_test.go b/vendor/github.com/cloudsigma/cepgo/cepgo_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/cloudsigma/cepgo/cepgo_test.go rename to vendor/github.com/cloudsigma/cepgo/cepgo_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go b/vendor/github.com/coreos/go-systemd/dbus/dbus.go similarity index 96% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go rename to vendor/github.com/coreos/go-systemd/dbus/dbus.go index ba7968e5..88927b7f 100644 --- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus.go +++ b/vendor/github.com/coreos/go-systemd/dbus/dbus.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" ) const signalBuffer = 100 diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus_test.go b/vendor/github.com/coreos/go-systemd/dbus/dbus_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/dbus_test.go rename to vendor/github.com/coreos/go-systemd/dbus/dbus_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go b/vendor/github.com/coreos/go-systemd/dbus/methods.go similarity index 99% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go rename to vendor/github.com/coreos/go-systemd/dbus/methods.go index 4f552b78..372476c5 100644 --- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods.go +++ b/vendor/github.com/coreos/go-systemd/dbus/methods.go @@ -18,7 +18,7 @@ package dbus import ( "errors" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" ) func (c *Conn) initJobs() { diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods_test.go b/vendor/github.com/coreos/go-systemd/dbus/methods_test.go similarity index 98% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods_test.go rename to vendor/github.com/coreos/go-systemd/dbus/methods_test.go index 123de379..9e2f2232 100644 --- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/methods_test.go +++ b/vendor/github.com/coreos/go-systemd/dbus/methods_test.go @@ -18,7 +18,7 @@ package dbus import ( "fmt" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" "math/rand" "os" "path/filepath" diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go b/vendor/github.com/coreos/go-systemd/dbus/properties.go similarity index 98% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go rename to vendor/github.com/coreos/go-systemd/dbus/properties.go index a3593a9f..83dc1ab6 100644 --- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/properties.go +++ b/vendor/github.com/coreos/go-systemd/dbus/properties.go @@ -17,7 +17,7 @@ limitations under the License. package dbus import ( - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" ) // From the systemd docs: diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go b/vendor/github.com/coreos/go-systemd/dbus/set.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set.go rename to vendor/github.com/coreos/go-systemd/dbus/set.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set_test.go b/vendor/github.com/coreos/go-systemd/dbus/set_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/set_test.go rename to vendor/github.com/coreos/go-systemd/dbus/set_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go b/vendor/github.com/coreos/go-systemd/dbus/subscription.go similarity index 98% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go rename to vendor/github.com/coreos/go-systemd/dbus/subscription.go index e8b04afc..c545c05b 100644 --- a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription.go +++ b/vendor/github.com/coreos/go-systemd/dbus/subscription.go @@ -20,7 +20,7 @@ import ( "errors" "time" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" ) const ( diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go b/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set.go rename to vendor/github.com/coreos/go-systemd/dbus/subscription_set.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set_test.go b/vendor/github.com/coreos/go-systemd/dbus/subscription_set_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_set_test.go rename to vendor/github.com/coreos/go-systemd/dbus/subscription_set_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_test.go b/vendor/github.com/coreos/go-systemd/dbus/subscription_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/go-systemd/dbus/subscription_test.go rename to vendor/github.com/coreos/go-systemd/dbus/subscription_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE b/vendor/github.com/coreos/yaml/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/LICENSE rename to vendor/github.com/coreos/yaml/LICENSE diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml b/vendor/github.com/coreos/yaml/LICENSE.libyaml similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/LICENSE.libyaml rename to vendor/github.com/coreos/yaml/LICENSE.libyaml diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/README.md b/vendor/github.com/coreos/yaml/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/README.md rename to vendor/github.com/coreos/yaml/README.md diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/apic.go b/vendor/github.com/coreos/yaml/apic.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/apic.go rename to vendor/github.com/coreos/yaml/apic.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/decode.go b/vendor/github.com/coreos/yaml/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/decode.go rename to vendor/github.com/coreos/yaml/decode.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go b/vendor/github.com/coreos/yaml/decode_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/decode_test.go rename to vendor/github.com/coreos/yaml/decode_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go b/vendor/github.com/coreos/yaml/emitterc.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/emitterc.go rename to vendor/github.com/coreos/yaml/emitterc.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/encode.go b/vendor/github.com/coreos/yaml/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/encode.go rename to vendor/github.com/coreos/yaml/encode.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go b/vendor/github.com/coreos/yaml/encode_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/encode_test.go rename to vendor/github.com/coreos/yaml/encode_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/parserc.go b/vendor/github.com/coreos/yaml/parserc.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/parserc.go rename to vendor/github.com/coreos/yaml/parserc.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/readerc.go b/vendor/github.com/coreos/yaml/readerc.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/readerc.go rename to vendor/github.com/coreos/yaml/readerc.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/resolve.go b/vendor/github.com/coreos/yaml/resolve.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/resolve.go rename to vendor/github.com/coreos/yaml/resolve.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go b/vendor/github.com/coreos/yaml/scannerc.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/scannerc.go rename to vendor/github.com/coreos/yaml/scannerc.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/sorter.go b/vendor/github.com/coreos/yaml/sorter.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/sorter.go rename to vendor/github.com/coreos/yaml/sorter.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go b/vendor/github.com/coreos/yaml/suite_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/suite_test.go rename to vendor/github.com/coreos/yaml/suite_test.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/writerc.go b/vendor/github.com/coreos/yaml/writerc.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/writerc.go rename to vendor/github.com/coreos/yaml/writerc.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/yaml.go b/vendor/github.com/coreos/yaml/yaml.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/yaml.go rename to vendor/github.com/coreos/yaml/yaml.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go b/vendor/github.com/coreos/yaml/yamlh.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/yamlh.go rename to vendor/github.com/coreos/yaml/yamlh.go diff --git a/Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go b/vendor/github.com/coreos/yaml/yamlprivateh.go similarity index 100% rename from Godeps/_workspace/src/github.com/coreos/yaml/yamlprivateh.go rename to vendor/github.com/coreos/yaml/yamlprivateh.go diff --git a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS b/vendor/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS similarity index 100% rename from Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS rename to vendor/github.com/dotcloud/docker/pkg/netlink/MAINTAINERS diff --git a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink.go b/vendor/github.com/dotcloud/docker/pkg/netlink/netlink.go similarity index 100% rename from Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink.go rename to vendor/github.com/dotcloud/docker/pkg/netlink/netlink.go diff --git a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go b/vendor/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go rename to vendor/github.com/dotcloud/docker/pkg/netlink/netlink_linux.go diff --git a/Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go b/vendor/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go similarity index 100% rename from Godeps/_workspace/src/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go rename to vendor/github.com/dotcloud/docker/pkg/netlink/netlink_unsupported.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/LICENSE b/vendor/github.com/guelfey/go.dbus/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/LICENSE rename to vendor/github.com/guelfey/go.dbus/LICENSE diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/README.markdown b/vendor/github.com/guelfey/go.dbus/README.markdown similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/README.markdown rename to vendor/github.com/guelfey/go.dbus/README.markdown diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth.go b/vendor/github.com/guelfey/go.dbus/auth.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/auth.go rename to vendor/github.com/guelfey/go.dbus/auth.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_external.go b/vendor/github.com/guelfey/go.dbus/auth_external.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_external.go rename to vendor/github.com/guelfey/go.dbus/auth_external.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_sha1.go b/vendor/github.com/guelfey/go.dbus/auth_sha1.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/auth_sha1.go rename to vendor/github.com/guelfey/go.dbus/auth_sha1.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/call.go b/vendor/github.com/guelfey/go.dbus/call.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/call.go rename to vendor/github.com/guelfey/go.dbus/call.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn.go b/vendor/github.com/guelfey/go.dbus/conn.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/conn.go rename to vendor/github.com/guelfey/go.dbus/conn.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_darwin.go b/vendor/github.com/guelfey/go.dbus/conn_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_darwin.go rename to vendor/github.com/guelfey/go.dbus/conn_darwin.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_other.go b/vendor/github.com/guelfey/go.dbus/conn_other.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_other.go rename to vendor/github.com/guelfey/go.dbus/conn_other.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_test.go b/vendor/github.com/guelfey/go.dbus/conn_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/conn_test.go rename to vendor/github.com/guelfey/go.dbus/conn_test.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/dbus.go b/vendor/github.com/guelfey/go.dbus/dbus.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/dbus.go rename to vendor/github.com/guelfey/go.dbus/dbus.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/decoder.go b/vendor/github.com/guelfey/go.dbus/decoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/decoder.go rename to vendor/github.com/guelfey/go.dbus/decoder.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/doc.go b/vendor/github.com/guelfey/go.dbus/doc.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/doc.go rename to vendor/github.com/guelfey/go.dbus/doc.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/encoder.go b/vendor/github.com/guelfey/go.dbus/encoder.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/encoder.go rename to vendor/github.com/guelfey/go.dbus/encoder.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/examples_test.go b/vendor/github.com/guelfey/go.dbus/examples_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/examples_test.go rename to vendor/github.com/guelfey/go.dbus/examples_test.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/export.go b/vendor/github.com/guelfey/go.dbus/export.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/export.go rename to vendor/github.com/guelfey/go.dbus/export.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/call.go b/vendor/github.com/guelfey/go.dbus/introspect/call.go similarity index 86% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/call.go rename to vendor/github.com/guelfey/go.dbus/introspect/call.go index f511836a..180ba58d 100644 --- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/call.go +++ b/vendor/github.com/guelfey/go.dbus/introspect/call.go @@ -2,7 +2,7 @@ package introspect import ( "encoding/xml" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" "strings" ) diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspect.go b/vendor/github.com/guelfey/go.dbus/introspect/introspect.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspect.go rename to vendor/github.com/guelfey/go.dbus/introspect/introspect.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspectable.go b/vendor/github.com/guelfey/go.dbus/introspect/introspectable.go similarity index 95% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspectable.go rename to vendor/github.com/guelfey/go.dbus/introspect/introspectable.go index 9cbda45a..ca1f8b57 100644 --- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect/introspectable.go +++ b/vendor/github.com/guelfey/go.dbus/introspect/introspectable.go @@ -2,7 +2,7 @@ package introspect import ( "encoding/xml" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus" "reflect" ) diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/message.go b/vendor/github.com/guelfey/go.dbus/message.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/message.go rename to vendor/github.com/guelfey/go.dbus/message.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/prop/prop.go b/vendor/github.com/guelfey/go.dbus/prop/prop.go similarity index 97% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/prop/prop.go rename to vendor/github.com/guelfey/go.dbus/prop/prop.go index 092124ab..bc695207 100644 --- a/Godeps/_workspace/src/github.com/guelfey/go.dbus/prop/prop.go +++ b/vendor/github.com/guelfey/go.dbus/prop/prop.go @@ -3,8 +3,8 @@ package prop import ( - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/guelfey/go.dbus/introspect" + "github.com/guelfey/go.dbus" + "github.com/guelfey/go.dbus/introspect" "sync" ) diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/proto_test.go b/vendor/github.com/guelfey/go.dbus/proto_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/proto_test.go rename to vendor/github.com/guelfey/go.dbus/proto_test.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/sig.go b/vendor/github.com/guelfey/go.dbus/sig.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/sig.go rename to vendor/github.com/guelfey/go.dbus/sig.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/sig_test.go b/vendor/github.com/guelfey/go.dbus/sig_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/sig_test.go rename to vendor/github.com/guelfey/go.dbus/sig_test.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_darwin.go b/vendor/github.com/guelfey/go.dbus/transport_darwin.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_darwin.go rename to vendor/github.com/guelfey/go.dbus/transport_darwin.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_generic.go b/vendor/github.com/guelfey/go.dbus/transport_generic.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_generic.go rename to vendor/github.com/guelfey/go.dbus/transport_generic.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix.go b/vendor/github.com/guelfey/go.dbus/transport_unix.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix.go rename to vendor/github.com/guelfey/go.dbus/transport_unix.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix_test.go b/vendor/github.com/guelfey/go.dbus/transport_unix_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unix_test.go rename to vendor/github.com/guelfey/go.dbus/transport_unix_test.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unixcred.go b/vendor/github.com/guelfey/go.dbus/transport_unixcred.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/transport_unixcred.go rename to vendor/github.com/guelfey/go.dbus/transport_unixcred.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant.go b/vendor/github.com/guelfey/go.dbus/variant.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/variant.go rename to vendor/github.com/guelfey/go.dbus/variant.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_lexer.go b/vendor/github.com/guelfey/go.dbus/variant_lexer.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_lexer.go rename to vendor/github.com/guelfey/go.dbus/variant_lexer.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_parser.go b/vendor/github.com/guelfey/go.dbus/variant_parser.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_parser.go rename to vendor/github.com/guelfey/go.dbus/variant_parser.go diff --git a/Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_test.go b/vendor/github.com/guelfey/go.dbus/variant_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/guelfey/go.dbus/variant_test.go rename to vendor/github.com/guelfey/go.dbus/variant_test.go diff --git a/Godeps/_workspace/src/github.com/sigma/bdoor/LICENSE b/vendor/github.com/sigma/bdoor/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/bdoor/LICENSE rename to vendor/github.com/sigma/bdoor/LICENSE diff --git a/Godeps/_workspace/src/github.com/sigma/bdoor/README b/vendor/github.com/sigma/bdoor/README similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/bdoor/README rename to vendor/github.com/sigma/bdoor/README diff --git a/Godeps/_workspace/src/github.com/sigma/bdoor/check.go b/vendor/github.com/sigma/bdoor/check.go similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/bdoor/check.go rename to vendor/github.com/sigma/bdoor/check.go diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/CDDL.txt b/vendor/github.com/sigma/vmw-guestinfo/CDDL.txt similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/CDDL.txt rename to vendor/github.com/sigma/vmw-guestinfo/CDDL.txt diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/LGPL.txt b/vendor/github.com/sigma/vmw-guestinfo/LGPL.txt similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/LGPL.txt rename to vendor/github.com/sigma/vmw-guestinfo/LGPL.txt diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/LICENSE b/vendor/github.com/sigma/vmw-guestinfo/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/LICENSE rename to vendor/github.com/sigma/vmw-guestinfo/LICENSE diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/README b/vendor/github.com/sigma/vmw-guestinfo/README similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/README rename to vendor/github.com/sigma/vmw-guestinfo/README diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/bridge.go b/vendor/github.com/sigma/vmw-guestinfo/bridge/bridge.go similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/bridge.go rename to vendor/github.com/sigma/vmw-guestinfo/bridge/bridge.go diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/message.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/message.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/message.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/message.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/examples/main.go b/vendor/github.com/sigma/vmw-guestinfo/examples/main.go similarity index 67% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/examples/main.go rename to vendor/github.com/sigma/vmw-guestinfo/examples/main.go index c4195f88..d9553906 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/examples/main.go +++ b/vendor/github.com/sigma/vmw-guestinfo/examples/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck" + "github.com/sigma/vmw-guestinfo/rpcvmx" + "github.com/sigma/vmw-guestinfo/vmcheck" ) func main() { diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoor.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoor.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoorInt.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoorInt.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoorInt.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoorInt.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_def.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoor_def.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_def.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoor_def.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_types.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoor_types.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_types.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoor_types.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/community_source.h b/vendor/github.com/sigma/vmw-guestinfo/include/community_source.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/community_source.h rename to vendor/github.com/sigma/vmw-guestinfo/include/community_source.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h b/vendor/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h rename to vendor/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/message.h b/vendor/github.com/sigma/vmw-guestinfo/include/message.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/message.h rename to vendor/github.com/sigma/vmw-guestinfo/include/message.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_assert.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_assert.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_assert.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_assert.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmware.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmware.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message/message.go b/vendor/github.com/sigma/vmw-guestinfo/message/message.go similarity index 93% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message/message.go rename to vendor/github.com/sigma/vmw-guestinfo/message/message.go index 0ece8fa4..e61359a9 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message/message.go +++ b/vendor/github.com/sigma/vmw-guestinfo/message/message.go @@ -3,7 +3,7 @@ package message import ( "errors" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge" + "github.com/sigma/vmw-guestinfo/bridge" ) var ( diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go b/vendor/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go similarity index 94% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go rename to vendor/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go index 68a57448..294edd1a 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go +++ b/vendor/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message" + "github.com/sigma/vmw-guestinfo/message" ) // ErrRpciFormat represents an invalid result format diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go b/vendor/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go similarity index 94% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go rename to vendor/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go index 8a060908..50330b5c 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go +++ b/vendor/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout" + "github.com/sigma/vmw-guestinfo/rpcout" ) // Config gives access to the vmx config through the VMware backdoor diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go b/vendor/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go similarity index 68% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go rename to vendor/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go index e5516441..ef3733dd 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go +++ b/vendor/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go @@ -1,7 +1,7 @@ package vmcheck import ( - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/bdoor" + "github.com/sigma/bdoor" ) // IsVirtualWorld returns whether the code is running in a VMware virtual machine or no diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-ovflib/README b/vendor/github.com/sigma/vmw-ovflib/README similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-ovflib/README rename to vendor/github.com/sigma/vmw-ovflib/README diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-ovflib/ovf.go b/vendor/github.com/sigma/vmw-ovflib/ovf.go similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-ovflib/ovf.go rename to vendor/github.com/sigma/vmw-ovflib/ovf.go diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-ovflib/ovf_test.go b/vendor/github.com/sigma/vmw-ovflib/ovf_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-ovflib/ovf_test.go rename to vendor/github.com/sigma/vmw-ovflib/ovf_test.go diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/LICENSE b/vendor/github.com/tarm/goserial/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/LICENSE rename to vendor/github.com/tarm/goserial/LICENSE diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/README.md b/vendor/github.com/tarm/goserial/README.md similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/README.md rename to vendor/github.com/tarm/goserial/README.md diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/basic_test.go b/vendor/github.com/tarm/goserial/basic_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/basic_test.go rename to vendor/github.com/tarm/goserial/basic_test.go diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/serial.go b/vendor/github.com/tarm/goserial/serial.go similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/serial.go rename to vendor/github.com/tarm/goserial/serial.go diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/serial_linux.go b/vendor/github.com/tarm/goserial/serial_linux.go similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/serial_linux.go rename to vendor/github.com/tarm/goserial/serial_linux.go diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/serial_posix.go b/vendor/github.com/tarm/goserial/serial_posix.go similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/serial_posix.go rename to vendor/github.com/tarm/goserial/serial_posix.go diff --git a/Godeps/_workspace/src/github.com/tarm/goserial/serial_windows.go b/vendor/github.com/tarm/goserial/serial_windows.go similarity index 100% rename from Godeps/_workspace/src/github.com/tarm/goserial/serial_windows.go rename to vendor/github.com/tarm/goserial/serial_windows.go From 10292504a752f4f2f732db893e006388b3a5ccd7 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Sat, 2 Apr 2016 12:31:08 -0700 Subject: [PATCH 3/4] *: go fmt The test script wasn't actually failing on improperly formatted code since `go fmt` doesn't exit properly. --- config/config_test.go | 12 +++--- config/validate/node_test.go | 28 +++++++------- config/validate/report_test.go | 6 +-- config/validate/validate.go | 2 +- coreos-cloudinit.go | 14 +++---- .../metadata/digitalocean/metadata_test.go | 2 +- datasource/test/filesystem_test.go | 10 ++--- datasource/vmware/vmware_amd64.go | 2 +- initialize/config_test.go | 38 +++++++++---------- network/digitalocean_test.go | 14 +++---- network/interface_test.go | 36 +++++++++--------- network/stanza_test.go | 6 +-- network/vmware_test.go | 14 +++---- system/env_file.go | 2 +- system/systemd.go | 2 +- 15 files changed, 94 insertions(+), 94 deletions(-) diff --git a/config/config_test.go b/config/config_test.go index efcdd18b..78a4280b 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -30,11 +30,11 @@ func TestNewCloudConfig(t *testing.T) { {}, { contents: "#cloud-config\nwrite_files:\n - path: underscore", - config: CloudConfig{WriteFiles: []File{File{Path: "underscore"}}}, + config: CloudConfig{WriteFiles: []File{{Path: "underscore"}}}, }, { contents: "#cloud-config\nwrite-files:\n - path: hyphen", - config: CloudConfig{WriteFiles: []File{File{Path: "hyphen"}}}, + config: CloudConfig{WriteFiles: []File{{Path: "hyphen"}}}, }, { contents: "#cloud-config\ncoreos:\n update:\n reboot-strategy: off", @@ -46,19 +46,19 @@ func TestNewCloudConfig(t *testing.T) { }, { contents: "#cloud-config\nwrite_files:\n - permissions: 0744", - config: CloudConfig{WriteFiles: []File{File{RawFilePermissions: "0744"}}}, + config: CloudConfig{WriteFiles: []File{{RawFilePermissions: "0744"}}}, }, { contents: "#cloud-config\nwrite_files:\n - permissions: 744", - config: CloudConfig{WriteFiles: []File{File{RawFilePermissions: "744"}}}, + config: CloudConfig{WriteFiles: []File{{RawFilePermissions: "744"}}}, }, { contents: "#cloud-config\nwrite_files:\n - permissions: '0744'", - config: CloudConfig{WriteFiles: []File{File{RawFilePermissions: "0744"}}}, + config: CloudConfig{WriteFiles: []File{{RawFilePermissions: "0744"}}}, }, { contents: "#cloud-config\nwrite_files:\n - permissions: '744'", - config: CloudConfig{WriteFiles: []File{File{RawFilePermissions: "744"}}}, + config: CloudConfig{WriteFiles: []File{{RawFilePermissions: "744"}}}, }, } diff --git a/config/validate/node_test.go b/config/validate/node_test.go index 1a347c1c..e683382e 100644 --- a/config/validate/node_test.go +++ b/config/validate/node_test.go @@ -33,18 +33,18 @@ func TestChild(t *testing.T) { { parent: node{ children: []node{ - node{name: "c1"}, - node{name: "c2"}, - node{name: "c3"}, + {name: "c1"}, + {name: "c2"}, + {name: "c3"}, }, }, }, { parent: node{ children: []node{ - node{name: "c1"}, - node{name: "c2"}, - node{name: "c3"}, + {name: "c1"}, + {name: "c2"}, + {name: "c3"}, }, }, name: "c2", @@ -76,8 +76,8 @@ func TestHumanType(t *testing.T) { node: node{ Value: reflect.ValueOf([]int{1, 2}), children: []node{ - node{Value: reflect.ValueOf(1)}, - node{Value: reflect.ValueOf(2)}, + {Value: reflect.ValueOf(1)}, + {Value: reflect.ValueOf(2)}, }}, humanType: "[]int", }, @@ -108,7 +108,7 @@ func TestToNode(t *testing.T) { }{}, node: node{ children: []node{ - node{ + { name: "a", field: reflect.TypeOf(struct { A int `yaml:"a"` @@ -123,7 +123,7 @@ func TestToNode(t *testing.T) { }{}, node: node{ children: []node{ - node{ + { name: "a", field: reflect.TypeOf(struct { A []int `yaml:"a"` @@ -141,11 +141,11 @@ func TestToNode(t *testing.T) { context: NewContext([]byte("a:\n b: 2")), node: node{ children: []node{ - node{ + { line: 1, name: "a", children: []node{ - node{name: "b", line: 2}, + {name: "b", line: 2}, }, }, }, @@ -159,10 +159,10 @@ func TestToNode(t *testing.T) { }{}, node: node{ children: []node{ - node{ + { name: "a", children: []node{ - node{ + { name: "b", field: reflect.TypeOf(struct { Jon bool `yaml:"b"` diff --git a/config/validate/report_test.go b/config/validate/report_test.go index ba640064..3bdfb657 100644 --- a/config/validate/report_test.go +++ b/config/validate/report_test.go @@ -77,9 +77,9 @@ func TestReport(t *testing.T) { {(*Report).Info, 10, "test info 10"}, }, []Entry{ - Entry{entryWarning, "test warning 1", 1}, - Entry{entryError, "test error 2", 2}, - Entry{entryInfo, "test info 10", 10}, + {entryWarning, "test warning 1", 1}, + {entryError, "test error 2", 2}, + {entryInfo, "test info 10", 10}, }, }, } diff --git a/config/validate/validate.go b/config/validate/validate.go index cf668cf7..ad5c0b22 100644 --- a/config/validate/validate.go +++ b/config/validate/validate.go @@ -46,7 +46,7 @@ func Validate(userdataBytes []byte) (Report, error) { return validateCloudConfig(userdataBytes, Rules) default: return Report{entries: []Entry{ - Entry{kind: entryError, message: `must be "#cloud-config" or begin with "#!"`, line: 1}, + {kind: entryError, message: `must be "#cloud-config" or begin with "#!"`, line: 1}, }}, nil } } diff --git a/coreos-cloudinit.go b/coreos-cloudinit.go index 76b3d63b..b64d5208 100644 --- a/coreos-cloudinit.go +++ b/coreos-cloudinit.go @@ -104,28 +104,28 @@ type oemConfig map[string]string var ( oemConfigs = map[string]oemConfig{ - "digitalocean": oemConfig{ + "digitalocean": { "from-digitalocean-metadata": "http://169.254.169.254/", "convert-netconf": "digitalocean", }, - "ec2-compat": oemConfig{ + "ec2-compat": { "from-ec2-metadata": "http://169.254.169.254/", "from-configdrive": "/media/configdrive", }, - "rackspace-onmetal": oemConfig{ + "rackspace-onmetal": { "from-configdrive": "/media/configdrive", "convert-netconf": "debian", }, - "azure": oemConfig{ + "azure": { "from-waagent": "/var/lib/waagent", }, - "cloudsigma": oemConfig{ + "cloudsigma": { "from-cloudsigma-metadata": "true", }, - "packet": oemConfig{ + "packet": { "from-packet-metadata": "https://metadata.packet.net/", }, - "vmware": oemConfig{ + "vmware": { "from-vmware-guestinfo": "true", "convert-netconf": "vmware", }, diff --git a/datasource/metadata/digitalocean/metadata_test.go b/datasource/metadata/digitalocean/metadata_test.go index fd8a0a0c..c38a490c 100644 --- a/datasource/metadata/digitalocean/metadata_test.go +++ b/datasource/metadata/digitalocean/metadata_test.go @@ -93,7 +93,7 @@ func TestFetchMetadata(t *testing.T) { NetworkConfig: Metadata{ Interfaces: Interfaces{ Public: []Interface{ - Interface{ + { IPv4: &Address{ IPAddress: "192.168.1.2", Netmask: "255.255.255.0", diff --git a/datasource/test/filesystem_test.go b/datasource/test/filesystem_test.go index 547c51f1..fa1c56b7 100644 --- a/datasource/test/filesystem_test.go +++ b/datasource/test/filesystem_test.go @@ -70,26 +70,26 @@ func TestNewMockFilesystem(t *testing.T) { filesystem: MockFilesystem{}, }, { - files: []File{File{Path: "file"}}, + files: []File{{Path: "file"}}, filesystem: MockFilesystem{ "file": File{Path: "file"}, }, }, { - files: []File{File{Path: "/file"}}, + files: []File{{Path: "/file"}}, filesystem: MockFilesystem{ "/file": File{Path: "/file"}, }, }, { - files: []File{File{Path: "/dir/file"}}, + files: []File{{Path: "/dir/file"}}, filesystem: MockFilesystem{ "/dir": File{Path: "/dir", Directory: true}, "/dir/file": File{Path: "/dir/file"}, }, }, { - files: []File{File{Path: "/dir/dir/file"}}, + files: []File{{Path: "/dir/dir/file"}}, filesystem: MockFilesystem{ "/dir": File{Path: "/dir", Directory: true}, "/dir/dir": File{Path: "/dir/dir", Directory: true}, @@ -97,7 +97,7 @@ func TestNewMockFilesystem(t *testing.T) { }, }, { - files: []File{File{Path: "/dir/dir/dir", Directory: true}}, + files: []File{{Path: "/dir/dir/dir", Directory: true}}, filesystem: MockFilesystem{ "/dir": File{Path: "/dir", Directory: true}, "/dir/dir": File{Path: "/dir/dir", Directory: true}, diff --git a/datasource/vmware/vmware_amd64.go b/datasource/vmware/vmware_amd64.go index b719c5e2..79c6ca34 100644 --- a/datasource/vmware/vmware_amd64.go +++ b/datasource/vmware/vmware_amd64.go @@ -85,7 +85,7 @@ func readConfig(key string) (string, error) { return data, err } -func getOvfReadConfig (ovfEnv []byte) readConfigFunction { +func getOvfReadConfig(ovfEnv []byte) readConfigFunction { env := &ovf.OvfEnvironment{} if len(ovfEnv) != 0 { env = ovf.ReadEnvironment(ovfEnv) diff --git a/initialize/config_test.go b/initialize/config_test.go index 33be737e..b8b92493 100644 --- a/initialize/config_test.go +++ b/initialize/config_test.go @@ -123,9 +123,9 @@ func TestCreateNetworkingUnits(t *testing.T) { network.InterfaceGenerator(mockInterface{filename: "test3", network: "test network"}), }, []system.Unit{ - system.Unit{Unit: config.Unit{Name: "test1.netdev", Runtime: true, Content: "test netdev"}}, - system.Unit{Unit: config.Unit{Name: "test2.link", Runtime: true, Content: "test link"}}, - system.Unit{Unit: config.Unit{Name: "test3.network", Runtime: true, Content: "test network"}}, + {Unit: config.Unit{Name: "test1.netdev", Runtime: true, Content: "test netdev"}}, + {Unit: config.Unit{Name: "test2.link", Runtime: true, Content: "test link"}}, + {Unit: config.Unit{Name: "test3.network", Runtime: true, Content: "test network"}}, }, }, { @@ -133,9 +133,9 @@ func TestCreateNetworkingUnits(t *testing.T) { network.InterfaceGenerator(mockInterface{filename: "test", netdev: "test netdev", link: "test link", network: "test network"}), }, []system.Unit{ - system.Unit{Unit: config.Unit{Name: "test.netdev", Runtime: true, Content: "test netdev"}}, - system.Unit{Unit: config.Unit{Name: "test.link", Runtime: true, Content: "test link"}}, - system.Unit{Unit: config.Unit{Name: "test.network", Runtime: true, Content: "test network"}}, + {Unit: config.Unit{Name: "test.netdev", Runtime: true, Content: "test netdev"}}, + {Unit: config.Unit{Name: "test.link", Runtime: true, Content: "test link"}}, + {Unit: config.Unit{Name: "test.network", Runtime: true, Content: "test network"}}, }, }, } { @@ -154,7 +154,7 @@ func TestProcessUnits(t *testing.T) { }{ { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "foo", Mask: true, }}, @@ -165,16 +165,16 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "baz.service", Content: "[Service]\nExecStart=/bin/baz", Command: "start", }}, - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "foo.network", Content: "[Network]\nFoo=true", }}, - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "bar.network", Content: "[Network]\nBar=true", }}, @@ -182,15 +182,15 @@ func TestProcessUnits(t *testing.T) { result: TestUnitManager{ placed: []string{"baz.service", "foo.network", "bar.network"}, commands: []UnitAction{ - UnitAction{"systemd-networkd.service", "restart"}, - UnitAction{"baz.service", "start"}, + {"systemd-networkd.service", "restart"}, + {"baz.service", "start"}, }, reload: true, }, }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "baz.service", Content: "[Service]\nExecStart=/bin/true", }}, @@ -202,7 +202,7 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "locksmithd.service", Runtime: true, }}, @@ -213,7 +213,7 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "woof", Enable: true, }}, @@ -224,7 +224,7 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "hi.service", Runtime: true, Content: "[Service]\nExecStart=/bin/echo hi", @@ -248,7 +248,7 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ DropIns: []config.UnitDropIn{ { Name: "lo.conf", @@ -261,7 +261,7 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "hi.service", DropIns: []config.UnitDropIn{ { @@ -274,7 +274,7 @@ func TestProcessUnits(t *testing.T) { }, { units: []system.Unit{ - system.Unit{Unit: config.Unit{ + {Unit: config.Unit{ Name: "hi.service", DropIns: []config.UnitDropIn{ { diff --git a/network/digitalocean_test.go b/network/digitalocean_test.go index fc4fc6d5..3d267433 100644 --- a/network/digitalocean_test.go +++ b/network/digitalocean_test.go @@ -138,7 +138,7 @@ func TestParseInterface(t *testing.T) { iface: &logicalInterface{ hwaddr: net.HardwareAddr([]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}), config: configMethodStatic{ - addresses: []net.IPNet{net.IPNet{ + addresses: []net.IPNet{{ IP: net.ParseIP("1.2.3.4"), Mask: net.IPMask(net.ParseIP("255.255.0.0")), }}, @@ -174,12 +174,12 @@ func TestParseInterface(t *testing.T) { iface: &logicalInterface{ hwaddr: net.HardwareAddr([]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}), config: configMethodStatic{ - addresses: []net.IPNet{net.IPNet{ + addresses: []net.IPNet{{ IP: net.ParseIP("1.2.3.4"), Mask: net.IPMask(net.ParseIP("255.255.0.0")), }}, nameservers: []net.IP{}, - routes: []route{route{ + routes: []route{{ net.IPNet{IP: net.IPv4zero, Mask: net.IPMask(net.IPv4zero)}, net.ParseIP("5.6.7.8"), }}, @@ -210,7 +210,7 @@ func TestParseInterface(t *testing.T) { iface: &logicalInterface{ hwaddr: net.HardwareAddr([]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}), config: configMethodStatic{ - addresses: []net.IPNet{net.IPNet{ + addresses: []net.IPNet{{ IP: net.ParseIP("fe00::"), Mask: net.IPMask(net.ParseIP("ffff::")), }}, @@ -246,12 +246,12 @@ func TestParseInterface(t *testing.T) { iface: &logicalInterface{ hwaddr: net.HardwareAddr([]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}), config: configMethodStatic{ - addresses: []net.IPNet{net.IPNet{ + addresses: []net.IPNet{{ IP: net.ParseIP("fe00::"), Mask: net.IPMask(net.ParseIP("ffff::")), }}, nameservers: []net.IP{}, - routes: []route{route{ + routes: []route{{ net.IPNet{IP: net.IPv6zero, Mask: net.IPMask(net.IPv6zero)}, net.ParseIP("fe00:1234::"), }}, @@ -446,7 +446,7 @@ func TestProcessDigitalOceanNetconf(t *testing.T) { cfg: digitalocean.Metadata{ Interfaces: digitalocean.Interfaces{ Public: []digitalocean.Interface{ - digitalocean.Interface{ + { IPv4: &digitalocean.Address{ IPAddress: "bad", }, diff --git a/network/interface_test.go b/network/interface_test.go index 5cafc939..fbf39e51 100644 --- a/network/interface_test.go +++ b/network/interface_test.go @@ -96,7 +96,7 @@ func TestInterfaceGenerators(t *testing.T) { config: configMethodStatic{ addresses: []net.IPNet{{IP: []byte{192, 168, 1, 100}, Mask: []byte{255, 255, 255, 0}}}, nameservers: []net.IP{[]byte{8, 8, 8, 8}}, - routes: []route{route{destination: net.IPNet{IP: []byte{0, 0, 0, 0}, Mask: []byte{0, 0, 0, 0}}, gateway: []byte{1, 2, 3, 4}}}, + routes: []route{{destination: net.IPNet{IP: []byte{0, 0, 0, 0}, Mask: []byte{0, 0, 0, 0}}, gateway: []byte{1, 2, 3, 4}}}, }, }}, }, @@ -152,7 +152,7 @@ func TestModprobeParams(t *testing.T) { func TestBuildInterfacesLo(t *testing.T) { stanzas := []*stanzaInterface{ - &stanzaInterface{ + { name: "lo", kind: interfacePhysical, auto: false, @@ -174,7 +174,7 @@ func TestBuildInterfacesBlindBond(t *testing.T) { auto: false, configMethod: configMethodManual{}, options: map[string][]string{ - "bond-slaves": []string{"eth0"}, + "bond-slaves": {"eth0"}, }, }, } @@ -211,8 +211,8 @@ func TestBuildInterfacesBlindVLAN(t *testing.T) { auto: false, configMethod: configMethodManual{}, options: map[string][]string{ - "id": []string{"0"}, - "raw_device": []string{"eth0"}, + "id": {"0"}, + "raw_device": {"eth0"}, }, }, } @@ -243,51 +243,51 @@ func TestBuildInterfacesBlindVLAN(t *testing.T) { func TestBuildInterfaces(t *testing.T) { stanzas := []*stanzaInterface{ - &stanzaInterface{ + { name: "eth0", kind: interfacePhysical, auto: false, configMethod: configMethodManual{}, options: map[string][]string{}, }, - &stanzaInterface{ + { name: "bond0", kind: interfaceBond, auto: false, configMethod: configMethodManual{}, options: map[string][]string{ - "bond-slaves": []string{"eth0"}, - "bond-mode": []string{"4"}, - "bond-miimon": []string{"100"}, + "bond-slaves": {"eth0"}, + "bond-mode": {"4"}, + "bond-miimon": {"100"}, }, }, - &stanzaInterface{ + { name: "bond1", kind: interfaceBond, auto: false, configMethod: configMethodManual{}, options: map[string][]string{ - "bond-slaves": []string{"bond0"}, + "bond-slaves": {"bond0"}, }, }, - &stanzaInterface{ + { name: "vlan0", kind: interfaceVLAN, auto: false, configMethod: configMethodManual{}, options: map[string][]string{ - "id": []string{"0"}, - "raw_device": []string{"eth0"}, + "id": {"0"}, + "raw_device": {"eth0"}, }, }, - &stanzaInterface{ + { name: "vlan1", kind: interfaceVLAN, auto: false, configMethod: configMethodManual{}, options: map[string][]string{ - "id": []string{"1"}, - "raw_device": []string{"bond0"}, + "id": {"1"}, + "raw_device": {"bond0"}, }, }, } diff --git a/network/stanza_test.go b/network/stanza_test.go index 9f476380..e3ac31e6 100644 --- a/network/stanza_test.go +++ b/network/stanza_test.go @@ -151,7 +151,7 @@ func TestParseBondStanzaNoSlaves(t *testing.T) { func TestParseBondStanza(t *testing.T) { conf := configMethodManual{} options := map[string][]string{ - "bond-slaves": []string{"1", "2"}, + "bond-slaves": {"1", "2"}, } bond, err := parseBondStanza("test", conf, nil, options) if err != nil { @@ -171,8 +171,8 @@ func TestParseBondStanza(t *testing.T) { func TestParsePhysicalStanza(t *testing.T) { conf := configMethodManual{} options := map[string][]string{ - "a": []string{"1", "2"}, - "b": []string{"1"}, + "a": {"1", "2"}, + "b": {"1"}, } physical, err := parsePhysicalStanza("test", conf, nil, options) if err != nil { diff --git a/network/vmware_test.go b/network/vmware_test.go index 010568c9..e3bf6d95 100644 --- a/network/vmware_test.go +++ b/network/vmware_test.go @@ -82,11 +82,11 @@ func TestProcessVMwareNetconf(t *testing.T) { hwaddr: mustParseMac(net.ParseMAC("00:11:22:33:44:55")), config: configMethodStatic{ hwaddress: mustParseMac(net.ParseMAC("00:11:22:33:44:55")), - addresses: []net.IPNet{net.IPNet{IP: net.ParseIP("10.0.0.100"), Mask: net.CIDRMask(24, net.IPv4len*8)}}, + addresses: []net.IPNet{{IP: net.ParseIP("10.0.0.100"), Mask: net.CIDRMask(24, net.IPv4len*8)}}, // I realize how upset you must be that I am shoving an IPMask into an IP. This is because net.IPv4zero is // actually a magic IPv6 address which ruins our equality check. What's that? Just use IP::Equal()? I'd rather // DeepEqual just handle that for me, but until Go gets operator overloading, we are stuck with this. - routes: []route{route{ + routes: []route{{ destination: net.IPNet{IP: net.IP(net.CIDRMask(0, net.IPv4len*8)), Mask: net.CIDRMask(0, net.IPv4len*8)}, gateway: net.ParseIP("10.0.0.1")}, }, @@ -116,10 +116,10 @@ func TestProcessVMwareNetconf(t *testing.T) { config: configMethodStatic{ hwaddress: mustParseMac(net.ParseMAC("00:11:22:33:44:55")), addresses: []net.IPNet{ - net.IPNet{IP: net.ParseIP("10.0.0.100"), Mask: net.CIDRMask(24, net.IPv4len*8)}, - net.IPNet{IP: net.ParseIP("10.0.0.101"), Mask: net.CIDRMask(24, net.IPv4len*8)}, + {IP: net.ParseIP("10.0.0.100"), Mask: net.CIDRMask(24, net.IPv4len*8)}, + {IP: net.ParseIP("10.0.0.101"), Mask: net.CIDRMask(24, net.IPv4len*8)}, }, - routes: []route{route{ + routes: []route{{ destination: net.IPNet{IP: net.IP(net.CIDRMask(0, net.IPv4len*8)), Mask: net.CIDRMask(0, net.IPv4len*8)}, gateway: net.ParseIP("10.0.0.1")}, }, @@ -129,8 +129,8 @@ func TestProcessVMwareNetconf(t *testing.T) { &physicalInterface{logicalInterface{ name: "eth0", config: configMethodStatic{ - addresses: []net.IPNet{net.IPNet{IP: net.ParseIP("10.0.1.100"), Mask: net.CIDRMask(24, net.IPv4len*8)}}, - routes: []route{route{ + addresses: []net.IPNet{{IP: net.ParseIP("10.0.1.100"), Mask: net.CIDRMask(24, net.IPv4len*8)}}, + routes: []route{{ destination: net.IPNet{IP: net.IP(net.CIDRMask(0, net.IPv4len*8)), Mask: net.CIDRMask(0, net.IPv4len*8)}, gateway: net.ParseIP("10.0.1.1")}, }, diff --git a/system/env_file.go b/system/env_file.go index 6b2c926d..4c6e08b1 100644 --- a/system/env_file.go +++ b/system/env_file.go @@ -106,7 +106,7 @@ func WriteEnvFile(ef *EnvFile, root string) error { // keys returns the keys of a map in sorted order func keys(m map[string]string) (s []string) { - for k, _ := range m { + for k := range m { s = append(s, k) } sort.Strings(s) diff --git a/system/systemd.go b/system/systemd.go index 190b9e77..4385b556 100644 --- a/system/systemd.go +++ b/system/systemd.go @@ -23,8 +23,8 @@ import ( "path" "strings" - "github.com/coreos/go-systemd/dbus" "github.com/coreos/coreos-cloudinit/config" + "github.com/coreos/go-systemd/dbus" ) func NewUnitManager(root string) UnitManager { From daf8cc86944bc396778711800cdca9163723237f Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Sat, 2 Apr 2016 12:34:30 -0700 Subject: [PATCH 4/4] build: update test script to test properly --- test | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/test b/test index 645e967a..be9454ab 100755 --- a/test +++ b/test @@ -2,42 +2,26 @@ source ./build -SRC=" - config - config/validate - datasource - datasource/configdrive - datasource/file - datasource/metadata - datasource/metadata/cloudsigma - datasource/metadata/digitalocean - datasource/metadata/ec2 - datasource/proc_cmdline - datasource/test - datasource/url - datasource/vmware - datasource/waagent - initialize - network - pkg - system - . -" +SRC=$(find . -name '*.go' \ + -not -path "./vendor/*") + +PKG=$(cd gopath/src/${REPO_PATH}; go list ./... | \ + grep --invert-match vendor) echo "Checking gofix..." go tool fix -diff $SRC echo "Checking gofmt..." -gofmt -d -e $SRC - -# split SRC into an array and prepend REPO_PATH to each local package for go vet -split_vet=(${SRC// / }) -VET_TEST="${REPO_PATH} ${split_vet[@]/#/${REPO_PATH}/}" +res=$(gofmt -d -e -s $SRC) +echo "${res}" +if [ -n "${res}" ]; then + exit 1 +fi echo "Checking govet..." -go vet $VET_TEST +go vet $PKG echo "Running tests..." -go test -timeout 60s -cover $@ ${VET_TEST} --race +go test -timeout 60s -cover $@ ${PKG} --race echo "Success"