diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52b1b8c389c07ee48823245f24d916ae7adb9dac..bd6f9390e522ce8f86ba4e8f2a526de224aece7a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,12 @@
image: golang:1.6
+services:
+- docker:dind
+
+variables:
+ DOCKER_DRIVER: overlay
+ DOCKER_HOST: tcp://docker:2375
+
stages:
- build
- mirror
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..27b5869a9652f4ca40680b36d55b5013bf3cfe70
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,16 @@
+## Contributing to GitLab Multi Runner
+
+Contributions are welcome!
+
+The official repository for this project is on [GitLab.com](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner).
+
+* [Development](docs/development/README.md)
+* [Issues](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues)
+* [Merge Requests](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests)
+
+## Contributor license agreement
+
+By submitting code as an individual you agree to the
+[individual contributor license agreement](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/legal/individual_contributor_license_agreement.md).
+By submitting code as an entity you agree to the
+[corporate contributor license agreement](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/legal/corporate_contributor_license_agreement.md).
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index fab774d1f1649498b7c1dac52ea62def6a42616a..633910a5f0298c4e90c88bd941379e2d365ccb1e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,20 +1,15 @@
{
"ImportPath": "gitlab.com/gitlab-org/gitlab-ci-multi-runner",
- "GoVersion": "go1.6.0",
- "GodepVersion": "v71",
+ "GoVersion": "go1.7",
+ "GodepVersion": "v74",
"Packages": [
"./..."
],
"Deps": [
- {
- "ImportPath": "bitbucket.org/ww/goautoneg",
- "Comment": "null-5",
- "Rev": "'75cd24fc2f2c2a2088577d12123ddee5f54e0675'"
- },
{
"ImportPath": "github.com/BurntSushi/toml",
- "Comment": "v0.1.0-24-gffbe061",
- "Rev": "ffbe061dbf09df6f4d404ef06736cc2b9e2510f7"
+ "Comment": "v0.2.0",
+ "Rev": "bbd5bb678321a0d6e58f1099321dfa73391c1b6f"
},
{
"ImportPath": "github.com/Sirupsen/logrus",
@@ -25,67 +20,16 @@
"ImportPath": "github.com/ayufan/golang-kardianos-service",
"Rev": "0c8eb6d8fff2e2fb884a7bfd23e183fb63c0eff3"
},
- {
- "ImportPath": "github.com/beorn7/perks/quantile",
- "Rev": "b965b613227fddccbfffe13eae360ed3fa822f8d"
- },
- {
- "ImportPath": "github.com/blang/semver",
- "Comment": "v3.0.1",
- "Rev": "31b736133b98f26d5e078ec9eb591666edfd091f"
- },
{
"ImportPath": "github.com/codegangsta/cli",
- "Comment": "1.2.0-139-g142e6cd",
+ "Comment": "v1.8.0-4-g142e6cd",
"Rev": "142e6cd241a4dfbf7f07a018f1f8225180018da4"
},
- {
- "ImportPath": "github.com/cpuguy83/go-md2man/md2man",
- "Comment": "v1.0.4",
- "Rev": "71acacd42f85e5e82f70a55327789582a5200a90"
- },
- {
- "ImportPath": "github.com/davecgh/go-spew/spew",
- "Rev": "3e6e67c4dcea3ac2f25fd4731abc0e1deaf36216"
- },
{
"ImportPath": "github.com/docker/docker/pkg/homedir",
"Comment": "v1.4.1-5743-g7ead74d",
"Rev": "7ead74d903de625eef9dc0ec83ba5bcedd0bc0dc"
},
- {
- "ImportPath": "github.com/docker/docker/pkg/parsers",
- "Comment": "v1.4.1-5743-g7ead74d",
- "Rev": "7ead74d903de625eef9dc0ec83ba5bcedd0bc0dc"
- },
- {
- "ImportPath": "github.com/docker/go-units",
- "Comment": "v0.1.0-21-g0bbddae",
- "Rev": "0bbddae09c5a5419a8c6dcdd7ff90da3d450393b"
- },
- {
- "ImportPath": "github.com/docker/spdystream",
- "Rev": "43bffc458d55aa784be658c9867fbefcfcb7fecf"
- },
- {
- "ImportPath": "github.com/docker/spdystream/spdy",
- "Rev": "43bffc458d55aa784be658c9867fbefcfcb7fecf"
- },
- {
- "ImportPath": "github.com/emicklei/go-restful",
- "Comment": "v1.2",
- "Rev": "777bb3f19bcafe2575ffb2a3e46af92509ae9594"
- },
- {
- "ImportPath": "github.com/emicklei/go-restful/log",
- "Comment": "v1.2",
- "Rev": "777bb3f19bcafe2575ffb2a3e46af92509ae9594"
- },
- {
- "ImportPath": "github.com/emicklei/go-restful/swagger",
- "Comment": "v1.2",
- "Rev": "777bb3f19bcafe2575ffb2a3e46af92509ae9594"
- },
{
"ImportPath": "github.com/fsouza/go-dockerclient",
"Rev": "0099401a7342ad77e71ca9f9a57c5e72fb80f6b2"
@@ -162,124 +106,24 @@
"ImportPath": "github.com/getsentry/raven-go",
"Rev": "dffeb57df75d6a911f00232155194e43d79d38d7"
},
- {
- "ImportPath": "github.com/ghodss/yaml",
- "Rev": "73d445a93680fa1a78ae23a5839bad48f32ba1ee"
- },
- {
- "ImportPath": "github.com/golang/glog",
- "Rev": "44145f04b68cf362d9c4df2182967c2275eaefed"
- },
- {
- "ImportPath": "github.com/golang/groupcache/lru",
- "Rev": "604ed5785183e59ae2789449d89e73f3a2a77987"
- },
{
"ImportPath": "github.com/golang/mock/gomock",
"Rev": "06883d979f10cc178f2716846215c8cf90f9e363"
},
- {
- "ImportPath": "github.com/golang/protobuf/proto",
- "Rev": "45bba206dd5270d96bac4942dcfe515726613249"
- },
- {
- "ImportPath": "github.com/google/cadvisor/info/v1",
- "Comment": "v0.21.1",
- "Rev": "49a08d5139ae0111757a110ea3b55fe9a607873d"
- },
- {
- "ImportPath": "github.com/google/gofuzz",
- "Rev": "bbcb9da2d746f8bdbd6a936686a0a6067ada0ec5"
- },
- {
- "ImportPath": "github.com/inconshreveable/mousetrap",
- "Rev": "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
- },
- {
- "ImportPath": "github.com/juju/ratelimit",
- "Rev": "77ed1c8a01217656d2080ad51981f6e99adaa177"
- },
{
"ImportPath": "github.com/kardianos/osext",
"Rev": "efacde03154693404c65e7aa7d461ac9014acd0c"
},
- {
- "ImportPath": "github.com/matttproud/golang_protobuf_extensions/pbutil",
- "Rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"
- },
{
"ImportPath": "github.com/minio/minio-go",
- "Comment": "1.0.1-38-ge9fd7b8",
+ "Comment": "v1.0.0-94-ge9fd7b8",
"Rev": "e9fd7b820d9a87122e159439ca034472040a43ce"
},
- {
- "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups",
- "Comment": "v0.0.7-31-g4f60120",
- "Rev": "4f601205d475e1995472d81b3787b197008c5dd7"
- },
- {
- "ImportPath": "github.com/opencontainers/runc/libcontainer/cgroups/fs",
- "Comment": "v0.0.7-31-g4f60120",
- "Rev": "4f601205d475e1995472d81b3787b197008c5dd7"
- },
- {
- "ImportPath": "github.com/opencontainers/runc/libcontainer/configs",
- "Comment": "v0.0.7-31-g4f60120",
- "Rev": "4f601205d475e1995472d81b3787b197008c5dd7"
- },
- {
- "ImportPath": "github.com/opencontainers/runc/libcontainer/system",
- "Comment": "v0.0.7-31-g4f60120",
- "Rev": "4f601205d475e1995472d81b3787b197008c5dd7"
- },
{
"ImportPath": "github.com/opencontainers/runc/libcontainer/user",
"Comment": "v0.0.7-31-g4f60120",
"Rev": "4f601205d475e1995472d81b3787b197008c5dd7"
},
- {
- "ImportPath": "github.com/pborman/uuid",
- "Rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4"
- },
- {
- "ImportPath": "github.com/prometheus/client_golang/prometheus",
- "Comment": "0.7.0-39-g3b78d7a",
- "Rev": "3b78d7a77f51ccbc364d4bc170920153022cfd08"
- },
- {
- "ImportPath": "github.com/prometheus/client_model/go",
- "Comment": "model-0.0.2-12-gfa8ad6f",
- "Rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"
- },
- {
- "ImportPath": "github.com/prometheus/common/expfmt",
- "Rev": "ef7a9a5fb138aa5d3a19988537606226869a0390"
- },
- {
- "ImportPath": "github.com/prometheus/common/model",
- "Rev": "ef7a9a5fb138aa5d3a19988537606226869a0390"
- },
- {
- "ImportPath": "github.com/prometheus/procfs",
- "Rev": "490cc6eb5fa45bf8a8b7b73c8bc82a8160e8531d"
- },
- {
- "ImportPath": "github.com/russross/blackfriday",
- "Comment": "v1.2-42-g77efab5",
- "Rev": "77efab57b2f74dd3f9051c79752b2e8995c8b789"
- },
- {
- "ImportPath": "github.com/shurcooL/sanitized_anchor_name",
- "Rev": "9a8b7d4e8f347bfa230879db9d7d4e4d9e19f962"
- },
- {
- "ImportPath": "github.com/spf13/cobra",
- "Rev": "1c44ec8d3f1552cac48999f9306da23c4d8a288b"
- },
- {
- "ImportPath": "github.com/spf13/pflag",
- "Rev": "08b1a584251b5b62f458943640fc8ebd4d50aaa5"
- },
{
"ImportPath": "github.com/stretchr/objx",
"Rev": "cbeaeb16a013161a98496fad62933b1d21786672"
@@ -296,10 +140,6 @@
"ImportPath": "github.com/stretchr/testify/require",
"Rev": "1297dc01ed0a819ff634c89707081a4df43baf6b"
},
- {
- "ImportPath": "github.com/ugorji/go/codec",
- "Rev": "a396ed22fc049df733440d90efe17475e3929ccb"
- },
{
"ImportPath": "gitlab.com/ayufan/golang-cli-helpers",
"Rev": "0a14b63a7466ee44de4a90f998fad73afa8482bf"
@@ -312,10 +152,6 @@
"ImportPath": "golang.org/x/crypto/ssh",
"Rev": "1f22c0103821b9390939b6776727195525381532"
},
- {
- "ImportPath": "golang.org/x/net/context",
- "Rev": "b797637b7aeeed133049c7281bfa31dcc9ca42d6"
- },
{
"ImportPath": "golang.org/x/sys/windows",
"Rev": "98fc11432b951eb53c62602ba4ae99d03c1fb7e2"
@@ -339,489 +175,6 @@
{
"ImportPath": "gopkg.in/yaml.v1",
"Rev": "9f9df34309c04878acc86042b16630b0f696e1de"
- },
- {
- "ImportPath": "gopkg.in/yaml.v2",
- "Rev": "d466437aa4adc35830964cffc5b5f262c63ddcb4"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/endpoints",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/errors",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/meta",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/pod",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/resource",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/service",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/testapi",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/unversioned",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/util",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/v1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/api/validation",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apimachinery",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apimachinery/registered",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/authorization/v1beta1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/autoscaling/v1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/batch",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/batch/v1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/extensions/v1beta1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/metrics",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/metrics/install",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/apis/metrics/v1alpha1",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/auth/user",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/capabilities",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/cache",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/metrics",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/record",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/restclient",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/transport",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/typed/discovery",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/typed/generated/core/unversioned",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/typed/generated/extensions/unversioned",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/fake",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/client/unversioned/remotecommand",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/controller",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/controller/framework",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/conversion",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/conversion/queryparams",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/credentialprovider",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/fieldpath",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/fields",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/kubectl",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/kubectl/resource",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/kubelet/qos",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/kubelet/qos/util",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/labels",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/master/ports",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/runtime",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/json",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/recognizer",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/runtime/serializer/versioning",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/types",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/deployment",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/errors",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/hash",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/httpstream/spdy",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/integer",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/intstr",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/jsonpath",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/labels",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/net",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/net/sets",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/parsers",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/pod",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/rand",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/runtime",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/sets",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/strategicpatch",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/validation",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/validation/field",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/wait",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/util/yaml",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/version",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/watch",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/pkg/watch/json",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/third_party/forked/json",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/third_party/forked/reflect",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/third_party/golang/netutil",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "k8s.io/kubernetes/third_party/golang/template",
- "Comment": "v1.2.4",
- "Rev": "3eed1e3be6848b877ff80a93da3785d9034d0a4f"
- },
- {
- "ImportPath": "speter.net/go/exp/math/dec/inf",
- "Rev": "42ca6cd68aa922bc3f32f1e056e61b65945d9ad7"
}
]
}
diff --git a/Godeps/_workspace/.gitignore b/Godeps/_workspace/.gitignore
deleted file mode 100644
index f037d684ef2bd64c0ed8a87d7e85977324b277de..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/pkg
-/bin
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/decode_test.go b/Godeps/_workspace/src/github.com/BurntSushi/toml/decode_test.go
deleted file mode 100644
index 213e70dcaf4a68ba567606512dd366d74e193075..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/BurntSushi/toml/decode_test.go
+++ /dev/null
@@ -1,1092 +0,0 @@
-package toml
-
-import (
- "fmt"
- "log"
- "reflect"
- "testing"
- "time"
-)
-
-func init() {
- log.SetFlags(0)
-}
-
-func TestDecodeSimple(t *testing.T) {
- var testSimple = `
-age = 250
-andrew = "gallant"
-kait = "brady"
-now = 1987-07-05T05:45:00Z
-yesOrNo = true
-pi = 3.14
-colors = [
- ["red", "green", "blue"],
- ["cyan", "magenta", "yellow", "black"],
-]
-
-[My.Cats]
-plato = "cat 1"
-cauchy = "cat 2"
-`
-
- type cats struct {
- Plato string
- Cauchy string
- }
- type simple struct {
- Age int
- Colors [][]string
- Pi float64
- YesOrNo bool
- Now time.Time
- Andrew string
- Kait string
- My map[string]cats
- }
-
- var val simple
- _, err := Decode(testSimple, &val)
- if err != nil {
- t.Fatal(err)
- }
-
- now, err := time.Parse("2006-01-02T15:04:05", "1987-07-05T05:45:00")
- if err != nil {
- panic(err)
- }
- var answer = simple{
- Age: 250,
- Andrew: "gallant",
- Kait: "brady",
- Now: now,
- YesOrNo: true,
- Pi: 3.14,
- Colors: [][]string{
- {"red", "green", "blue"},
- {"cyan", "magenta", "yellow", "black"},
- },
- My: map[string]cats{
- "Cats": {Plato: "cat 1", Cauchy: "cat 2"},
- },
- }
- if !reflect.DeepEqual(val, answer) {
- t.Fatalf("Expected\n-----\n%#v\n-----\nbut got\n-----\n%#v\n",
- answer, val)
- }
-}
-
-func TestDecodeEmbedded(t *testing.T) {
- type Dog struct{ Name string }
- type Age int
-
- tests := map[string]struct {
- input string
- decodeInto interface{}
- wantDecoded interface{}
- }{
- "embedded struct": {
- input: `Name = "milton"`,
- decodeInto: &struct{ Dog }{},
- wantDecoded: &struct{ Dog }{Dog{"milton"}},
- },
- "embedded non-nil pointer to struct": {
- input: `Name = "milton"`,
- decodeInto: &struct{ *Dog }{},
- wantDecoded: &struct{ *Dog }{&Dog{"milton"}},
- },
- "embedded nil pointer to struct": {
- input: ``,
- decodeInto: &struct{ *Dog }{},
- wantDecoded: &struct{ *Dog }{nil},
- },
- "embedded int": {
- input: `Age = -5`,
- decodeInto: &struct{ Age }{},
- wantDecoded: &struct{ Age }{-5},
- },
- }
-
- for label, test := range tests {
- _, err := Decode(test.input, test.decodeInto)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(test.wantDecoded, test.decodeInto) {
- t.Errorf("%s: want decoded == %+v, got %+v",
- label, test.wantDecoded, test.decodeInto)
- }
- }
-}
-
-func TestDecodeIgnoredFields(t *testing.T) {
- type simple struct {
- Number int `toml:"-"`
- }
- const input = `
-Number = 123
-- = 234
-`
- var s simple
- if _, err := Decode(input, &s); err != nil {
- t.Fatal(err)
- }
- if s.Number != 0 {
- t.Errorf("got: %d; want 0", s.Number)
- }
-}
-
-func TestTableArrays(t *testing.T) {
- var tomlTableArrays = `
-[[albums]]
-name = "Born to Run"
-
- [[albums.songs]]
- name = "Jungleland"
-
- [[albums.songs]]
- name = "Meeting Across the River"
-
-[[albums]]
-name = "Born in the USA"
-
- [[albums.songs]]
- name = "Glory Days"
-
- [[albums.songs]]
- name = "Dancing in the Dark"
-`
-
- type Song struct {
- Name string
- }
-
- type Album struct {
- Name string
- Songs []Song
- }
-
- type Music struct {
- Albums []Album
- }
-
- expected := Music{[]Album{
- {"Born to Run", []Song{{"Jungleland"}, {"Meeting Across the River"}}},
- {"Born in the USA", []Song{{"Glory Days"}, {"Dancing in the Dark"}}},
- }}
- var got Music
- if _, err := Decode(tomlTableArrays, &got); err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(expected, got) {
- t.Fatalf("\n%#v\n!=\n%#v\n", expected, got)
- }
-}
-
-// Case insensitive matching tests.
-// A bit more comprehensive than needed given the current implementation,
-// but implementations change.
-// Probably still missing demonstrations of some ugly corner cases regarding
-// case insensitive matching and multiple fields.
-func TestCase(t *testing.T) {
- var caseToml = `
-tOpString = "string"
-tOpInt = 1
-tOpFloat = 1.1
-tOpBool = true
-tOpdate = 2006-01-02T15:04:05Z
-tOparray = [ "array" ]
-Match = "i should be in Match only"
-MatcH = "i should be in MatcH only"
-once = "just once"
-[nEst.eD]
-nEstedString = "another string"
-`
-
- type InsensitiveEd struct {
- NestedString string
- }
-
- type InsensitiveNest struct {
- Ed InsensitiveEd
- }
-
- type Insensitive struct {
- TopString string
- TopInt int
- TopFloat float64
- TopBool bool
- TopDate time.Time
- TopArray []string
- Match string
- MatcH string
- Once string
- OncE string
- Nest InsensitiveNest
- }
-
- tme, err := time.Parse(time.RFC3339, time.RFC3339[:len(time.RFC3339)-5])
- if err != nil {
- panic(err)
- }
- expected := Insensitive{
- TopString: "string",
- TopInt: 1,
- TopFloat: 1.1,
- TopBool: true,
- TopDate: tme,
- TopArray: []string{"array"},
- MatcH: "i should be in MatcH only",
- Match: "i should be in Match only",
- Once: "just once",
- OncE: "",
- Nest: InsensitiveNest{
- Ed: InsensitiveEd{NestedString: "another string"},
- },
- }
- var got Insensitive
- if _, err := Decode(caseToml, &got); err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(expected, got) {
- t.Fatalf("\n%#v\n!=\n%#v\n", expected, got)
- }
-}
-
-func TestPointers(t *testing.T) {
- type Object struct {
- Type string
- Description string
- }
-
- type Dict struct {
- NamedObject map[string]*Object
- BaseObject *Object
- Strptr *string
- Strptrs []*string
- }
- s1, s2, s3 := "blah", "abc", "def"
- expected := &Dict{
- Strptr: &s1,
- Strptrs: []*string{&s2, &s3},
- NamedObject: map[string]*Object{
- "foo": {"FOO", "fooooo!!!"},
- "bar": {"BAR", "ba-ba-ba-ba-barrrr!!!"},
- },
- BaseObject: &Object{"BASE", "da base"},
- }
-
- ex1 := `
-Strptr = "blah"
-Strptrs = ["abc", "def"]
-
-[NamedObject.foo]
-Type = "FOO"
-Description = "fooooo!!!"
-
-[NamedObject.bar]
-Type = "BAR"
-Description = "ba-ba-ba-ba-barrrr!!!"
-
-[BaseObject]
-Type = "BASE"
-Description = "da base"
-`
- dict := new(Dict)
- _, err := Decode(ex1, dict)
- if err != nil {
- t.Errorf("Decode error: %v", err)
- }
- if !reflect.DeepEqual(expected, dict) {
- t.Fatalf("\n%#v\n!=\n%#v\n", expected, dict)
- }
-}
-
-func TestDecodeBadTimestamp(t *testing.T) {
- var x struct {
- T time.Time
- }
- for _, s := range []string{
- "T = 123", "T = 2006-01-50T00:00:00Z", "T = 2006-01-30T00:00:00",
- } {
- if _, err := Decode(s, &x); err == nil {
- t.Errorf("Expected invalid DateTime error for %q", s)
- }
- }
-}
-
-func TestDecodeMultilineStrings(t *testing.T) {
- var x struct {
- S string
- }
- const s0 = `s = """
-a b \n c
-d e f
-"""`
- if _, err := Decode(s0, &x); err != nil {
- t.Fatal(err)
- }
- if want := "a b \n c\nd e f\n"; x.S != want {
- t.Errorf("got: %q; want: %q", x.S, want)
- }
- const s1 = `s = """a b c\
-"""`
- if _, err := Decode(s1, &x); err != nil {
- t.Fatal(err)
- }
- if want := "a b c"; x.S != want {
- t.Errorf("got: %q; want: %q", x.S, want)
- }
-}
-
-type sphere struct {
- Center [3]float64
- Radius float64
-}
-
-func TestDecodeSimpleArray(t *testing.T) {
- var s1 sphere
- if _, err := Decode(`center = [0.0, 1.5, 0.0]`, &s1); err != nil {
- t.Fatal(err)
- }
-}
-
-func TestDecodeArrayWrongSize(t *testing.T) {
- var s1 sphere
- if _, err := Decode(`center = [0.1, 2.3]`, &s1); err == nil {
- t.Fatal("Expected array type mismatch error")
- }
-}
-
-func TestDecodeLargeIntoSmallInt(t *testing.T) {
- type table struct {
- Value int8
- }
- var tab table
- if _, err := Decode(`value = 500`, &tab); err == nil {
- t.Fatal("Expected integer out-of-bounds error.")
- }
-}
-
-func TestDecodeSizedInts(t *testing.T) {
- type table struct {
- U8 uint8
- U16 uint16
- U32 uint32
- U64 uint64
- U uint
- I8 int8
- I16 int16
- I32 int32
- I64 int64
- I int
- }
- answer := table{1, 1, 1, 1, 1, -1, -1, -1, -1, -1}
- toml := `
- u8 = 1
- u16 = 1
- u32 = 1
- u64 = 1
- u = 1
- i8 = -1
- i16 = -1
- i32 = -1
- i64 = -1
- i = -1
- `
- var tab table
- if _, err := Decode(toml, &tab); err != nil {
- t.Fatal(err.Error())
- }
- if answer != tab {
- t.Fatalf("Expected %#v but got %#v", answer, tab)
- }
-}
-
-func TestUnmarshaler(t *testing.T) {
-
- var tomlBlob = `
-[dishes.hamboogie]
-name = "Hamboogie with fries"
-price = 10.99
-
-[[dishes.hamboogie.ingredients]]
-name = "Bread Bun"
-
-[[dishes.hamboogie.ingredients]]
-name = "Lettuce"
-
-[[dishes.hamboogie.ingredients]]
-name = "Real Beef Patty"
-
-[[dishes.hamboogie.ingredients]]
-name = "Tomato"
-
-[dishes.eggsalad]
-name = "Egg Salad with rice"
-price = 3.99
-
-[[dishes.eggsalad.ingredients]]
-name = "Egg"
-
-[[dishes.eggsalad.ingredients]]
-name = "Mayo"
-
-[[dishes.eggsalad.ingredients]]
-name = "Rice"
-`
- m := &menu{}
- if _, err := Decode(tomlBlob, m); err != nil {
- log.Fatal(err)
- }
-
- if len(m.Dishes) != 2 {
- t.Log("two dishes should be loaded with UnmarshalTOML()")
- t.Errorf("expected %d but got %d", 2, len(m.Dishes))
- }
-
- eggSalad := m.Dishes["eggsalad"]
- if _, ok := interface{}(eggSalad).(dish); !ok {
- t.Errorf("expected a dish")
- }
-
- if eggSalad.Name != "Egg Salad with rice" {
- t.Errorf("expected the dish to be named 'Egg Salad with rice'")
- }
-
- if len(eggSalad.Ingredients) != 3 {
- t.Log("dish should be loaded with UnmarshalTOML()")
- t.Errorf("expected %d but got %d", 3, len(eggSalad.Ingredients))
- }
-
- found := false
- for _, i := range eggSalad.Ingredients {
- if i.Name == "Rice" {
- found = true
- break
- }
- }
- if !found {
- t.Error("Rice was not loaded in UnmarshalTOML()")
- }
-
- // test on a value - must be passed as *
- o := menu{}
- if _, err := Decode(tomlBlob, &o); err != nil {
- log.Fatal(err)
- }
-
-}
-
-type menu struct {
- Dishes map[string]dish
-}
-
-func (m *menu) UnmarshalTOML(p interface{}) error {
- m.Dishes = make(map[string]dish)
- data, _ := p.(map[string]interface{})
- dishes := data["dishes"].(map[string]interface{})
- for n, v := range dishes {
- if d, ok := v.(map[string]interface{}); ok {
- nd := dish{}
- nd.UnmarshalTOML(d)
- m.Dishes[n] = nd
- } else {
- return fmt.Errorf("not a dish")
- }
- }
- return nil
-}
-
-type dish struct {
- Name string
- Price float32
- Ingredients []ingredient
-}
-
-func (d *dish) UnmarshalTOML(p interface{}) error {
- data, _ := p.(map[string]interface{})
- d.Name, _ = data["name"].(string)
- d.Price, _ = data["price"].(float32)
- ingredients, _ := data["ingredients"].([]map[string]interface{})
- for _, e := range ingredients {
- n, _ := interface{}(e).(map[string]interface{})
- name, _ := n["name"].(string)
- i := ingredient{name}
- d.Ingredients = append(d.Ingredients, i)
- }
- return nil
-}
-
-type ingredient struct {
- Name string
-}
-
-func TestDecodeSlices(t *testing.T) {
- type T struct {
- S []string
- }
- for i, tt := range []struct {
- v T
- input string
- want T
- }{
- {T{}, "", T{}},
- {T{[]string{}}, "", T{[]string{}}},
- {T{[]string{"a", "b"}}, "", T{[]string{"a", "b"}}},
- {T{}, "S = []", T{[]string{}}},
- {T{[]string{}}, "S = []", T{[]string{}}},
- {T{[]string{"a", "b"}}, "S = []", T{[]string{}}},
- {T{}, `S = ["x"]`, T{[]string{"x"}}},
- {T{[]string{}}, `S = ["x"]`, T{[]string{"x"}}},
- {T{[]string{"a", "b"}}, `S = ["x"]`, T{[]string{"x"}}},
- } {
- if _, err := Decode(tt.input, &tt.v); err != nil {
- t.Errorf("[%d] %s", i, err)
- continue
- }
- if !reflect.DeepEqual(tt.v, tt.want) {
- t.Errorf("[%d] got %#v; want %#v", i, tt.v, tt.want)
- }
- }
-}
-
-func TestDecodePrimitive(t *testing.T) {
- type S struct {
- P Primitive
- }
- type T struct {
- S []int
- }
- slicep := func(s []int) *[]int { return &s }
- arrayp := func(a [2]int) *[2]int { return &a }
- mapp := func(m map[string]int) *map[string]int { return &m }
- for i, tt := range []struct {
- v interface{}
- input string
- want interface{}
- }{
- // slices
- {slicep(nil), "", slicep(nil)},
- {slicep([]int{}), "", slicep([]int{})},
- {slicep([]int{1, 2, 3}), "", slicep([]int{1, 2, 3})},
- {slicep(nil), "P = [1,2]", slicep([]int{1, 2})},
- {slicep([]int{}), "P = [1,2]", slicep([]int{1, 2})},
- {slicep([]int{1, 2, 3}), "P = [1,2]", slicep([]int{1, 2})},
-
- // arrays
- {arrayp([2]int{2, 3}), "", arrayp([2]int{2, 3})},
- {arrayp([2]int{2, 3}), "P = [3,4]", arrayp([2]int{3, 4})},
-
- // maps
- {mapp(nil), "", mapp(nil)},
- {mapp(map[string]int{}), "", mapp(map[string]int{})},
- {mapp(map[string]int{"a": 1}), "", mapp(map[string]int{"a": 1})},
- {mapp(nil), "[P]\na = 2", mapp(map[string]int{"a": 2})},
- {mapp(map[string]int{}), "[P]\na = 2", mapp(map[string]int{"a": 2})},
- {mapp(map[string]int{"a": 1, "b": 3}), "[P]\na = 2", mapp(map[string]int{"a": 2, "b": 3})},
-
- // structs
- {&T{nil}, "[P]", &T{nil}},
- {&T{[]int{}}, "[P]", &T{[]int{}}},
- {&T{[]int{1, 2, 3}}, "[P]", &T{[]int{1, 2, 3}}},
- {&T{nil}, "[P]\nS = [1,2]", &T{[]int{1, 2}}},
- {&T{[]int{}}, "[P]\nS = [1,2]", &T{[]int{1, 2}}},
- {&T{[]int{1, 2, 3}}, "[P]\nS = [1,2]", &T{[]int{1, 2}}},
- } {
- var s S
- md, err := Decode(tt.input, &s)
- if err != nil {
- t.Errorf("[%d] Decode error: %s", i, err)
- continue
- }
- if err := md.PrimitiveDecode(s.P, tt.v); err != nil {
- t.Errorf("[%d] PrimitiveDecode error: %s", i, err)
- continue
- }
- if !reflect.DeepEqual(tt.v, tt.want) {
- t.Errorf("[%d] got %#v; want %#v", i, tt.v, tt.want)
- }
- }
-}
-
-func ExampleMetaData_PrimitiveDecode() {
- var md MetaData
- var err error
-
- var tomlBlob = `
-ranking = ["Springsteen", "J Geils"]
-
-[bands.Springsteen]
-started = 1973
-albums = ["Greetings", "WIESS", "Born to Run", "Darkness"]
-
-[bands."J Geils"]
-started = 1970
-albums = ["The J. Geils Band", "Full House", "Blow Your Face Out"]
-`
-
- type band struct {
- Started int
- Albums []string
- }
- type classics struct {
- Ranking []string
- Bands map[string]Primitive
- }
-
- // Do the initial decode. Reflection is delayed on Primitive values.
- var music classics
- if md, err = Decode(tomlBlob, &music); err != nil {
- log.Fatal(err)
- }
-
- // MetaData still includes information on Primitive values.
- fmt.Printf("Is `bands.Springsteen` defined? %v\n",
- md.IsDefined("bands", "Springsteen"))
-
- // Decode primitive data into Go values.
- for _, artist := range music.Ranking {
- // A band is a primitive value, so we need to decode it to get a
- // real `band` value.
- primValue := music.Bands[artist]
-
- var aBand band
- if err = md.PrimitiveDecode(primValue, &aBand); err != nil {
- log.Fatal(err)
- }
- fmt.Printf("%s started in %d.\n", artist, aBand.Started)
- }
- // Check to see if there were any fields left undecoded.
- // Note that this won't be empty before decoding the Primitive value!
- fmt.Printf("Undecoded: %q\n", md.Undecoded())
-
- // Output:
- // Is `bands.Springsteen` defined? true
- // Springsteen started in 1973.
- // J Geils started in 1970.
- // Undecoded: []
-}
-
-func ExampleDecode() {
- var tomlBlob = `
-# Some comments.
-[alpha]
-ip = "10.0.0.1"
-
- [alpha.config]
- Ports = [ 8001, 8002 ]
- Location = "Toronto"
- Created = 1987-07-05T05:45:00Z
-
-[beta]
-ip = "10.0.0.2"
-
- [beta.config]
- Ports = [ 9001, 9002 ]
- Location = "New Jersey"
- Created = 1887-01-05T05:55:00Z
-`
-
- type serverConfig struct {
- Ports []int
- Location string
- Created time.Time
- }
-
- type server struct {
- IP string `toml:"ip,omitempty"`
- Config serverConfig `toml:"config"`
- }
-
- type servers map[string]server
-
- var config servers
- if _, err := Decode(tomlBlob, &config); err != nil {
- log.Fatal(err)
- }
-
- for _, name := range []string{"alpha", "beta"} {
- s := config[name]
- fmt.Printf("Server: %s (ip: %s) in %s created on %s\n",
- name, s.IP, s.Config.Location,
- s.Config.Created.Format("2006-01-02"))
- fmt.Printf("Ports: %v\n", s.Config.Ports)
- }
-
- // Output:
- // Server: alpha (ip: 10.0.0.1) in Toronto created on 1987-07-05
- // Ports: [8001 8002]
- // Server: beta (ip: 10.0.0.2) in New Jersey created on 1887-01-05
- // Ports: [9001 9002]
-}
-
-type duration struct {
- time.Duration
-}
-
-func (d *duration) UnmarshalText(text []byte) error {
- var err error
- d.Duration, err = time.ParseDuration(string(text))
- return err
-}
-
-// Example Unmarshaler shows how to decode TOML strings into your own
-// custom data type.
-func Example_unmarshaler() {
- blob := `
-[[song]]
-name = "Thunder Road"
-duration = "4m49s"
-
-[[song]]
-name = "Stairway to Heaven"
-duration = "8m03s"
-`
- type song struct {
- Name string
- Duration duration
- }
- type songs struct {
- Song []song
- }
- var favorites songs
- if _, err := Decode(blob, &favorites); err != nil {
- log.Fatal(err)
- }
-
- // Code to implement the TextUnmarshaler interface for `duration`:
- //
- // type duration struct {
- // time.Duration
- // }
- //
- // func (d *duration) UnmarshalText(text []byte) error {
- // var err error
- // d.Duration, err = time.ParseDuration(string(text))
- // return err
- // }
-
- for _, s := range favorites.Song {
- fmt.Printf("%s (%s)\n", s.Name, s.Duration)
- }
- // Output:
- // Thunder Road (4m49s)
- // Stairway to Heaven (8m3s)
-}
-
-// Example StrictDecoding shows how to detect whether there are keys in the
-// TOML document that weren't decoded into the value given. This is useful
-// for returning an error to the user if they've included extraneous fields
-// in their configuration.
-func Example_strictDecoding() {
- var blob = `
-key1 = "value1"
-key2 = "value2"
-key3 = "value3"
-`
- type config struct {
- Key1 string
- Key3 string
- }
-
- var conf config
- md, err := Decode(blob, &conf)
- if err != nil {
- log.Fatal(err)
- }
- fmt.Printf("Undecoded keys: %q\n", md.Undecoded())
- // Output:
- // Undecoded keys: ["key2"]
-}
-
-// Example UnmarshalTOML shows how to implement a struct type that knows how to
-// unmarshal itself. The struct must take full responsibility for mapping the
-// values passed into the struct. The method may be used with interfaces in a
-// struct in cases where the actual type is not known until the data is
-// examined.
-func Example_unmarshalTOML() {
-
- var blob = `
-[[parts]]
-type = "valve"
-id = "valve-1"
-size = 1.2
-rating = 4
-
-[[parts]]
-type = "valve"
-id = "valve-2"
-size = 2.1
-rating = 5
-
-[[parts]]
-type = "pipe"
-id = "pipe-1"
-length = 2.1
-diameter = 12
-
-[[parts]]
-type = "cable"
-id = "cable-1"
-length = 12
-rating = 3.1
-`
- o := &order{}
- err := Unmarshal([]byte(blob), o)
- if err != nil {
- log.Fatal(err)
- }
-
- fmt.Println(len(o.parts))
-
- for _, part := range o.parts {
- fmt.Println(part.Name())
- }
-
- // Code to implement UmarshalJSON.
-
- // type order struct {
- // // NOTE `order.parts` is a private slice of type `part` which is an
- // // interface and may only be loaded from toml using the
- // // UnmarshalTOML() method of the Umarshaler interface.
- // parts parts
- // }
-
- // func (o *order) UnmarshalTOML(data interface{}) error {
-
- // // NOTE the example below contains detailed type casting to show how
- // // the 'data' is retrieved. In operational use, a type cast wrapper
- // // may be prefered e.g.
- // //
- // // func AsMap(v interface{}) (map[string]interface{}, error) {
- // // return v.(map[string]interface{})
- // // }
- // //
- // // resulting in:
- // // d, _ := AsMap(data)
- // //
-
- // d, _ := data.(map[string]interface{})
- // parts, _ := d["parts"].([]map[string]interface{})
-
- // for _, p := range parts {
-
- // typ, _ := p["type"].(string)
- // id, _ := p["id"].(string)
-
- // // detect the type of part and handle each case
- // switch p["type"] {
- // case "valve":
-
- // size := float32(p["size"].(float64))
- // rating := int(p["rating"].(int64))
-
- // valve := &valve{
- // Type: typ,
- // ID: id,
- // Size: size,
- // Rating: rating,
- // }
-
- // o.parts = append(o.parts, valve)
-
- // case "pipe":
-
- // length := float32(p["length"].(float64))
- // diameter := int(p["diameter"].(int64))
-
- // pipe := &pipe{
- // Type: typ,
- // ID: id,
- // Length: length,
- // Diameter: diameter,
- // }
-
- // o.parts = append(o.parts, pipe)
-
- // case "cable":
-
- // length := int(p["length"].(int64))
- // rating := float32(p["rating"].(float64))
-
- // cable := &cable{
- // Type: typ,
- // ID: id,
- // Length: length,
- // Rating: rating,
- // }
-
- // o.parts = append(o.parts, cable)
-
- // }
- // }
-
- // return nil
- // }
-
- // type parts []part
-
- // type part interface {
- // Name() string
- // }
-
- // type valve struct {
- // Type string
- // ID string
- // Size float32
- // Rating int
- // }
-
- // func (v *valve) Name() string {
- // return fmt.Sprintf("VALVE: %s", v.ID)
- // }
-
- // type pipe struct {
- // Type string
- // ID string
- // Length float32
- // Diameter int
- // }
-
- // func (p *pipe) Name() string {
- // return fmt.Sprintf("PIPE: %s", p.ID)
- // }
-
- // type cable struct {
- // Type string
- // ID string
- // Length int
- // Rating float32
- // }
-
- // func (c *cable) Name() string {
- // return fmt.Sprintf("CABLE: %s", c.ID)
- // }
-
- // Output:
- // 4
- // VALVE: valve-1
- // VALVE: valve-2
- // PIPE: pipe-1
- // CABLE: cable-1
-
-}
-
-type order struct {
- // NOTE `order.parts` is a private slice of type `part` which is an
- // interface and may only be loaded from toml using the UnmarshalTOML()
- // method of the Umarshaler interface.
- parts parts
-}
-
-func (o *order) UnmarshalTOML(data interface{}) error {
-
- // NOTE the example below contains detailed type casting to show how
- // the 'data' is retrieved. In operational use, a type cast wrapper
- // may be prefered e.g.
- //
- // func AsMap(v interface{}) (map[string]interface{}, error) {
- // return v.(map[string]interface{})
- // }
- //
- // resulting in:
- // d, _ := AsMap(data)
- //
-
- d, _ := data.(map[string]interface{})
- parts, _ := d["parts"].([]map[string]interface{})
-
- for _, p := range parts {
-
- typ, _ := p["type"].(string)
- id, _ := p["id"].(string)
-
- // detect the type of part and handle each case
- switch p["type"] {
- case "valve":
-
- size := float32(p["size"].(float64))
- rating := int(p["rating"].(int64))
-
- valve := &valve{
- Type: typ,
- ID: id,
- Size: size,
- Rating: rating,
- }
-
- o.parts = append(o.parts, valve)
-
- case "pipe":
-
- length := float32(p["length"].(float64))
- diameter := int(p["diameter"].(int64))
-
- pipe := &pipe{
- Type: typ,
- ID: id,
- Length: length,
- Diameter: diameter,
- }
-
- o.parts = append(o.parts, pipe)
-
- case "cable":
-
- length := int(p["length"].(int64))
- rating := float32(p["rating"].(float64))
-
- cable := &cable{
- Type: typ,
- ID: id,
- Length: length,
- Rating: rating,
- }
-
- o.parts = append(o.parts, cable)
-
- }
- }
-
- return nil
-}
-
-type parts []part
-
-type part interface {
- Name() string
-}
-
-type valve struct {
- Type string
- ID string
- Size float32
- Rating int
-}
-
-func (v *valve) Name() string {
- return fmt.Sprintf("VALVE: %s", v.ID)
-}
-
-type pipe struct {
- Type string
- ID string
- Length float32
- Diameter int
-}
-
-func (p *pipe) Name() string {
- return fmt.Sprintf("PIPE: %s", p.ID)
-}
-
-type cable struct {
- Type string
- ID string
- Length int
- Rating float32
-}
-
-func (c *cable) Name() string {
- return fmt.Sprintf("CABLE: %s", c.ID)
-}
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/encode_test.go b/Godeps/_workspace/src/github.com/BurntSushi/toml/encode_test.go
deleted file mode 100644
index ef7acdd74b3ea0d1c24a8e1e3171cac6c7fa7039..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/BurntSushi/toml/encode_test.go
+++ /dev/null
@@ -1,590 +0,0 @@
-package toml
-
-import (
- "bytes"
- "fmt"
- "log"
- "net"
- "testing"
- "time"
-)
-
-func TestEncodeRoundTrip(t *testing.T) {
- type Config struct {
- Age int
- Cats []string
- Pi float64
- Perfection []int
- DOB time.Time
- Ipaddress net.IP
- }
-
- var inputs = Config{
- 13,
- []string{"one", "two", "three"},
- 3.145,
- []int{11, 2, 3, 4},
- time.Now(),
- net.ParseIP("192.168.59.254"),
- }
-
- var firstBuffer bytes.Buffer
- e := NewEncoder(&firstBuffer)
- err := e.Encode(inputs)
- if err != nil {
- t.Fatal(err)
- }
- var outputs Config
- if _, err := Decode(firstBuffer.String(), &outputs); err != nil {
- log.Printf("Could not decode:\n-----\n%s\n-----\n",
- firstBuffer.String())
- t.Fatal(err)
- }
-
- // could test each value individually, but I'm lazy
- var secondBuffer bytes.Buffer
- e2 := NewEncoder(&secondBuffer)
- err = e2.Encode(outputs)
- if err != nil {
- t.Fatal(err)
- }
- if firstBuffer.String() != secondBuffer.String() {
- t.Error(
- firstBuffer.String(),
- "\n\n is not identical to\n\n",
- secondBuffer.String())
- }
-}
-
-// XXX(burntsushi)
-// I think these tests probably should be removed. They are good, but they
-// ought to be obsolete by toml-test.
-func TestEncode(t *testing.T) {
- type Embedded struct {
- Int int `toml:"_int"`
- }
- type NonStruct int
-
- date := time.Date(2014, 5, 11, 20, 30, 40, 0, time.FixedZone("IST", 3600))
- dateStr := "2014-05-11T19:30:40Z"
-
- tests := map[string]struct {
- input interface{}
- wantOutput string
- wantError error
- }{
- "bool field": {
- input: struct {
- BoolTrue bool
- BoolFalse bool
- }{true, false},
- wantOutput: "BoolTrue = true\nBoolFalse = false\n",
- },
- "int fields": {
- input: struct {
- Int int
- Int8 int8
- Int16 int16
- Int32 int32
- Int64 int64
- }{1, 2, 3, 4, 5},
- wantOutput: "Int = 1\nInt8 = 2\nInt16 = 3\nInt32 = 4\nInt64 = 5\n",
- },
- "uint fields": {
- input: struct {
- Uint uint
- Uint8 uint8
- Uint16 uint16
- Uint32 uint32
- Uint64 uint64
- }{1, 2, 3, 4, 5},
- wantOutput: "Uint = 1\nUint8 = 2\nUint16 = 3\nUint32 = 4" +
- "\nUint64 = 5\n",
- },
- "float fields": {
- input: struct {
- Float32 float32
- Float64 float64
- }{1.5, 2.5},
- wantOutput: "Float32 = 1.5\nFloat64 = 2.5\n",
- },
- "string field": {
- input: struct{ String string }{"foo"},
- wantOutput: "String = \"foo\"\n",
- },
- "string field and unexported field": {
- input: struct {
- String string
- unexported int
- }{"foo", 0},
- wantOutput: "String = \"foo\"\n",
- },
- "datetime field in UTC": {
- input: struct{ Date time.Time }{date},
- wantOutput: fmt.Sprintf("Date = %s\n", dateStr),
- },
- "datetime field as primitive": {
- // Using a map here to fail if isStructOrMap() returns true for
- // time.Time.
- input: map[string]interface{}{
- "Date": date,
- "Int": 1,
- },
- wantOutput: fmt.Sprintf("Date = %s\nInt = 1\n", dateStr),
- },
- "array fields": {
- input: struct {
- IntArray0 [0]int
- IntArray3 [3]int
- }{[0]int{}, [3]int{1, 2, 3}},
- wantOutput: "IntArray0 = []\nIntArray3 = [1, 2, 3]\n",
- },
- "slice fields": {
- input: struct{ IntSliceNil, IntSlice0, IntSlice3 []int }{
- nil, []int{}, []int{1, 2, 3},
- },
- wantOutput: "IntSlice0 = []\nIntSlice3 = [1, 2, 3]\n",
- },
- "datetime slices": {
- input: struct{ DatetimeSlice []time.Time }{
- []time.Time{date, date},
- },
- wantOutput: fmt.Sprintf("DatetimeSlice = [%s, %s]\n",
- dateStr, dateStr),
- },
- "nested arrays and slices": {
- input: struct {
- SliceOfArrays [][2]int
- ArrayOfSlices [2][]int
- SliceOfArraysOfSlices [][2][]int
- ArrayOfSlicesOfArrays [2][][2]int
- SliceOfMixedArrays [][2]interface{}
- ArrayOfMixedSlices [2][]interface{}
- }{
- [][2]int{{1, 2}, {3, 4}},
- [2][]int{{1, 2}, {3, 4}},
- [][2][]int{
- {
- {1, 2}, {3, 4},
- },
- {
- {5, 6}, {7, 8},
- },
- },
- [2][][2]int{
- {
- {1, 2}, {3, 4},
- },
- {
- {5, 6}, {7, 8},
- },
- },
- [][2]interface{}{
- {1, 2}, {"a", "b"},
- },
- [2][]interface{}{
- {1, 2}, {"a", "b"},
- },
- },
- wantOutput: `SliceOfArrays = [[1, 2], [3, 4]]
-ArrayOfSlices = [[1, 2], [3, 4]]
-SliceOfArraysOfSlices = [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
-ArrayOfSlicesOfArrays = [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
-SliceOfMixedArrays = [[1, 2], ["a", "b"]]
-ArrayOfMixedSlices = [[1, 2], ["a", "b"]]
-`,
- },
- "empty slice": {
- input: struct{ Empty []interface{} }{[]interface{}{}},
- wantOutput: "Empty = []\n",
- },
- "(error) slice with element type mismatch (string and integer)": {
- input: struct{ Mixed []interface{} }{[]interface{}{1, "a"}},
- wantError: errArrayMixedElementTypes,
- },
- "(error) slice with element type mismatch (integer and float)": {
- input: struct{ Mixed []interface{} }{[]interface{}{1, 2.5}},
- wantError: errArrayMixedElementTypes,
- },
- "slice with elems of differing Go types, same TOML types": {
- input: struct {
- MixedInts []interface{}
- MixedFloats []interface{}
- }{
- []interface{}{
- int(1), int8(2), int16(3), int32(4), int64(5),
- uint(1), uint8(2), uint16(3), uint32(4), uint64(5),
- },
- []interface{}{float32(1.5), float64(2.5)},
- },
- wantOutput: "MixedInts = [1, 2, 3, 4, 5, 1, 2, 3, 4, 5]\n" +
- "MixedFloats = [1.5, 2.5]\n",
- },
- "(error) slice w/ element type mismatch (one is nested array)": {
- input: struct{ Mixed []interface{} }{
- []interface{}{1, []interface{}{2}},
- },
- wantError: errArrayMixedElementTypes,
- },
- "(error) slice with 1 nil element": {
- input: struct{ NilElement1 []interface{} }{[]interface{}{nil}},
- wantError: errArrayNilElement,
- },
- "(error) slice with 1 nil element (and other non-nil elements)": {
- input: struct{ NilElement []interface{} }{
- []interface{}{1, nil},
- },
- wantError: errArrayNilElement,
- },
- "simple map": {
- input: map[string]int{"a": 1, "b": 2},
- wantOutput: "a = 1\nb = 2\n",
- },
- "map with interface{} value type": {
- input: map[string]interface{}{"a": 1, "b": "c"},
- wantOutput: "a = 1\nb = \"c\"\n",
- },
- "map with interface{} value type, some of which are structs": {
- input: map[string]interface{}{
- "a": struct{ Int int }{2},
- "b": 1,
- },
- wantOutput: "b = 1\n\n[a]\n Int = 2\n",
- },
- "nested map": {
- input: map[string]map[string]int{
- "a": {"b": 1},
- "c": {"d": 2},
- },
- wantOutput: "[a]\n b = 1\n\n[c]\n d = 2\n",
- },
- "nested struct": {
- input: struct{ Struct struct{ Int int } }{
- struct{ Int int }{1},
- },
- wantOutput: "[Struct]\n Int = 1\n",
- },
- "nested struct and non-struct field": {
- input: struct {
- Struct struct{ Int int }
- Bool bool
- }{struct{ Int int }{1}, true},
- wantOutput: "Bool = true\n\n[Struct]\n Int = 1\n",
- },
- "2 nested structs": {
- input: struct{ Struct1, Struct2 struct{ Int int } }{
- struct{ Int int }{1}, struct{ Int int }{2},
- },
- wantOutput: "[Struct1]\n Int = 1\n\n[Struct2]\n Int = 2\n",
- },
- "deeply nested structs": {
- input: struct {
- Struct1, Struct2 struct{ Struct3 *struct{ Int int } }
- }{
- struct{ Struct3 *struct{ Int int } }{&struct{ Int int }{1}},
- struct{ Struct3 *struct{ Int int } }{nil},
- },
- wantOutput: "[Struct1]\n [Struct1.Struct3]\n Int = 1" +
- "\n\n[Struct2]\n",
- },
- "nested struct with nil struct elem": {
- input: struct {
- Struct struct{ Inner *struct{ Int int } }
- }{
- struct{ Inner *struct{ Int int } }{nil},
- },
- wantOutput: "[Struct]\n",
- },
- "nested struct with no fields": {
- input: struct {
- Struct struct{ Inner struct{} }
- }{
- struct{ Inner struct{} }{struct{}{}},
- },
- wantOutput: "[Struct]\n [Struct.Inner]\n",
- },
- "struct with tags": {
- input: struct {
- Struct struct {
- Int int `toml:"_int"`
- } `toml:"_struct"`
- Bool bool `toml:"_bool"`
- }{
- struct {
- Int int `toml:"_int"`
- }{1}, true,
- },
- wantOutput: "_bool = true\n\n[_struct]\n _int = 1\n",
- },
- "embedded struct": {
- input: struct{ Embedded }{Embedded{1}},
- wantOutput: "_int = 1\n",
- },
- "embedded *struct": {
- input: struct{ *Embedded }{&Embedded{1}},
- wantOutput: "_int = 1\n",
- },
- "nested embedded struct": {
- input: struct {
- Struct struct{ Embedded } `toml:"_struct"`
- }{struct{ Embedded }{Embedded{1}}},
- wantOutput: "[_struct]\n _int = 1\n",
- },
- "nested embedded *struct": {
- input: struct {
- Struct struct{ *Embedded } `toml:"_struct"`
- }{struct{ *Embedded }{&Embedded{1}}},
- wantOutput: "[_struct]\n _int = 1\n",
- },
- "embedded non-struct": {
- input: struct{ NonStruct }{5},
- wantOutput: "NonStruct = 5\n",
- },
- "array of tables": {
- input: struct {
- Structs []*struct{ Int int } `toml:"struct"`
- }{
- []*struct{ Int int }{{1}, {3}},
- },
- wantOutput: "[[struct]]\n Int = 1\n\n[[struct]]\n Int = 3\n",
- },
- "array of tables order": {
- input: map[string]interface{}{
- "map": map[string]interface{}{
- "zero": 5,
- "arr": []map[string]int{
- {
- "friend": 5,
- },
- },
- },
- },
- wantOutput: "[map]\n zero = 5\n\n [[map.arr]]\n friend = 5\n",
- },
- "(error) top-level slice": {
- input: []struct{ Int int }{{1}, {2}, {3}},
- wantError: errNoKey,
- },
- "(error) slice of slice": {
- input: struct {
- Slices [][]struct{ Int int }
- }{
- [][]struct{ Int int }{{{1}}, {{2}}, {{3}}},
- },
- wantError: errArrayNoTable,
- },
- "(error) map no string key": {
- input: map[int]string{1: ""},
- wantError: errNonString,
- },
- "(error) empty key name": {
- input: map[string]int{"": 1},
- wantError: errAnything,
- },
- "(error) empty map name": {
- input: map[string]interface{}{
- "": map[string]int{"v": 1},
- },
- wantError: errAnything,
- },
- }
- for label, test := range tests {
- encodeExpected(t, label, test.input, test.wantOutput, test.wantError)
- }
-}
-
-func TestEncodeNestedTableArrays(t *testing.T) {
- type song struct {
- Name string `toml:"name"`
- }
- type album struct {
- Name string `toml:"name"`
- Songs []song `toml:"songs"`
- }
- type springsteen struct {
- Albums []album `toml:"albums"`
- }
- value := springsteen{
- []album{
- {"Born to Run",
- []song{{"Jungleland"}, {"Meeting Across the River"}}},
- {"Born in the USA",
- []song{{"Glory Days"}, {"Dancing in the Dark"}}},
- },
- }
- expected := `[[albums]]
- name = "Born to Run"
-
- [[albums.songs]]
- name = "Jungleland"
-
- [[albums.songs]]
- name = "Meeting Across the River"
-
-[[albums]]
- name = "Born in the USA"
-
- [[albums.songs]]
- name = "Glory Days"
-
- [[albums.songs]]
- name = "Dancing in the Dark"
-`
- encodeExpected(t, "nested table arrays", value, expected, nil)
-}
-
-func TestEncodeArrayHashWithNormalHashOrder(t *testing.T) {
- type Alpha struct {
- V int
- }
- type Beta struct {
- V int
- }
- type Conf struct {
- V int
- A Alpha
- B []Beta
- }
-
- val := Conf{
- V: 1,
- A: Alpha{2},
- B: []Beta{{3}},
- }
- expected := "V = 1\n\n[A]\n V = 2\n\n[[B]]\n V = 3\n"
- encodeExpected(t, "array hash with normal hash order", val, expected, nil)
-}
-
-func TestEncodeWithOmitEmpty(t *testing.T) {
- type simple struct {
- Bool bool `toml:"bool,omitempty"`
- String string `toml:"string,omitempty"`
- Array [0]byte `toml:"array,omitempty"`
- Slice []int `toml:"slice,omitempty"`
- Map map[string]string `toml:"map,omitempty"`
- }
-
- var v simple
- encodeExpected(t, "fields with omitempty are omitted when empty", v, "", nil)
- v = simple{
- Bool: true,
- String: " ",
- Slice: []int{2, 3, 4},
- Map: map[string]string{"foo": "bar"},
- }
- expected := `bool = true
-string = " "
-slice = [2, 3, 4]
-
-[map]
- foo = "bar"
-`
- encodeExpected(t, "fields with omitempty are not omitted when non-empty",
- v, expected, nil)
-}
-
-func TestEncodeWithOmitZero(t *testing.T) {
- type simple struct {
- Number int `toml:"number,omitzero"`
- Real float64 `toml:"real,omitzero"`
- Unsigned uint `toml:"unsigned,omitzero"`
- }
-
- value := simple{0, 0.0, uint(0)}
- expected := ""
-
- encodeExpected(t, "simple with omitzero, all zero", value, expected, nil)
-
- value.Number = 10
- value.Real = 20
- value.Unsigned = 5
- expected = `number = 10
-real = 20.0
-unsigned = 5
-`
- encodeExpected(t, "simple with omitzero, non-zero", value, expected, nil)
-}
-
-func TestEncodeOmitemptyWithEmptyName(t *testing.T) {
- type simple struct {
- S []int `toml:",omitempty"`
- }
- v := simple{[]int{1, 2, 3}}
- expected := "S = [1, 2, 3]\n"
- encodeExpected(t, "simple with omitempty, no name, non-empty field",
- v, expected, nil)
-}
-
-func TestEncodeAnonymousStructPointerField(t *testing.T) {
- type Sub struct{}
- type simple struct {
- *Sub
- }
-
- value := simple{}
- expected := ""
- encodeExpected(t, "nil anonymous struct pointer field", value, expected, nil)
-
- value = simple{Sub: &Sub{}}
- expected = ""
- encodeExpected(t, "non-nil anonymous struct pointer field", value, expected, nil)
-}
-
-func TestEncodeIgnoredFields(t *testing.T) {
- type simple struct {
- Number int `toml:"-"`
- }
- value := simple{}
- expected := ""
- encodeExpected(t, "ignored field", value, expected, nil)
-}
-
-func encodeExpected(
- t *testing.T, label string, val interface{}, wantStr string, wantErr error,
-) {
- var buf bytes.Buffer
- enc := NewEncoder(&buf)
- err := enc.Encode(val)
- if err != wantErr {
- if wantErr != nil {
- if wantErr == errAnything && err != nil {
- return
- }
- t.Errorf("%s: want Encode error %v, got %v", label, wantErr, err)
- } else {
- t.Errorf("%s: Encode failed: %s", label, err)
- }
- }
- if err != nil {
- return
- }
- if got := buf.String(); wantStr != got {
- t.Errorf("%s: want\n-----\n%q\n-----\nbut got\n-----\n%q\n-----\n",
- label, wantStr, got)
- }
-}
-
-func ExampleEncoder_Encode() {
- date, _ := time.Parse(time.RFC822, "14 Mar 10 18:00 UTC")
- var config = map[string]interface{}{
- "date": date,
- "counts": []int{1, 1, 2, 3, 5, 8},
- "hash": map[string]string{
- "key1": "val1",
- "key2": "val2",
- },
- }
- buf := new(bytes.Buffer)
- if err := NewEncoder(buf).Encode(config); err != nil {
- log.Fatal(err)
- }
- fmt.Println(buf.String())
-
- // Output:
- // counts = [1, 1, 2, 3, 5, 8]
- // date = 2010-03-14T18:00:00Z
- //
- // [hash]
- // key1 = "val1"
- // key2 = "val2"
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go
deleted file mode 100644
index 99c3b41d5f57fa2285516aba5971bf5399f51dbc..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package logrus
-
-import (
- "bytes"
- "fmt"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestEntryWithError(t *testing.T) {
-
- assert := assert.New(t)
-
- defer func() {
- ErrorKey = "error"
- }()
-
- err := fmt.Errorf("kaboom at layer %d", 4711)
-
- assert.Equal(err, WithError(err).Data["error"])
-
- logger := New()
- logger.Out = &bytes.Buffer{}
- entry := NewEntry(logger)
-
- assert.Equal(err, entry.WithError(err).Data["error"])
-
- ErrorKey = "err"
-
- assert.Equal(err, entry.WithError(err).Data["err"])
-
-}
-
-func TestEntryPanicln(t *testing.T) {
- errBoom := fmt.Errorf("boom time")
-
- defer func() {
- p := recover()
- assert.NotNil(t, p)
-
- switch pVal := p.(type) {
- case *Entry:
- assert.Equal(t, "kaboom", pVal.Message)
- assert.Equal(t, errBoom, pVal.Data["err"])
- default:
- t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
- }
- }()
-
- logger := New()
- logger.Out = &bytes.Buffer{}
- entry := NewEntry(logger)
- entry.WithField("err", errBoom).Panicln("kaboom")
-}
-
-func TestEntryPanicf(t *testing.T) {
- errBoom := fmt.Errorf("boom again")
-
- defer func() {
- p := recover()
- assert.NotNil(t, p)
-
- switch pVal := p.(type) {
- case *Entry:
- assert.Equal(t, "kaboom true", pVal.Message)
- assert.Equal(t, errBoom, pVal.Data["err"])
- default:
- t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
- }
- }()
-
- logger := New()
- logger.Out = &bytes.Buffer{}
- entry := NewEntry(logger)
- entry.WithField("err", errBoom).Panicf("kaboom %v", true)
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go
deleted file mode 100644
index a1623ec003f5a7583fc54bcdb7a0de4f8a8ce236..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/basic/basic.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
- "github.com/Sirupsen/logrus"
-)
-
-var log = logrus.New()
-
-func init() {
- log.Formatter = new(logrus.JSONFormatter)
- log.Formatter = new(logrus.TextFormatter) // default
- log.Level = logrus.DebugLevel
-}
-
-func main() {
- defer func() {
- err := recover()
- if err != nil {
- log.WithFields(logrus.Fields{
- "omg": true,
- "err": err,
- "number": 100,
- }).Fatal("The ice breaks!")
- }
- }()
-
- log.WithFields(logrus.Fields{
- "animal": "walrus",
- "number": 8,
- }).Debug("Started observing beach")
-
- log.WithFields(logrus.Fields{
- "animal": "walrus",
- "size": 10,
- }).Info("A group of walrus emerges from the ocean")
-
- log.WithFields(logrus.Fields{
- "omg": true,
- "number": 122,
- }).Warn("The group's number increased tremendously!")
-
- log.WithFields(logrus.Fields{
- "temperature": -4,
- }).Debug("Temperature changes")
-
- log.WithFields(logrus.Fields{
- "animal": "orca",
- "size": 9009,
- }).Panic("It's over 9000!")
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go
deleted file mode 100644
index cb5759a35cf529c1e73aab21e32d0ab3ce5ec34d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/examples/hook/hook.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package main
-
-import (
- "github.com/Sirupsen/logrus"
- "github.com/Sirupsen/logrus/hooks/airbrake"
-)
-
-var log = logrus.New()
-
-func init() {
- log.Formatter = new(logrus.TextFormatter) // default
- log.Hooks.Add(airbrake.NewHook("https://example.com", "xyz", "development"))
-}
-
-func main() {
- log.WithFields(logrus.Fields{
- "animal": "walrus",
- "size": 10,
- }).Info("A group of walrus emerges from the ocean")
-
- log.WithFields(logrus.Fields{
- "omg": true,
- "number": 122,
- }).Warn("The group's number increased tremendously!")
-
- log.WithFields(logrus.Fields{
- "omg": true,
- "number": 100,
- }).Fatal("The ice breaks!")
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go
deleted file mode 100644
index c6d290c77f09bbac452837acffaf9a89f2c984b8..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter_bench_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package logrus
-
-import (
- "fmt"
- "testing"
- "time"
-)
-
-// smallFields is a small size data set for benchmarking
-var smallFields = Fields{
- "foo": "bar",
- "baz": "qux",
- "one": "two",
- "three": "four",
-}
-
-// largeFields is a large size data set for benchmarking
-var largeFields = Fields{
- "foo": "bar",
- "baz": "qux",
- "one": "two",
- "three": "four",
- "five": "six",
- "seven": "eight",
- "nine": "ten",
- "eleven": "twelve",
- "thirteen": "fourteen",
- "fifteen": "sixteen",
- "seventeen": "eighteen",
- "nineteen": "twenty",
- "a": "b",
- "c": "d",
- "e": "f",
- "g": "h",
- "i": "j",
- "k": "l",
- "m": "n",
- "o": "p",
- "q": "r",
- "s": "t",
- "u": "v",
- "w": "x",
- "y": "z",
- "this": "will",
- "make": "thirty",
- "entries": "yeah",
-}
-
-var errorFields = Fields{
- "foo": fmt.Errorf("bar"),
- "baz": fmt.Errorf("qux"),
-}
-
-func BenchmarkErrorTextFormatter(b *testing.B) {
- doBenchmark(b, &TextFormatter{DisableColors: true}, errorFields)
-}
-
-func BenchmarkSmallTextFormatter(b *testing.B) {
- doBenchmark(b, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func BenchmarkLargeTextFormatter(b *testing.B) {
- doBenchmark(b, &TextFormatter{DisableColors: true}, largeFields)
-}
-
-func BenchmarkSmallColoredTextFormatter(b *testing.B) {
- doBenchmark(b, &TextFormatter{ForceColors: true}, smallFields)
-}
-
-func BenchmarkLargeColoredTextFormatter(b *testing.B) {
- doBenchmark(b, &TextFormatter{ForceColors: true}, largeFields)
-}
-
-func BenchmarkSmallJSONFormatter(b *testing.B) {
- doBenchmark(b, &JSONFormatter{}, smallFields)
-}
-
-func BenchmarkLargeJSONFormatter(b *testing.B) {
- doBenchmark(b, &JSONFormatter{}, largeFields)
-}
-
-func doBenchmark(b *testing.B, formatter Formatter, fields Fields) {
- entry := &Entry{
- Time: time.Time{},
- Level: InfoLevel,
- Message: "message",
- Data: fields,
- }
- var d []byte
- var err error
- for i := 0; i < b.N; i++ {
- d, err = formatter.Format(entry)
- if err != nil {
- b.Fatal(err)
- }
- b.SetBytes(int64(len(d)))
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go
deleted file mode 100644
index 8ea93ddf20a037f43ff21b8ff7ecdb1d46f46e98..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package logstash
-
-import (
- "encoding/json"
- "fmt"
-
- "github.com/Sirupsen/logrus"
-)
-
-// Formatter generates json in logstash format.
-// Logstash site: http://logstash.net/
-type LogstashFormatter struct {
- Type string // if not empty use for logstash type field.
-
- // TimestampFormat sets the format used for timestamps.
- TimestampFormat string
-}
-
-func (f *LogstashFormatter) Format(entry *logrus.Entry) ([]byte, error) {
- entry.Data["@version"] = 1
-
- if f.TimestampFormat == "" {
- f.TimestampFormat = logrus.DefaultTimestampFormat
- }
-
- entry.Data["@timestamp"] = entry.Time.Format(f.TimestampFormat)
-
- // set message field
- v, ok := entry.Data["message"]
- if ok {
- entry.Data["fields.message"] = v
- }
- entry.Data["message"] = entry.Message
-
- // set level field
- v, ok = entry.Data["level"]
- if ok {
- entry.Data["fields.level"] = v
- }
- entry.Data["level"] = entry.Level.String()
-
- // set type field
- if f.Type != "" {
- v, ok = entry.Data["type"]
- if ok {
- entry.Data["fields.type"] = v
- }
- entry.Data["type"] = f.Type
- }
-
- serialized, err := json.Marshal(entry.Data)
- if err != nil {
- return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
- }
- return append(serialized, '\n'), nil
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go
deleted file mode 100644
index d8814a0eae438f362e567edbbe112962eae0ab7a..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatters/logstash/logstash_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package logstash
-
-import (
- "bytes"
- "encoding/json"
- "github.com/Sirupsen/logrus"
- "github.com/stretchr/testify/assert"
- "testing"
-)
-
-func TestLogstashFormatter(t *testing.T) {
- assert := assert.New(t)
-
- lf := LogstashFormatter{Type: "abc"}
-
- fields := logrus.Fields{
- "message": "def",
- "level": "ijk",
- "type": "lmn",
- "one": 1,
- "pi": 3.14,
- "bool": true,
- }
-
- entry := logrus.WithFields(fields)
- entry.Message = "msg"
- entry.Level = logrus.InfoLevel
-
- b, _ := lf.Format(entry)
-
- var data map[string]interface{}
- dec := json.NewDecoder(bytes.NewReader(b))
- dec.UseNumber()
- dec.Decode(&data)
-
- // base fields
- assert.Equal(json.Number("1"), data["@version"])
- assert.NotEmpty(data["@timestamp"])
- assert.Equal("abc", data["type"])
- assert.Equal("msg", data["message"])
- assert.Equal("info", data["level"])
-
- // substituted fields
- assert.Equal("def", data["fields.message"])
- assert.Equal("ijk", data["fields.level"])
- assert.Equal("lmn", data["fields.type"])
-
- // formats
- assert.Equal(json.Number("1"), data["one"])
- assert.Equal(json.Number("3.14"), data["pi"])
- assert.Equal(true, data["bool"])
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go
deleted file mode 100644
index 13f34cb6f8150fe7a0342fc5ea6db61907938a67..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hook_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package logrus
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-type TestHook struct {
- Fired bool
-}
-
-func (hook *TestHook) Fire(entry *Entry) error {
- hook.Fired = true
- return nil
-}
-
-func (hook *TestHook) Levels() []Level {
- return []Level{
- DebugLevel,
- InfoLevel,
- WarnLevel,
- ErrorLevel,
- FatalLevel,
- PanicLevel,
- }
-}
-
-func TestHookFires(t *testing.T) {
- hook := new(TestHook)
-
- LogAndAssertJSON(t, func(log *Logger) {
- log.Hooks.Add(hook)
- assert.Equal(t, hook.Fired, false)
-
- log.Print("test")
- }, func(fields Fields) {
- assert.Equal(t, hook.Fired, true)
- })
-}
-
-type ModifyHook struct {
-}
-
-func (hook *ModifyHook) Fire(entry *Entry) error {
- entry.Data["wow"] = "whale"
- return nil
-}
-
-func (hook *ModifyHook) Levels() []Level {
- return []Level{
- DebugLevel,
- InfoLevel,
- WarnLevel,
- ErrorLevel,
- FatalLevel,
- PanicLevel,
- }
-}
-
-func TestHookCanModifyEntry(t *testing.T) {
- hook := new(ModifyHook)
-
- LogAndAssertJSON(t, func(log *Logger) {
- log.Hooks.Add(hook)
- log.WithField("wow", "elephant").Print("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["wow"], "whale")
- })
-}
-
-func TestCanFireMultipleHooks(t *testing.T) {
- hook1 := new(ModifyHook)
- hook2 := new(TestHook)
-
- LogAndAssertJSON(t, func(log *Logger) {
- log.Hooks.Add(hook1)
- log.Hooks.Add(hook2)
-
- log.WithField("wow", "elephant").Print("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["wow"], "whale")
- assert.Equal(t, hook2.Fired, true)
- })
-}
-
-type ErrorHook struct {
- Fired bool
-}
-
-func (hook *ErrorHook) Fire(entry *Entry) error {
- hook.Fired = true
- return nil
-}
-
-func (hook *ErrorHook) Levels() []Level {
- return []Level{
- ErrorLevel,
- }
-}
-
-func TestErrorHookShouldntFireOnInfo(t *testing.T) {
- hook := new(ErrorHook)
-
- LogAndAssertJSON(t, func(log *Logger) {
- log.Hooks.Add(hook)
- log.Info("test")
- }, func(fields Fields) {
- assert.Equal(t, hook.Fired, false)
- })
-}
-
-func TestErrorHookShouldFireOnError(t *testing.T) {
- hook := new(ErrorHook)
-
- LogAndAssertJSON(t, func(log *Logger) {
- log.Hooks.Add(hook)
- log.Error("test")
- }, func(fields Fields) {
- assert.Equal(t, hook.Fired, true)
- })
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
deleted file mode 100644
index b0502c335a96d5389512f63e2cff71ff217a78f3..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package airbrake
-
-import (
- "errors"
- "fmt"
-
- "github.com/Sirupsen/logrus"
- "github.com/tobi/airbrake-go"
-)
-
-// AirbrakeHook to send exceptions to an exception-tracking service compatible
-// with the Airbrake API.
-type airbrakeHook struct {
- APIKey string
- Endpoint string
- Environment string
-}
-
-func NewHook(endpoint, apiKey, env string) *airbrakeHook {
- return &airbrakeHook{
- APIKey: apiKey,
- Endpoint: endpoint,
- Environment: env,
- }
-}
-
-func (hook *airbrakeHook) Fire(entry *logrus.Entry) error {
- airbrake.ApiKey = hook.APIKey
- airbrake.Endpoint = hook.Endpoint
- airbrake.Environment = hook.Environment
-
- var notifyErr error
- err, ok := entry.Data["error"].(error)
- if ok {
- notifyErr = err
- } else {
- notifyErr = errors.New(entry.Message)
- }
-
- airErr := airbrake.Notify(notifyErr)
- if airErr != nil {
- return fmt.Errorf("Failed to send error to Airbrake: %s", airErr)
- }
-
- return nil
-}
-
-func (hook *airbrakeHook) Levels() []logrus.Level {
- return []logrus.Level{
- logrus.ErrorLevel,
- logrus.FatalLevel,
- logrus.PanicLevel,
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go
deleted file mode 100644
index 058a91e3438204512dcfd1c27ea1892462609763..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/airbrake/airbrake_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package airbrake
-
-import (
- "encoding/xml"
- "net/http"
- "net/http/httptest"
- "testing"
- "time"
-
- "github.com/Sirupsen/logrus"
-)
-
-type notice struct {
- Error NoticeError `xml:"error"`
-}
-type NoticeError struct {
- Class string `xml:"class"`
- Message string `xml:"message"`
-}
-
-type customErr struct {
- msg string
-}
-
-func (e *customErr) Error() string {
- return e.msg
-}
-
-const (
- testAPIKey = "abcxyz"
- testEnv = "development"
- expectedClass = "*airbrake.customErr"
- expectedMsg = "foo"
- unintendedMsg = "Airbrake will not see this string"
-)
-
-var (
- noticeError = make(chan NoticeError, 1)
-)
-
-// TestLogEntryMessageReceived checks if invoking Logrus' log.Error
-// method causes an XML payload containing the log entry message is received
-// by a HTTP server emulating an Airbrake-compatible endpoint.
-func TestLogEntryMessageReceived(t *testing.T) {
- log := logrus.New()
- ts := startAirbrakeServer(t)
- defer ts.Close()
-
- hook := NewHook(ts.URL, testAPIKey, "production")
- log.Hooks.Add(hook)
-
- log.Error(expectedMsg)
-
- select {
- case received := <-noticeError:
- if received.Message != expectedMsg {
- t.Errorf("Unexpected message received: %s", received.Message)
- }
- case <-time.After(time.Second):
- t.Error("Timed out; no notice received by Airbrake API")
- }
-}
-
-// TestLogEntryMessageReceived confirms that, when passing an error type using
-// logrus.Fields, a HTTP server emulating an Airbrake endpoint receives the
-// error message returned by the Error() method on the error interface
-// rather than the logrus.Entry.Message string.
-func TestLogEntryWithErrorReceived(t *testing.T) {
- log := logrus.New()
- ts := startAirbrakeServer(t)
- defer ts.Close()
-
- hook := NewHook(ts.URL, testAPIKey, "production")
- log.Hooks.Add(hook)
-
- log.WithFields(logrus.Fields{
- "error": &customErr{expectedMsg},
- }).Error(unintendedMsg)
-
- select {
- case received := <-noticeError:
- if received.Message != expectedMsg {
- t.Errorf("Unexpected message received: %s", received.Message)
- }
- if received.Class != expectedClass {
- t.Errorf("Unexpected error class: %s", received.Class)
- }
- case <-time.After(time.Second):
- t.Error("Timed out; no notice received by Airbrake API")
- }
-}
-
-// TestLogEntryWithNonErrorTypeNotReceived confirms that, when passing a
-// non-error type using logrus.Fields, a HTTP server emulating an Airbrake
-// endpoint receives the logrus.Entry.Message string.
-//
-// Only error types are supported when setting the 'error' field using
-// logrus.WithFields().
-func TestLogEntryWithNonErrorTypeNotReceived(t *testing.T) {
- log := logrus.New()
- ts := startAirbrakeServer(t)
- defer ts.Close()
-
- hook := NewHook(ts.URL, testAPIKey, "production")
- log.Hooks.Add(hook)
-
- log.WithFields(logrus.Fields{
- "error": expectedMsg,
- }).Error(unintendedMsg)
-
- select {
- case received := <-noticeError:
- if received.Message != unintendedMsg {
- t.Errorf("Unexpected message received: %s", received.Message)
- }
- case <-time.After(time.Second):
- t.Error("Timed out; no notice received by Airbrake API")
- }
-}
-
-func startAirbrakeServer(t *testing.T) *httptest.Server {
- ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- var notice notice
- if err := xml.NewDecoder(r.Body).Decode(¬ice); err != nil {
- t.Error(err)
- }
- r.Body.Close()
-
- noticeError <- notice.Error
- }))
-
- return ts
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go
deleted file mode 100644
index d20a0f54ab7705c21d3762ab2b01d59f343215e4..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package logrus_bugsnag
-
-import (
- "errors"
-
- "github.com/Sirupsen/logrus"
- "github.com/bugsnag/bugsnag-go"
-)
-
-type bugsnagHook struct{}
-
-// ErrBugsnagUnconfigured is returned if NewBugsnagHook is called before
-// bugsnag.Configure. Bugsnag must be configured before the hook.
-var ErrBugsnagUnconfigured = errors.New("bugsnag must be configured before installing this logrus hook")
-
-// ErrBugsnagSendFailed indicates that the hook failed to submit an error to
-// bugsnag. The error was successfully generated, but `bugsnag.Notify()`
-// failed.
-type ErrBugsnagSendFailed struct {
- err error
-}
-
-func (e ErrBugsnagSendFailed) Error() string {
- return "failed to send error to Bugsnag: " + e.err.Error()
-}
-
-// NewBugsnagHook initializes a logrus hook which sends exceptions to an
-// exception-tracking service compatible with the Bugsnag API. Before using
-// this hook, you must call bugsnag.Configure(). The returned object should be
-// registered with a log via `AddHook()`
-//
-// Entries that trigger an Error, Fatal or Panic should now include an "error"
-// field to send to Bugsnag.
-func NewBugsnagHook() (*bugsnagHook, error) {
- if bugsnag.Config.APIKey == "" {
- return nil, ErrBugsnagUnconfigured
- }
- return &bugsnagHook{}, nil
-}
-
-// Fire forwards an error to Bugsnag. Given a logrus.Entry, it extracts the
-// "error" field (or the Message if the error isn't present) and sends it off.
-func (hook *bugsnagHook) Fire(entry *logrus.Entry) error {
- var notifyErr error
- err, ok := entry.Data["error"].(error)
- if ok {
- notifyErr = err
- } else {
- notifyErr = errors.New(entry.Message)
- }
-
- bugsnagErr := bugsnag.Notify(notifyErr)
- if bugsnagErr != nil {
- return ErrBugsnagSendFailed{bugsnagErr}
- }
-
- return nil
-}
-
-// Levels enumerates the log levels on which the error should be forwarded to
-// bugsnag: everything at or above the "Error" level.
-func (hook *bugsnagHook) Levels() []logrus.Level {
- return []logrus.Level{
- logrus.ErrorLevel,
- logrus.FatalLevel,
- logrus.PanicLevel,
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go
deleted file mode 100644
index e9ea298d89b4316bdefc2a76ddaa6f90a67079b7..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/bugsnag/bugsnag_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package logrus_bugsnag
-
-import (
- "encoding/json"
- "errors"
- "io/ioutil"
- "net/http"
- "net/http/httptest"
- "testing"
- "time"
-
- "github.com/Sirupsen/logrus"
- "github.com/bugsnag/bugsnag-go"
-)
-
-type notice struct {
- Events []struct {
- Exceptions []struct {
- Message string `json:"message"`
- } `json:"exceptions"`
- } `json:"events"`
-}
-
-func TestNoticeReceived(t *testing.T) {
- msg := make(chan string, 1)
- expectedMsg := "foo"
-
- ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- var notice notice
- data, _ := ioutil.ReadAll(r.Body)
- if err := json.Unmarshal(data, ¬ice); err != nil {
- t.Error(err)
- }
- _ = r.Body.Close()
-
- msg <- notice.Events[0].Exceptions[0].Message
- }))
- defer ts.Close()
-
- hook := &bugsnagHook{}
-
- bugsnag.Configure(bugsnag.Configuration{
- Endpoint: ts.URL,
- ReleaseStage: "production",
- APIKey: "12345678901234567890123456789012",
- Synchronous: true,
- })
-
- log := logrus.New()
- log.Hooks.Add(hook)
-
- log.WithFields(logrus.Fields{
- "error": errors.New(expectedMsg),
- }).Error("Bugsnag will not see this string")
-
- select {
- case received := <-msg:
- if received != expectedMsg {
- t.Errorf("Unexpected message received: %s", received)
- }
- case <-time.After(time.Second):
- t.Error("Timed out; no notice received by Bugsnag API")
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md
deleted file mode 100644
index ae61e9229ab72c5ab2924eebadc64238a5976f70..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/README.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Papertrail Hook for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:" />
-
-[Papertrail](https://papertrailapp.com) provides hosted log management. Once stored in Papertrail, you can [group](http://help.papertrailapp.com/kb/how-it-works/groups/) your logs on various dimensions, [search](http://help.papertrailapp.com/kb/how-it-works/search-syntax) them, and trigger [alerts](http://help.papertrailapp.com/kb/how-it-works/alerts).
-
-In most deployments, you'll want to send logs to Papertrail via their [remote_syslog](http://help.papertrailapp.com/kb/configuration/configuring-centralized-logging-from-text-log-files-in-unix/) daemon, which requires no application-specific configuration. This hook is intended for relatively low-volume logging, likely in managed cloud hosting deployments where installing `remote_syslog` is not possible.
-
-## Usage
-
-You can find your Papertrail UDP port on your [Papertrail account page](https://papertrailapp.com/account/destinations). Substitute it below for `YOUR_PAPERTRAIL_UDP_PORT`.
-
-For `YOUR_APP_NAME`, substitute a short string that will readily identify your application or service in the logs.
-
-```go
-import (
- "log/syslog"
- "github.com/Sirupsen/logrus"
- "github.com/Sirupsen/logrus/hooks/papertrail"
-)
-
-func main() {
- log := logrus.New()
- hook, err := logrus_papertrail.NewPapertrailHook("logs.papertrailapp.com", YOUR_PAPERTRAIL_UDP_PORT, YOUR_APP_NAME)
-
- if err == nil {
- log.Hooks.Add(hook)
- }
-}
-```
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
deleted file mode 100644
index c0f10c1bda23f85d74cf5bab5aa0f9abeb91c428..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package logrus_papertrail
-
-import (
- "fmt"
- "net"
- "os"
- "time"
-
- "github.com/Sirupsen/logrus"
-)
-
-const (
- format = "Jan 2 15:04:05"
-)
-
-// PapertrailHook to send logs to a logging service compatible with the Papertrail API.
-type PapertrailHook struct {
- Host string
- Port int
- AppName string
- UDPConn net.Conn
-}
-
-// NewPapertrailHook creates a hook to be added to an instance of logger.
-func NewPapertrailHook(host string, port int, appName string) (*PapertrailHook, error) {
- conn, err := net.Dial("udp", fmt.Sprintf("%s:%d", host, port))
- return &PapertrailHook{host, port, appName, conn}, err
-}
-
-// Fire is called when a log event is fired.
-func (hook *PapertrailHook) Fire(entry *logrus.Entry) error {
- date := time.Now().Format(format)
- msg, _ := entry.String()
- payload := fmt.Sprintf("<22> %s %s: %s", date, hook.AppName, msg)
-
- bytesWritten, err := hook.UDPConn.Write([]byte(payload))
- if err != nil {
- fmt.Fprintf(os.Stderr, "Unable to send log line to Papertrail via UDP. Wrote %d bytes before error: %v", bytesWritten, err)
- return err
- }
-
- return nil
-}
-
-// Levels returns the available logging levels.
-func (hook *PapertrailHook) Levels() []logrus.Level {
- return []logrus.Level{
- logrus.PanicLevel,
- logrus.FatalLevel,
- logrus.ErrorLevel,
- logrus.WarnLevel,
- logrus.InfoLevel,
- logrus.DebugLevel,
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go
deleted file mode 100644
index 96318d00304919901682ae416417718e0765b4be..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/papertrail/papertrail_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logrus_papertrail
-
-import (
- "fmt"
- "testing"
-
- "github.com/Sirupsen/logrus"
- "github.com/stvp/go-udp-testing"
-)
-
-func TestWritingToUDP(t *testing.T) {
- port := 16661
- udp.SetAddr(fmt.Sprintf(":%d", port))
-
- hook, err := NewPapertrailHook("localhost", port, "test")
- if err != nil {
- t.Errorf("Unable to connect to local UDP server.")
- }
-
- log := logrus.New()
- log.Hooks.Add(hook)
-
- udp.ShouldReceive(t, "foo", func() {
- log.Info("foo")
- })
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md
deleted file mode 100644
index 31de6540adbf9948e60b7ad26d5c1f7c0398c48d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Sentry Hook for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:" />
-
-[Sentry](https://getsentry.com) provides both self-hosted and hosted
-solutions for exception tracking.
-Both client and server are
-[open source](https://github.com/getsentry/sentry).
-
-## Usage
-
-Every sentry application defined on the server gets a different
-[DSN](https://www.getsentry.com/docs/). In the example below replace
-`YOUR_DSN` with the one created for your application.
-
-```go
-import (
- "github.com/Sirupsen/logrus"
- "github.com/Sirupsen/logrus/hooks/sentry"
-)
-
-func main() {
- log := logrus.New()
- hook, err := logrus_sentry.NewSentryHook(YOUR_DSN, []logrus.Level{
- logrus.PanicLevel,
- logrus.FatalLevel,
- logrus.ErrorLevel,
- })
-
- if err == nil {
- log.Hooks.Add(hook)
- }
-}
-```
-
-If you wish to initialize a SentryHook with tags, you can use the `NewWithTagsSentryHook` constructor to provide default tags:
-
-```go
-tags := map[string]string{
- "site": "example.com",
-}
-levels := []logrus.Level{
- logrus.PanicLevel,
- logrus.FatalLevel,
- logrus.ErrorLevel,
-}
-hook, err := logrus_sentry.NewWithTagsSentryHook(YOUR_DSN, tags, levels)
-
-```
-
-If you wish to initialize a SentryHook with an already initialized raven client, you can use
-the `NewWithClientSentryHook` constructor:
-
-```go
-import (
- "github.com/Sirupsen/logrus"
- "github.com/Sirupsen/logrus/hooks/sentry"
- "github.com/getsentry/raven-go"
-)
-
-func main() {
- log := logrus.New()
-
- client, err := raven.New(YOUR_DSN)
- if err != nil {
- log.Fatal(err)
- }
-
- hook, err := logrus_sentry.NewWithClientSentryHook(client, []logrus.Level{
- logrus.PanicLevel,
- logrus.FatalLevel,
- logrus.ErrorLevel,
- })
-
- if err == nil {
- log.Hooks.Add(hook)
- }
-}
-
-hook, err := NewWithClientSentryHook(client, []logrus.Level{
- logrus.ErrorLevel,
-})
-```
-
-## Special fields
-
-Some logrus fields have a special meaning in this hook,
-these are `server_name`, `logger` and `http_request`.
-When logs are sent to sentry these fields are treated differently.
-- `server_name` (also known as hostname) is the name of the server which
-is logging the event (hostname.example.com)
-- `logger` is the part of the application which is logging the event.
-In go this usually means setting it to the name of the package.
-- `http_request` is the in-coming request(*http.Request). The detailed request data are sent to Sentry.
-
-## Timeout
-
-`Timeout` is the time the sentry hook will wait for a response
-from the sentry server.
-
-If this time elapses with no response from
-the server an error will be returned.
-
-If `Timeout` is set to 0 the SentryHook will not wait for a reply
-and will assume a correct delivery.
-
-The SentryHook has a default timeout of `100 milliseconds` when created
-with a call to `NewSentryHook`. This can be changed by assigning a value to the `Timeout` field:
-
-```go
-hook, _ := logrus_sentry.NewSentryHook(...)
-hook.Timeout = 20*time.Second
-```
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
deleted file mode 100644
index cf88098a8892f328e0db8d5ec09d2f8988f24d90..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package logrus_sentry
-
-import (
- "fmt"
- "net/http"
- "time"
-
- "github.com/Sirupsen/logrus"
- "github.com/getsentry/raven-go"
-)
-
-var (
- severityMap = map[logrus.Level]raven.Severity{
- logrus.DebugLevel: raven.DEBUG,
- logrus.InfoLevel: raven.INFO,
- logrus.WarnLevel: raven.WARNING,
- logrus.ErrorLevel: raven.ERROR,
- logrus.FatalLevel: raven.FATAL,
- logrus.PanicLevel: raven.FATAL,
- }
-)
-
-func getAndDel(d logrus.Fields, key string) (string, bool) {
- var (
- ok bool
- v interface{}
- val string
- )
- if v, ok = d[key]; !ok {
- return "", false
- }
-
- if val, ok = v.(string); !ok {
- return "", false
- }
- delete(d, key)
- return val, true
-}
-
-func getAndDelRequest(d logrus.Fields, key string) (*http.Request, bool) {
- var (
- ok bool
- v interface{}
- req *http.Request
- )
- if v, ok = d[key]; !ok {
- return nil, false
- }
- if req, ok = v.(*http.Request); !ok || req == nil {
- return nil, false
- }
- delete(d, key)
- return req, true
-}
-
-// SentryHook delivers logs to a sentry server.
-type SentryHook struct {
- // Timeout sets the time to wait for a delivery error from the sentry server.
- // If this is set to zero the server will not wait for any response and will
- // consider the message correctly sent
- Timeout time.Duration
-
- client *raven.Client
- levels []logrus.Level
-}
-
-// NewSentryHook creates a hook to be added to an instance of logger
-// and initializes the raven client.
-// This method sets the timeout to 100 milliseconds.
-func NewSentryHook(DSN string, levels []logrus.Level) (*SentryHook, error) {
- client, err := raven.New(DSN)
- if err != nil {
- return nil, err
- }
- return &SentryHook{100 * time.Millisecond, client, levels}, nil
-}
-
-// NewWithTagsSentryHook creates a hook with tags to be added to an instance
-// of logger and initializes the raven client. This method sets the timeout to
-// 100 milliseconds.
-func NewWithTagsSentryHook(DSN string, tags map[string]string, levels []logrus.Level) (*SentryHook, error) {
- client, err := raven.NewWithTags(DSN, tags)
- if err != nil {
- return nil, err
- }
- return &SentryHook{100 * time.Millisecond, client, levels}, nil
-}
-
-// NewWithClientSentryHook creates a hook using an initialized raven client.
-// This method sets the timeout to 100 milliseconds.
-func NewWithClientSentryHook(client *raven.Client, levels []logrus.Level) (*SentryHook, error) {
- return &SentryHook{100 * time.Millisecond, client, levels}, nil
-}
-
-// Called when an event should be sent to sentry
-// Special fields that sentry uses to give more information to the server
-// are extracted from entry.Data (if they are found)
-// These fields are: logger, server_name and http_request
-func (hook *SentryHook) Fire(entry *logrus.Entry) error {
- packet := &raven.Packet{
- Message: entry.Message,
- Timestamp: raven.Timestamp(entry.Time),
- Level: severityMap[entry.Level],
- Platform: "go",
- }
-
- d := entry.Data
-
- if logger, ok := getAndDel(d, "logger"); ok {
- packet.Logger = logger
- }
- if serverName, ok := getAndDel(d, "server_name"); ok {
- packet.ServerName = serverName
- }
- if req, ok := getAndDelRequest(d, "http_request"); ok {
- packet.Interfaces = append(packet.Interfaces, raven.NewHttp(req))
- }
- packet.Extra = map[string]interface{}(d)
-
- _, errCh := hook.client.Capture(packet, nil)
- timeout := hook.Timeout
- if timeout != 0 {
- timeoutCh := time.After(timeout)
- select {
- case err := <-errCh:
- return err
- case <-timeoutCh:
- return fmt.Errorf("no response from sentry server in %s", timeout)
- }
- }
- return nil
-}
-
-// Levels returns the available logging levels.
-func (hook *SentryHook) Levels() []logrus.Level {
- return hook.levels
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go
deleted file mode 100644
index 4a97bc63e28c04896bfb8bf900bbb33084def379..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/sentry/sentry_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package logrus_sentry
-
-import (
- "encoding/json"
- "fmt"
- "io/ioutil"
- "net/http"
- "net/http/httptest"
- "reflect"
- "strings"
- "testing"
-
- "github.com/Sirupsen/logrus"
- "github.com/getsentry/raven-go"
-)
-
-const (
- message = "error message"
- server_name = "testserver.internal"
- logger_name = "test.logger"
-)
-
-func getTestLogger() *logrus.Logger {
- l := logrus.New()
- l.Out = ioutil.Discard
- return l
-}
-
-func WithTestDSN(t *testing.T, tf func(string, <-chan *raven.Packet)) {
- pch := make(chan *raven.Packet, 1)
- s := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
- defer req.Body.Close()
- d := json.NewDecoder(req.Body)
- p := &raven.Packet{}
- err := d.Decode(p)
- if err != nil {
- t.Fatal(err.Error())
- }
-
- pch <- p
- }))
- defer s.Close()
-
- fragments := strings.SplitN(s.URL, "://", 2)
- dsn := fmt.Sprintf(
- "%s://public:secret@%s/sentry/project-id",
- fragments[0],
- fragments[1],
- )
- tf(dsn, pch)
-}
-
-func TestSpecialFields(t *testing.T) {
- WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
- logger := getTestLogger()
-
- hook, err := NewSentryHook(dsn, []logrus.Level{
- logrus.ErrorLevel,
- })
-
- if err != nil {
- t.Fatal(err.Error())
- }
- logger.Hooks.Add(hook)
-
- req, _ := http.NewRequest("GET", "url", nil)
- logger.WithFields(logrus.Fields{
- "server_name": server_name,
- "logger": logger_name,
- "http_request": req,
- }).Error(message)
-
- packet := <-pch
- if packet.Logger != logger_name {
- t.Errorf("logger should have been %s, was %s", logger_name, packet.Logger)
- }
-
- if packet.ServerName != server_name {
- t.Errorf("server_name should have been %s, was %s", server_name, packet.ServerName)
- }
- })
-}
-
-func TestSentryHandler(t *testing.T) {
- WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
- logger := getTestLogger()
- hook, err := NewSentryHook(dsn, []logrus.Level{
- logrus.ErrorLevel,
- })
- if err != nil {
- t.Fatal(err.Error())
- }
- logger.Hooks.Add(hook)
-
- logger.Error(message)
- packet := <-pch
- if packet.Message != message {
- t.Errorf("message should have been %s, was %s", message, packet.Message)
- }
- })
-}
-
-func TestSentryWithClient(t *testing.T) {
- WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
- logger := getTestLogger()
-
- client, _ := raven.New(dsn)
-
- hook, err := NewWithClientSentryHook(client, []logrus.Level{
- logrus.ErrorLevel,
- })
- if err != nil {
- t.Fatal(err.Error())
- }
- logger.Hooks.Add(hook)
-
- logger.Error(message)
- packet := <-pch
- if packet.Message != message {
- t.Errorf("message should have been %s, was %s", message, packet.Message)
- }
- })
-}
-
-func TestSentryTags(t *testing.T) {
- WithTestDSN(t, func(dsn string, pch <-chan *raven.Packet) {
- logger := getTestLogger()
- tags := map[string]string{
- "site": "test",
- }
- levels := []logrus.Level{
- logrus.ErrorLevel,
- }
-
- hook, err := NewWithTagsSentryHook(dsn, tags, levels)
- if err != nil {
- t.Fatal(err.Error())
- }
-
- logger.Hooks.Add(hook)
-
- logger.Error(message)
- packet := <-pch
- expected := raven.Tags{
- raven.Tag{
- Key: "site",
- Value: "test",
- },
- }
- if !reflect.DeepEqual(packet.Tags, expected) {
- t.Errorf("message should have been %s, was %s", message, packet.Message)
- }
- })
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md
deleted file mode 100644
index 4dbb8e729078e3db1a9e91e84f3097bcb3e0038a..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Syslog Hooks for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>
-
-## Usage
-
-```go
-import (
- "log/syslog"
- "github.com/Sirupsen/logrus"
- logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
- log := logrus.New()
- hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
- if err == nil {
- log.Hooks.Add(hook)
- }
-}
-```
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
deleted file mode 100644
index b6fa3746280c6febb096a3ee3220dc204f5337bf..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package logrus_syslog
-
-import (
- "fmt"
- "github.com/Sirupsen/logrus"
- "log/syslog"
- "os"
-)
-
-// SyslogHook to send logs via syslog.
-type SyslogHook struct {
- Writer *syslog.Writer
- SyslogNetwork string
- SyslogRaddr string
-}
-
-// Creates a hook to be added to an instance of logger. This is called with
-// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
-// `if err == nil { log.Hooks.Add(hook) }`
-func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
- w, err := syslog.Dial(network, raddr, priority, tag)
- return &SyslogHook{w, network, raddr}, err
-}
-
-func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
- line, err := entry.String()
- if err != nil {
- fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
- return err
- }
-
- switch entry.Level {
- case logrus.PanicLevel:
- return hook.Writer.Crit(line)
- case logrus.FatalLevel:
- return hook.Writer.Crit(line)
- case logrus.ErrorLevel:
- return hook.Writer.Err(line)
- case logrus.WarnLevel:
- return hook.Writer.Warning(line)
- case logrus.InfoLevel:
- return hook.Writer.Info(line)
- case logrus.DebugLevel:
- return hook.Writer.Debug(line)
- default:
- return nil
- }
-}
-
-func (hook *SyslogHook) Levels() []logrus.Level {
- return []logrus.Level{
- logrus.PanicLevel,
- logrus.FatalLevel,
- logrus.ErrorLevel,
- logrus.WarnLevel,
- logrus.InfoLevel,
- logrus.DebugLevel,
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go
deleted file mode 100644
index 42762dc10d7152b0605280d12d774c0f1116d14a..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logrus_syslog
-
-import (
- "github.com/Sirupsen/logrus"
- "log/syslog"
- "testing"
-)
-
-func TestLocalhostAddAndPrint(t *testing.T) {
- log := logrus.New()
- hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
- if err != nil {
- t.Errorf("Unable to connect to local syslog.")
- }
-
- log.Hooks.Add(hook)
-
- for _, level := range hook.Levels() {
- if len(log.Hooks[level]) != 1 {
- t.Errorf("SyslogHook was not added. The length of log.Hooks[%v]: %v", level, len(log.Hooks[level]))
- }
- }
-
- log.Info("Congratulations!")
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go
deleted file mode 100644
index 1d70873254d7b67de2e3309cfb837f3c92f79853..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package logrus
-
-import (
- "encoding/json"
- "errors"
-
- "testing"
-)
-
-func TestErrorNotLost(t *testing.T) {
- formatter := &JSONFormatter{}
-
- b, err := formatter.Format(WithField("error", errors.New("wild walrus")))
- if err != nil {
- t.Fatal("Unable to format entry: ", err)
- }
-
- entry := make(map[string]interface{})
- err = json.Unmarshal(b, &entry)
- if err != nil {
- t.Fatal("Unable to unmarshal formatted entry: ", err)
- }
-
- if entry["error"] != "wild walrus" {
- t.Fatal("Error field not set")
- }
-}
-
-func TestErrorNotLostOnFieldNotNamedError(t *testing.T) {
- formatter := &JSONFormatter{}
-
- b, err := formatter.Format(WithField("omg", errors.New("wild walrus")))
- if err != nil {
- t.Fatal("Unable to format entry: ", err)
- }
-
- entry := make(map[string]interface{})
- err = json.Unmarshal(b, &entry)
- if err != nil {
- t.Fatal("Unable to unmarshal formatted entry: ", err)
- }
-
- if entry["omg"] != "wild walrus" {
- t.Fatal("Error field not set")
- }
-}
-
-func TestFieldClashWithTime(t *testing.T) {
- formatter := &JSONFormatter{}
-
- b, err := formatter.Format(WithField("time", "right now!"))
- if err != nil {
- t.Fatal("Unable to format entry: ", err)
- }
-
- entry := make(map[string]interface{})
- err = json.Unmarshal(b, &entry)
- if err != nil {
- t.Fatal("Unable to unmarshal formatted entry: ", err)
- }
-
- if entry["fields.time"] != "right now!" {
- t.Fatal("fields.time not set to original time field")
- }
-
- if entry["time"] != "0001-01-01T00:00:00Z" {
- t.Fatal("time field not set to current time, was: ", entry["time"])
- }
-}
-
-func TestFieldClashWithMsg(t *testing.T) {
- formatter := &JSONFormatter{}
-
- b, err := formatter.Format(WithField("msg", "something"))
- if err != nil {
- t.Fatal("Unable to format entry: ", err)
- }
-
- entry := make(map[string]interface{})
- err = json.Unmarshal(b, &entry)
- if err != nil {
- t.Fatal("Unable to unmarshal formatted entry: ", err)
- }
-
- if entry["fields.msg"] != "something" {
- t.Fatal("fields.msg not set to original msg field")
- }
-}
-
-func TestFieldClashWithLevel(t *testing.T) {
- formatter := &JSONFormatter{}
-
- b, err := formatter.Format(WithField("level", "something"))
- if err != nil {
- t.Fatal("Unable to format entry: ", err)
- }
-
- entry := make(map[string]interface{})
- err = json.Unmarshal(b, &entry)
- if err != nil {
- t.Fatal("Unable to unmarshal formatted entry: ", err)
- }
-
- if entry["fields.level"] != "something" {
- t.Fatal("fields.level not set to original level field")
- }
-}
-
-func TestJSONEntryEndsWithNewline(t *testing.T) {
- formatter := &JSONFormatter{}
-
- b, err := formatter.Format(WithField("level", "something"))
- if err != nil {
- t.Fatal("Unable to format entry: ", err)
- }
-
- if b[len(b)-1] != '\n' {
- t.Fatal("Expected JSON log entry to end with a newline")
- }
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go
deleted file mode 100644
index efaacea2361a0e48978ae94820caaba3390ac926..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus_test.go
+++ /dev/null
@@ -1,301 +0,0 @@
-package logrus
-
-import (
- "bytes"
- "encoding/json"
- "strconv"
- "strings"
- "sync"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fields)) {
- var buffer bytes.Buffer
- var fields Fields
-
- logger := New()
- logger.Out = &buffer
- logger.Formatter = new(JSONFormatter)
-
- log(logger)
-
- err := json.Unmarshal(buffer.Bytes(), &fields)
- assert.Nil(t, err)
-
- assertions(fields)
-}
-
-func LogAndAssertText(t *testing.T, log func(*Logger), assertions func(fields map[string]string)) {
- var buffer bytes.Buffer
-
- logger := New()
- logger.Out = &buffer
- logger.Formatter = &TextFormatter{
- DisableColors: true,
- }
-
- log(logger)
-
- fields := make(map[string]string)
- for _, kv := range strings.Split(buffer.String(), " ") {
- if !strings.Contains(kv, "=") {
- continue
- }
- kvArr := strings.Split(kv, "=")
- key := strings.TrimSpace(kvArr[0])
- val := kvArr[1]
- if kvArr[1][0] == '"' {
- var err error
- val, err = strconv.Unquote(val)
- assert.NoError(t, err)
- }
- fields[key] = val
- }
- assertions(fields)
-}
-
-func TestPrint(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Print("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test")
- assert.Equal(t, fields["level"], "info")
- })
-}
-
-func TestInfo(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Info("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test")
- assert.Equal(t, fields["level"], "info")
- })
-}
-
-func TestWarn(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Warn("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test")
- assert.Equal(t, fields["level"], "warning")
- })
-}
-
-func TestInfolnShouldAddSpacesBetweenStrings(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Infoln("test", "test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test test")
- })
-}
-
-func TestInfolnShouldAddSpacesBetweenStringAndNonstring(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Infoln("test", 10)
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test 10")
- })
-}
-
-func TestInfolnShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Infoln(10, 10)
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "10 10")
- })
-}
-
-func TestInfoShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Infoln(10, 10)
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "10 10")
- })
-}
-
-func TestInfoShouldNotAddSpacesBetweenStringAndNonstring(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Info("test", 10)
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test10")
- })
-}
-
-func TestInfoShouldNotAddSpacesBetweenStrings(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.Info("test", "test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "testtest")
- })
-}
-
-func TestWithFieldsShouldAllowAssignments(t *testing.T) {
- var buffer bytes.Buffer
- var fields Fields
-
- logger := New()
- logger.Out = &buffer
- logger.Formatter = new(JSONFormatter)
-
- localLog := logger.WithFields(Fields{
- "key1": "value1",
- })
-
- localLog.WithField("key2", "value2").Info("test")
- err := json.Unmarshal(buffer.Bytes(), &fields)
- assert.Nil(t, err)
-
- assert.Equal(t, "value2", fields["key2"])
- assert.Equal(t, "value1", fields["key1"])
-
- buffer = bytes.Buffer{}
- fields = Fields{}
- localLog.Info("test")
- err = json.Unmarshal(buffer.Bytes(), &fields)
- assert.Nil(t, err)
-
- _, ok := fields["key2"]
- assert.Equal(t, false, ok)
- assert.Equal(t, "value1", fields["key1"])
-}
-
-func TestUserSuppliedFieldDoesNotOverwriteDefaults(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.WithField("msg", "hello").Info("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test")
- })
-}
-
-func TestUserSuppliedMsgFieldHasPrefix(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.WithField("msg", "hello").Info("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["msg"], "test")
- assert.Equal(t, fields["fields.msg"], "hello")
- })
-}
-
-func TestUserSuppliedTimeFieldHasPrefix(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.WithField("time", "hello").Info("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["fields.time"], "hello")
- })
-}
-
-func TestUserSuppliedLevelFieldHasPrefix(t *testing.T) {
- LogAndAssertJSON(t, func(log *Logger) {
- log.WithField("level", 1).Info("test")
- }, func(fields Fields) {
- assert.Equal(t, fields["level"], "info")
- assert.Equal(t, fields["fields.level"], 1.0) // JSON has floats only
- })
-}
-
-func TestDefaultFieldsAreNotPrefixed(t *testing.T) {
- LogAndAssertText(t, func(log *Logger) {
- ll := log.WithField("herp", "derp")
- ll.Info("hello")
- ll.Info("bye")
- }, func(fields map[string]string) {
- for _, fieldName := range []string{"fields.level", "fields.time", "fields.msg"} {
- if _, ok := fields[fieldName]; ok {
- t.Fatalf("should not have prefixed %q: %v", fieldName, fields)
- }
- }
- })
-}
-
-func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
-
- var buffer bytes.Buffer
- var fields Fields
-
- logger := New()
- logger.Out = &buffer
- logger.Formatter = new(JSONFormatter)
-
- llog := logger.WithField("context", "eating raw fish")
-
- llog.Info("looks delicious")
-
- err := json.Unmarshal(buffer.Bytes(), &fields)
- assert.NoError(t, err, "should have decoded first message")
- assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
- assert.Equal(t, fields["msg"], "looks delicious")
- assert.Equal(t, fields["context"], "eating raw fish")
-
- buffer.Reset()
-
- llog.Warn("omg it is!")
-
- err = json.Unmarshal(buffer.Bytes(), &fields)
- assert.NoError(t, err, "should have decoded second message")
- assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
- assert.Equal(t, fields["msg"], "omg it is!")
- assert.Equal(t, fields["context"], "eating raw fish")
- assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
-
-}
-
-func TestConvertLevelToString(t *testing.T) {
- assert.Equal(t, "debug", DebugLevel.String())
- assert.Equal(t, "info", InfoLevel.String())
- assert.Equal(t, "warning", WarnLevel.String())
- assert.Equal(t, "error", ErrorLevel.String())
- assert.Equal(t, "fatal", FatalLevel.String())
- assert.Equal(t, "panic", PanicLevel.String())
-}
-
-func TestParseLevel(t *testing.T) {
- l, err := ParseLevel("panic")
- assert.Nil(t, err)
- assert.Equal(t, PanicLevel, l)
-
- l, err = ParseLevel("fatal")
- assert.Nil(t, err)
- assert.Equal(t, FatalLevel, l)
-
- l, err = ParseLevel("error")
- assert.Nil(t, err)
- assert.Equal(t, ErrorLevel, l)
-
- l, err = ParseLevel("warn")
- assert.Nil(t, err)
- assert.Equal(t, WarnLevel, l)
-
- l, err = ParseLevel("warning")
- assert.Nil(t, err)
- assert.Equal(t, WarnLevel, l)
-
- l, err = ParseLevel("info")
- assert.Nil(t, err)
- assert.Equal(t, InfoLevel, l)
-
- l, err = ParseLevel("debug")
- assert.Nil(t, err)
- assert.Equal(t, DebugLevel, l)
-
- l, err = ParseLevel("invalid")
- assert.Equal(t, "not a valid logrus Level: \"invalid\"", err.Error())
-}
-
-func TestGetSetLevelRace(t *testing.T) {
- wg := sync.WaitGroup{}
- for i := 0; i < 100; i++ {
- wg.Add(1)
- go func(i int) {
- defer wg.Done()
- if i%2 == 0 {
- SetLevel(InfoLevel)
- } else {
- GetLevel()
- }
- }(i)
-
- }
- wg.Wait()
-}
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go b/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go
deleted file mode 100644
index e25a44f67bfe3ff3171d18f26db4e30259a6715d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package logrus
-
-import (
- "bytes"
- "errors"
- "testing"
- "time"
-)
-
-func TestQuoting(t *testing.T) {
- tf := &TextFormatter{DisableColors: true}
-
- checkQuoting := func(q bool, value interface{}) {
- b, _ := tf.Format(WithField("test", value))
- idx := bytes.Index(b, ([]byte)("test="))
- cont := bytes.Contains(b[idx+5:], []byte{'"'})
- if cont != q {
- if q {
- t.Errorf("quoting expected for: %#v", value)
- } else {
- t.Errorf("quoting not expected for: %#v", value)
- }
- }
- }
-
- checkQuoting(false, "abcd")
- checkQuoting(false, "v1.0")
- checkQuoting(false, "1234567890")
- checkQuoting(true, "/foobar")
- checkQuoting(true, "x y")
- checkQuoting(true, "x,y")
- checkQuoting(false, errors.New("invalid"))
- checkQuoting(true, errors.New("invalid argument"))
-}
-
-func TestTimestampFormat(t *testing.T) {
- checkTimeStr := func(format string) {
- customFormatter := &TextFormatter{DisableColors: true, TimestampFormat: format}
- customStr, _ := customFormatter.Format(WithField("test", "test"))
- timeStart := bytes.Index(customStr, ([]byte)("time="))
- timeEnd := bytes.Index(customStr, ([]byte)("level="))
- timeStr := customStr[timeStart+5 : timeEnd-1]
- if timeStr[0] == '"' && timeStr[len(timeStr)-1] == '"' {
- timeStr = timeStr[1 : len(timeStr)-1]
- }
- if format == "" {
- format = time.RFC3339
- }
- _, e := time.Parse(format, (string)(timeStr))
- if e != nil {
- t.Errorf("time string \"%s\" did not match provided time format \"%s\": %s", timeStr, format, e)
- }
- }
-
- checkTimeStr("2006-01-02T15:04:05.000000000Z07:00")
- checkTimeStr("Mon Jan _2 15:04:05 2006")
- checkTimeStr("")
-}
-
-// TODO add tests for sorting etc., this requires a parser for the text
-// formatter output.
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/app_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/app_test.go
deleted file mode 100644
index 4c6787aebdedd71ef7e1209308fca0c998a88fc9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/app_test.go
+++ /dev/null
@@ -1,867 +0,0 @@
-package cli
-
-import (
- "bytes"
- "flag"
- "fmt"
- "io"
- "os"
- "strings"
- "testing"
-)
-
-func ExampleApp() {
- // set args for examples sake
- os.Args = []string{"greet", "--name", "Jeremy"}
-
- app := NewApp()
- app.Name = "greet"
- app.Flags = []Flag{
- StringFlag{Name: "name", Value: "bob", Usage: "a name to say"},
- }
- app.Action = func(c *Context) {
- fmt.Printf("Hello %v\n", c.String("name"))
- }
- app.Author = "Harrison"
- app.Email = "harrison@lolwut.com"
- app.Authors = []Author{Author{Name: "Oliver Allen", Email: "oliver@toyshop.com"}}
- app.Run(os.Args)
- // Output:
- // Hello Jeremy
-}
-
-func ExampleAppSubcommand() {
- // set args for examples sake
- os.Args = []string{"say", "hi", "english", "--name", "Jeremy"}
- app := NewApp()
- app.Name = "say"
- app.Commands = []Command{
- {
- Name: "hello",
- Aliases: []string{"hi"},
- Usage: "use it to see a description",
- Description: "This is how we describe hello the function",
- Subcommands: []Command{
- {
- Name: "english",
- Aliases: []string{"en"},
- Usage: "sends a greeting in english",
- Description: "greets someone in english",
- Flags: []Flag{
- StringFlag{
- Name: "name",
- Value: "Bob",
- Usage: "Name of the person to greet",
- },
- },
- Action: func(c *Context) {
- fmt.Println("Hello,", c.String("name"))
- },
- },
- },
- },
- }
-
- app.Run(os.Args)
- // Output:
- // Hello, Jeremy
-}
-
-func ExampleAppHelp() {
- // set args for examples sake
- os.Args = []string{"greet", "h", "describeit"}
-
- app := NewApp()
- app.Name = "greet"
- app.Flags = []Flag{
- StringFlag{Name: "name", Value: "bob", Usage: "a name to say"},
- }
- app.Commands = []Command{
- {
- Name: "describeit",
- Aliases: []string{"d"},
- Usage: "use it to see a description",
- Description: "This is how we describe describeit the function",
- Action: func(c *Context) {
- fmt.Printf("i like to describe things")
- },
- },
- }
- app.Run(os.Args)
- // Output:
- // NAME:
- // describeit - use it to see a description
- //
- // USAGE:
- // command describeit [arguments...]
- //
- // DESCRIPTION:
- // This is how we describe describeit the function
-}
-
-func ExampleAppBashComplete() {
- // set args for examples sake
- os.Args = []string{"greet", "--generate-bash-completion"}
-
- app := NewApp()
- app.Name = "greet"
- app.EnableBashCompletion = true
- app.Commands = []Command{
- {
- Name: "describeit",
- Aliases: []string{"d"},
- Usage: "use it to see a description",
- Description: "This is how we describe describeit the function",
- Action: func(c *Context) {
- fmt.Printf("i like to describe things")
- },
- }, {
- Name: "next",
- Usage: "next example",
- Description: "more stuff to see when generating bash completion",
- Action: func(c *Context) {
- fmt.Printf("the next example")
- },
- },
- }
-
- app.Run(os.Args)
- // Output:
- // describeit
- // d
- // next
- // help
- // h
-}
-
-func TestApp_Run(t *testing.T) {
- s := ""
-
- app := NewApp()
- app.Action = func(c *Context) {
- s = s + c.Args().First()
- }
-
- err := app.Run([]string{"command", "foo"})
- expect(t, err, nil)
- err = app.Run([]string{"command", "bar"})
- expect(t, err, nil)
- expect(t, s, "foobar")
-}
-
-var commandAppTests = []struct {
- name string
- expected bool
-}{
- {"foobar", true},
- {"batbaz", true},
- {"b", true},
- {"f", true},
- {"bat", false},
- {"nothing", false},
-}
-
-func TestApp_Command(t *testing.T) {
- app := NewApp()
- fooCommand := Command{Name: "foobar", Aliases: []string{"f"}}
- batCommand := Command{Name: "batbaz", Aliases: []string{"b"}}
- app.Commands = []Command{
- fooCommand,
- batCommand,
- }
-
- for _, test := range commandAppTests {
- expect(t, app.Command(test.name) != nil, test.expected)
- }
-}
-
-func TestApp_CommandWithArgBeforeFlags(t *testing.T) {
- var parsedOption, firstArg string
-
- app := NewApp()
- command := Command{
- Name: "cmd",
- Flags: []Flag{
- StringFlag{Name: "option", Value: "", Usage: "some option"},
- },
- Action: func(c *Context) {
- parsedOption = c.String("option")
- firstArg = c.Args().First()
- },
- }
- app.Commands = []Command{command}
-
- app.Run([]string{"", "cmd", "my-arg", "--option", "my-option"})
-
- expect(t, parsedOption, "my-option")
- expect(t, firstArg, "my-arg")
-}
-
-func TestApp_RunAsSubcommandParseFlags(t *testing.T) {
- var context *Context
-
- a := NewApp()
- a.Commands = []Command{
- {
- Name: "foo",
- Action: func(c *Context) {
- context = c
- },
- Flags: []Flag{
- StringFlag{
- Name: "lang",
- Value: "english",
- Usage: "language for the greeting",
- },
- },
- Before: func(_ *Context) error { return nil },
- },
- }
- a.Run([]string{"", "foo", "--lang", "spanish", "abcd"})
-
- expect(t, context.Args().Get(0), "abcd")
- expect(t, context.String("lang"), "spanish")
-}
-
-func TestApp_CommandWithFlagBeforeTerminator(t *testing.T) {
- var parsedOption string
- var args []string
-
- app := NewApp()
- command := Command{
- Name: "cmd",
- Flags: []Flag{
- StringFlag{Name: "option", Value: "", Usage: "some option"},
- },
- Action: func(c *Context) {
- parsedOption = c.String("option")
- args = c.Args()
- },
- }
- app.Commands = []Command{command}
-
- app.Run([]string{"", "cmd", "my-arg", "--option", "my-option", "--", "--notARealFlag"})
-
- expect(t, parsedOption, "my-option")
- expect(t, args[0], "my-arg")
- expect(t, args[1], "--")
- expect(t, args[2], "--notARealFlag")
-}
-
-func TestApp_CommandWithNoFlagBeforeTerminator(t *testing.T) {
- var args []string
-
- app := NewApp()
- command := Command{
- Name: "cmd",
- Action: func(c *Context) {
- args = c.Args()
- },
- }
- app.Commands = []Command{command}
-
- app.Run([]string{"", "cmd", "my-arg", "--", "notAFlagAtAll"})
-
- expect(t, args[0], "my-arg")
- expect(t, args[1], "--")
- expect(t, args[2], "notAFlagAtAll")
-}
-
-func TestApp_Float64Flag(t *testing.T) {
- var meters float64
-
- app := NewApp()
- app.Flags = []Flag{
- Float64Flag{Name: "height", Value: 1.5, Usage: "Set the height, in meters"},
- }
- app.Action = func(c *Context) {
- meters = c.Float64("height")
- }
-
- app.Run([]string{"", "--height", "1.93"})
- expect(t, meters, 1.93)
-}
-
-func TestApp_ParseSliceFlags(t *testing.T) {
- var parsedOption, firstArg string
- var parsedIntSlice []int
- var parsedStringSlice []string
-
- app := NewApp()
- command := Command{
- Name: "cmd",
- Flags: []Flag{
- IntSliceFlag{Name: "p", Value: &IntSlice{}, Usage: "set one or more ip addr"},
- StringSliceFlag{Name: "ip", Value: &StringSlice{}, Usage: "set one or more ports to open"},
- },
- Action: func(c *Context) {
- parsedIntSlice = c.IntSlice("p")
- parsedStringSlice = c.StringSlice("ip")
- parsedOption = c.String("option")
- firstArg = c.Args().First()
- },
- }
- app.Commands = []Command{command}
-
- app.Run([]string{"", "cmd", "my-arg", "-p", "22", "-p", "80", "-ip", "8.8.8.8", "-ip", "8.8.4.4"})
-
- IntsEquals := func(a, b []int) bool {
- if len(a) != len(b) {
- return false
- }
- for i, v := range a {
- if v != b[i] {
- return false
- }
- }
- return true
- }
-
- StrsEquals := func(a, b []string) bool {
- if len(a) != len(b) {
- return false
- }
- for i, v := range a {
- if v != b[i] {
- return false
- }
- }
- return true
- }
- var expectedIntSlice = []int{22, 80}
- var expectedStringSlice = []string{"8.8.8.8", "8.8.4.4"}
-
- if !IntsEquals(parsedIntSlice, expectedIntSlice) {
- t.Errorf("%v does not match %v", parsedIntSlice, expectedIntSlice)
- }
-
- if !StrsEquals(parsedStringSlice, expectedStringSlice) {
- t.Errorf("%v does not match %v", parsedStringSlice, expectedStringSlice)
- }
-}
-
-func TestApp_ParseSliceFlagsWithMissingValue(t *testing.T) {
- var parsedIntSlice []int
- var parsedStringSlice []string
-
- app := NewApp()
- command := Command{
- Name: "cmd",
- Flags: []Flag{
- IntSliceFlag{Name: "a", Usage: "set numbers"},
- StringSliceFlag{Name: "str", Usage: "set strings"},
- },
- Action: func(c *Context) {
- parsedIntSlice = c.IntSlice("a")
- parsedStringSlice = c.StringSlice("str")
- },
- }
- app.Commands = []Command{command}
-
- app.Run([]string{"", "cmd", "my-arg", "-a", "2", "-str", "A"})
-
- var expectedIntSlice = []int{2}
- var expectedStringSlice = []string{"A"}
-
- if parsedIntSlice[0] != expectedIntSlice[0] {
- t.Errorf("%v does not match %v", parsedIntSlice[0], expectedIntSlice[0])
- }
-
- if parsedStringSlice[0] != expectedStringSlice[0] {
- t.Errorf("%v does not match %v", parsedIntSlice[0], expectedIntSlice[0])
- }
-}
-
-func TestApp_DefaultStdout(t *testing.T) {
- app := NewApp()
-
- if app.Writer != os.Stdout {
- t.Error("Default output writer not set.")
- }
-}
-
-type mockWriter struct {
- written []byte
-}
-
-func (fw *mockWriter) Write(p []byte) (n int, err error) {
- if fw.written == nil {
- fw.written = p
- } else {
- fw.written = append(fw.written, p...)
- }
-
- return len(p), nil
-}
-
-func (fw *mockWriter) GetWritten() (b []byte) {
- return fw.written
-}
-
-func TestApp_SetStdout(t *testing.T) {
- w := &mockWriter{}
-
- app := NewApp()
- app.Name = "test"
- app.Writer = w
-
- err := app.Run([]string{"help"})
-
- if err != nil {
- t.Fatalf("Run error: %s", err)
- }
-
- if len(w.written) == 0 {
- t.Error("App did not write output to desired writer.")
- }
-}
-
-func TestApp_BeforeFunc(t *testing.T) {
- beforeRun, subcommandRun := false, false
- beforeError := fmt.Errorf("fail")
- var err error
-
- app := NewApp()
-
- app.Before = func(c *Context) error {
- beforeRun = true
- s := c.String("opt")
- if s == "fail" {
- return beforeError
- }
-
- return nil
- }
-
- app.Commands = []Command{
- Command{
- Name: "sub",
- Action: func(c *Context) {
- subcommandRun = true
- },
- },
- }
-
- app.Flags = []Flag{
- StringFlag{Name: "opt"},
- }
-
- // run with the Before() func succeeding
- err = app.Run([]string{"command", "--opt", "succeed", "sub"})
-
- if err != nil {
- t.Fatalf("Run error: %s", err)
- }
-
- if beforeRun == false {
- t.Errorf("Before() not executed when expected")
- }
-
- if subcommandRun == false {
- t.Errorf("Subcommand not executed when expected")
- }
-
- // reset
- beforeRun, subcommandRun = false, false
-
- // run with the Before() func failing
- err = app.Run([]string{"command", "--opt", "fail", "sub"})
-
- // should be the same error produced by the Before func
- if err != beforeError {
- t.Errorf("Run error expected, but not received")
- }
-
- if beforeRun == false {
- t.Errorf("Before() not executed when expected")
- }
-
- if subcommandRun == true {
- t.Errorf("Subcommand executed when NOT expected")
- }
-
-}
-
-func TestApp_AfterFunc(t *testing.T) {
- afterRun, subcommandRun := false, false
- afterError := fmt.Errorf("fail")
- var err error
-
- app := NewApp()
-
- app.After = func(c *Context) error {
- afterRun = true
- s := c.String("opt")
- if s == "fail" {
- return afterError
- }
-
- return nil
- }
-
- app.Commands = []Command{
- Command{
- Name: "sub",
- Action: func(c *Context) {
- subcommandRun = true
- },
- },
- }
-
- app.Flags = []Flag{
- StringFlag{Name: "opt"},
- }
-
- // run with the After() func succeeding
- err = app.Run([]string{"command", "--opt", "succeed", "sub"})
-
- if err != nil {
- t.Fatalf("Run error: %s", err)
- }
-
- if afterRun == false {
- t.Errorf("After() not executed when expected")
- }
-
- if subcommandRun == false {
- t.Errorf("Subcommand not executed when expected")
- }
-
- // reset
- afterRun, subcommandRun = false, false
-
- // run with the Before() func failing
- err = app.Run([]string{"command", "--opt", "fail", "sub"})
-
- // should be the same error produced by the Before func
- if err != afterError {
- t.Errorf("Run error expected, but not received")
- }
-
- if afterRun == false {
- t.Errorf("After() not executed when expected")
- }
-
- if subcommandRun == false {
- t.Errorf("Subcommand not executed when expected")
- }
-}
-
-func TestAppNoHelpFlag(t *testing.T) {
- oldFlag := HelpFlag
- defer func() {
- HelpFlag = oldFlag
- }()
-
- HelpFlag = BoolFlag{}
-
- app := NewApp()
- err := app.Run([]string{"test", "-h"})
-
- if err != flag.ErrHelp {
- t.Errorf("expected error about missing help flag, but got: %s (%T)", err, err)
- }
-}
-
-func TestAppHelpPrinter(t *testing.T) {
- oldPrinter := HelpPrinter
- defer func() {
- HelpPrinter = oldPrinter
- }()
-
- var wasCalled = false
- HelpPrinter = func(w io.Writer, template string, data interface{}) {
- wasCalled = true
- }
-
- app := NewApp()
- app.Run([]string{"-h"})
-
- if wasCalled == false {
- t.Errorf("Help printer expected to be called, but was not")
- }
-}
-
-func TestAppVersionPrinter(t *testing.T) {
- oldPrinter := VersionPrinter
- defer func() {
- VersionPrinter = oldPrinter
- }()
-
- var wasCalled = false
- VersionPrinter = func(c *Context) {
- wasCalled = true
- }
-
- app := NewApp()
- ctx := NewContext(app, nil, nil)
- ShowVersion(ctx)
-
- if wasCalled == false {
- t.Errorf("Version printer expected to be called, but was not")
- }
-}
-
-func TestAppCommandNotFound(t *testing.T) {
- beforeRun, subcommandRun := false, false
- app := NewApp()
-
- app.CommandNotFound = func(c *Context, command string) {
- beforeRun = true
- }
-
- app.Commands = []Command{
- Command{
- Name: "bar",
- Action: func(c *Context) {
- subcommandRun = true
- },
- },
- }
-
- app.Run([]string{"command", "foo"})
-
- expect(t, beforeRun, true)
- expect(t, subcommandRun, false)
-}
-
-func TestGlobalFlag(t *testing.T) {
- var globalFlag string
- var globalFlagSet bool
- app := NewApp()
- app.Flags = []Flag{
- StringFlag{Name: "global, g", Usage: "global"},
- }
- app.Action = func(c *Context) {
- globalFlag = c.GlobalString("global")
- globalFlagSet = c.GlobalIsSet("global")
- }
- app.Run([]string{"command", "-g", "foo"})
- expect(t, globalFlag, "foo")
- expect(t, globalFlagSet, true)
-
-}
-
-func TestGlobalFlagsInSubcommands(t *testing.T) {
- subcommandRun := false
- parentFlag := false
- app := NewApp()
-
- app.Flags = []Flag{
- BoolFlag{Name: "debug, d", Usage: "Enable debugging"},
- }
-
- app.Commands = []Command{
- Command{
- Name: "foo",
- Flags: []Flag{
- BoolFlag{Name: "parent, p", Usage: "Parent flag"},
- },
- Subcommands: []Command{
- {
- Name: "bar",
- Action: func(c *Context) {
- if c.GlobalBool("debug") {
- subcommandRun = true
- }
- if c.GlobalBool("parent") {
- parentFlag = true
- }
- },
- },
- },
- },
- }
-
- app.Run([]string{"command", "-d", "foo", "-p", "bar"})
-
- expect(t, subcommandRun, true)
- expect(t, parentFlag, true)
-}
-
-func TestApp_Run_CommandWithSubcommandHasHelpTopic(t *testing.T) {
- var subcommandHelpTopics = [][]string{
- {"command", "foo", "--help"},
- {"command", "foo", "-h"},
- {"command", "foo", "help"},
- }
-
- for _, flagSet := range subcommandHelpTopics {
- t.Logf("==> checking with flags %v", flagSet)
-
- app := NewApp()
- buf := new(bytes.Buffer)
- app.Writer = buf
-
- subCmdBar := Command{
- Name: "bar",
- Usage: "does bar things",
- }
- subCmdBaz := Command{
- Name: "baz",
- Usage: "does baz things",
- }
- cmd := Command{
- Name: "foo",
- Description: "descriptive wall of text about how it does foo things",
- Subcommands: []Command{subCmdBar, subCmdBaz},
- }
-
- app.Commands = []Command{cmd}
- err := app.Run(flagSet)
-
- if err != nil {
- t.Error(err)
- }
-
- output := buf.String()
- t.Logf("output: %q\n", buf.Bytes())
-
- if strings.Contains(output, "No help topic for") {
- t.Errorf("expect a help topic, got none: \n%q", output)
- }
-
- for _, shouldContain := range []string{
- cmd.Name, cmd.Description,
- subCmdBar.Name, subCmdBar.Usage,
- subCmdBaz.Name, subCmdBaz.Usage,
- } {
- if !strings.Contains(output, shouldContain) {
- t.Errorf("want help to contain %q, did not: \n%q", shouldContain, output)
- }
- }
- }
-}
-
-func TestApp_Run_SubcommandFullPath(t *testing.T) {
- app := NewApp()
- buf := new(bytes.Buffer)
- app.Writer = buf
-
- subCmd := Command{
- Name: "bar",
- Usage: "does bar things",
- }
- cmd := Command{
- Name: "foo",
- Description: "foo commands",
- Subcommands: []Command{subCmd},
- }
- app.Commands = []Command{cmd}
-
- err := app.Run([]string{"command", "foo", "bar", "--help"})
- if err != nil {
- t.Error(err)
- }
-
- output := buf.String()
- if !strings.Contains(output, "foo bar - does bar things") {
- t.Errorf("expected full path to subcommand: %s", output)
- }
- if !strings.Contains(output, "command foo bar [arguments...]") {
- t.Errorf("expected full path to subcommand: %s", output)
- }
-}
-
-func TestApp_Run_Help(t *testing.T) {
- var helpArguments = [][]string{{"boom", "--help"}, {"boom", "-h"}, {"boom", "help"}}
-
- for _, args := range helpArguments {
- buf := new(bytes.Buffer)
-
- t.Logf("==> checking with arguments %v", args)
-
- app := NewApp()
- app.Name = "boom"
- app.Usage = "make an explosive entrance"
- app.Writer = buf
- app.Action = func(c *Context) {
- buf.WriteString("boom I say!")
- }
-
- err := app.Run(args)
- if err != nil {
- t.Error(err)
- }
-
- output := buf.String()
- t.Logf("output: %q\n", buf.Bytes())
-
- if !strings.Contains(output, "boom - make an explosive entrance") {
- t.Errorf("want help to contain %q, did not: \n%q", "boom - make an explosive entrance", output)
- }
- }
-}
-
-func TestApp_Run_Version(t *testing.T) {
- var versionArguments = [][]string{{"boom", "--version"}, {"boom", "-v"}}
-
- for _, args := range versionArguments {
- buf := new(bytes.Buffer)
-
- t.Logf("==> checking with arguments %v", args)
-
- app := NewApp()
- app.Name = "boom"
- app.Usage = "make an explosive entrance"
- app.Version = "0.1.0"
- app.Writer = buf
- app.Action = func(c *Context) {
- buf.WriteString("boom I say!")
- }
-
- err := app.Run(args)
- if err != nil {
- t.Error(err)
- }
-
- output := buf.String()
- t.Logf("output: %q\n", buf.Bytes())
-
- if !strings.Contains(output, "0.1.0") {
- t.Errorf("want version to contain %q, did not: \n%q", "0.1.0", output)
- }
- }
-}
-
-func TestApp_Run_DoesNotOverwriteErrorFromBefore(t *testing.T) {
- app := NewApp()
- app.Action = func(c *Context) {}
- app.Before = func(c *Context) error { return fmt.Errorf("before error") }
- app.After = func(c *Context) error { return fmt.Errorf("after error") }
-
- err := app.Run([]string{"foo"})
- if err == nil {
- t.Fatalf("expected to recieve error from Run, got none")
- }
-
- if !strings.Contains(err.Error(), "before error") {
- t.Errorf("expected text of error from Before method, but got none in \"%v\"", err)
- }
- if !strings.Contains(err.Error(), "after error") {
- t.Errorf("expected text of error from After method, but got none in \"%v\"", err)
- }
-}
-
-func TestApp_Run_SubcommandDoesNotOverwriteErrorFromBefore(t *testing.T) {
- app := NewApp()
- app.Commands = []Command{
- Command{
- Name: "bar",
- Before: func(c *Context) error { return fmt.Errorf("before error") },
- After: func(c *Context) error { return fmt.Errorf("after error") },
- },
- }
-
- err := app.Run([]string{"foo", "bar"})
- if err == nil {
- t.Fatalf("expected to recieve error from Run, got none")
- }
-
- if !strings.Contains(err.Error(), "before error") {
- t.Errorf("expected text of error from Before method, but got none in \"%v\"", err)
- }
- if !strings.Contains(err.Error(), "after error") {
- t.Errorf("expected text of error from After method, but got none in \"%v\"", err)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete b/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete
deleted file mode 100644
index 9b55dd990cb54cb231c6c6a8769c0d52fce582d1..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/bash_autocomplete
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/bash
-
-_cli_bash_autocomplete() {
- local cur prev opts base
- COMPREPLY=()
- cur="${COMP_WORDS[COMP_CWORD]}"
- prev="${COMP_WORDS[COMP_CWORD-1]}"
- opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
- COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
- return 0
- }
-
- complete -F _cli_bash_autocomplete $PROG
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete b/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete
deleted file mode 100644
index 5430a18f9576dad5659d5eb269cab0765ed917da..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/autocomplete/zsh_autocomplete
+++ /dev/null
@@ -1,5 +0,0 @@
-autoload -U compinit && compinit
-autoload -U bashcompinit && bashcompinit
-
-script_dir=$(dirname $0)
-source ${script_dir}/bash_autocomplete
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/cli_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/cli_test.go
deleted file mode 100644
index e54f8e2688e8754e969e4cd0a4ef14bb6bda40d0..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/cli_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package cli
-
-import (
- "os"
-)
-
-func Example() {
- app := NewApp()
- app.Name = "todo"
- app.Usage = "task list on the command line"
- app.Commands = []Command{
- {
- Name: "add",
- Aliases: []string{"a"},
- Usage: "add a task to the list",
- Action: func(c *Context) {
- println("added task: ", c.Args().First())
- },
- },
- {
- Name: "complete",
- Aliases: []string{"c"},
- Usage: "complete a task on the list",
- Action: func(c *Context) {
- println("completed task: ", c.Args().First())
- },
- },
- }
-
- app.Run(os.Args)
-}
-
-func ExampleSubcommand() {
- app := NewApp()
- app.Name = "say"
- app.Commands = []Command{
- {
- Name: "hello",
- Aliases: []string{"hi"},
- Usage: "use it to see a description",
- Description: "This is how we describe hello the function",
- Subcommands: []Command{
- {
- Name: "english",
- Aliases: []string{"en"},
- Usage: "sends a greeting in english",
- Description: "greets someone in english",
- Flags: []Flag{
- StringFlag{
- Name: "name",
- Value: "Bob",
- Usage: "Name of the person to greet",
- },
- },
- Action: func(c *Context) {
- println("Hello, ", c.String("name"))
- },
- }, {
- Name: "spanish",
- Aliases: []string{"sp"},
- Usage: "sends a greeting in spanish",
- Flags: []Flag{
- StringFlag{
- Name: "surname",
- Value: "Jones",
- Usage: "Surname of the person to greet",
- },
- },
- Action: func(c *Context) {
- println("Hola, ", c.String("surname"))
- },
- }, {
- Name: "french",
- Aliases: []string{"fr"},
- Usage: "sends a greeting in french",
- Flags: []Flag{
- StringFlag{
- Name: "nickname",
- Value: "Stevie",
- Usage: "Nickname of the person to greet",
- },
- },
- Action: func(c *Context) {
- println("Bonjour, ", c.String("nickname"))
- },
- },
- },
- }, {
- Name: "bye",
- Usage: "says goodbye",
- Action: func(c *Context) {
- println("bye")
- },
- },
- }
-
- app.Run(os.Args)
-}
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/command_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/command_test.go
deleted file mode 100644
index 688d12c3b4ee3241e1a72a72a56b444da063fdb6..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/command_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package cli
-
-import (
- "flag"
- "testing"
-)
-
-func TestCommandDoNotIgnoreFlags(t *testing.T) {
- app := NewApp()
- set := flag.NewFlagSet("test", 0)
- test := []string{"blah", "blah", "-break"}
- set.Parse(test)
-
- c := NewContext(app, set, nil)
-
- command := Command{
- Name: "test-cmd",
- Aliases: []string{"tc"},
- Usage: "this is for testing",
- Description: "testing",
- Action: func(_ *Context) {},
- }
- err := command.Run(c)
-
- expect(t, err.Error(), "flag provided but not defined: -break")
-}
-
-func TestCommandIgnoreFlags(t *testing.T) {
- app := NewApp()
- set := flag.NewFlagSet("test", 0)
- test := []string{"blah", "blah"}
- set.Parse(test)
-
- c := NewContext(app, set, nil)
-
- command := Command{
- Name: "test-cmd",
- Aliases: []string{"tc"},
- Usage: "this is for testing",
- Description: "testing",
- Action: func(_ *Context) {},
- SkipFlagParsing: true,
- }
- err := command.Run(c)
-
- expect(t, err, nil)
-}
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/context_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/context_test.go
deleted file mode 100644
index 7f8e928932bbfc9dd438ce8beec3abbdf04abbfe..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/context_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package cli
-
-import (
- "flag"
- "testing"
- "time"
-)
-
-func TestNewContext(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Int("myflag", 12, "doc")
- globalSet := flag.NewFlagSet("test", 0)
- globalSet.Int("myflag", 42, "doc")
- globalCtx := NewContext(nil, globalSet, nil)
- command := Command{Name: "mycommand"}
- c := NewContext(nil, set, globalCtx)
- c.Command = command
- expect(t, c.Int("myflag"), 12)
- expect(t, c.GlobalInt("myflag"), 42)
- expect(t, c.Command.Name, "mycommand")
-}
-
-func TestContext_Int(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Int("myflag", 12, "doc")
- c := NewContext(nil, set, nil)
- expect(t, c.Int("myflag"), 12)
-}
-
-func TestContext_Duration(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Duration("myflag", time.Duration(12*time.Second), "doc")
- c := NewContext(nil, set, nil)
- expect(t, c.Duration("myflag"), time.Duration(12*time.Second))
-}
-
-func TestContext_String(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.String("myflag", "hello world", "doc")
- c := NewContext(nil, set, nil)
- expect(t, c.String("myflag"), "hello world")
-}
-
-func TestContext_Bool(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Bool("myflag", false, "doc")
- c := NewContext(nil, set, nil)
- expect(t, c.Bool("myflag"), false)
-}
-
-func TestContext_BoolT(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Bool("myflag", true, "doc")
- c := NewContext(nil, set, nil)
- expect(t, c.BoolT("myflag"), true)
-}
-
-func TestContext_Args(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Bool("myflag", false, "doc")
- c := NewContext(nil, set, nil)
- set.Parse([]string{"--myflag", "bat", "baz"})
- expect(t, len(c.Args()), 2)
- expect(t, c.Bool("myflag"), true)
-}
-
-func TestContext_IsSet(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Bool("myflag", false, "doc")
- set.String("otherflag", "hello world", "doc")
- globalSet := flag.NewFlagSet("test", 0)
- globalSet.Bool("myflagGlobal", true, "doc")
- globalCtx := NewContext(nil, globalSet, nil)
- c := NewContext(nil, set, globalCtx)
- set.Parse([]string{"--myflag", "bat", "baz"})
- globalSet.Parse([]string{"--myflagGlobal", "bat", "baz"})
- expect(t, c.IsSet("myflag"), true)
- expect(t, c.IsSet("otherflag"), false)
- expect(t, c.IsSet("bogusflag"), false)
- expect(t, c.IsSet("myflagGlobal"), false)
-}
-
-func TestContext_GlobalIsSet(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Bool("myflag", false, "doc")
- set.String("otherflag", "hello world", "doc")
- globalSet := flag.NewFlagSet("test", 0)
- globalSet.Bool("myflagGlobal", true, "doc")
- globalSet.Bool("myflagGlobalUnset", true, "doc")
- globalCtx := NewContext(nil, globalSet, nil)
- c := NewContext(nil, set, globalCtx)
- set.Parse([]string{"--myflag", "bat", "baz"})
- globalSet.Parse([]string{"--myflagGlobal", "bat", "baz"})
- expect(t, c.GlobalIsSet("myflag"), false)
- expect(t, c.GlobalIsSet("otherflag"), false)
- expect(t, c.GlobalIsSet("bogusflag"), false)
- expect(t, c.GlobalIsSet("myflagGlobal"), true)
- expect(t, c.GlobalIsSet("myflagGlobalUnset"), false)
- expect(t, c.GlobalIsSet("bogusGlobal"), false)
-}
-
-func TestContext_NumFlags(t *testing.T) {
- set := flag.NewFlagSet("test", 0)
- set.Bool("myflag", false, "doc")
- set.String("otherflag", "hello world", "doc")
- globalSet := flag.NewFlagSet("test", 0)
- globalSet.Bool("myflagGlobal", true, "doc")
- globalCtx := NewContext(nil, globalSet, nil)
- c := NewContext(nil, set, globalCtx)
- set.Parse([]string{"--myflag", "--otherflag=foo"})
- globalSet.Parse([]string{"--myflagGlobal"})
- expect(t, c.NumFlags(), 2)
-}
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/flag_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/flag_test.go
deleted file mode 100644
index 36061028af22824ee54c678e51410c53952784b9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/flag_test.go
+++ /dev/null
@@ -1,740 +0,0 @@
-package cli
-
-import (
- "fmt"
- "os"
- "reflect"
- "strings"
- "testing"
-)
-
-var boolFlagTests = []struct {
- name string
- expected string
-}{
- {"help", "--help\t"},
- {"h", "-h\t"},
-}
-
-func TestBoolFlagHelpOutput(t *testing.T) {
-
- for _, test := range boolFlagTests {
- flag := BoolFlag{Name: test.name}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%s does not match %s", output, test.expected)
- }
- }
-}
-
-var stringFlagTests = []struct {
- name string
- value string
- expected string
-}{
- {"help", "", "--help \t"},
- {"h", "", "-h \t"},
- {"h", "", "-h \t"},
- {"test", "Something", "--test \"Something\"\t"},
-}
-
-func TestStringFlagHelpOutput(t *testing.T) {
-
- for _, test := range stringFlagTests {
- flag := StringFlag{Name: test.name, Value: test.value}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%s does not match %s", output, test.expected)
- }
- }
-}
-
-func TestStringFlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_FOO", "derp")
- for _, test := range stringFlagTests {
- flag := StringFlag{Name: test.name, Value: test.value, EnvVar: "APP_FOO"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_FOO]") {
- t.Errorf("%s does not end with [$APP_FOO]", output)
- }
- }
-}
-
-var stringSliceFlagTests = []struct {
- name string
- value *StringSlice
- expected string
-}{
- {"help", func() *StringSlice {
- s := &StringSlice{}
- s.Set("")
- return s
- }(), "--help [--help option --help option]\t"},
- {"h", func() *StringSlice {
- s := &StringSlice{}
- s.Set("")
- return s
- }(), "-h [-h option -h option]\t"},
- {"h", func() *StringSlice {
- s := &StringSlice{}
- s.Set("")
- return s
- }(), "-h [-h option -h option]\t"},
- {"test", func() *StringSlice {
- s := &StringSlice{}
- s.Set("Something")
- return s
- }(), "--test [--test option --test option]\t"},
-}
-
-func TestStringSliceFlagHelpOutput(t *testing.T) {
-
- for _, test := range stringSliceFlagTests {
- flag := StringSliceFlag{Name: test.name, Value: test.value}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%q does not match %q", output, test.expected)
- }
- }
-}
-
-func TestStringSliceFlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_QWWX", "11,4")
- for _, test := range stringSliceFlagTests {
- flag := StringSliceFlag{Name: test.name, Value: test.value, EnvVar: "APP_QWWX"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_QWWX]") {
- t.Errorf("%q does not end with [$APP_QWWX]", output)
- }
- }
-}
-
-var intFlagTests = []struct {
- name string
- expected string
-}{
- {"help", "--help \"0\"\t"},
- {"h", "-h \"0\"\t"},
-}
-
-func TestIntFlagHelpOutput(t *testing.T) {
-
- for _, test := range intFlagTests {
- flag := IntFlag{Name: test.name}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%s does not match %s", output, test.expected)
- }
- }
-}
-
-func TestIntFlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_BAR", "2")
- for _, test := range intFlagTests {
- flag := IntFlag{Name: test.name, EnvVar: "APP_BAR"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_BAR]") {
- t.Errorf("%s does not end with [$APP_BAR]", output)
- }
- }
-}
-
-var durationFlagTests = []struct {
- name string
- expected string
-}{
- {"help", "--help \"0\"\t"},
- {"h", "-h \"0\"\t"},
-}
-
-func TestDurationFlagHelpOutput(t *testing.T) {
-
- for _, test := range durationFlagTests {
- flag := DurationFlag{Name: test.name}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%s does not match %s", output, test.expected)
- }
- }
-}
-
-func TestDurationFlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_BAR", "2h3m6s")
- for _, test := range durationFlagTests {
- flag := DurationFlag{Name: test.name, EnvVar: "APP_BAR"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_BAR]") {
- t.Errorf("%s does not end with [$APP_BAR]", output)
- }
- }
-}
-
-var intSliceFlagTests = []struct {
- name string
- value *IntSlice
- expected string
-}{
- {"help", &IntSlice{}, "--help [--help option --help option]\t"},
- {"h", &IntSlice{}, "-h [-h option -h option]\t"},
- {"h", &IntSlice{}, "-h [-h option -h option]\t"},
- {"test", func() *IntSlice {
- i := &IntSlice{}
- i.Set("9")
- return i
- }(), "--test [--test option --test option]\t"},
-}
-
-func TestIntSliceFlagHelpOutput(t *testing.T) {
-
- for _, test := range intSliceFlagTests {
- flag := IntSliceFlag{Name: test.name, Value: test.value}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%q does not match %q", output, test.expected)
- }
- }
-}
-
-func TestIntSliceFlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_SMURF", "42,3")
- for _, test := range intSliceFlagTests {
- flag := IntSliceFlag{Name: test.name, Value: test.value, EnvVar: "APP_SMURF"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_SMURF]") {
- t.Errorf("%q does not end with [$APP_SMURF]", output)
- }
- }
-}
-
-var float64FlagTests = []struct {
- name string
- expected string
-}{
- {"help", "--help \"0\"\t"},
- {"h", "-h \"0\"\t"},
-}
-
-func TestFloat64FlagHelpOutput(t *testing.T) {
-
- for _, test := range float64FlagTests {
- flag := Float64Flag{Name: test.name}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%s does not match %s", output, test.expected)
- }
- }
-}
-
-func TestFloat64FlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_BAZ", "99.4")
- for _, test := range float64FlagTests {
- flag := Float64Flag{Name: test.name, EnvVar: "APP_BAZ"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_BAZ]") {
- t.Errorf("%s does not end with [$APP_BAZ]", output)
- }
- }
-}
-
-var genericFlagTests = []struct {
- name string
- value Generic
- expected string
-}{
- {"test", &Parser{"abc", "def"}, "--test \"abc,def\"\ttest flag"},
- {"t", &Parser{"abc", "def"}, "-t \"abc,def\"\ttest flag"},
-}
-
-func TestGenericFlagHelpOutput(t *testing.T) {
-
- for _, test := range genericFlagTests {
- flag := GenericFlag{Name: test.name, Value: test.value, Usage: "test flag"}
- output := flag.String()
-
- if output != test.expected {
- t.Errorf("%q does not match %q", output, test.expected)
- }
- }
-}
-
-func TestGenericFlagWithEnvVarHelpOutput(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_ZAP", "3")
- for _, test := range genericFlagTests {
- flag := GenericFlag{Name: test.name, EnvVar: "APP_ZAP"}
- output := flag.String()
-
- if !strings.HasSuffix(output, " [$APP_ZAP]") {
- t.Errorf("%s does not end with [$APP_ZAP]", output)
- }
- }
-}
-
-func TestParseMultiString(t *testing.T) {
- (&App{
- Flags: []Flag{
- StringFlag{Name: "serve, s"},
- },
- Action: func(ctx *Context) {
- if ctx.String("serve") != "10" {
- t.Errorf("main name not set")
- }
- if ctx.String("s") != "10" {
- t.Errorf("short name not set")
- }
- },
- }).Run([]string{"run", "-s", "10"})
-}
-
-func TestParseMultiStringFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_COUNT", "20")
- (&App{
- Flags: []Flag{
- StringFlag{Name: "count, c", EnvVar: "APP_COUNT"},
- },
- Action: func(ctx *Context) {
- if ctx.String("count") != "20" {
- t.Errorf("main name not set")
- }
- if ctx.String("c") != "20" {
- t.Errorf("short name not set")
- }
- },
- }).Run([]string{"run"})
-}
-
-func TestParseMultiStringFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_COUNT", "20")
- (&App{
- Flags: []Flag{
- StringFlag{Name: "count, c", EnvVar: "COMPAT_COUNT,APP_COUNT"},
- },
- Action: func(ctx *Context) {
- if ctx.String("count") != "20" {
- t.Errorf("main name not set")
- }
- if ctx.String("c") != "20" {
- t.Errorf("short name not set")
- }
- },
- }).Run([]string{"run"})
-}
-
-func TestParseMultiStringSlice(t *testing.T) {
- (&App{
- Flags: []Flag{
- StringSliceFlag{Name: "serve, s", Value: &StringSlice{}},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.StringSlice("serve"), []string{"10", "20"}) {
- t.Errorf("main name not set")
- }
- if !reflect.DeepEqual(ctx.StringSlice("s"), []string{"10", "20"}) {
- t.Errorf("short name not set")
- }
- },
- }).Run([]string{"run", "-s", "10", "-s", "20"})
-}
-
-func TestParseMultiStringSliceFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_INTERVALS", "20,30,40")
-
- (&App{
- Flags: []Flag{
- StringSliceFlag{Name: "intervals, i", Value: &StringSlice{}, EnvVar: "APP_INTERVALS"},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.StringSlice("intervals"), []string{"20", "30", "40"}) {
- t.Errorf("main name not set from env")
- }
- if !reflect.DeepEqual(ctx.StringSlice("i"), []string{"20", "30", "40"}) {
- t.Errorf("short name not set from env")
- }
- },
- }).Run([]string{"run"})
-}
-
-func TestParseMultiStringSliceFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_INTERVALS", "20,30,40")
-
- (&App{
- Flags: []Flag{
- StringSliceFlag{Name: "intervals, i", Value: &StringSlice{}, EnvVar: "COMPAT_INTERVALS,APP_INTERVALS"},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.StringSlice("intervals"), []string{"20", "30", "40"}) {
- t.Errorf("main name not set from env")
- }
- if !reflect.DeepEqual(ctx.StringSlice("i"), []string{"20", "30", "40"}) {
- t.Errorf("short name not set from env")
- }
- },
- }).Run([]string{"run"})
-}
-
-func TestParseMultiInt(t *testing.T) {
- a := App{
- Flags: []Flag{
- IntFlag{Name: "serve, s"},
- },
- Action: func(ctx *Context) {
- if ctx.Int("serve") != 10 {
- t.Errorf("main name not set")
- }
- if ctx.Int("s") != 10 {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run", "-s", "10"})
-}
-
-func TestParseMultiIntFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_TIMEOUT_SECONDS", "10")
- a := App{
- Flags: []Flag{
- IntFlag{Name: "timeout, t", EnvVar: "APP_TIMEOUT_SECONDS"},
- },
- Action: func(ctx *Context) {
- if ctx.Int("timeout") != 10 {
- t.Errorf("main name not set")
- }
- if ctx.Int("t") != 10 {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiIntFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_TIMEOUT_SECONDS", "10")
- a := App{
- Flags: []Flag{
- IntFlag{Name: "timeout, t", EnvVar: "COMPAT_TIMEOUT_SECONDS,APP_TIMEOUT_SECONDS"},
- },
- Action: func(ctx *Context) {
- if ctx.Int("timeout") != 10 {
- t.Errorf("main name not set")
- }
- if ctx.Int("t") != 10 {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiIntSlice(t *testing.T) {
- (&App{
- Flags: []Flag{
- IntSliceFlag{Name: "serve, s", Value: &IntSlice{}},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.IntSlice("serve"), []int{10, 20}) {
- t.Errorf("main name not set")
- }
- if !reflect.DeepEqual(ctx.IntSlice("s"), []int{10, 20}) {
- t.Errorf("short name not set")
- }
- },
- }).Run([]string{"run", "-s", "10", "-s", "20"})
-}
-
-func TestParseMultiIntSliceFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_INTERVALS", "20,30,40")
-
- (&App{
- Flags: []Flag{
- IntSliceFlag{Name: "intervals, i", Value: &IntSlice{}, EnvVar: "APP_INTERVALS"},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.IntSlice("intervals"), []int{20, 30, 40}) {
- t.Errorf("main name not set from env")
- }
- if !reflect.DeepEqual(ctx.IntSlice("i"), []int{20, 30, 40}) {
- t.Errorf("short name not set from env")
- }
- },
- }).Run([]string{"run"})
-}
-
-func TestParseMultiIntSliceFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_INTERVALS", "20,30,40")
-
- (&App{
- Flags: []Flag{
- IntSliceFlag{Name: "intervals, i", Value: &IntSlice{}, EnvVar: "COMPAT_INTERVALS,APP_INTERVALS"},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.IntSlice("intervals"), []int{20, 30, 40}) {
- t.Errorf("main name not set from env")
- }
- if !reflect.DeepEqual(ctx.IntSlice("i"), []int{20, 30, 40}) {
- t.Errorf("short name not set from env")
- }
- },
- }).Run([]string{"run"})
-}
-
-func TestParseMultiFloat64(t *testing.T) {
- a := App{
- Flags: []Flag{
- Float64Flag{Name: "serve, s"},
- },
- Action: func(ctx *Context) {
- if ctx.Float64("serve") != 10.2 {
- t.Errorf("main name not set")
- }
- if ctx.Float64("s") != 10.2 {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run", "-s", "10.2"})
-}
-
-func TestParseMultiFloat64FromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_TIMEOUT_SECONDS", "15.5")
- a := App{
- Flags: []Flag{
- Float64Flag{Name: "timeout, t", EnvVar: "APP_TIMEOUT_SECONDS"},
- },
- Action: func(ctx *Context) {
- if ctx.Float64("timeout") != 15.5 {
- t.Errorf("main name not set")
- }
- if ctx.Float64("t") != 15.5 {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiFloat64FromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_TIMEOUT_SECONDS", "15.5")
- a := App{
- Flags: []Flag{
- Float64Flag{Name: "timeout, t", EnvVar: "COMPAT_TIMEOUT_SECONDS,APP_TIMEOUT_SECONDS"},
- },
- Action: func(ctx *Context) {
- if ctx.Float64("timeout") != 15.5 {
- t.Errorf("main name not set")
- }
- if ctx.Float64("t") != 15.5 {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiBool(t *testing.T) {
- a := App{
- Flags: []Flag{
- BoolFlag{Name: "serve, s"},
- },
- Action: func(ctx *Context) {
- if ctx.Bool("serve") != true {
- t.Errorf("main name not set")
- }
- if ctx.Bool("s") != true {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run", "--serve"})
-}
-
-func TestParseMultiBoolFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_DEBUG", "1")
- a := App{
- Flags: []Flag{
- BoolFlag{Name: "debug, d", EnvVar: "APP_DEBUG"},
- },
- Action: func(ctx *Context) {
- if ctx.Bool("debug") != true {
- t.Errorf("main name not set from env")
- }
- if ctx.Bool("d") != true {
- t.Errorf("short name not set from env")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiBoolFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_DEBUG", "1")
- a := App{
- Flags: []Flag{
- BoolFlag{Name: "debug, d", EnvVar: "COMPAT_DEBUG,APP_DEBUG"},
- },
- Action: func(ctx *Context) {
- if ctx.Bool("debug") != true {
- t.Errorf("main name not set from env")
- }
- if ctx.Bool("d") != true {
- t.Errorf("short name not set from env")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiBoolT(t *testing.T) {
- a := App{
- Flags: []Flag{
- BoolTFlag{Name: "serve, s"},
- },
- Action: func(ctx *Context) {
- if ctx.BoolT("serve") != true {
- t.Errorf("main name not set")
- }
- if ctx.BoolT("s") != true {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run", "--serve"})
-}
-
-func TestParseMultiBoolTFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_DEBUG", "0")
- a := App{
- Flags: []Flag{
- BoolTFlag{Name: "debug, d", EnvVar: "APP_DEBUG"},
- },
- Action: func(ctx *Context) {
- if ctx.BoolT("debug") != false {
- t.Errorf("main name not set from env")
- }
- if ctx.BoolT("d") != false {
- t.Errorf("short name not set from env")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseMultiBoolTFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_DEBUG", "0")
- a := App{
- Flags: []Flag{
- BoolTFlag{Name: "debug, d", EnvVar: "COMPAT_DEBUG,APP_DEBUG"},
- },
- Action: func(ctx *Context) {
- if ctx.BoolT("debug") != false {
- t.Errorf("main name not set from env")
- }
- if ctx.BoolT("d") != false {
- t.Errorf("short name not set from env")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-type Parser [2]string
-
-func (p *Parser) Set(value string) error {
- parts := strings.Split(value, ",")
- if len(parts) != 2 {
- return fmt.Errorf("invalid format")
- }
-
- (*p)[0] = parts[0]
- (*p)[1] = parts[1]
-
- return nil
-}
-
-func (p *Parser) String() string {
- return fmt.Sprintf("%s,%s", p[0], p[1])
-}
-
-func TestParseGeneric(t *testing.T) {
- a := App{
- Flags: []Flag{
- GenericFlag{Name: "serve, s", Value: &Parser{}},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.Generic("serve"), &Parser{"10", "20"}) {
- t.Errorf("main name not set")
- }
- if !reflect.DeepEqual(ctx.Generic("s"), &Parser{"10", "20"}) {
- t.Errorf("short name not set")
- }
- },
- }
- a.Run([]string{"run", "-s", "10,20"})
-}
-
-func TestParseGenericFromEnv(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_SERVE", "20,30")
- a := App{
- Flags: []Flag{
- GenericFlag{Name: "serve, s", Value: &Parser{}, EnvVar: "APP_SERVE"},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.Generic("serve"), &Parser{"20", "30"}) {
- t.Errorf("main name not set from env")
- }
- if !reflect.DeepEqual(ctx.Generic("s"), &Parser{"20", "30"}) {
- t.Errorf("short name not set from env")
- }
- },
- }
- a.Run([]string{"run"})
-}
-
-func TestParseGenericFromEnvCascade(t *testing.T) {
- os.Clearenv()
- os.Setenv("APP_FOO", "99,2000")
- a := App{
- Flags: []Flag{
- GenericFlag{Name: "foos", Value: &Parser{}, EnvVar: "COMPAT_FOO,APP_FOO"},
- },
- Action: func(ctx *Context) {
- if !reflect.DeepEqual(ctx.Generic("foos"), &Parser{"99", "2000"}) {
- t.Errorf("value not set from env")
- }
- },
- }
- a.Run([]string{"run"})
-}
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/help_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/help_test.go
deleted file mode 100644
index 42d0284c91f31828c35a154c4b6340c88fbed980..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/help_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package cli
-
-import (
- "bytes"
- "testing"
-)
-
-func Test_ShowAppHelp_NoAuthor(t *testing.T) {
- output := new(bytes.Buffer)
- app := NewApp()
- app.Writer = output
-
- c := NewContext(app, nil, nil)
-
- ShowAppHelp(c)
-
- if bytes.Index(output.Bytes(), []byte("AUTHOR(S):")) != -1 {
- t.Errorf("expected\n%snot to include %s", output.String(), "AUTHOR(S):")
- }
-}
-
-func Test_ShowAppHelp_NoVersion(t *testing.T) {
- output := new(bytes.Buffer)
- app := NewApp()
- app.Writer = output
-
- app.Version = ""
-
- c := NewContext(app, nil, nil)
-
- ShowAppHelp(c)
-
- if bytes.Index(output.Bytes(), []byte("VERSION:")) != -1 {
- t.Errorf("expected\n%snot to include %s", output.String(), "VERSION:")
- }
-}
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/helpers_test.go b/Godeps/_workspace/src/github.com/codegangsta/cli/helpers_test.go
deleted file mode 100644
index 3ce8e938bc3b5d2061ba9b9c37db31e80917519b..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/codegangsta/cli/helpers_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package cli
-
-import (
- "reflect"
- "testing"
-)
-
-/* Test Helpers */
-func expect(t *testing.T, a interface{}, b interface{}) {
- if a != b {
- t.Errorf("Expected %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
- }
-}
-
-func refute(t *testing.T, a interface{}, b interface{}) {
- if a == b {
- t.Errorf("Did not expect %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
- }
-}
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/homedir/homedir_test.go b/Godeps/_workspace/src/github.com/docker/docker/pkg/homedir/homedir_test.go
deleted file mode 100644
index 7a95cb2bd7d289ea9679b47a8028cd6d80ad821d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/docker/docker/pkg/homedir/homedir_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package homedir
-
-import (
- "path/filepath"
- "testing"
-)
-
-func TestGet(t *testing.T) {
- home := Get()
- if home == "" {
- t.Fatal("returned home directory is empty")
- }
-
- if !filepath.IsAbs(home) {
- t.Fatalf("returned path is not absolute: %s", home)
- }
-}
-
-func TestGetShortcutString(t *testing.T) {
- shortcut := GetShortcutString()
- if shortcut == "" {
- t.Fatal("returned shortcut string is empty")
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth_test.go
deleted file mode 100644
index e53b1760117e26795fa7350de13a71f105a401b9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "encoding/base64"
- "fmt"
- "net/http"
- "strings"
- "testing"
-)
-
-func TestAuthLegacyConfig(t *testing.T) {
- auth := base64.StdEncoding.EncodeToString([]byte("user:pa:ss"))
- read := strings.NewReader(fmt.Sprintf(`{"docker.io":{"auth":"%s","email":"user@example.com"}}`, auth))
- ac, err := NewAuthConfigurations(read)
- if err != nil {
- t.Error(err)
- }
- c, ok := ac.Configs["docker.io"]
- if !ok {
- t.Error("NewAuthConfigurations: Expected Configs to contain docker.io")
- }
- if got, want := c.Email, "user@example.com"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].Email: wrong result. Want %q. Got %q`, want, got)
- }
- if got, want := c.Username, "user"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].Username: wrong result. Want %q. Got %q`, want, got)
- }
- if got, want := c.Password, "pa:ss"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].Password: wrong result. Want %q. Got %q`, want, got)
- }
- if got, want := c.ServerAddress, "docker.io"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].ServerAddress: wrong result. Want %q. Got %q`, want, got)
- }
-}
-
-func TestAuthBadConfig(t *testing.T) {
- auth := base64.StdEncoding.EncodeToString([]byte("userpass"))
- read := strings.NewReader(fmt.Sprintf(`{"docker.io":{"auth":"%s","email":"user@example.com"}}`, auth))
- ac, err := NewAuthConfigurations(read)
- if err != ErrCannotParseDockercfg {
- t.Errorf("Incorrect error returned %v\n", err)
- }
- if ac != nil {
- t.Errorf("Invalid auth configuration returned, should be nil %v\n", ac)
- }
-}
-
-func TestAuthConfig(t *testing.T) {
- auth := base64.StdEncoding.EncodeToString([]byte("user:pass"))
- read := strings.NewReader(fmt.Sprintf(`{"auths":{"docker.io":{"auth":"%s","email":"user@example.com"}}}`, auth))
- ac, err := NewAuthConfigurations(read)
- if err != nil {
- t.Error(err)
- }
- c, ok := ac.Configs["docker.io"]
- if !ok {
- t.Error("NewAuthConfigurations: Expected Configs to contain docker.io")
- }
- if got, want := c.Email, "user@example.com"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].Email: wrong result. Want %q. Got %q`, want, got)
- }
- if got, want := c.Username, "user"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].Username: wrong result. Want %q. Got %q`, want, got)
- }
- if got, want := c.Password, "pass"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].Password: wrong result. Want %q. Got %q`, want, got)
- }
- if got, want := c.ServerAddress, "docker.io"; got != want {
- t.Errorf(`AuthConfigurations.Configs["docker.io"].ServerAddress: wrong result. Want %q. Got %q`, want, got)
- }
-}
-
-func TestAuthCheck(t *testing.T) {
- fakeRT := &FakeRoundTripper{status: http.StatusOK}
- client := newTestClient(fakeRT)
- if err := client.AuthCheck(nil); err == nil {
- t.Fatalf("expected error on nil auth config")
- }
- // test good auth
- if err := client.AuthCheck(&AuthConfiguration{}); err != nil {
- t.Fatal(err)
- }
- *fakeRT = FakeRoundTripper{status: http.StatusUnauthorized}
- if err := client.AuthCheck(&AuthConfiguration{}); err == nil {
- t.Fatal("expected failure from unauthorized auth")
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/build_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/build_test.go
deleted file mode 100644
index c9640f20571e6d3c121f7855a57641b61979590e..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/build_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package docker
-
-import (
- "bytes"
- "io"
- "io/ioutil"
- "net/http"
- "os"
- "reflect"
- "testing"
-
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive"
-)
-
-func TestBuildImageMultipleContextsError(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- NoCache: true,
- SuppressOutput: true,
- RmTmpContainer: true,
- ForceRmTmpContainer: true,
- InputStream: &buf,
- OutputStream: &buf,
- ContextDir: "testing/data",
- }
- err := client.BuildImage(opts)
- if err != ErrMultipleContexts {
- t.Errorf("BuildImage: providing both InputStream and ContextDir should produce an error")
- }
-}
-
-func TestBuildImageContextDirDockerignoreParsing(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
-
- if err := os.Symlink("doesnotexist", "testing/data/symlink"); err != nil {
- t.Errorf("error creating symlink on demand: %s", err)
- }
- defer func() {
- if err := os.Remove("testing/data/symlink"); err != nil {
- t.Errorf("error removing symlink on demand: %s", err)
- }
- }()
-
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- NoCache: true,
- SuppressOutput: true,
- RmTmpContainer: true,
- ForceRmTmpContainer: true,
- OutputStream: &buf,
- ContextDir: "testing/data",
- }
- err := client.BuildImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- reqBody := fakeRT.requests[0].Body
- tmpdir, err := unpackBodyTarball(reqBody)
- if err != nil {
- t.Fatal(err)
- }
-
- defer func() {
- if err := os.RemoveAll(tmpdir); err != nil {
- t.Fatal(err)
- }
- }()
-
- files, err := ioutil.ReadDir(tmpdir)
- if err != nil {
- t.Fatal(err)
- }
-
- foundFiles := []string{}
- for _, file := range files {
- foundFiles = append(foundFiles, file.Name())
- }
-
- expectedFiles := []string{
- ".dockerignore",
- "Dockerfile",
- "barfile",
- "ca.pem",
- "cert.pem",
- "key.pem",
- "server.pem",
- "serverkey.pem",
- "symlink",
- }
-
- if !reflect.DeepEqual(expectedFiles, foundFiles) {
- t.Errorf(
- "BuildImage: incorrect files sent in tarball to docker server\nexpected %+v, found %+v",
- expectedFiles, foundFiles,
- )
- }
-}
-
-func TestBuildImageSendXRegistryConfig(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- NoCache: true,
- SuppressOutput: true,
- RmTmpContainer: true,
- ForceRmTmpContainer: true,
- OutputStream: &buf,
- ContextDir: "testing/data",
- AuthConfigs: AuthConfigurations{
- Configs: map[string]AuthConfiguration{
- "quay.io": {
- Username: "foo",
- Password: "bar",
- Email: "baz",
- ServerAddress: "quay.io",
- },
- },
- },
- }
-
- encodedConfig := "eyJjb25maWdzIjp7InF1YXkuaW8iOnsidXNlcm5hbWUiOiJmb28iLCJwYXNzd29yZCI6ImJhciIsImVtYWlsIjoiYmF6Iiwic2VydmVyYWRkcmVzcyI6InF1YXkuaW8ifX19Cg=="
-
- if err := client.BuildImage(opts); err != nil {
- t.Fatal(err)
- }
-
- xRegistryConfig := fakeRT.requests[0].Header["X-Registry-Config"][0]
- if xRegistryConfig != encodedConfig {
- t.Errorf(
- "BuildImage: X-Registry-Config not set currectly: expected %q, got %q",
- encodedConfig,
- xRegistryConfig,
- )
- }
-}
-
-func unpackBodyTarball(req io.ReadCloser) (tmpdir string, err error) {
- tmpdir, err = ioutil.TempDir("", "go-dockerclient-test")
- if err != nil {
- return
- }
- err = archive.Untar(req, tmpdir, &archive.TarOptions{
- Compression: archive.Uncompressed,
- NoLchown: true,
- })
- return
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go
deleted file mode 100644
index 9418b183cf35217dd6b3ba4bb06635a64ee79005..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import "testing"
-
-func TestChangeString(t *testing.T) {
- var tests = []struct {
- change Change
- expected string
- }{
- {Change{"/etc/passwd", ChangeModify}, "C /etc/passwd"},
- {Change{"/etc/passwd", ChangeAdd}, "A /etc/passwd"},
- {Change{"/etc/passwd", ChangeDelete}, "D /etc/passwd"},
- {Change{"/etc/passwd", 33}, " /etc/passwd"},
- }
- for _, tt := range tests {
- if got := tt.change.String(); got != tt.expected {
- t.Errorf("Change.String(): want %q. Got %q.", tt.expected, got)
- }
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go
deleted file mode 100644
index d6ae570ba54a85b8e1100cb8e68dbcd1b96815bb..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client_test.go
+++ /dev/null
@@ -1,502 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "bytes"
- "fmt"
- "io/ioutil"
- "net"
- "net/http"
- "net/url"
- "os"
- "path/filepath"
- "reflect"
- "strconv"
- "strings"
- "testing"
- "time"
-
- "github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
-)
-
-func TestNewAPIClient(t *testing.T) {
- endpoint := "http://localhost:4243"
- client, err := NewClient(endpoint)
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- // test unix socket endpoints
- endpoint = "unix:///var/run/docker.sock"
- client, err = NewClient(endpoint)
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- if !client.SkipServerVersionCheck {
- t.Error("Expected SkipServerVersionCheck to be true, got false")
- }
- if client.requestedAPIVersion != nil {
- t.Errorf("Expected requestedAPIVersion to be nil, got %#v.", client.requestedAPIVersion)
- }
-}
-
-func newTLSClient(endpoint string) (*Client, error) {
- return NewTLSClient(endpoint,
- "testing/data/cert.pem",
- "testing/data/key.pem",
- "testing/data/ca.pem")
-}
-
-func TestNewTSLAPIClient(t *testing.T) {
- endpoint := "https://localhost:4243"
- client, err := newTLSClient(endpoint)
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- if !client.SkipServerVersionCheck {
- t.Error("Expected SkipServerVersionCheck to be true, got false")
- }
- if client.requestedAPIVersion != nil {
- t.Errorf("Expected requestedAPIVersion to be nil, got %#v.", client.requestedAPIVersion)
- }
-}
-
-func TestNewVersionedClient(t *testing.T) {
- endpoint := "http://localhost:4243"
- client, err := NewVersionedClient(endpoint, "1.12")
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- if reqVersion := client.requestedAPIVersion.String(); reqVersion != "1.12" {
- t.Errorf("Wrong requestAPIVersion. Want %q. Got %q.", "1.12", reqVersion)
- }
- if client.SkipServerVersionCheck {
- t.Error("Expected SkipServerVersionCheck to be false, got true")
- }
-}
-
-func TestNewVersionedClientFromEnv(t *testing.T) {
- endpoint := "tcp://localhost:2376"
- endpointURL := "http://localhost:2376"
- os.Setenv("DOCKER_HOST", endpoint)
- os.Setenv("DOCKER_TLS_VERIFY", "")
- client, err := NewVersionedClientFromEnv("1.12")
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- if client.endpointURL.String() != endpointURL {
- t.Errorf("Expected endpointURL %s. Got %s.", endpoint, client.endpoint)
- }
- if reqVersion := client.requestedAPIVersion.String(); reqVersion != "1.12" {
- t.Errorf("Wrong requestAPIVersion. Want %q. Got %q.", "1.12", reqVersion)
- }
- if client.SkipServerVersionCheck {
- t.Error("Expected SkipServerVersionCheck to be false, got true")
- }
-}
-
-func TestNewVersionedClientFromEnvTLS(t *testing.T) {
- endpoint := "tcp://localhost:2376"
- endpointURL := "https://localhost:2376"
- base, _ := os.Getwd()
- os.Setenv("DOCKER_CERT_PATH", filepath.Join(base, "/testing/data/"))
- os.Setenv("DOCKER_HOST", endpoint)
- os.Setenv("DOCKER_TLS_VERIFY", "1")
- client, err := NewVersionedClientFromEnv("1.12")
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- if client.endpointURL.String() != endpointURL {
- t.Errorf("Expected endpointURL %s. Got %s.", endpoint, client.endpoint)
- }
- if reqVersion := client.requestedAPIVersion.String(); reqVersion != "1.12" {
- t.Errorf("Wrong requestAPIVersion. Want %q. Got %q.", "1.12", reqVersion)
- }
- if client.SkipServerVersionCheck {
- t.Error("Expected SkipServerVersionCheck to be false, got true")
- }
-}
-
-func TestNewTLSVersionedClient(t *testing.T) {
- certPath := "testing/data/cert.pem"
- keyPath := "testing/data/key.pem"
- caPath := "testing/data/ca.pem"
- endpoint := "https://localhost:4243"
- client, err := NewVersionedTLSClient(endpoint, certPath, keyPath, caPath, "1.14")
- if err != nil {
- t.Fatal(err)
- }
- if client.endpoint != endpoint {
- t.Errorf("Expected endpoint %s. Got %s.", endpoint, client.endpoint)
- }
- if reqVersion := client.requestedAPIVersion.String(); reqVersion != "1.14" {
- t.Errorf("Wrong requestAPIVersion. Want %q. Got %q.", "1.14", reqVersion)
- }
- if client.SkipServerVersionCheck {
- t.Error("Expected SkipServerVersionCheck to be false, got true")
- }
-}
-
-func TestNewTLSVersionedClientInvalidCA(t *testing.T) {
- certPath := "testing/data/cert.pem"
- keyPath := "testing/data/key.pem"
- caPath := "testing/data/key.pem"
- endpoint := "https://localhost:4243"
- _, err := NewVersionedTLSClient(endpoint, certPath, keyPath, caPath, "1.14")
- if err == nil {
- t.Errorf("Expected invalid ca at %s", caPath)
- }
-}
-
-func TestNewClientInvalidEndpoint(t *testing.T) {
- cases := []string{
- "htp://localhost:3243", "http://localhost:a",
- "", "http://localhost:8080:8383", "http://localhost:65536",
- "https://localhost:-20",
- }
- for _, c := range cases {
- client, err := NewClient(c)
- if client != nil {
- t.Errorf("Want <nil> client for invalid endpoint, got %#v.", client)
- }
- if !reflect.DeepEqual(err, ErrInvalidEndpoint) {
- t.Errorf("NewClient(%q): Got invalid error for invalid endpoint. Want %#v. Got %#v.", c, ErrInvalidEndpoint, err)
- }
- }
-}
-
-func TestNewClientNoSchemeEndpoint(t *testing.T) {
- cases := []string{"localhost", "localhost:8080"}
- for _, c := range cases {
- client, err := NewClient(c)
- if client == nil {
- t.Errorf("Want client for scheme-less endpoint, got <nil>")
- }
- if err != nil {
- t.Errorf("Got unexpected error scheme-less endpoint: %q", err)
- }
- }
-}
-
-func TestNewTLSClient(t *testing.T) {
- var tests = []struct {
- endpoint string
- expected string
- }{
- {"tcp://localhost:2376", "https"},
- {"tcp://localhost:2375", "https"},
- {"tcp://localhost:4000", "https"},
- {"http://localhost:4000", "https"},
- }
- for _, tt := range tests {
- client, err := newTLSClient(tt.endpoint)
- if err != nil {
- t.Error(err)
- }
- got := client.endpointURL.Scheme
- if got != tt.expected {
- t.Errorf("endpointURL.Scheme: Got %s. Want %s.", got, tt.expected)
- }
- }
-}
-
-func TestEndpoint(t *testing.T) {
- client, err := NewVersionedClient("http://localhost:4243", "1.12")
- if err != nil {
- t.Fatal(err)
- }
- if endpoint := client.Endpoint(); endpoint != client.endpoint {
- t.Errorf("Client.Endpoint(): want %q. Got %q", client.endpoint, endpoint)
- }
-}
-
-func TestGetURL(t *testing.T) {
- var tests = []struct {
- endpoint string
- path string
- expected string
- }{
- {"http://localhost:4243/", "/", "http://localhost:4243/"},
- {"http://localhost:4243", "/", "http://localhost:4243/"},
- {"http://localhost:4243", "/containers/ps", "http://localhost:4243/containers/ps"},
- {"tcp://localhost:4243", "/containers/ps", "http://localhost:4243/containers/ps"},
- {"http://localhost:4243/////", "/", "http://localhost:4243/"},
- {"unix:///var/run/docker.socket", "/containers", "/containers"},
- }
- for _, tt := range tests {
- client, _ := NewClient(tt.endpoint)
- client.endpoint = tt.endpoint
- client.SkipServerVersionCheck = true
- got := client.getURL(tt.path)
- if got != tt.expected {
- t.Errorf("getURL(%q): Got %s. Want %s.", tt.path, got, tt.expected)
- }
- }
-}
-
-func TestGetFakeUnixURL(t *testing.T) {
- var tests = []struct {
- endpoint string
- path string
- expected string
- }{
- {"unix://var/run/docker.sock", "/", "http://unix.sock/"},
- {"unix://var/run/docker.socket", "/", "http://unix.sock/"},
- {"unix://var/run/docker.sock", "/containers/ps", "http://unix.sock/containers/ps"},
- }
- for _, tt := range tests {
- client, _ := NewClient(tt.endpoint)
- client.endpoint = tt.endpoint
- client.SkipServerVersionCheck = true
- got := client.getFakeUnixURL(tt.path)
- if got != tt.expected {
- t.Errorf("getURL(%q): Got %s. Want %s.", tt.path, got, tt.expected)
- }
- }
-}
-
-func TestError(t *testing.T) {
- fakeBody := ioutil.NopCloser(bytes.NewBufferString("bad parameter"))
- resp := &http.Response{
- StatusCode: 400,
- Body: fakeBody,
- }
- err := newError(resp)
- expected := Error{Status: 400, Message: "bad parameter"}
- if !reflect.DeepEqual(expected, *err) {
- t.Errorf("Wrong error type. Want %#v. Got %#v.", expected, *err)
- }
- message := "API error (400): bad parameter"
- if err.Error() != message {
- t.Errorf("Wrong error message. Want %q. Got %q.", message, err.Error())
- }
-}
-
-func TestQueryString(t *testing.T) {
- v := float32(2.4)
- f32QueryString := fmt.Sprintf("w=%s&x=10&y=10.35", strconv.FormatFloat(float64(v), 'f', -1, 64))
- jsonPerson := url.QueryEscape(`{"Name":"gopher","age":4}`)
- var tests = []struct {
- input interface{}
- want string
- }{
- {&ListContainersOptions{All: true}, "all=1"},
- {ListContainersOptions{All: true}, "all=1"},
- {ListContainersOptions{Before: "something"}, "before=something"},
- {ListContainersOptions{Before: "something", Since: "other"}, "before=something&since=other"},
- {ListContainersOptions{Filters: map[string][]string{"status": {"paused", "running"}}}, "filters=%7B%22status%22%3A%5B%22paused%22%2C%22running%22%5D%7D"},
- {dumb{X: 10, Y: 10.35000}, "x=10&y=10.35"},
- {dumb{W: v, X: 10, Y: 10.35000}, f32QueryString},
- {dumb{X: 10, Y: 10.35000, Z: 10}, "x=10&y=10.35&zee=10"},
- {dumb{v: 4, X: 10, Y: 10.35000}, "x=10&y=10.35"},
- {dumb{T: 10, Y: 10.35000}, "y=10.35"},
- {dumb{Person: &person{Name: "gopher", Age: 4}}, "p=" + jsonPerson},
- {nil, ""},
- {10, ""},
- {"not_a_struct", ""},
- }
- for _, tt := range tests {
- got := queryString(tt.input)
- if got != tt.want {
- t.Errorf("queryString(%v). Want %q. Got %q.", tt.input, tt.want, got)
- }
- }
-}
-
-func TestAPIVersions(t *testing.T) {
- var tests = []struct {
- a string
- b string
- expectedALessThanB bool
- expectedALessThanOrEqualToB bool
- expectedAGreaterThanB bool
- expectedAGreaterThanOrEqualToB bool
- }{
- {"1.11", "1.11", false, true, false, true},
- {"1.10", "1.11", true, true, false, false},
- {"1.11", "1.10", false, false, true, true},
-
- {"1.11-ubuntu0", "1.11", false, true, false, true},
- {"1.10", "1.11-el7", true, true, false, false},
-
- {"1.9", "1.11", true, true, false, false},
- {"1.11", "1.9", false, false, true, true},
-
- {"1.1.1", "1.1", false, false, true, true},
- {"1.1", "1.1.1", true, true, false, false},
-
- {"2.1", "1.1.1", false, false, true, true},
- {"2.1", "1.3.1", false, false, true, true},
- {"1.1.1", "2.1", true, true, false, false},
- {"1.3.1", "2.1", true, true, false, false},
- }
-
- for _, tt := range tests {
- a, _ := NewAPIVersion(tt.a)
- b, _ := NewAPIVersion(tt.b)
-
- if tt.expectedALessThanB && !a.LessThan(b) {
- t.Errorf("Expected %#v < %#v", a, b)
- }
- if tt.expectedALessThanOrEqualToB && !a.LessThanOrEqualTo(b) {
- t.Errorf("Expected %#v <= %#v", a, b)
- }
- if tt.expectedAGreaterThanB && !a.GreaterThan(b) {
- t.Errorf("Expected %#v > %#v", a, b)
- }
- if tt.expectedAGreaterThanOrEqualToB && !a.GreaterThanOrEqualTo(b) {
- t.Errorf("Expected %#v >= %#v", a, b)
- }
- }
-}
-
-func TestPing(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- err := client.Ping()
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestPingFailing(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusInternalServerError}
- client := newTestClient(fakeRT)
- err := client.Ping()
- if err == nil {
- t.Fatal("Expected non nil error, got nil")
- }
- expectedErrMsg := "API error (500): "
- if err.Error() != expectedErrMsg {
- t.Fatalf("Expected error to be %q, got: %q", expectedErrMsg, err.Error())
- }
-}
-
-func TestPingFailingWrongStatus(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusAccepted}
- client := newTestClient(fakeRT)
- err := client.Ping()
- if err == nil {
- t.Fatal("Expected non nil error, got nil")
- }
- expectedErrMsg := "API error (202): "
- if err.Error() != expectedErrMsg {
- t.Fatalf("Expected error to be %q, got: %q", expectedErrMsg, err.Error())
- }
-}
-
-func TestPingErrorWithUnixSocket(t *testing.T) {
- go func() {
- li, err := net.Listen("unix", "/tmp/echo.sock")
- if err != nil {
- t.Fatal(err)
- }
- defer li.Close()
- if err != nil {
- t.Fatalf("Expected to get listener, but failed: %#v", err)
- }
-
- fd, err := li.Accept()
- if err != nil {
- t.Fatalf("Expected to accept connection, but failed: %#v", err)
- }
-
- buf := make([]byte, 512)
- nr, err := fd.Read(buf)
-
- // Create invalid response message to trigger error.
- data := buf[0:nr]
- for i := 0; i < 10; i++ {
- data[i] = 63
- }
-
- _, err = fd.Write(data)
- if err != nil {
- t.Fatalf("Expected to write to socket, but failed: %#v", err)
- }
-
- return
- }()
-
- // Wait for unix socket to listen
- time.Sleep(10 * time.Millisecond)
-
- endpoint := "unix:///tmp/echo.sock"
- u, _ := parseEndpoint(endpoint, false)
- client := Client{
- HTTPClient: cleanhttp.DefaultClient(),
- Dialer: &net.Dialer{},
- endpoint: endpoint,
- endpointURL: u,
- SkipServerVersionCheck: true,
- }
-
- err := client.Ping()
- if err == nil {
- t.Fatal("Expected non nil error, got nil")
- }
-}
-
-type FakeRoundTripper struct {
- message string
- status int
- header map[string]string
- requests []*http.Request
-}
-
-func (rt *FakeRoundTripper) RoundTrip(r *http.Request) (*http.Response, error) {
- body := strings.NewReader(rt.message)
- rt.requests = append(rt.requests, r)
- res := &http.Response{
- StatusCode: rt.status,
- Body: ioutil.NopCloser(body),
- Header: make(http.Header),
- }
- for k, v := range rt.header {
- res.Header.Set(k, v)
- }
- return res, nil
-}
-
-func (rt *FakeRoundTripper) Reset() {
- rt.requests = nil
-}
-
-type person struct {
- Name string
- Age int `json:"age"`
-}
-
-type dumb struct {
- T int `qs:"-"`
- v int
- W float32
- X int
- Y float64
- Z int `qs:"zee"`
- Person *person `qs:"p"`
-}
-
-type fakeEndpointURL struct {
- Scheme string
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go
deleted file mode 100644
index 1b05b27bb5fc9f448dfb8d73aa901ee9708ddda4..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container_test.go
+++ /dev/null
@@ -1,2263 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "bytes"
- "encoding/json"
- "errors"
- "fmt"
- "io/ioutil"
- "net"
- "net/http"
- "net/http/httptest"
- "net/url"
- "os"
- "reflect"
- "regexp"
- "runtime"
- "strconv"
- "strings"
- "testing"
- "time"
-
- "github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp"
-)
-
-func TestStateString(t *testing.T) {
- started := time.Now().Add(-3 * time.Hour)
- var tests = []struct {
- input State
- expected string
- }{
- {State{Running: true, Paused: true}, "^paused$"},
- {State{Running: true, StartedAt: started}, "^Up 3h.*$"},
- {State{Running: false, ExitCode: 7}, "^Exit 7$"},
- }
- for _, tt := range tests {
- re := regexp.MustCompile(tt.expected)
- if got := tt.input.String(); !re.MatchString(got) {
- t.Errorf("State.String(): wrong result. Want %q. Got %q.", tt.expected, got)
- }
- }
-}
-
-func TestListContainers(t *testing.T) {
- jsonContainers := `[
- {
- "Id": "8dfafdbc3a40",
- "Image": "base:latest",
- "Command": "echo 1",
- "Created": 1367854155,
- "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
- "Status": "Exit 0"
- },
- {
- "Id": "9cd87474be90",
- "Image": "base:latest",
- "Command": "echo 222222",
- "Created": 1367854155,
- "Ports":[{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
- "Status": "Exit 0"
- },
- {
- "Id": "3176a2479c92",
- "Image": "base:latest",
- "Command": "echo 3333333333333333",
- "Created": 1367854154,
- "Ports":[{"PrivatePort": 2221, "PublicPort": 3331, "Type": "tcp"}],
- "Status": "Exit 0"
- },
- {
- "Id": "4cb07b47f9fb",
- "Image": "base:latest",
- "Command": "echo 444444444444444444444444444444444",
- "Ports":[{"PrivatePort": 2223, "PublicPort": 3332, "Type": "tcp"}],
- "Created": 1367854152,
- "Status": "Exit 0"
- }
-]`
- var expected []APIContainers
- err := json.Unmarshal([]byte(jsonContainers), &expected)
- if err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: jsonContainers, status: http.StatusOK})
- containers, err := client.ListContainers(ListContainersOptions{})
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(containers, expected) {
- t.Errorf("ListContainers: Expected %#v. Got %#v.", expected, containers)
- }
-}
-
-func TestListContainersParams(t *testing.T) {
- var tests = []struct {
- input ListContainersOptions
- params map[string][]string
- }{
- {ListContainersOptions{}, map[string][]string{}},
- {ListContainersOptions{All: true}, map[string][]string{"all": {"1"}}},
- {ListContainersOptions{All: true, Limit: 10}, map[string][]string{"all": {"1"}, "limit": {"10"}}},
- {
- ListContainersOptions{All: true, Limit: 10, Since: "adf9983", Before: "abdeef"},
- map[string][]string{"all": {"1"}, "limit": {"10"}, "since": {"adf9983"}, "before": {"abdeef"}},
- },
- {
- ListContainersOptions{Filters: map[string][]string{"status": {"paused", "running"}}},
- map[string][]string{"filters": {"{\"status\":[\"paused\",\"running\"]}"}},
- },
- {
- ListContainersOptions{All: true, Filters: map[string][]string{"exited": {"0"}, "status": {"exited"}}},
- map[string][]string{"all": {"1"}, "filters": {"{\"exited\":[\"0\"],\"status\":[\"exited\"]}"}},
- },
- }
- fakeRT := &FakeRoundTripper{message: "[]", status: http.StatusOK}
- client := newTestClient(fakeRT)
- u, _ := url.Parse(client.getURL("/containers/json"))
- for _, tt := range tests {
- if _, err := client.ListContainers(tt.input); err != nil {
- t.Error(err)
- }
- got := map[string][]string(fakeRT.requests[0].URL.Query())
- if !reflect.DeepEqual(got, tt.params) {
- t.Errorf("Expected %#v, got %#v.", tt.params, got)
- }
- if path := fakeRT.requests[0].URL.Path; path != u.Path {
- t.Errorf("Wrong path on request. Want %q. Got %q.", u.Path, path)
- }
- if meth := fakeRT.requests[0].Method; meth != "GET" {
- t.Errorf("Wrong HTTP method. Want GET. Got %s.", meth)
- }
- fakeRT.Reset()
- }
-}
-
-func TestListContainersFailure(t *testing.T) {
- var tests = []struct {
- status int
- message string
- }{
- {400, "bad parameter"},
- {500, "internal server error"},
- }
- for _, tt := range tests {
- client := newTestClient(&FakeRoundTripper{message: tt.message, status: tt.status})
- expected := Error{Status: tt.status, Message: tt.message}
- containers, err := client.ListContainers(ListContainersOptions{})
- if !reflect.DeepEqual(expected, *err.(*Error)) {
- t.Errorf("Wrong error in ListContainers. Want %#v. Got %#v.", expected, err)
- }
- if len(containers) > 0 {
- t.Errorf("ListContainers failure. Expected empty list. Got %#v.", containers)
- }
- }
-}
-
-func TestInspectContainer(t *testing.T) {
- jsonContainer := `{
- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
- "AppArmorProfile": "Profile",
- "Created": "2013-05-07T14:51:42.087658+02:00",
- "Path": "date",
- "Args": [],
- "Config": {
- "Hostname": "4fa6e0f0c678",
- "User": "",
- "Memory": 17179869184,
- "MemorySwap": 34359738368,
- "AttachStdin": false,
- "AttachStdout": true,
- "AttachStderr": true,
- "PortSpecs": null,
- "Tty": false,
- "OpenStdin": false,
- "StdinOnce": false,
- "Env": null,
- "Cmd": [
- "date"
- ],
- "Image": "base",
- "Volumes": {},
- "VolumesFrom": "",
- "SecurityOpt": [
- "label:user:USER"
- ],
- "Ulimits": [
- { "Name": "nofile", "Soft": 1024, "Hard": 2048 }
- ]
- },
- "State": {
- "Running": false,
- "Pid": 0,
- "ExitCode": 0,
- "StartedAt": "2013-05-07T14:51:42.087658+02:00",
- "Ghost": false
- },
- "Node": {
- "ID": "4I4E:QR4I:Z733:QEZK:5X44:Q4T7:W2DD:JRDY:KB2O:PODO:Z5SR:XRB6",
- "IP": "192.168.99.105",
- "Addra": "192.168.99.105:2376",
- "Name": "node-01",
- "Cpus": 4,
- "Memory": 1048436736,
- "Labels": {
- "executiondriver": "native-0.2",
- "kernelversion": "3.18.5-tinycore64",
- "operatingsystem": "Boot2Docker 1.5.0 (TCL 5.4); master : a66bce5 - Tue Feb 10 23:31:27 UTC 2015",
- "provider": "virtualbox",
- "storagedriver": "aufs"
- }
- },
- "Image": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
- "NetworkSettings": {
- "IpAddress": "",
- "IpPrefixLen": 0,
- "Gateway": "",
- "Bridge": "",
- "PortMapping": null
- },
- "SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
- "ResolvConfPath": "/etc/resolv.conf",
- "Volumes": {},
- "HostConfig": {
- "Binds": null,
- "ContainerIDFile": "",
- "LxcConf": [],
- "Privileged": false,
- "PortBindings": {
- "80/tcp": [
- {
- "HostIp": "0.0.0.0",
- "HostPort": "49153"
- }
- ]
- },
- "Links": null,
- "PublishAllPorts": false,
- "CgroupParent": "/mesos",
- "Memory": 17179869184,
- "MemorySwap": 34359738368,
- "GroupAdd": ["fake", "12345"],
- "OomScoreAdj": 642
- }
-}`
- var expected Container
- err := json.Unmarshal([]byte(jsonContainer), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c678"
- container, err := client.InspectContainer(id)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(*container, expected) {
- t.Errorf("InspectContainer(%q): Expected %#v. Got %#v.", id, expected, container)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/json"))
- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
- t.Errorf("InspectContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestInspectContainerNetwork(t *testing.T) {
- jsonContainer := `{
- "Id": "81e1bbe20b5508349e1c804eb08b7b6ca8366751dbea9f578b3ea0773fa66c1c",
- "Created": "2015-11-12T14:54:04.791485659Z",
- "Path": "consul-template",
- "Args": [
- "-config=/tmp/haproxy.json",
- "-consul=192.168.99.120:8500"
- ],
- "State": {
- "Status": "running",
- "Running": true,
- "Paused": false,
- "Restarting": false,
- "OOMKilled": false,
- "Dead": false,
- "Pid": 3196,
- "ExitCode": 0,
- "Error": "",
- "StartedAt": "2015-11-12T14:54:05.026747471Z",
- "FinishedAt": "0001-01-01T00:00:00Z"
- },
- "Image": "4921c5917fc117df3dec32f4c1976635dc6c56ccd3336fe1db3477f950e78bf7",
- "ResolvConfPath": "/mnt/sda1/var/lib/docker/containers/81e1bbe20b5508349e1c804eb08b7b6ca8366751dbea9f578b3ea0773fa66c1c/resolv.conf",
- "HostnamePath": "/mnt/sda1/var/lib/docker/containers/81e1bbe20b5508349e1c804eb08b7b6ca8366751dbea9f578b3ea0773fa66c1c/hostname",
- "HostsPath": "/mnt/sda1/var/lib/docker/containers/81e1bbe20b5508349e1c804eb08b7b6ca8366751dbea9f578b3ea0773fa66c1c/hosts",
- "LogPath": "/mnt/sda1/var/lib/docker/containers/81e1bbe20b5508349e1c804eb08b7b6ca8366751dbea9f578b3ea0773fa66c1c/81e1bbe20b5508349e1c804eb08b7b6ca8366751dbea9f578b3ea0773fa66c1c-json.log",
- "Node": {
- "ID": "AUIB:LFOT:3LSF:SCFS:OYDQ:NLXD:JZNE:4INI:3DRC:ZFBB:GWCY:DWJK",
- "IP": "192.168.99.121",
- "Addr": "192.168.99.121:2376",
- "Name": "swl-demo1",
- "Cpus": 1,
- "Memory": 2099945472,
- "Labels": {
- "executiondriver": "native-0.2",
- "kernelversion": "4.1.12-boot2docker",
- "operatingsystem": "Boot2Docker 1.9.0 (TCL 6.4); master : 16e4a2a - Tue Nov 3 19:49:22 UTC 2015",
- "provider": "virtualbox",
- "storagedriver": "aufs"
- }
- },
- "Name": "/docker-proxy.swl-demo1",
- "RestartCount": 0,
- "Driver": "aufs",
- "ExecDriver": "native-0.2",
- "MountLabel": "",
- "ProcessLabel": "",
- "AppArmorProfile": "",
- "ExecIDs": null,
- "HostConfig": {
- "Binds": null,
- "ContainerIDFile": "",
- "LxcConf": [],
- "Memory": 0,
- "MemoryReservation": 0,
- "MemorySwap": 0,
- "KernelMemory": 0,
- "CpuShares": 0,
- "CpuPeriod": 0,
- "CpusetCpus": "",
- "CpusetMems": "",
- "CpuQuota": 0,
- "BlkioWeight": 0,
- "OomKillDisable": false,
- "MemorySwappiness": -1,
- "Privileged": false,
- "PortBindings": {
- "443/tcp": [
- {
- "HostIp": "",
- "HostPort": "443"
- }
- ]
- },
- "Links": null,
- "PublishAllPorts": false,
- "Dns": null,
- "DnsOptions": null,
- "DnsSearch": null,
- "ExtraHosts": null,
- "VolumesFrom": null,
- "Devices": [],
- "NetworkMode": "swl-net",
- "IpcMode": "",
- "PidMode": "",
- "UTSMode": "",
- "CapAdd": null,
- "CapDrop": null,
- "GroupAdd": null,
- "RestartPolicy": {
- "Name": "no",
- "MaximumRetryCount": 0
- },
- "SecurityOpt": null,
- "ReadonlyRootfs": false,
- "Ulimits": null,
- "LogConfig": {
- "Type": "json-file",
- "Config": {}
- },
- "CgroupParent": "",
- "ConsoleSize": [
- 0,
- 0
- ],
- "VolumeDriver": ""
- },
- "GraphDriver": {
- "Name": "aufs",
- "Data": null
- },
- "Mounts": [],
- "Config": {
- "Hostname": "81e1bbe20b55",
- "Domainname": "",
- "User": "",
- "AttachStdin": false,
- "AttachStdout": false,
- "AttachStderr": false,
- "ExposedPorts": {
- "443/tcp": {}
- },
- "Tty": false,
- "OpenStdin": false,
- "StdinOnce": false,
- "Env": [
- "DOMAIN=local.auto",
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
- "CONSUL_TEMPLATE_VERSION=0.11.1"
- ],
- "Cmd": [
- "-consul=192.168.99.120:8500"
- ],
- "Image": "docker-proxy:latest",
- "Volumes": null,
- "WorkingDir": "",
- "Entrypoint": [
- "consul-template",
- "-config=/tmp/haproxy.json"
- ],
- "OnBuild": null,
- "Labels": {},
- "StopSignal": "SIGTERM"
- },
- "NetworkSettings": {
- "Bridge": "",
- "SandboxID": "c6b903dc5c1a96113a22dbc44709e30194079bd2d262eea1eb4f38d85821f6e1",
- "HairpinMode": false,
- "LinkLocalIPv6Address": "",
- "LinkLocalIPv6PrefixLen": 0,
- "Ports": {
- "443/tcp": [
- {
- "HostIp": "192.168.99.121",
- "HostPort": "443"
- }
- ]
- },
- "SandboxKey": "/var/run/docker/netns/c6b903dc5c1a",
- "SecondaryIPAddresses": null,
- "SecondaryIPv6Addresses": null,
- "EndpointID": "",
- "Gateway": "",
- "GlobalIPv6Address": "",
- "GlobalIPv6PrefixLen": 0,
- "IPAddress": "",
- "IPPrefixLen": 0,
- "IPv6Gateway": "",
- "MacAddress": "",
- "Networks": {
- "swl-net": {
- "EndpointID": "683e3092275782a53c3b0968cc7e3a10f23264022ded9cb20490902f96fc5981",
- "Gateway": "",
- "IPAddress": "10.0.0.3",
- "IPPrefixLen": 24,
- "IPv6Gateway": "",
- "GlobalIPv6Address": "",
- "GlobalIPv6PrefixLen": 0,
- "MacAddress": "02:42:0a:00:00:03"
- }
- }
- }
-}`
-
- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "81e1bbe20b55"
- exp := "10.0.0.3"
-
- container, err := client.InspectContainer(id)
- if err != nil {
- t.Fatal(err)
- }
-
- s := reflect.Indirect(reflect.ValueOf(container.NetworkSettings))
- networks := s.FieldByName("Networks")
- if networks.IsValid() {
- var ip string
- for _, net := range networks.MapKeys() {
- if net.Interface().(string) == container.HostConfig.NetworkMode {
- ip = networks.MapIndex(net).FieldByName("IPAddress").Interface().(string)
- t.Logf("%s %v", net, ip)
- }
- }
- if ip != exp {
- t.Errorf("InspectContainerNetworks(%q): Expected %#v. Got %#v.", id, exp, ip)
- }
- } else {
- t.Errorf("InspectContainerNetworks(%q): No method Networks for NetworkSettings", id)
- }
-
-}
-
-func TestInspectContainerNegativeSwap(t *testing.T) {
- jsonContainer := `{
- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
- "Created": "2013-05-07T14:51:42.087658+02:00",
- "Path": "date",
- "Args": [],
- "Config": {
- "Hostname": "4fa6e0f0c678",
- "User": "",
- "Memory": 17179869184,
- "MemorySwap": -1,
- "AttachStdin": false,
- "AttachStdout": true,
- "AttachStderr": true,
- "PortSpecs": null,
- "Tty": false,
- "OpenStdin": false,
- "StdinOnce": false,
- "Env": null,
- "Cmd": [
- "date"
- ],
- "Image": "base",
- "Volumes": {},
- "VolumesFrom": ""
- },
- "State": {
- "Running": false,
- "Pid": 0,
- "ExitCode": 0,
- "StartedAt": "2013-05-07T14:51:42.087658+02:00",
- "Ghost": false
- },
- "Image": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
- "NetworkSettings": {
- "IpAddress": "",
- "IpPrefixLen": 0,
- "Gateway": "",
- "Bridge": "",
- "PortMapping": null
- },
- "SysInitPath": "/home/kitty/go/src/github.com/dotcloud/docker/bin/docker",
- "ResolvConfPath": "/etc/resolv.conf",
- "Volumes": {},
- "HostConfig": {
- "Binds": null,
- "ContainerIDFile": "",
- "LxcConf": [],
- "Privileged": false,
- "PortBindings": {
- "80/tcp": [
- {
- "HostIp": "0.0.0.0",
- "HostPort": "49153"
- }
- ]
- },
- "Links": null,
- "PublishAllPorts": false
- }
-}`
- var expected Container
- err := json.Unmarshal([]byte(jsonContainer), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c678"
- container, err := client.InspectContainer(id)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(*container, expected) {
- t.Errorf("InspectContainer(%q): Expected %#v. Got %#v.", id, expected, container)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/json"))
- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
- t.Errorf("InspectContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestInspectContainerFailure(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "server error", status: 500})
- expected := Error{Status: 500, Message: "server error"}
- container, err := client.InspectContainer("abe033")
- if container != nil {
- t.Errorf("InspectContainer: Expected <nil> container, got %#v", container)
- }
- if !reflect.DeepEqual(expected, *err.(*Error)) {
- t.Errorf("InspectContainer: Wrong error information. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestInspectContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: 404})
- container, err := client.InspectContainer("abe033")
- if container != nil {
- t.Errorf("InspectContainer: Expected <nil> container, got %#v", container)
- }
- expected := &NoSuchContainer{ID: "abe033"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("InspectContainer: Wrong error information. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestContainerChanges(t *testing.T) {
- jsonChanges := `[
- {
- "Path":"/dev",
- "Kind":0
- },
- {
- "Path":"/dev/kmsg",
- "Kind":1
- },
- {
- "Path":"/test",
- "Kind":1
- }
-]`
- var expected []Change
- err := json.Unmarshal([]byte(jsonChanges), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonChanges, status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c678"
- changes, err := client.ContainerChanges(id)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(changes, expected) {
- t.Errorf("ContainerChanges(%q): Expected %#v. Got %#v.", id, expected, changes)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/4fa6e0f0c678/changes"))
- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
- t.Errorf("ContainerChanges(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestContainerChangesFailure(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "server error", status: 500})
- expected := Error{Status: 500, Message: "server error"}
- changes, err := client.ContainerChanges("abe033")
- if changes != nil {
- t.Errorf("ContainerChanges: Expected <nil> changes, got %#v", changes)
- }
- if !reflect.DeepEqual(expected, *err.(*Error)) {
- t.Errorf("ContainerChanges: Wrong error information. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestContainerChangesNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: 404})
- changes, err := client.ContainerChanges("abe033")
- if changes != nil {
- t.Errorf("ContainerChanges: Expected <nil> changes, got %#v", changes)
- }
- expected := &NoSuchContainer{ID: "abe033"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("ContainerChanges: Wrong error information. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestCreateContainer(t *testing.T) {
- jsonContainer := `{
- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
- "Warnings": []
-}`
- var expected Container
- err := json.Unmarshal([]byte(jsonContainer), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
- client := newTestClient(fakeRT)
- config := Config{AttachStdout: true, AttachStdin: true}
- opts := CreateContainerOptions{Name: "TestCreateContainer", Config: &config}
- container, err := client.CreateContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- if container.ID != id {
- t.Errorf("CreateContainer: wrong ID. Want %q. Got %q.", id, container.ID)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("CreateContainer: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/create"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("CreateContainer: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
- }
- var gotBody Config
- err = json.NewDecoder(req.Body).Decode(&gotBody)
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestCreateContainerImageNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "No such image", status: http.StatusNotFound})
- config := Config{AttachStdout: true, AttachStdin: true}
- container, err := client.CreateContainer(CreateContainerOptions{Config: &config})
- if container != nil {
- t.Errorf("CreateContainer: expected <nil> container, got %#v.", container)
- }
- if !reflect.DeepEqual(err, ErrNoSuchImage) {
- t.Errorf("CreateContainer: Wrong error type. Want %#v. Got %#v.", ErrNoSuchImage, err)
- }
-}
-
-func TestCreateContainerDuplicateName(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "No such image", status: http.StatusConflict})
- config := Config{AttachStdout: true, AttachStdin: true}
- container, err := client.CreateContainer(CreateContainerOptions{Config: &config})
- if container != nil {
- t.Errorf("CreateContainer: expected <nil> container, got %#v.", container)
- }
- if err != ErrContainerAlreadyExists {
- t.Errorf("CreateContainer: Wrong error type. Want %#v. Got %#v.", ErrContainerAlreadyExists, err)
- }
-}
-
-func TestCreateContainerWithHostConfig(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "{}", status: http.StatusOK}
- client := newTestClient(fakeRT)
- config := Config{}
- hostConfig := HostConfig{PublishAllPorts: true}
- opts := CreateContainerOptions{Name: "TestCreateContainerWithHostConfig", Config: &config, HostConfig: &hostConfig}
- _, err := client.CreateContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- var gotBody map[string]interface{}
- err = json.NewDecoder(req.Body).Decode(&gotBody)
- if err != nil {
- t.Fatal(err)
- }
- if _, ok := gotBody["HostConfig"]; !ok {
- t.Errorf("CreateContainer: wrong body. HostConfig was not serialized")
- }
-}
-
-func TestStartContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.StartContainer(id, &HostConfig{})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("StartContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/start"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("StartContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
- expectedContentType := "application/json"
- if contentType := req.Header.Get("Content-Type"); contentType != expectedContentType {
- t.Errorf("StartContainer(%q): Wrong content-type in request. Want %q. Got %q.", id, expectedContentType, contentType)
- }
-}
-
-func TestStartContainerNilHostConfig(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.StartContainer(id, nil)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("StartContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/start"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("StartContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
- expectedContentType := "application/json"
- if contentType := req.Header.Get("Content-Type"); contentType != expectedContentType {
- t.Errorf("StartContainer(%q): Wrong content-type in request. Want %q. Got %q.", id, expectedContentType, contentType)
- }
- var buf [4]byte
- req.Body.Read(buf[:])
- if string(buf[:]) != "null" {
- t.Errorf("Startcontainer(%q): Wrong body. Want null. Got %s", id, buf[:])
- }
-}
-
-func TestStartContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.StartContainer("a2344", &HostConfig{})
- expected := &NoSuchContainer{ID: "a2344", Err: err.(*NoSuchContainer).Err}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("StartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestStartContainerAlreadyRunning(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "container already running", status: http.StatusNotModified})
- err := client.StartContainer("a2334", &HostConfig{})
- expected := &ContainerAlreadyRunning{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("StartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestStopContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.StopContainer(id, 10)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("StopContainer(%q, 10): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/stop"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("StopContainer(%q, 10): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestStopContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.StopContainer("a2334", 10)
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestStopContainerNotRunning(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "container not running", status: http.StatusNotModified})
- err := client.StopContainer("a2334", 10)
- expected := &ContainerNotRunning{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestRestartContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.RestartContainer(id, 10)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("RestartContainer(%q, 10): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/restart"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("RestartContainer(%q, 10): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestRestartContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.RestartContainer("a2334", 10)
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("RestartContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestPauseContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.PauseContainer(id)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("PauseContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/pause"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("PauseContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestPauseContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.PauseContainer("a2334")
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("PauseContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestUnpauseContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.UnpauseContainer(id)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("PauseContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/unpause"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("PauseContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestUnpauseContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.UnpauseContainer("a2334")
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("PauseContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestKillContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.KillContainer(KillContainerOptions{ID: id})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("KillContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/kill"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("KillContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestKillContainerSignal(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.KillContainer(KillContainerOptions{ID: id, Signal: SIGTERM})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("KillContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- if signal := req.URL.Query().Get("signal"); signal != "15" {
- t.Errorf("KillContainer(%q): Wrong query string in request. Want %q. Got %q.", id, "15", signal)
- }
-}
-
-func TestKillContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.KillContainer(KillContainerOptions{ID: "a2334"})
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("KillContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestRemoveContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- opts := RemoveContainerOptions{ID: id}
- err := client.RemoveContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "DELETE" {
- t.Errorf("RemoveContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "DELETE", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("RemoveContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestRemoveContainerRemoveVolumes(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- opts := RemoveContainerOptions{ID: id, RemoveVolumes: true}
- err := client.RemoveContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- params := map[string][]string(req.URL.Query())
- expected := map[string][]string{"v": {"1"}}
- if !reflect.DeepEqual(params, expected) {
- t.Errorf("RemoveContainer(%q): wrong parameters. Want %#v. Got %#v.", id, expected, params)
- }
-}
-
-func TestRemoveContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- err := client.RemoveContainer(RemoveContainerOptions{ID: "a2334"})
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("RemoveContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestResizeContainerTTY(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- err := client.ResizeContainerTTY(id, 40, 80)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("ResizeContainerTTY(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/resize"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("ResizeContainerTTY(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
- got := map[string][]string(req.URL.Query())
- expectedParams := map[string][]string{
- "w": {"80"},
- "h": {"40"},
- }
- if !reflect.DeepEqual(got, expectedParams) {
- t.Errorf("Expected %#v, got %#v.", expectedParams, got)
- }
-}
-
-func TestWaitContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: `{"StatusCode": 56}`, status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- status, err := client.WaitContainer(id)
- if err != nil {
- t.Fatal(err)
- }
- if status != 56 {
- t.Errorf("WaitContainer(%q): wrong return. Want 56. Got %d.", id, status)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("WaitContainer(%q): wrong HTTP method. Want %q. Got %q.", id, "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/" + id + "/wait"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("WaitContainer(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestWaitContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- _, err := client.WaitContainer("a2334")
- expected := &NoSuchContainer{ID: "a2334"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("WaitContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestCommitContainer(t *testing.T) {
- response := `{"Id":"596069db4bf5"}`
- client := newTestClient(&FakeRoundTripper{message: response, status: http.StatusOK})
- id := "596069db4bf5"
- image, err := client.CommitContainer(CommitContainerOptions{})
- if err != nil {
- t.Fatal(err)
- }
- if image.ID != id {
- t.Errorf("CommitContainer: Wrong image id. Want %q. Got %q.", id, image.ID)
- }
-}
-
-func TestCommitContainerParams(t *testing.T) {
- cfg := Config{Memory: 67108864}
- json, _ := json.Marshal(&cfg)
- var tests = []struct {
- input CommitContainerOptions
- params map[string][]string
- body []byte
- }{
- {CommitContainerOptions{}, map[string][]string{}, nil},
- {CommitContainerOptions{Container: "44c004db4b17"}, map[string][]string{"container": {"44c004db4b17"}}, nil},
- {
- CommitContainerOptions{Container: "44c004db4b17", Repository: "tsuru/python", Message: "something"},
- map[string][]string{"container": {"44c004db4b17"}, "repo": {"tsuru/python"}, "comment": {"something"}},
- nil,
- },
- {
- CommitContainerOptions{Container: "44c004db4b17", Run: &cfg},
- map[string][]string{"container": {"44c004db4b17"}},
- json,
- },
- }
- fakeRT := &FakeRoundTripper{message: "{}", status: http.StatusOK}
- client := newTestClient(fakeRT)
- u, _ := url.Parse(client.getURL("/commit"))
- for _, tt := range tests {
- if _, err := client.CommitContainer(tt.input); err != nil {
- t.Error(err)
- }
- got := map[string][]string(fakeRT.requests[0].URL.Query())
- if !reflect.DeepEqual(got, tt.params) {
- t.Errorf("Expected %#v, got %#v.", tt.params, got)
- }
- if path := fakeRT.requests[0].URL.Path; path != u.Path {
- t.Errorf("Wrong path on request. Want %q. Got %q.", u.Path, path)
- }
- if meth := fakeRT.requests[0].Method; meth != "POST" {
- t.Errorf("Wrong HTTP method. Want POST. Got %s.", meth)
- }
- if tt.body != nil {
- if requestBody, err := ioutil.ReadAll(fakeRT.requests[0].Body); err == nil {
- if bytes.Compare(requestBody, tt.body) != 0 {
- t.Errorf("Expected body %#v, got %#v", tt.body, requestBody)
- }
- } else {
- t.Errorf("Error reading request body: %#v", err)
- }
- }
- fakeRT.Reset()
- }
-}
-
-func TestCommitContainerFailure(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusInternalServerError})
- _, err := client.CommitContainer(CommitContainerOptions{})
- if err == nil {
- t.Error("Expected non-nil error, got <nil>.")
- }
-}
-
-func TestCommitContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- _, err := client.CommitContainer(CommitContainerOptions{})
- expected := &NoSuchContainer{ID: ""}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("CommitContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestAttachToContainerLogs(t *testing.T) {
- var req http.Request
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 19})
- w.Write([]byte("something happened!"))
- req = *r
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var buf bytes.Buffer
- opts := AttachToContainerOptions{
- Container: "a123456",
- OutputStream: &buf,
- Stdout: true,
- Stderr: true,
- Logs: true,
- }
- err := client.AttachToContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- expected := "something happened!"
- if buf.String() != expected {
- t.Errorf("AttachToContainer for logs: wrong output. Want %q. Got %q.", expected, buf.String())
- }
- if req.Method != "POST" {
- t.Errorf("AttachToContainer: wrong HTTP method. Want POST. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/containers/a123456/attach"))
- if req.URL.Path != u.Path {
- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
- expectedQs := map[string][]string{
- "logs": {"1"},
- "stdout": {"1"},
- "stderr": {"1"},
- }
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expectedQs) {
- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expectedQs, got)
- }
-}
-
-func TestAttachToContainer(t *testing.T) {
- var reader = strings.NewReader("send value")
- var req http.Request
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
- w.Write([]byte("hello"))
- req = *r
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var stdout, stderr bytes.Buffer
- opts := AttachToContainerOptions{
- Container: "a123456",
- OutputStream: &stdout,
- ErrorStream: &stderr,
- InputStream: reader,
- Stdin: true,
- Stdout: true,
- Stderr: true,
- Stream: true,
- RawTerminal: true,
- }
- err := client.AttachToContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- expected := map[string][]string{
- "stdin": {"1"},
- "stdout": {"1"},
- "stderr": {"1"},
- "stream": {"1"},
- }
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestAttachToContainerSentinel(t *testing.T) {
- var reader = strings.NewReader("send value")
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
- w.Write([]byte("hello"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var stdout, stderr bytes.Buffer
- success := make(chan struct{})
- opts := AttachToContainerOptions{
- Container: "a123456",
- OutputStream: &stdout,
- ErrorStream: &stderr,
- InputStream: reader,
- Stdin: true,
- Stdout: true,
- Stderr: true,
- Stream: true,
- RawTerminal: true,
- Success: success,
- }
- go func() {
- if err := client.AttachToContainer(opts); err != nil {
- t.Error(err)
- }
- }()
- success <- <-success
-}
-
-func TestAttachToContainerNilStdout(t *testing.T) {
- var reader = strings.NewReader("send value")
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
- w.Write([]byte("hello"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var stderr bytes.Buffer
- opts := AttachToContainerOptions{
- Container: "a123456",
- OutputStream: nil,
- ErrorStream: &stderr,
- InputStream: reader,
- Stdin: true,
- Stdout: true,
- Stderr: true,
- Stream: true,
- RawTerminal: true,
- }
- err := client.AttachToContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestAttachToContainerNilStderr(t *testing.T) {
- var reader = strings.NewReader("send value")
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
- w.Write([]byte("hello"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var stdout bytes.Buffer
- opts := AttachToContainerOptions{
- Container: "a123456",
- OutputStream: &stdout,
- InputStream: reader,
- Stdin: true,
- Stdout: true,
- Stderr: true,
- Stream: true,
- RawTerminal: true,
- }
- err := client.AttachToContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestAttachToContainerStdinOnly(t *testing.T) {
- var reader = strings.NewReader("send value")
- serverFinished := make(chan struct{})
- clientFinished := make(chan struct{})
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.WriteHeader(http.StatusOK)
- hj, ok := w.(http.Hijacker)
- if !ok {
- t.Fatal("cannot hijack server connection")
- }
- conn, _, err := hj.Hijack()
- if err != nil {
- t.Fatal(err)
- }
- // wait for client to indicate it's finished
- <-clientFinished
- // inform test that the server has finished
- close(serverFinished)
- conn.Close()
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- success := make(chan struct{})
- opts := AttachToContainerOptions{
- Container: "a123456",
- InputStream: reader,
- Stdin: true,
- Stdout: false,
- Stderr: false,
- Stream: true,
- RawTerminal: false,
- Success: success,
- }
- go func() {
- if err := client.AttachToContainer(opts); err != nil {
- t.Error(err)
- }
- // client's attach session is over
- close(clientFinished)
- }()
- success <- <-success
- // wait for server to finish handling attach
- <-serverFinished
-}
-
-func TestAttachToContainerRawTerminalFalse(t *testing.T) {
- input := strings.NewReader("send value")
- var req http.Request
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- req = *r
- w.WriteHeader(http.StatusOK)
- hj, ok := w.(http.Hijacker)
- if !ok {
- t.Fatal("cannot hijack server connection")
- }
- conn, _, err := hj.Hijack()
- if err != nil {
- t.Fatal(err)
- }
- conn.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
- conn.Write([]byte("hello"))
- conn.Write([]byte{2, 0, 0, 0, 0, 0, 0, 6})
- conn.Write([]byte("hello!"))
- conn.Close()
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var stdout, stderr bytes.Buffer
- opts := AttachToContainerOptions{
- Container: "a123456",
- OutputStream: &stdout,
- ErrorStream: &stderr,
- InputStream: input,
- Stdin: true,
- Stdout: true,
- Stderr: true,
- Stream: true,
- RawTerminal: false,
- }
- client.AttachToContainer(opts)
- expected := map[string][]string{
- "stdin": {"1"},
- "stdout": {"1"},
- "stderr": {"1"},
- "stream": {"1"},
- }
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("AttachToContainer: wrong query string. Want %#v. Got %#v.", expected, got)
- }
- if stdout.String() != "hello" {
- t.Errorf("AttachToContainer: wrong content written to stdout. Want %q. Got %q.", "hello", stdout.String())
- }
- if stderr.String() != "hello!" {
- t.Errorf("AttachToContainer: wrong content written to stderr. Want %q. Got %q.", "hello!", stderr.String())
- }
-}
-
-func TestAttachToContainerWithoutContainer(t *testing.T) {
- var client Client
- err := client.AttachToContainer(AttachToContainerOptions{})
- expected := &NoSuchContainer{ID: ""}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("AttachToContainer: wrong error. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestLogs(t *testing.T) {
- var req http.Request
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
- w.Write(prefix)
- w.Write([]byte("something happened!"))
- req = *r
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var buf bytes.Buffer
- opts := LogsOptions{
- Container: "a123456",
- OutputStream: &buf,
- Follow: true,
- Stdout: true,
- Stderr: true,
- Timestamps: true,
- }
- err := client.Logs(opts)
- if err != nil {
- t.Fatal(err)
- }
- expected := "something happened!"
- if buf.String() != expected {
- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
- }
- if req.Method != "GET" {
- t.Errorf("Logs: wrong HTTP method. Want GET. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/containers/a123456/logs"))
- if req.URL.Path != u.Path {
- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
- expectedQs := map[string][]string{
- "follow": {"1"},
- "stdout": {"1"},
- "stderr": {"1"},
- "timestamps": {"1"},
- "tail": {"all"},
- }
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expectedQs) {
- t.Errorf("Logs: wrong query string. Want %#v. Got %#v.", expectedQs, got)
- }
-}
-
-func TestLogsNilStdoutDoesntFail(t *testing.T) {
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
- w.Write(prefix)
- w.Write([]byte("something happened!"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- opts := LogsOptions{
- Container: "a123456",
- Follow: true,
- Stdout: true,
- Stderr: true,
- Timestamps: true,
- }
- err := client.Logs(opts)
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestLogsNilStderrDoesntFail(t *testing.T) {
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- prefix := []byte{2, 0, 0, 0, 0, 0, 0, 19}
- w.Write(prefix)
- w.Write([]byte("something happened!"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- opts := LogsOptions{
- Container: "a123456",
- Follow: true,
- Stdout: true,
- Stderr: true,
- Timestamps: true,
- }
- err := client.Logs(opts)
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestLogsSpecifyingTail(t *testing.T) {
- var req http.Request
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- prefix := []byte{1, 0, 0, 0, 0, 0, 0, 19}
- w.Write(prefix)
- w.Write([]byte("something happened!"))
- req = *r
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var buf bytes.Buffer
- opts := LogsOptions{
- Container: "a123456",
- OutputStream: &buf,
- Follow: true,
- Stdout: true,
- Stderr: true,
- Timestamps: true,
- Tail: "100",
- }
- err := client.Logs(opts)
- if err != nil {
- t.Fatal(err)
- }
- expected := "something happened!"
- if buf.String() != expected {
- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
- }
- if req.Method != "GET" {
- t.Errorf("Logs: wrong HTTP method. Want GET. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/containers/a123456/logs"))
- if req.URL.Path != u.Path {
- t.Errorf("AttachToContainer for logs: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
- expectedQs := map[string][]string{
- "follow": {"1"},
- "stdout": {"1"},
- "stderr": {"1"},
- "timestamps": {"1"},
- "tail": {"100"},
- }
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expectedQs) {
- t.Errorf("Logs: wrong query string. Want %#v. Got %#v.", expectedQs, got)
- }
-}
-
-func TestLogsRawTerminal(t *testing.T) {
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte("something happened!"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var buf bytes.Buffer
- opts := LogsOptions{
- Container: "a123456",
- OutputStream: &buf,
- Follow: true,
- RawTerminal: true,
- Stdout: true,
- Stderr: true,
- Timestamps: true,
- Tail: "100",
- }
- err := client.Logs(opts)
- if err != nil {
- t.Fatal(err)
- }
- expected := "something happened!"
- if buf.String() != expected {
- t.Errorf("Logs: wrong output. Want %q. Got %q.", expected, buf.String())
- }
-}
-
-func TestLogsNoContainer(t *testing.T) {
- var client Client
- err := client.Logs(LogsOptions{})
- expected := &NoSuchContainer{ID: ""}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("AttachToContainer: wrong error. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestNoSuchContainerError(t *testing.T) {
- var err = &NoSuchContainer{ID: "i345"}
- expected := "No such container: i345"
- if got := err.Error(); got != expected {
- t.Errorf("NoSuchContainer: wrong message. Want %q. Got %q.", expected, got)
- }
-}
-
-func TestNoSuchContainerErrorMessage(t *testing.T) {
- var err = &NoSuchContainer{ID: "i345", Err: errors.New("some advanced error info")}
- expected := "some advanced error info"
- if got := err.Error(); got != expected {
- t.Errorf("NoSuchContainer: wrong message. Want %q. Got %q.", expected, got)
- }
-}
-
-func TestExportContainer(t *testing.T) {
- content := "exported container tar content"
- out := stdoutMock{bytes.NewBufferString(content)}
- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
- opts := ExportContainerOptions{ID: "4fa6e0f0c678", OutputStream: out}
- err := client.ExportContainer(opts)
- if err != nil {
- t.Errorf("ExportContainer: caugh error %#v while exporting container, expected nil", err.Error())
- }
- if out.String() != content {
- t.Errorf("ExportContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
- }
-}
-
-func TestExportContainerViaUnixSocket(t *testing.T) {
- if runtime.GOOS != "darwin" {
- t.Skip(fmt.Sprintf("skipping test on %s", runtime.GOOS))
- }
- content := "exported container tar content"
- var buf []byte
- out := bytes.NewBuffer(buf)
- tempSocket := tempfile("export_socket")
- defer os.Remove(tempSocket)
- endpoint := "unix://" + tempSocket
- u, _ := parseEndpoint(endpoint, false)
- client := Client{
- HTTPClient: cleanhttp.DefaultClient(),
- Dialer: &net.Dialer{},
- endpoint: endpoint,
- endpointURL: u,
- SkipServerVersionCheck: true,
- }
- listening := make(chan string)
- done := make(chan int)
- go runStreamConnServer(t, "unix", tempSocket, listening, done)
- <-listening // wait for server to start
- opts := ExportContainerOptions{ID: "4fa6e0f0c678", OutputStream: out}
- err := client.ExportContainer(opts)
- <-done // make sure server stopped
- if err != nil {
- t.Errorf("ExportContainer: caugh error %#v while exporting container, expected nil", err.Error())
- }
- if out.String() != content {
- t.Errorf("ExportContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
- }
-}
-
-func runStreamConnServer(t *testing.T, network, laddr string, listening chan<- string, done chan<- int) {
- defer close(done)
- l, err := net.Listen(network, laddr)
- if err != nil {
- t.Errorf("Listen(%q, %q) failed: %v", network, laddr, err)
- listening <- "<nil>"
- return
- }
- defer l.Close()
- listening <- l.Addr().String()
- c, err := l.Accept()
- if err != nil {
- t.Logf("Accept failed: %v", err)
- return
- }
- c.Write([]byte("HTTP/1.1 200 OK\n\nexported container tar content"))
- c.Close()
-}
-
-func tempfile(filename string) string {
- return os.TempDir() + "/" + filename + "." + strconv.Itoa(os.Getpid())
-}
-
-func TestExportContainerNoId(t *testing.T) {
- client := Client{}
- out := stdoutMock{bytes.NewBufferString("")}
- err := client.ExportContainer(ExportContainerOptions{OutputStream: out})
- e, ok := err.(*NoSuchContainer)
- if !ok {
- t.Errorf("ExportContainer: wrong error. Want NoSuchContainer. Got %#v.", e)
- }
- if e.ID != "" {
- t.Errorf("ExportContainer: wrong ID. Want %q. Got %q", "", e.ID)
- }
-}
-
-func TestUploadToContainer(t *testing.T) {
- content := "File content"
- in := stdinMock{bytes.NewBufferString(content)}
- fakeRT := &FakeRoundTripper{status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := UploadToContainerOptions{
- Path: "abc",
- InputStream: in,
- }
- err := client.UploadToContainer("a123456", opts)
- if err != nil {
- t.Errorf("UploadToContainer: caught error %#v while uploading archive to container, expected nil", err)
- }
-
- req := fakeRT.requests[0]
-
- if req.Method != "PUT" {
- t.Errorf("UploadToContainer{Path:abc}: Wrong HTTP method. Want PUT. Got %s", req.Method)
- }
-
- if pathParam := req.URL.Query().Get("path"); pathParam != "abc" {
- t.Errorf("ListImages({Path:abc}): Wrong parameter. Want path=abc. Got path=%s", pathParam)
- }
-
-}
-
-func TestDownloadFromContainer(t *testing.T) {
- filecontent := "File content"
- client := newTestClient(&FakeRoundTripper{message: filecontent, status: http.StatusOK})
-
- var out bytes.Buffer
- opts := DownloadFromContainerOptions{
- OutputStream: &out,
- }
- err := client.DownloadFromContainer("a123456", opts)
- if err != nil {
- t.Errorf("DownloadFromContainer: caught error %#v while downloading from container, expected nil", err.Error())
- }
- if out.String() != filecontent {
- t.Errorf("DownloadFromContainer: wrong stdout. Want %#v. Got %#v.", filecontent, out.String())
- }
-}
-
-func TestCopyFromContainer(t *testing.T) {
- content := "File content"
- out := stdoutMock{bytes.NewBufferString(content)}
- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
- opts := CopyFromContainerOptions{
- Container: "a123456",
- OutputStream: &out,
- }
- err := client.CopyFromContainer(opts)
- if err != nil {
- t.Errorf("CopyFromContainer: caught error %#v while copying from container, expected nil", err.Error())
- }
- if out.String() != content {
- t.Errorf("CopyFromContainer: wrong stdout. Want %#v. Got %#v.", content, out.String())
- }
-}
-
-func TestCopyFromContainerEmptyContainer(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{status: http.StatusOK})
- err := client.CopyFromContainer(CopyFromContainerOptions{})
- _, ok := err.(*NoSuchContainer)
- if !ok {
- t.Errorf("CopyFromContainer: invalid error returned. Want NoSuchContainer, got %#v.", err)
- }
-}
-
-func TestPassingNameOptToCreateContainerReturnsItInContainer(t *testing.T) {
- jsonContainer := `{
- "Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2",
- "Warnings": []
-}`
- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
- client := newTestClient(fakeRT)
- config := Config{AttachStdout: true, AttachStdin: true}
- opts := CreateContainerOptions{Name: "TestCreateContainer", Config: &config}
- container, err := client.CreateContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- if container.Name != "TestCreateContainer" {
- t.Errorf("Container name expected to be TestCreateContainer, was %s", container.Name)
- }
-}
-
-func TestAlwaysRestart(t *testing.T) {
- policy := AlwaysRestart()
- if policy.Name != "always" {
- t.Errorf("AlwaysRestart(): wrong policy name. Want %q. Got %q", "always", policy.Name)
- }
- if policy.MaximumRetryCount != 0 {
- t.Errorf("AlwaysRestart(): wrong MaximumRetryCount. Want 0. Got %d", policy.MaximumRetryCount)
- }
-}
-
-func TestRestartOnFailure(t *testing.T) {
- const retry = 5
- policy := RestartOnFailure(retry)
- if policy.Name != "on-failure" {
- t.Errorf("RestartOnFailure(%d): wrong policy name. Want %q. Got %q", retry, "on-failure", policy.Name)
- }
- if policy.MaximumRetryCount != retry {
- t.Errorf("RestartOnFailure(%d): wrong MaximumRetryCount. Want %d. Got %d", retry, retry, policy.MaximumRetryCount)
- }
-}
-
-func TestNeverRestart(t *testing.T) {
- policy := NeverRestart()
- if policy.Name != "no" {
- t.Errorf("NeverRestart(): wrong policy name. Want %q. Got %q", "always", policy.Name)
- }
- if policy.MaximumRetryCount != 0 {
- t.Errorf("NeverRestart(): wrong MaximumRetryCount. Want 0. Got %d", policy.MaximumRetryCount)
- }
-}
-
-func TestTopContainer(t *testing.T) {
- jsonTop := `{
- "Processes": [
- [
- "ubuntu",
- "3087",
- "815",
- "0",
- "01:44",
- "?",
- "00:00:00",
- "cmd1"
- ],
- [
- "root",
- "3158",
- "3087",
- "0",
- "01:44",
- "?",
- "00:00:01",
- "cmd2"
- ]
- ],
- "Titles": [
- "UID",
- "PID",
- "PPID",
- "C",
- "STIME",
- "TTY",
- "TIME",
- "CMD"
- ]
-}`
- var expected TopResult
- err := json.Unmarshal([]byte(jsonTop), &expected)
- if err != nil {
- t.Fatal(err)
- }
- id := "4fa6e0f0"
- fakeRT := &FakeRoundTripper{message: jsonTop, status: http.StatusOK}
- client := newTestClient(fakeRT)
- processes, err := client.TopContainer(id, "")
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(processes, expected) {
- t.Errorf("TopContainer: Expected %#v. Got %#v.", expected, processes)
- }
- if len(processes.Processes) != 2 || len(processes.Processes[0]) != 8 ||
- processes.Processes[0][7] != "cmd1" {
- t.Errorf("TopContainer: Process list to include cmd1. Got %#v.", processes)
- }
- expectedURI := "/containers/" + id + "/top"
- if !strings.HasSuffix(fakeRT.requests[0].URL.String(), expectedURI) {
- t.Errorf("TopContainer: Expected URI to have %q. Got %q.", expectedURI, fakeRT.requests[0].URL.String())
- }
-}
-
-func TestTopContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- _, err := client.TopContainer("abef348", "")
- expected := &NoSuchContainer{ID: "abef348"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("StopContainer: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestTopContainerWithPsArgs(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "no such container", status: http.StatusNotFound}
- client := newTestClient(fakeRT)
- expectedErr := &NoSuchContainer{ID: "abef348"}
- if _, err := client.TopContainer("abef348", "aux"); !reflect.DeepEqual(expectedErr, err) {
- t.Errorf("TopContainer: Expected %v. Got %v.", expectedErr, err)
- }
- expectedURI := "/containers/abef348/top?ps_args=aux"
- if !strings.HasSuffix(fakeRT.requests[0].URL.String(), expectedURI) {
- t.Errorf("TopContainer: Expected URI to have %q. Got %q.", expectedURI, fakeRT.requests[0].URL.String())
- }
-}
-
-func TestStatsTimeout(t *testing.T) {
- l, err := net.Listen("unix", "/tmp/docker_test.sock")
- if err != nil {
- t.Fatal(err)
- }
- received := false
- defer l.Close()
- go func() {
- l.Accept()
- received = true
- time.Sleep(time.Second)
- }()
- client, _ := NewClient("unix:///tmp/docker_test.sock")
- client.SkipServerVersionCheck = true
- errC := make(chan error, 1)
- statsC := make(chan *Stats)
- done := make(chan bool)
- go func() {
- errC <- client.Stats(StatsOptions{"c", statsC, true, done, time.Millisecond * 100})
- close(errC)
- }()
- err = <-errC
- e, ok := err.(net.Error)
- if !ok || !e.Timeout() {
- t.Error("Failed to receive timeout exception")
- }
- if !received {
- t.Fatal("Failed to receive message")
- }
-}
-
-func TestStats(t *testing.T) {
- jsonStats1 := `{
- "read" : "2015-01-08T22:57:31.547920715Z",
- "network" : {
- "rx_dropped" : 0,
- "rx_bytes" : 648,
- "rx_errors" : 0,
- "tx_packets" : 8,
- "tx_dropped" : 0,
- "rx_packets" : 8,
- "tx_errors" : 0,
- "tx_bytes" : 648
- },
- "networks" : {
- "eth0":{
- "rx_dropped" : 0,
- "rx_bytes" : 648,
- "rx_errors" : 0,
- "tx_packets" : 8,
- "tx_dropped" : 0,
- "rx_packets" : 8,
- "tx_errors" : 0,
- "tx_bytes" : 648
- }
- },
- "memory_stats" : {
- "stats" : {
- "total_pgmajfault" : 0,
- "cache" : 0,
- "mapped_file" : 0,
- "total_inactive_file" : 0,
- "pgpgout" : 414,
- "rss" : 6537216,
- "total_mapped_file" : 0,
- "writeback" : 0,
- "unevictable" : 0,
- "pgpgin" : 477,
- "total_unevictable" : 0,
- "pgmajfault" : 0,
- "total_rss" : 6537216,
- "total_rss_huge" : 6291456,
- "total_writeback" : 0,
- "total_inactive_anon" : 0,
- "rss_huge" : 6291456,
- "hierarchical_memory_limit": 189204833,
- "total_pgfault" : 964,
- "total_active_file" : 0,
- "active_anon" : 6537216,
- "total_active_anon" : 6537216,
- "total_pgpgout" : 414,
- "total_cache" : 0,
- "inactive_anon" : 0,
- "active_file" : 0,
- "pgfault" : 964,
- "inactive_file" : 0,
- "total_pgpgin" : 477,
- "swap" : 47312896,
- "hierarchical_memsw_limit" : 1610612736
- },
- "max_usage" : 6651904,
- "usage" : 6537216,
- "failcnt" : 0,
- "limit" : 67108864
- },
- "blkio_stats": {
- "io_service_bytes_recursive": [
- {
- "major": 8,
- "minor": 0,
- "op": "Read",
- "value": 428795731968
- },
- {
- "major": 8,
- "minor": 0,
- "op": "Write",
- "value": 388177920
- }
- ],
- "io_serviced_recursive": [
- {
- "major": 8,
- "minor": 0,
- "op": "Read",
- "value": 25994442
- },
- {
- "major": 8,
- "minor": 0,
- "op": "Write",
- "value": 1734
- }
- ],
- "io_queue_recursive": [],
- "io_service_time_recursive": [],
- "io_wait_time_recursive": [],
- "io_merged_recursive": [],
- "io_time_recursive": [],
- "sectors_recursive": []
- },
- "cpu_stats" : {
- "cpu_usage" : {
- "percpu_usage" : [
- 16970827,
- 1839451,
- 7107380,
- 10571290
- ],
- "usage_in_usermode" : 10000000,
- "total_usage" : 36488948,
- "usage_in_kernelmode" : 20000000
- },
- "system_cpu_usage" : 20091722000000000
- },
- "precpu_stats" : {
- "cpu_usage" : {
- "percpu_usage" : [
- 16970827,
- 1839451,
- 7107380,
- 10571290
- ],
- "usage_in_usermode" : 10000000,
- "total_usage" : 36488948,
- "usage_in_kernelmode" : 20000000
- },
- "system_cpu_usage" : 20091722000000000
- }
- }`
- // 1 second later, cache is 100
- jsonStats2 := `{
- "read" : "2015-01-08T22:57:32.547920715Z",
- "networks" : {
- "eth0":{
- "rx_dropped" : 0,
- "rx_bytes" : 648,
- "rx_errors" : 0,
- "tx_packets" : 8,
- "tx_dropped" : 0,
- "rx_packets" : 8,
- "tx_errors" : 0,
- "tx_bytes" : 648
- }
- },
- "memory_stats" : {
- "stats" : {
- "total_pgmajfault" : 0,
- "cache" : 100,
- "mapped_file" : 0,
- "total_inactive_file" : 0,
- "pgpgout" : 414,
- "rss" : 6537216,
- "total_mapped_file" : 0,
- "writeback" : 0,
- "unevictable" : 0,
- "pgpgin" : 477,
- "total_unevictable" : 0,
- "pgmajfault" : 0,
- "total_rss" : 6537216,
- "total_rss_huge" : 6291456,
- "total_writeback" : 0,
- "total_inactive_anon" : 0,
- "rss_huge" : 6291456,
- "total_pgfault" : 964,
- "total_active_file" : 0,
- "active_anon" : 6537216,
- "total_active_anon" : 6537216,
- "total_pgpgout" : 414,
- "total_cache" : 0,
- "inactive_anon" : 0,
- "active_file" : 0,
- "pgfault" : 964,
- "inactive_file" : 0,
- "total_pgpgin" : 477,
- "swap" : 47312896,
- "hierarchical_memsw_limit" : 1610612736
- },
- "max_usage" : 6651904,
- "usage" : 6537216,
- "failcnt" : 0,
- "limit" : 67108864
- },
- "blkio_stats": {
- "io_service_bytes_recursive": [
- {
- "major": 8,
- "minor": 0,
- "op": "Read",
- "value": 428795731968
- },
- {
- "major": 8,
- "minor": 0,
- "op": "Write",
- "value": 388177920
- }
- ],
- "io_serviced_recursive": [
- {
- "major": 8,
- "minor": 0,
- "op": "Read",
- "value": 25994442
- },
- {
- "major": 8,
- "minor": 0,
- "op": "Write",
- "value": 1734
- }
- ],
- "io_queue_recursive": [],
- "io_service_time_recursive": [],
- "io_wait_time_recursive": [],
- "io_merged_recursive": [],
- "io_time_recursive": [],
- "sectors_recursive": []
- },
- "cpu_stats" : {
- "cpu_usage" : {
- "percpu_usage" : [
- 16970827,
- 1839451,
- 7107380,
- 10571290
- ],
- "usage_in_usermode" : 10000000,
- "total_usage" : 36488948,
- "usage_in_kernelmode" : 20000000
- },
- "system_cpu_usage" : 20091722000000000
- },
- "precpu_stats" : {
- "cpu_usage" : {
- "percpu_usage" : [
- 16970827,
- 1839451,
- 7107380,
- 10571290
- ],
- "usage_in_usermode" : 10000000,
- "total_usage" : 36488948,
- "usage_in_kernelmode" : 20000000
- },
- "system_cpu_usage" : 20091722000000000
- }
- }`
- var expected1 Stats
- var expected2 Stats
- err := json.Unmarshal([]byte(jsonStats1), &expected1)
- if err != nil {
- t.Fatal(err)
- }
- err = json.Unmarshal([]byte(jsonStats2), &expected2)
- if err != nil {
- t.Fatal(err)
- }
- id := "4fa6e0f0"
-
- var req http.Request
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Header().Set("Content-Type", "application/json")
- w.Write([]byte(jsonStats1))
- w.Write([]byte(jsonStats2))
- req = *r
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- errC := make(chan error, 1)
- statsC := make(chan *Stats)
- done := make(chan bool)
- go func() {
- errC <- client.Stats(StatsOptions{id, statsC, true, done, 0})
- close(errC)
- }()
- var resultStats []*Stats
- for {
- stats, ok := <-statsC
- if !ok {
- break
- }
- resultStats = append(resultStats, stats)
- }
- err = <-errC
- if err != nil {
- t.Fatal(err)
- }
- if len(resultStats) != 2 {
- t.Fatalf("Stats: Expected 2 results. Got %d.", len(resultStats))
- }
- if !reflect.DeepEqual(resultStats[0], &expected1) {
- t.Errorf("Stats: Expected:\n%+v\nGot:\n%+v", expected1, resultStats[0])
- }
- if !reflect.DeepEqual(resultStats[1], &expected2) {
- t.Errorf("Stats: Expected:\n%+v\nGot:\n%+v", expected2, resultStats[1])
- }
- if req.Method != "GET" {
- t.Errorf("Stats: wrong HTTP method. Want GET. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/containers/" + id + "/stats"))
- if req.URL.Path != u.Path {
- t.Errorf("Stats: wrong HTTP path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
-}
-
-func TestStatsContainerNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such container", status: http.StatusNotFound})
- statsC := make(chan *Stats)
- done := make(chan bool)
- err := client.Stats(StatsOptions{"abef348", statsC, true, done, 0})
- expected := &NoSuchContainer{ID: "abef348"}
- if !reflect.DeepEqual(err, expected) {
- t.Errorf("Stats: Wrong error returned. Want %#v. Got %#v.", expected, err)
- }
-}
-
-func TestRenameContainer(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := RenameContainerOptions{ID: "something_old", Name: "something_new"}
- err := client.RenameContainer(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("RenameContainer: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/something_old/rename?name=something_new"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("RenameContainer: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
- }
- expectedValues := expectedURL.Query()["name"]
- actualValues := req.URL.Query()["name"]
- if len(actualValues) != 1 || expectedValues[0] != actualValues[0] {
- t.Errorf("RenameContainer: Wrong params in request. Want %q. Got %q.", expectedValues, actualValues)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go
deleted file mode 100644
index df5169d06bada3234090e72390fc195e2af74890..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env_test.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the DOCKER-LICENSE file.
-
-package docker
-
-import (
- "bytes"
- "errors"
- "reflect"
- "sort"
- "testing"
-)
-
-func TestGet(t *testing.T) {
- var tests = []struct {
- input []string
- query string
- expected string
- }{
- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PATH", "/usr/bin:/bin"},
- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATH", "/usr/local"},
- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATHI", ""},
- {[]string{"WAT="}, "WAT", ""},
- }
- for _, tt := range tests {
- env := Env(tt.input)
- got := env.Get(tt.query)
- if got != tt.expected {
- t.Errorf("Env.Get(%q): wrong result. Want %q. Got %q", tt.query, tt.expected, got)
- }
- }
-}
-
-func TestExists(t *testing.T) {
- var tests = []struct {
- input []string
- query string
- expected bool
- }{
- {[]string{"WAT=", "PYTHONPATH=/usr/local"}, "WAT", true},
- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATH", true},
- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, "PYTHONPATHI", false},
- }
- for _, tt := range tests {
- env := Env(tt.input)
- got := env.Exists(tt.query)
- if got != tt.expected {
- t.Errorf("Env.Exists(%q): wrong result. Want %v. Got %v", tt.query, tt.expected, got)
- }
- }
-}
-
-func TestGetBool(t *testing.T) {
- var tests = []struct {
- input string
- expected bool
- }{
- {"EMTPY_VAR", false}, {"ZERO_VAR", false}, {"NO_VAR", false},
- {"FALSE_VAR", false}, {"NONE_VAR", false}, {"TRUE_VAR", true},
- {"WAT", true}, {"PATH", true}, {"ONE_VAR", true}, {"NO_VAR_TAB", false},
- }
- env := Env([]string{
- "EMPTY_VAR=", "ZERO_VAR=0", "NO_VAR=no", "FALSE_VAR=false",
- "NONE_VAR=none", "TRUE_VAR=true", "WAT=wat", "PATH=/usr/bin:/bin",
- "ONE_VAR=1", "NO_VAR_TAB=0 \t\t\t",
- })
- for _, tt := range tests {
- got := env.GetBool(tt.input)
- if got != tt.expected {
- t.Errorf("Env.GetBool(%q): wrong result. Want %v. Got %v.", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestSetBool(t *testing.T) {
- var tests = []struct {
- input bool
- expected string
- }{
- {true, "1"}, {false, "0"},
- }
- for _, tt := range tests {
- var env Env
- env.SetBool("SOME", tt.input)
- if got := env.Get("SOME"); got != tt.expected {
- t.Errorf("Env.SetBool(%v): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestGetInt(t *testing.T) {
- var tests = []struct {
- input string
- expected int
- }{
- {"NEGATIVE_INTEGER", -10}, {"NON_INTEGER", -1}, {"ONE", 1}, {"TWO", 2},
- }
- env := Env([]string{"NEGATIVE_INTEGER=-10", "NON_INTEGER=wat", "ONE=1", "TWO=2"})
- for _, tt := range tests {
- got := env.GetInt(tt.input)
- if got != tt.expected {
- t.Errorf("Env.GetInt(%q): wrong result. Want %d. Got %d", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestSetInt(t *testing.T) {
- var tests = []struct {
- input int
- expected string
- }{
- {10, "10"}, {13, "13"}, {7, "7"}, {33, "33"},
- {0, "0"}, {-34, "-34"},
- }
- for _, tt := range tests {
- var env Env
- env.SetInt("SOME", tt.input)
- if got := env.Get("SOME"); got != tt.expected {
- t.Errorf("Env.SetBool(%d): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestGetInt64(t *testing.T) {
- var tests = []struct {
- input string
- expected int64
- }{
- {"NEGATIVE_INTEGER", -10}, {"NON_INTEGER", -1}, {"ONE", 1}, {"TWO", 2},
- }
- env := Env([]string{"NEGATIVE_INTEGER=-10", "NON_INTEGER=wat", "ONE=1", "TWO=2"})
- for _, tt := range tests {
- got := env.GetInt64(tt.input)
- if got != tt.expected {
- t.Errorf("Env.GetInt64(%q): wrong result. Want %d. Got %d", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestSetInt64(t *testing.T) {
- var tests = []struct {
- input int64
- expected string
- }{
- {10, "10"}, {13, "13"}, {7, "7"}, {33, "33"},
- {0, "0"}, {-34, "-34"},
- }
- for _, tt := range tests {
- var env Env
- env.SetInt64("SOME", tt.input)
- if got := env.Get("SOME"); got != tt.expected {
- t.Errorf("Env.SetBool(%d): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestGetJSON(t *testing.T) {
- var p struct {
- Name string `json:"name"`
- Age int `json:"age"`
- }
- var env Env
- env.Set("person", `{"name":"Gopher","age":5}`)
- err := env.GetJSON("person", &p)
- if err != nil {
- t.Error(err)
- }
- if p.Name != "Gopher" {
- t.Errorf("Env.GetJSON(%q): wrong name. Want %q. Got %q", "person", "Gopher", p.Name)
- }
- if p.Age != 5 {
- t.Errorf("Env.GetJSON(%q): wrong age. Want %d. Got %d", "person", 5, p.Age)
- }
-}
-
-func TestGetJSONAbsent(t *testing.T) {
- var l []string
- var env Env
- err := env.GetJSON("person", &l)
- if err != nil {
- t.Error(err)
- }
- if l != nil {
- t.Errorf("Env.GetJSON(): get unexpected list %v", l)
- }
-}
-
-func TestGetJSONFailure(t *testing.T) {
- var p []string
- var env Env
- env.Set("list-person", `{"name":"Gopher","age":5}`)
- err := env.GetJSON("list-person", &p)
- if err == nil {
- t.Errorf("Env.GetJSON(%q): got unexpected <nil> error.", "list-person")
- }
-}
-
-func TestSetJSON(t *testing.T) {
- var p1 = struct {
- Name string `json:"name"`
- Age int `json:"age"`
- }{Name: "Gopher", Age: 5}
- var env Env
- err := env.SetJSON("person", p1)
- if err != nil {
- t.Error(err)
- }
- var p2 struct {
- Name string `json:"name"`
- Age int `json:"age"`
- }
- err = env.GetJSON("person", &p2)
- if err != nil {
- t.Error(err)
- }
- if !reflect.DeepEqual(p1, p2) {
- t.Errorf("Env.SetJSON(%q): wrong result. Want %v. Got %v", "person", p1, p2)
- }
-}
-
-func TestSetJSONFailure(t *testing.T) {
- var env Env
- err := env.SetJSON("person", unmarshable{})
- if err == nil {
- t.Error("Env.SetJSON(): got unexpected <nil> error")
- }
- if env.Exists("person") {
- t.Errorf("Env.SetJSON(): should not define the key %q, but did", "person")
- }
-}
-
-func TestGetList(t *testing.T) {
- var tests = []struct {
- input string
- expected []string
- }{
- {"WAT=wat", []string{"wat"}},
- {`WAT=["wat","wet","wit","wot","wut"]`, []string{"wat", "wet", "wit", "wot", "wut"}},
- {"WAT=", nil},
- }
- for _, tt := range tests {
- env := Env([]string{tt.input})
- got := env.GetList("WAT")
- if !reflect.DeepEqual(got, tt.expected) {
- t.Errorf("Env.GetList(%q): wrong result. Want %v. Got %v", "WAT", tt.expected, got)
- }
- }
-}
-
-func TestSetList(t *testing.T) {
- list := []string{"a", "b", "c"}
- var env Env
- if err := env.SetList("SOME", list); err != nil {
- t.Error(err)
- }
- if got := env.GetList("SOME"); !reflect.DeepEqual(got, list) {
- t.Errorf("Env.SetList(%v): wrong result. Got %v", list, got)
- }
-}
-
-func TestSet(t *testing.T) {
- var env Env
- env.Set("PATH", "/home/bin:/bin")
- env.Set("SOMETHING", "/usr/bin")
- env.Set("PATH", "/bin")
- if expected, got := "/usr/bin", env.Get("SOMETHING"); got != expected {
- t.Errorf("Env.Set(%q): wrong result. Want %q. Got %q", expected, expected, got)
- }
- if expected, got := "/bin", env.Get("PATH"); got != expected {
- t.Errorf("Env.Set(%q): wrong result. Want %q. Got %q", expected, expected, got)
- }
-}
-
-func TestDecode(t *testing.T) {
- var tests = []struct {
- input string
- expectedOut []string
- expectedErr string
- }{
- {
- `{"PATH":"/usr/bin:/bin","containers":54,"wat":["123","345"]}`,
- []string{"PATH=/usr/bin:/bin", "containers=54", `wat=["123","345"]`},
- "",
- },
- {"}}", nil, "invalid character '}' looking for beginning of value"},
- {`{}`, nil, ""},
- }
- for _, tt := range tests {
- var env Env
- err := env.Decode(bytes.NewBufferString(tt.input))
- if tt.expectedErr == "" {
- if err != nil {
- t.Error(err)
- }
- } else if tt.expectedErr != err.Error() {
- t.Errorf("Env.Decode(): invalid error. Want %q. Got %q.", tt.expectedErr, err)
- }
- got := []string(env)
- sort.Strings(got)
- sort.Strings(tt.expectedOut)
- if !reflect.DeepEqual(got, tt.expectedOut) {
- t.Errorf("Env.Decode(): wrong result. Want %v. Got %v.", tt.expectedOut, got)
- }
- }
-}
-
-func TestSetAuto(t *testing.T) {
- buf := bytes.NewBufferString("oi")
- var tests = []struct {
- input interface{}
- expected string
- }{
- {10, "10"},
- {10.3, "10"},
- {"oi", "oi"},
- {buf, "{}"},
- {unmarshable{}, "{}"},
- }
- for _, tt := range tests {
- var env Env
- env.SetAuto("SOME", tt.input)
- if got := env.Get("SOME"); got != tt.expected {
- t.Errorf("Env.SetAuto(%v): wrong result. Want %q. Got %q", tt.input, tt.expected, got)
- }
- }
-}
-
-func TestMap(t *testing.T) {
- var tests = []struct {
- input []string
- expected map[string]string
- }{
- {[]string{"PATH=/usr/bin:/bin", "PYTHONPATH=/usr/local"}, map[string]string{"PATH": "/usr/bin:/bin", "PYTHONPATH": "/usr/local"}},
- {nil, nil},
- }
- for _, tt := range tests {
- env := Env(tt.input)
- got := env.Map()
- if !reflect.DeepEqual(got, tt.expected) {
- t.Errorf("Env.Map(): wrong result. Want %v. Got %v", tt.expected, got)
- }
- }
-}
-
-type unmarshable struct {
-}
-
-func (unmarshable) MarshalJSON() ([]byte, error) {
- return nil, errors.New("cannot marshal")
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go
deleted file mode 100644
index a308538ccd5f4efc0022bafc023237329494a8b9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "bufio"
- "crypto/tls"
- "crypto/x509"
- "fmt"
- "io/ioutil"
- "net/http"
- "net/http/httptest"
- "strings"
- "testing"
- "time"
-)
-
-func TestEventListeners(t *testing.T) {
- testEventListeners("TestEventListeners", t, httptest.NewServer, NewClient)
-}
-
-func TestTLSEventListeners(t *testing.T) {
- testEventListeners("TestTLSEventListeners", t, func(handler http.Handler) *httptest.Server {
- server := httptest.NewUnstartedServer(handler)
-
- cert, err := tls.LoadX509KeyPair("testing/data/server.pem", "testing/data/serverkey.pem")
- if err != nil {
- t.Fatalf("Error loading server key pair: %s", err)
- }
-
- caCert, err := ioutil.ReadFile("testing/data/ca.pem")
- if err != nil {
- t.Fatalf("Error loading ca certificate: %s", err)
- }
- caPool := x509.NewCertPool()
- if !caPool.AppendCertsFromPEM(caCert) {
- t.Fatalf("Could not add ca certificate")
- }
-
- server.TLS = &tls.Config{
- Certificates: []tls.Certificate{cert},
- RootCAs: caPool,
- }
- server.StartTLS()
- return server
- }, func(url string) (*Client, error) {
- return NewTLSClient(url, "testing/data/cert.pem", "testing/data/key.pem", "testing/data/ca.pem")
- })
-}
-
-func testEventListeners(testName string, t *testing.T, buildServer func(http.Handler) *httptest.Server, buildClient func(string) (*Client, error)) {
- response := `{"status":"create","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
-{"status":"start","id":"dfdf82bd3881","from":"base:latest","time":1374067924}
-{"status":"stop","id":"dfdf82bd3881","from":"base:latest","time":1374067966}
-{"status":"destroy","id":"dfdf82bd3881","from":"base:latest","time":1374067970}
-`
-
- server := buildServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- rsc := bufio.NewScanner(strings.NewReader(response))
- for rsc.Scan() {
- w.Write([]byte(rsc.Text()))
- w.(http.Flusher).Flush()
- time.Sleep(10 * time.Millisecond)
- }
- }))
- defer server.Close()
-
- client, err := buildClient(server.URL)
- if err != nil {
- t.Errorf("Failed to create client: %s", err)
- }
- client.SkipServerVersionCheck = true
-
- listener := make(chan *APIEvents, 10)
- defer func() {
- time.Sleep(10 * time.Millisecond)
- if err := client.RemoveEventListener(listener); err != nil {
- t.Error(err)
- }
- }()
-
- err = client.AddEventListener(listener)
- if err != nil {
- t.Errorf("Failed to add event listener: %s", err)
- }
-
- timeout := time.After(1 * time.Second)
- var count int
-
- for {
- select {
- case msg := <-listener:
- t.Logf("Received: %v", *msg)
- count++
- err = checkEvent(count, msg)
- if err != nil {
- t.Fatalf("Check event failed: %s", err)
- }
- if count == 4 {
- return
- }
- case <-timeout:
- t.Fatalf("%s timed out waiting on events", testName)
- }
- }
-}
-
-func checkEvent(index int, event *APIEvents) error {
- if event.ID != "dfdf82bd3881" {
- return fmt.Errorf("event ID did not match. Expected dfdf82bd3881 got %s", event.ID)
- }
- if event.From != "base:latest" {
- return fmt.Errorf("event from did not match. Expected base:latest got %s", event.From)
- }
- var status string
- switch index {
- case 1:
- status = "create"
- case 2:
- status = "start"
- case 3:
- status = "stop"
- case 4:
- status = "destroy"
- }
- if event.Status != status {
- return fmt.Errorf("event status did not match. Expected %s got %s", status, event.Status)
- }
- return nil
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go
deleted file mode 100644
index 8c2c719e6e8c276e904d5c7b52622086c42197da..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/example_test.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker_test
-
-import (
- "archive/tar"
- "bytes"
- "fmt"
- "io"
- "log"
- "time"
-
- "github.com/fsouza/go-dockerclient"
-)
-
-func ExampleClient_AttachToContainer() {
- client, err := docker.NewClient("http://localhost:4243")
- if err != nil {
- log.Fatal(err)
- }
- client.SkipServerVersionCheck = true
- // Reading logs from container a84849 and sending them to buf.
- var buf bytes.Buffer
- err = client.AttachToContainer(docker.AttachToContainerOptions{
- Container: "a84849",
- OutputStream: &buf,
- Logs: true,
- Stdout: true,
- Stderr: true,
- })
- if err != nil {
- log.Fatal(err)
- }
- log.Println(buf.String())
- buf.Reset()
- err = client.AttachToContainer(docker.AttachToContainerOptions{
- Container: "a84849",
- OutputStream: &buf,
- Stdout: true,
- Stream: true,
- })
- if err != nil {
- log.Fatal(err)
- }
- log.Println(buf.String())
-}
-
-func ExampleClient_CopyFromContainer() {
- client, err := docker.NewClient("http://localhost:4243")
- if err != nil {
- log.Fatal(err)
- }
- cid := "a84849"
- var buf bytes.Buffer
- filename := "/tmp/output.txt"
- err = client.CopyFromContainer(docker.CopyFromContainerOptions{
- Container: cid,
- Resource: filename,
- OutputStream: &buf,
- })
- if err != nil {
- log.Fatalf("Error while copying from %s: %s\n", cid, err)
- }
- content := new(bytes.Buffer)
- r := bytes.NewReader(buf.Bytes())
- tr := tar.NewReader(r)
- tr.Next()
- if err != nil && err != io.EOF {
- log.Fatal(err)
- }
- if _, err := io.Copy(content, tr); err != nil {
- log.Fatal(err)
- }
- log.Println(buf.String())
-}
-
-func ExampleClient_BuildImage() {
- client, err := docker.NewClient("http://localhost:4243")
- if err != nil {
- log.Fatal(err)
- }
-
- t := time.Now()
- inputbuf, outputbuf := bytes.NewBuffer(nil), bytes.NewBuffer(nil)
- tr := tar.NewWriter(inputbuf)
- tr.WriteHeader(&tar.Header{Name: "Dockerfile", Size: 10, ModTime: t, AccessTime: t, ChangeTime: t})
- tr.Write([]byte("FROM base\n"))
- tr.Close()
- opts := docker.BuildImageOptions{
- Name: "test",
- InputStream: inputbuf,
- OutputStream: outputbuf,
- }
- if err := client.BuildImage(opts); err != nil {
- log.Fatal(err)
- }
-}
-
-func ExampleClient_ListenEvents() {
- client, err := docker.NewClient("http://localhost:4243")
- if err != nil {
- log.Fatal(err)
- }
-
- listener := make(chan *docker.APIEvents)
- err = client.AddEventListener(listener)
- if err != nil {
- log.Fatal(err)
- }
-
- defer func() {
-
- err = client.RemoveEventListener(listener)
- if err != nil {
- log.Fatal(err)
- }
-
- }()
-
- timeout := time.After(1 * time.Second)
-
- for {
- select {
- case msg := <-listener:
- log.Println(msg)
- case <-timeout:
- break
- }
- }
-
-}
-
-func ExampleEnv_Map() {
- e := docker.Env([]string{"A=1", "B=2", "C=3"})
- envs := e.Map()
- for k, v := range envs {
- fmt.Printf("%s=%q\n", k, v)
- }
-}
-
-func ExampleEnv_SetJSON() {
- type Person struct {
- Name string
- Age int
- }
- p := Person{Name: "Gopher", Age: 4}
- var e docker.Env
- err := e.SetJSON("person", p)
- if err != nil {
- log.Fatal(err)
- }
-}
-
-func ExampleEnv_GetJSON() {
- type Person struct {
- Name string
- Age int
- }
- p := Person{Name: "Gopher", Age: 4}
- var e docker.Env
- e.Set("person", `{"name":"Gopher","age":4}`)
- err := e.GetJSON("person", &p)
- if err != nil {
- log.Fatal(err)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go
deleted file mode 100644
index 2dc8d2100c60831c5a4d8c13c7e21d379b6be2a9..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec_test.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "bytes"
- "encoding/json"
- "net/http"
- "net/http/httptest"
- "net/url"
- "reflect"
- "strings"
- "testing"
-)
-
-func TestExecCreate(t *testing.T) {
- jsonContainer := `{"Id": "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"}`
- var expected struct{ ID string }
- err := json.Unmarshal([]byte(jsonContainer), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonContainer, status: http.StatusOK}
- client := newTestClient(fakeRT)
- config := CreateExecOptions{
- Container: "test",
- AttachStdin: true,
- AttachStdout: true,
- AttachStderr: false,
- Tty: false,
- Cmd: []string{"touch", "/tmp/file"},
- User: "a-user",
- }
- execObj, err := client.CreateExec(config)
- if err != nil {
- t.Fatal(err)
- }
- expectedID := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- if execObj.ID != expectedID {
- t.Errorf("ExecCreate: wrong ID. Want %q. Got %q.", expectedID, execObj.ID)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("ExecCreate: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/containers/test/exec"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
- }
- var gotBody struct{ ID string }
- err = json.NewDecoder(req.Body).Decode(&gotBody)
- if err != nil {
- t.Fatal(err)
- }
-}
-
-func TestExecStartDetached(t *testing.T) {
- execID := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- fakeRT := &FakeRoundTripper{status: http.StatusOK}
- client := newTestClient(fakeRT)
- config := StartExecOptions{
- Detach: true,
- }
- err := client.StartExec(execID, config)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("ExecStart: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/exec/" + execID + "/start"))
- if gotPath := req.URL.Path; gotPath != expectedURL.Path {
- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
- }
- t.Log(req.Body)
- var gotBody struct{ Detach bool }
- err = json.NewDecoder(req.Body).Decode(&gotBody)
- if err != nil {
- t.Fatal(err)
- }
- if !gotBody.Detach {
- t.Fatal("Expected Detach in StartExecOptions to be true")
- }
-}
-
-func TestExecStartAndAttach(t *testing.T) {
- var reader = strings.NewReader("send value")
- server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte{1, 0, 0, 0, 0, 0, 0, 5})
- w.Write([]byte("hello"))
- }))
- defer server.Close()
- client, _ := NewClient(server.URL)
- client.SkipServerVersionCheck = true
- var stdout, stderr bytes.Buffer
- success := make(chan struct{})
- execID := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- opts := StartExecOptions{
- OutputStream: &stdout,
- ErrorStream: &stderr,
- InputStream: reader,
- RawTerminal: true,
- Success: success,
- }
- go func() {
- if err := client.StartExec(execID, opts); err != nil {
- t.Error(err)
- }
- }()
- <-success
-}
-
-func TestExecResize(t *testing.T) {
- execID := "4fa6e0f0c6786287e131c3852c58a2e01cc697a68231826813597e4994f1d6e2"
- fakeRT := &FakeRoundTripper{status: http.StatusOK}
- client := newTestClient(fakeRT)
- err := client.ResizeExecTTY(execID, 10, 20)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("ExecStart: wrong HTTP method. Want %q. Got %q.", "POST", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/exec/" + execID + "/resize?h=10&w=20"))
- if gotPath := req.URL.RequestURI(); gotPath != expectedURL.RequestURI() {
- t.Errorf("ExecCreate: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
- }
-}
-
-func TestExecInspect(t *testing.T) {
- jsonExec := `{
- "ID": "32adfeeec34250f9530ce1dafd40c6233832315e065ea6b362d745e2f63cde0e",
- "Running": true,
- "ExitCode": 0,
- "ProcessConfig": {
- "privileged": false,
- "user": "",
- "tty": true,
- "entrypoint": "bash",
- "arguments": []
- },
- "OpenStdin": true,
- "OpenStderr": true,
- "OpenStdout": true,
- "Container": {
- "State": {
- "Running": true,
- "Paused": false,
- "Restarting": false,
- "OOMKilled": false,
- "Pid": 29392,
- "ExitCode": 0,
- "Error": "",
- "StartedAt": "2015-01-21T17:08:59.634662178Z",
- "FinishedAt": "0001-01-01T00:00:00Z"
- },
- "ID": "922cd0568714763dc725b24b7c9801016b2a3de68e2a1dc989bf5abf07740521",
- "Created": "2015-01-21T17:08:59.46407212Z",
- "Path": "/bin/bash",
- "Args": [
- "-lc",
- "tsuru_unit_agent http://192.168.50.4:8080 689b30e0ab3adce374346de2e72512138e0e8b75 gtest /var/lib/tsuru/start && tail -f /dev/null"
- ],
- "Config": {
- "Hostname": "922cd0568714",
- "Domainname": "",
- "User": "ubuntu",
- "Memory": 0,
- "MemorySwap": 0,
- "CpuShares": 100,
- "Cpuset": "",
- "AttachStdin": false,
- "AttachStdout": false,
- "AttachStderr": false,
- "PortSpecs": null,
- "ExposedPorts": {
- "8888/tcp": {}
- },
- "Tty": false,
- "OpenStdin": false,
- "StdinOnce": false,
- "Env": [
- "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
- ],
- "Cmd": [
- "/bin/bash",
- "-lc",
- "tsuru_unit_agent http://192.168.50.4:8080 689b30e0ab3adce374346de2e72512138e0e8b75 gtest /var/lib/tsuru/start && tail -f /dev/null"
- ],
- "Image": "tsuru/app-gtest",
- "Volumes": null,
- "WorkingDir": "",
- "Entrypoint": null,
- "NetworkDisabled": false,
- "MacAddress": "",
- "OnBuild": null
- },
- "Image": "a88060b8b54fde0f7168c86742d0ce83b80f3f10925d85c98fdad9ed00bef544",
- "NetworkSettings": {
- "IPAddress": "172.17.0.8",
- "IPPrefixLen": 16,
- "MacAddress": "02:42:ac:11:00:08",
- "LinkLocalIPv6Address": "fe80::42:acff:fe11:8",
- "LinkLocalIPv6PrefixLen": 64,
- "GlobalIPv6Address": "",
- "GlobalIPv6PrefixLen": 0,
- "Gateway": "172.17.42.1",
- "IPv6Gateway": "",
- "Bridge": "docker0",
- "PortMapping": null,
- "Ports": {
- "8888/tcp": [
- {
- "HostIp": "0.0.0.0",
- "HostPort": "49156"
- }
- ]
- }
- },
- "ResolvConfPath": "/var/lib/docker/containers/922cd0568714763dc725b24b7c9801016b2a3de68e2a1dc989bf5abf07740521/resolv.conf",
- "HostnamePath": "/var/lib/docker/containers/922cd0568714763dc725b24b7c9801016b2a3de68e2a1dc989bf5abf07740521/hostname",
- "HostsPath": "/var/lib/docker/containers/922cd0568714763dc725b24b7c9801016b2a3de68e2a1dc989bf5abf07740521/hosts",
- "Name": "/c7e43b72288ee9d0270a",
- "Driver": "aufs",
- "ExecDriver": "native-0.2",
- "MountLabel": "",
- "ProcessLabel": "",
- "AppArmorProfile": "",
- "RestartCount": 0,
- "UpdateDns": false,
- "Volumes": {},
- "VolumesRW": {}
- }
- }`
- var expected ExecInspect
- err := json.Unmarshal([]byte(jsonExec), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonExec, status: http.StatusOK}
- client := newTestClient(fakeRT)
- expectedID := "32adfeeec34250f9530ce1dafd40c6233832315e065ea6b362d745e2f63cde0e"
- execObj, err := client.InspectExec(expectedID)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(*execObj, expected) {
- t.Errorf("ExecInspect: Expected %#v. Got %#v.", expected, *execObj)
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("ExecInspect: wrong HTTP method. Want %q. Got %q.", "GET", req.Method)
- }
- expectedURL, _ := url.Parse(client.getURL("/exec/" + expectedID + "/json"))
- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
- t.Errorf("ExecInspect: Wrong path in request. Want %q. Got %q.", expectedURL.Path, gotPath)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
deleted file mode 100644
index 0e5fb872800da9557f75a5650bb9d80c1c2cf715..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
deleted file mode 100644
index c60a31b053bc4e306c079fb6a524ddc653b7f2ad..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-context
-=======
-[](https://travis-ci.org/gorilla/context)
-
-gorilla/context is a general purpose registry for global request variables.
-
-Read the full documentation here: http://www.gorillatoolkit.org/pkg/context
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
deleted file mode 100644
index 81cb128b19cad7e0a9ee89d7626746d1cf859564..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
- "net/http"
- "sync"
- "time"
-)
-
-var (
- mutex sync.RWMutex
- data = make(map[*http.Request]map[interface{}]interface{})
- datat = make(map[*http.Request]int64)
-)
-
-// Set stores a value for a given key in a given request.
-func Set(r *http.Request, key, val interface{}) {
- mutex.Lock()
- if data[r] == nil {
- data[r] = make(map[interface{}]interface{})
- datat[r] = time.Now().Unix()
- }
- data[r][key] = val
- mutex.Unlock()
-}
-
-// Get returns a value stored for a given key in a given request.
-func Get(r *http.Request, key interface{}) interface{} {
- mutex.RLock()
- if ctx := data[r]; ctx != nil {
- value := ctx[key]
- mutex.RUnlock()
- return value
- }
- mutex.RUnlock()
- return nil
-}
-
-// GetOk returns stored value and presence state like multi-value return of map access.
-func GetOk(r *http.Request, key interface{}) (interface{}, bool) {
- mutex.RLock()
- if _, ok := data[r]; ok {
- value, ok := data[r][key]
- mutex.RUnlock()
- return value, ok
- }
- mutex.RUnlock()
- return nil, false
-}
-
-// GetAll returns all stored values for the request as a map. Nil is returned for invalid requests.
-func GetAll(r *http.Request) map[interface{}]interface{} {
- mutex.RLock()
- if context, ok := data[r]; ok {
- result := make(map[interface{}]interface{}, len(context))
- for k, v := range context {
- result[k] = v
- }
- mutex.RUnlock()
- return result
- }
- mutex.RUnlock()
- return nil
-}
-
-// GetAllOk returns all stored values for the request as a map and a boolean value that indicates if
-// the request was registered.
-func GetAllOk(r *http.Request) (map[interface{}]interface{}, bool) {
- mutex.RLock()
- context, ok := data[r]
- result := make(map[interface{}]interface{}, len(context))
- for k, v := range context {
- result[k] = v
- }
- mutex.RUnlock()
- return result, ok
-}
-
-// Delete removes a value stored for a given key in a given request.
-func Delete(r *http.Request, key interface{}) {
- mutex.Lock()
- if data[r] != nil {
- delete(data[r], key)
- }
- mutex.Unlock()
-}
-
-// Clear removes all values stored for a given request.
-//
-// This is usually called by a handler wrapper to clean up request
-// variables at the end of a request lifetime. See ClearHandler().
-func Clear(r *http.Request) {
- mutex.Lock()
- clear(r)
- mutex.Unlock()
-}
-
-// clear is Clear without the lock.
-func clear(r *http.Request) {
- delete(data, r)
- delete(datat, r)
-}
-
-// Purge removes request data stored for longer than maxAge, in seconds.
-// It returns the amount of requests removed.
-//
-// If maxAge <= 0, all request data is removed.
-//
-// This is only used for sanity check: in case context cleaning was not
-// properly set some request data can be kept forever, consuming an increasing
-// amount of memory. In case this is detected, Purge() must be called
-// periodically until the problem is fixed.
-func Purge(maxAge int) int {
- mutex.Lock()
- count := 0
- if maxAge <= 0 {
- count = len(data)
- data = make(map[*http.Request]map[interface{}]interface{})
- datat = make(map[*http.Request]int64)
- } else {
- min := time.Now().Unix() - int64(maxAge)
- for r := range data {
- if datat[r] < min {
- clear(r)
- count++
- }
- }
- }
- mutex.Unlock()
- return count
-}
-
-// ClearHandler wraps an http.Handler and clears request values at the end
-// of a request lifetime.
-func ClearHandler(h http.Handler) http.Handler {
- return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- defer Clear(r)
- h.ServeHTTP(w, r)
- })
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context_test.go
deleted file mode 100644
index 9814c501e8aefc4c986715f861871600c1a6034f..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/context_test.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
- "net/http"
- "testing"
-)
-
-type keyType int
-
-const (
- key1 keyType = iota
- key2
-)
-
-func TestContext(t *testing.T) {
- assertEqual := func(val interface{}, exp interface{}) {
- if val != exp {
- t.Errorf("Expected %v, got %v.", exp, val)
- }
- }
-
- r, _ := http.NewRequest("GET", "http://localhost:8080/", nil)
- emptyR, _ := http.NewRequest("GET", "http://localhost:8080/", nil)
-
- // Get()
- assertEqual(Get(r, key1), nil)
-
- // Set()
- Set(r, key1, "1")
- assertEqual(Get(r, key1), "1")
- assertEqual(len(data[r]), 1)
-
- Set(r, key2, "2")
- assertEqual(Get(r, key2), "2")
- assertEqual(len(data[r]), 2)
-
- //GetOk
- value, ok := GetOk(r, key1)
- assertEqual(value, "1")
- assertEqual(ok, true)
-
- value, ok = GetOk(r, "not exists")
- assertEqual(value, nil)
- assertEqual(ok, false)
-
- Set(r, "nil value", nil)
- value, ok = GetOk(r, "nil value")
- assertEqual(value, nil)
- assertEqual(ok, true)
-
- // GetAll()
- values := GetAll(r)
- assertEqual(len(values), 3)
-
- // GetAll() for empty request
- values = GetAll(emptyR)
- if values != nil {
- t.Error("GetAll didn't return nil value for invalid request")
- }
-
- // GetAllOk()
- values, ok = GetAllOk(r)
- assertEqual(len(values), 3)
- assertEqual(ok, true)
-
- // GetAllOk() for empty request
- values, ok = GetAllOk(emptyR)
- assertEqual(value, nil)
- assertEqual(ok, false)
-
- // Delete()
- Delete(r, key1)
- assertEqual(Get(r, key1), nil)
- assertEqual(len(data[r]), 2)
-
- Delete(r, key2)
- assertEqual(Get(r, key2), nil)
- assertEqual(len(data[r]), 1)
-
- // Clear()
- Clear(r)
- assertEqual(len(data), 0)
-}
-
-func parallelReader(r *http.Request, key string, iterations int, wait, done chan struct{}) {
- <-wait
- for i := 0; i < iterations; i++ {
- Get(r, key)
- }
- done <- struct{}{}
-
-}
-
-func parallelWriter(r *http.Request, key, value string, iterations int, wait, done chan struct{}) {
- <-wait
- for i := 0; i < iterations; i++ {
- Set(r, key, value)
- }
- done <- struct{}{}
-
-}
-
-func benchmarkMutex(b *testing.B, numReaders, numWriters, iterations int) {
-
- b.StopTimer()
- r, _ := http.NewRequest("GET", "http://localhost:8080/", nil)
- done := make(chan struct{})
- b.StartTimer()
-
- for i := 0; i < b.N; i++ {
- wait := make(chan struct{})
-
- for i := 0; i < numReaders; i++ {
- go parallelReader(r, "test", iterations, wait, done)
- }
-
- for i := 0; i < numWriters; i++ {
- go parallelWriter(r, "test", "123", iterations, wait, done)
- }
-
- close(wait)
-
- for i := 0; i < numReaders+numWriters; i++ {
- <-done
- }
-
- }
-
-}
-
-func BenchmarkMutexSameReadWrite1(b *testing.B) {
- benchmarkMutex(b, 1, 1, 32)
-}
-func BenchmarkMutexSameReadWrite2(b *testing.B) {
- benchmarkMutex(b, 2, 2, 32)
-}
-func BenchmarkMutexSameReadWrite4(b *testing.B) {
- benchmarkMutex(b, 4, 4, 32)
-}
-func BenchmarkMutex1(b *testing.B) {
- benchmarkMutex(b, 2, 8, 32)
-}
-func BenchmarkMutex2(b *testing.B) {
- benchmarkMutex(b, 16, 4, 64)
-}
-func BenchmarkMutex3(b *testing.B) {
- benchmarkMutex(b, 1, 2, 128)
-}
-func BenchmarkMutex4(b *testing.B) {
- benchmarkMutex(b, 128, 32, 256)
-}
-func BenchmarkMutex5(b *testing.B) {
- benchmarkMutex(b, 1024, 2048, 64)
-}
-func BenchmarkMutex6(b *testing.B) {
- benchmarkMutex(b, 2048, 1024, 512)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
deleted file mode 100644
index 73c7400311e125ab152886838b51f2c490ddfbe1..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/context/doc.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package context stores values shared during a request lifetime.
-
-For example, a router can set variables extracted from the URL and later
-application handlers can access those values, or it can be used to store
-sessions values to be saved at the end of a request. There are several
-others common uses.
-
-The idea was posted by Brad Fitzpatrick to the go-nuts mailing list:
-
- http://groups.google.com/group/golang-nuts/msg/e2d679d303aa5d53
-
-Here's the basic usage: first define the keys that you will need. The key
-type is interface{} so a key can be of any type that supports equality.
-Here we define a key using a custom int type to avoid name collisions:
-
- package foo
-
- import (
- "github.com/gorilla/context"
- )
-
- type key int
-
- const MyKey key = 0
-
-Then set a variable. Variables are bound to an http.Request object, so you
-need a request instance to set a value:
-
- context.Set(r, MyKey, "bar")
-
-The application can later access the variable using the same key you provided:
-
- func MyHandler(w http.ResponseWriter, r *http.Request) {
- // val is "bar".
- val := context.Get(r, foo.MyKey)
-
- // returns ("bar", true)
- val, ok := context.GetOk(r, foo.MyKey)
- // ...
- }
-
-And that's all about the basic usage. We discuss some other ideas below.
-
-Any type can be stored in the context. To enforce a given type, make the key
-private and wrap Get() and Set() to accept and return values of a specific
-type:
-
- type key int
-
- const mykey key = 0
-
- // GetMyKey returns a value for this package from the request values.
- func GetMyKey(r *http.Request) SomeType {
- if rv := context.Get(r, mykey); rv != nil {
- return rv.(SomeType)
- }
- return nil
- }
-
- // SetMyKey sets a value for this package in the request values.
- func SetMyKey(r *http.Request, val SomeType) {
- context.Set(r, mykey, val)
- }
-
-Variables must be cleared at the end of a request, to remove all values
-that were stored. This can be done in an http.Handler, after a request was
-served. Just call Clear() passing the request:
-
- context.Clear(r)
-
-...or use ClearHandler(), which conveniently wraps an http.Handler to clear
-variables at the end of a request lifetime.
-
-The Routers from the packages gorilla/mux and gorilla/pat call Clear()
-so if you are using either of them you don't need to clear the context manually.
-*/
-package context
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
deleted file mode 100644
index 0e5fb872800da9557f75a5650bb9d80c1c2cf715..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/LICENSE
+++ /dev/null
@@ -1,27 +0,0 @@
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
deleted file mode 100644
index b987c9e5d10e5534287261323af124a6e2653c16..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/README.md
+++ /dev/null
@@ -1,240 +0,0 @@
-mux
-===
-[](https://godoc.org/github.com/gorilla/mux)
-[](https://travis-ci.org/gorilla/mux)
-
-Package `gorilla/mux` implements a request router and dispatcher.
-
-The name mux stands for "HTTP request multiplexer". Like the standard `http.ServeMux`, `mux.Router` matches incoming requests against a list of registered routes and calls a handler for the route that matches the URL or other conditions. The main features are:
-
-* Requests can be matched based on URL host, path, path prefix, schemes, header and query values, HTTP methods or using custom matchers.
-* URL hosts and paths can have variables with an optional regular expression.
-* Registered URLs can be built, or "reversed", which helps maintaining references to resources.
-* Routes can be used as subrouters: nested routes are only tested if the parent route matches. This is useful to define groups of routes that share common conditions like a host, a path prefix or other repeated attributes. As a bonus, this optimizes request matching.
-* It implements the `http.Handler` interface so it is compatible with the standard `http.ServeMux`.
-
-Let's start registering a couple of URL paths and handlers:
-
-```go
-func main() {
- r := mux.NewRouter()
- r.HandleFunc("/", HomeHandler)
- r.HandleFunc("/products", ProductsHandler)
- r.HandleFunc("/articles", ArticlesHandler)
- http.Handle("/", r)
-}
-```
-
-Here we register three routes mapping URL paths to handlers. This is equivalent to how `http.HandleFunc()` works: if an incoming request URL matches one of the paths, the corresponding handler is called passing (`http.ResponseWriter`, `*http.Request`) as parameters.
-
-Paths can have variables. They are defined using the format `{name}` or `{name:pattern}`. If a regular expression pattern is not defined, the matched variable will be anything until the next slash. For example:
-
-```go
-r := mux.NewRouter()
-r.HandleFunc("/products/{key}", ProductHandler)
-r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
-r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-```
-
-The names are used to create a map of route variables which can be retrieved calling `mux.Vars()`:
-
-```go
-vars := mux.Vars(request)
-category := vars["category"]
-```
-
-And this is all you need to know about the basic usage. More advanced options are explained below.
-
-Routes can also be restricted to a domain or subdomain. Just define a host pattern to be matched. They can also have variables:
-
-```go
-r := mux.NewRouter()
-// Only matches if domain is "www.example.com".
-r.Host("www.example.com")
-// Matches a dynamic subdomain.
-r.Host("{subdomain:[a-z]+}.domain.com")
-```
-
-There are several other matchers that can be added. To match path prefixes:
-
-```go
-r.PathPrefix("/products/")
-```
-
-...or HTTP methods:
-
-```go
-r.Methods("GET", "POST")
-```
-
-...or URL schemes:
-
-```go
-r.Schemes("https")
-```
-
-...or header values:
-
-```go
-r.Headers("X-Requested-With", "XMLHttpRequest")
-```
-
-...or query values:
-
-```go
-r.Queries("key", "value")
-```
-
-...or to use a custom matcher function:
-
-```go
-r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
- return r.ProtoMajor == 0
-})
-```
-
-...and finally, it is possible to combine several matchers in a single route:
-
-```go
-r.HandleFunc("/products", ProductsHandler).
- Host("www.example.com").
- Methods("GET").
- Schemes("http")
-```
-
-Setting the same matching conditions again and again can be boring, so we have a way to group several routes that share the same requirements. We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the host is `www.example.com`. Create a route for that host and get a "subrouter" from it:
-
-```go
-r := mux.NewRouter()
-s := r.Host("www.example.com").Subrouter()
-```
-
-Then register routes in the subrouter:
-
-```go
-s.HandleFunc("/products/", ProductsHandler)
-s.HandleFunc("/products/{key}", ProductHandler)
-s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-```
-
-The three URL paths we registered above will only be tested if the domain is `www.example.com`, because the subrouter is tested first. This is not only convenient, but also optimizes request matching. You can create subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define subrouters in a central place and then parts of the app can register its paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix, the inner routes use it as base for their paths:
-
-```go
-r := mux.NewRouter()
-s := r.PathPrefix("/products").Subrouter()
-// "/products/"
-s.HandleFunc("/", ProductsHandler)
-// "/products/{key}/"
-s.HandleFunc("/{key}/", ProductHandler)
-// "/products/{key}/details"
-s.HandleFunc("/{key}/details", ProductDetailsHandler)
-```
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built, or "reversed". We define a name calling `Name()` on a route. For example:
-
-```go
-r := mux.NewRouter()
-r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
- Name("article")
-```
-
-To build a URL, get the route and call the `URL()` method, passing a sequence of key/value pairs for the route variables. For the previous route, we would do:
-
-```go
-url, err := r.Get("article").URL("category", "technology", "id", "42")
-```
-
-...and the result will be a `url.URL` with the following path:
-
-```
-"/articles/technology/42"
-```
-
-This also works for host variables:
-
-```go
-r := mux.NewRouter()
-r.Host("{subdomain}.domain.com").
- Path("/articles/{category}/{id:[0-9]+}").
- HandlerFunc(ArticleHandler).
- Name("article")
-
-// url.String() will be "http://news.domain.com/articles/technology/42"
-url, err := r.Get("article").URL("subdomain", "news",
- "category", "technology",
- "id", "42")
-```
-
-All variables defined in the route are required, and their values must conform to the corresponding patterns. These requirements guarantee that a generated URL will always match a registered route -- the only exception is for explicitly defined "build-only" routes which never match.
-
-Regex support also exists for matching Headers within a route. For example, we could do:
-
-```go
-r.HeadersRegexp("Content-Type", "application/(text|json)")
-```
-
-...and the route will match both requests with a Content-Type of `application/json` as well as `application/text`
-
-There's also a way to build only the URL host or path for a route: use the methods `URLHost()` or `URLPath()` instead. For the previous route, we would do:
-
-```go
-// "http://news.domain.com/"
-host, err := r.Get("article").URLHost("subdomain", "news")
-
-// "/articles/technology/42"
-path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-```
-
-And if you use subrouters, host and path defined separately can be built as well:
-
-```go
-r := mux.NewRouter()
-s := r.Host("{subdomain}.domain.com").Subrouter()
-s.Path("/articles/{category}/{id:[0-9]+}").
- HandlerFunc(ArticleHandler).
- Name("article")
-
-// "http://news.domain.com/articles/technology/42"
-url, err := r.Get("article").URL("subdomain", "news",
- "category", "technology",
- "id", "42")
-```
-
-## Full Example
-
-Here's a complete, runnable example of a small `mux` based server:
-
-```go
-package main
-
-import (
- "net/http"
-
- "github.com/gorilla/mux"
-)
-
-func YourHandler(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte("Gorilla!\n"))
-}
-
-func main() {
- r := mux.NewRouter()
- // Routes consist of a path and a handler function.
- r.HandleFunc("/", YourHandler)
-
- // Bind to a port and pass our router in
- http.ListenAndServe(":8000", r)
-}
-```
-
-## License
-
-BSD licensed. See the LICENSE file for details.
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/bench_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/bench_test.go
deleted file mode 100644
index c5f97b2b2a80b42d6cd21f2b3de9f9a0d3f5e788..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/bench_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
- "net/http"
- "testing"
-)
-
-func BenchmarkMux(b *testing.B) {
- router := new(Router)
- handler := func(w http.ResponseWriter, r *http.Request) {}
- router.HandleFunc("/v1/{v1}", handler)
-
- request, _ := http.NewRequest("GET", "/v1/anything", nil)
- for i := 0; i < b.N; i++ {
- router.ServeHTTP(nil, request)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
deleted file mode 100644
index 49798cb5cf5291db6bc3eee2ad4d168c647b4166..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/doc.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package gorilla/mux implements a request router and dispatcher.
-
-The name mux stands for "HTTP request multiplexer". Like the standard
-http.ServeMux, mux.Router matches incoming requests against a list of
-registered routes and calls a handler for the route that matches the URL
-or other conditions. The main features are:
-
- * Requests can be matched based on URL host, path, path prefix, schemes,
- header and query values, HTTP methods or using custom matchers.
- * URL hosts and paths can have variables with an optional regular
- expression.
- * Registered URLs can be built, or "reversed", which helps maintaining
- references to resources.
- * Routes can be used as subrouters: nested routes are only tested if the
- parent route matches. This is useful to define groups of routes that
- share common conditions like a host, a path prefix or other repeated
- attributes. As a bonus, this optimizes request matching.
- * It implements the http.Handler interface so it is compatible with the
- standard http.ServeMux.
-
-Let's start registering a couple of URL paths and handlers:
-
- func main() {
- r := mux.NewRouter()
- r.HandleFunc("/", HomeHandler)
- r.HandleFunc("/products", ProductsHandler)
- r.HandleFunc("/articles", ArticlesHandler)
- http.Handle("/", r)
- }
-
-Here we register three routes mapping URL paths to handlers. This is
-equivalent to how http.HandleFunc() works: if an incoming request URL matches
-one of the paths, the corresponding handler is called passing
-(http.ResponseWriter, *http.Request) as parameters.
-
-Paths can have variables. They are defined using the format {name} or
-{name:pattern}. If a regular expression pattern is not defined, the matched
-variable will be anything until the next slash. For example:
-
- r := mux.NewRouter()
- r.HandleFunc("/products/{key}", ProductHandler)
- r.HandleFunc("/articles/{category}/", ArticlesCategoryHandler)
- r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler)
-
-The names are used to create a map of route variables which can be retrieved
-calling mux.Vars():
-
- vars := mux.Vars(request)
- category := vars["category"]
-
-And this is all you need to know about the basic usage. More advanced options
-are explained below.
-
-Routes can also be restricted to a domain or subdomain. Just define a host
-pattern to be matched. They can also have variables:
-
- r := mux.NewRouter()
- // Only matches if domain is "www.example.com".
- r.Host("www.example.com")
- // Matches a dynamic subdomain.
- r.Host("{subdomain:[a-z]+}.domain.com")
-
-There are several other matchers that can be added. To match path prefixes:
-
- r.PathPrefix("/products/")
-
-...or HTTP methods:
-
- r.Methods("GET", "POST")
-
-...or URL schemes:
-
- r.Schemes("https")
-
-...or header values:
-
- r.Headers("X-Requested-With", "XMLHttpRequest")
-
-...or query values:
-
- r.Queries("key", "value")
-
-...or to use a custom matcher function:
-
- r.MatcherFunc(func(r *http.Request, rm *RouteMatch) bool {
- return r.ProtoMajor == 0
- })
-
-...and finally, it is possible to combine several matchers in a single route:
-
- r.HandleFunc("/products", ProductsHandler).
- Host("www.example.com").
- Methods("GET").
- Schemes("http")
-
-Setting the same matching conditions again and again can be boring, so we have
-a way to group several routes that share the same requirements.
-We call it "subrouting".
-
-For example, let's say we have several URLs that should only match when the
-host is "www.example.com". Create a route for that host and get a "subrouter"
-from it:
-
- r := mux.NewRouter()
- s := r.Host("www.example.com").Subrouter()
-
-Then register routes in the subrouter:
-
- s.HandleFunc("/products/", ProductsHandler)
- s.HandleFunc("/products/{key}", ProductHandler)
- s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-
-The three URL paths we registered above will only be tested if the domain is
-"www.example.com", because the subrouter is tested first. This is not
-only convenient, but also optimizes request matching. You can create
-subrouters combining any attribute matchers accepted by a route.
-
-Subrouters can be used to create domain or path "namespaces": you define
-subrouters in a central place and then parts of the app can register its
-paths relatively to a given subrouter.
-
-There's one more thing about subroutes. When a subrouter has a path prefix,
-the inner routes use it as base for their paths:
-
- r := mux.NewRouter()
- s := r.PathPrefix("/products").Subrouter()
- // "/products/"
- s.HandleFunc("/", ProductsHandler)
- // "/products/{key}/"
- s.HandleFunc("/{key}/", ProductHandler)
- // "/products/{key}/details"
- s.HandleFunc("/{key}/details", ProductDetailsHandler)
-
-Now let's see how to build registered URLs.
-
-Routes can be named. All routes that define a name can have their URLs built,
-or "reversed". We define a name calling Name() on a route. For example:
-
- r := mux.NewRouter()
- r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
- Name("article")
-
-To build a URL, get the route and call the URL() method, passing a sequence of
-key/value pairs for the route variables. For the previous route, we would do:
-
- url, err := r.Get("article").URL("category", "technology", "id", "42")
-
-...and the result will be a url.URL with the following path:
-
- "/articles/technology/42"
-
-This also works for host variables:
-
- r := mux.NewRouter()
- r.Host("{subdomain}.domain.com").
- Path("/articles/{category}/{id:[0-9]+}").
- HandlerFunc(ArticleHandler).
- Name("article")
-
- // url.String() will be "http://news.domain.com/articles/technology/42"
- url, err := r.Get("article").URL("subdomain", "news",
- "category", "technology",
- "id", "42")
-
-All variables defined in the route are required, and their values must
-conform to the corresponding patterns. These requirements guarantee that a
-generated URL will always match a registered route -- the only exception is
-for explicitly defined "build-only" routes which never match.
-
-Regex support also exists for matching Headers within a route. For example, we could do:
-
- r.HeadersRegexp("Content-Type", "application/(text|json)")
-
-...and the route will match both requests with a Content-Type of `application/json` as well as
-`application/text`
-
-There's also a way to build only the URL host or path for a route:
-use the methods URLHost() or URLPath() instead. For the previous route,
-we would do:
-
- // "http://news.domain.com/"
- host, err := r.Get("article").URLHost("subdomain", "news")
-
- // "/articles/technology/42"
- path, err := r.Get("article").URLPath("category", "technology", "id", "42")
-
-And if you use subrouters, host and path defined separately can be built
-as well:
-
- r := mux.NewRouter()
- s := r.Host("{subdomain}.domain.com").Subrouter()
- s.Path("/articles/{category}/{id:[0-9]+}").
- HandlerFunc(ArticleHandler).
- Name("article")
-
- // "http://news.domain.com/articles/technology/42"
- url, err := r.Get("article").URL("subdomain", "news",
- "category", "technology",
- "id", "42")
-*/
-package mux
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
deleted file mode 100644
index cb03ddfe533db31c5420a877081bb69d8f9cd494..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux.go
+++ /dev/null
@@ -1,481 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
- "errors"
- "fmt"
- "net/http"
- "path"
- "regexp"
-
- "github.com/fsouza/go-dockerclient/external/github.com/gorilla/context"
-)
-
-// NewRouter returns a new router instance.
-func NewRouter() *Router {
- return &Router{namedRoutes: make(map[string]*Route), KeepContext: false}
-}
-
-// Router registers routes to be matched and dispatches a handler.
-//
-// It implements the http.Handler interface, so it can be registered to serve
-// requests:
-//
-// var router = mux.NewRouter()
-//
-// func main() {
-// http.Handle("/", router)
-// }
-//
-// Or, for Google App Engine, register it in a init() function:
-//
-// func init() {
-// http.Handle("/", router)
-// }
-//
-// This will send all incoming requests to the router.
-type Router struct {
- // Configurable Handler to be used when no route matches.
- NotFoundHandler http.Handler
- // Parent route, if this is a subrouter.
- parent parentRoute
- // Routes to be matched, in order.
- routes []*Route
- // Routes by name for URL building.
- namedRoutes map[string]*Route
- // See Router.StrictSlash(). This defines the flag for new routes.
- strictSlash bool
- // If true, do not clear the request context after handling the request
- KeepContext bool
-}
-
-// Match matches registered routes against the request.
-func (r *Router) Match(req *http.Request, match *RouteMatch) bool {
- for _, route := range r.routes {
- if route.Match(req, match) {
- return true
- }
- }
-
- // Closest match for a router (includes sub-routers)
- if r.NotFoundHandler != nil {
- match.Handler = r.NotFoundHandler
- return true
- }
- return false
-}
-
-// ServeHTTP dispatches the handler registered in the matched route.
-//
-// When there is a match, the route variables can be retrieved calling
-// mux.Vars(request).
-func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
- // Clean path to canonical form and redirect.
- if p := cleanPath(req.URL.Path); p != req.URL.Path {
-
- // Added 3 lines (Philip Schlump) - It was dropping the query string and #whatever from query.
- // This matches with fix in go 1.2 r.c. 4 for same problem. Go Issue:
- // http://code.google.com/p/go/issues/detail?id=5252
- url := *req.URL
- url.Path = p
- p = url.String()
-
- w.Header().Set("Location", p)
- w.WriteHeader(http.StatusMovedPermanently)
- return
- }
- var match RouteMatch
- var handler http.Handler
- if r.Match(req, &match) {
- handler = match.Handler
- setVars(req, match.Vars)
- setCurrentRoute(req, match.Route)
- }
- if handler == nil {
- handler = http.NotFoundHandler()
- }
- if !r.KeepContext {
- defer context.Clear(req)
- }
- handler.ServeHTTP(w, req)
-}
-
-// Get returns a route registered with the given name.
-func (r *Router) Get(name string) *Route {
- return r.getNamedRoutes()[name]
-}
-
-// GetRoute returns a route registered with the given name. This method
-// was renamed to Get() and remains here for backwards compatibility.
-func (r *Router) GetRoute(name string) *Route {
- return r.getNamedRoutes()[name]
-}
-
-// StrictSlash defines the trailing slash behavior for new routes. The initial
-// value is false.
-//
-// When true, if the route path is "/path/", accessing "/path" will redirect
-// to the former and vice versa. In other words, your application will always
-// see the path as specified in the route.
-//
-// When false, if the route path is "/path", accessing "/path/" will not match
-// this route and vice versa.
-//
-// Special case: when a route sets a path prefix using the PathPrefix() method,
-// strict slash is ignored for that route because the redirect behavior can't
-// be determined from a prefix alone. However, any subrouters created from that
-// route inherit the original StrictSlash setting.
-func (r *Router) StrictSlash(value bool) *Router {
- r.strictSlash = value
- return r
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Router) getNamedRoutes() map[string]*Route {
- if r.namedRoutes == nil {
- if r.parent != nil {
- r.namedRoutes = r.parent.getNamedRoutes()
- } else {
- r.namedRoutes = make(map[string]*Route)
- }
- }
- return r.namedRoutes
-}
-
-// getRegexpGroup returns regexp definitions from the parent route, if any.
-func (r *Router) getRegexpGroup() *routeRegexpGroup {
- if r.parent != nil {
- return r.parent.getRegexpGroup()
- }
- return nil
-}
-
-func (r *Router) buildVars(m map[string]string) map[string]string {
- if r.parent != nil {
- m = r.parent.buildVars(m)
- }
- return m
-}
-
-// ----------------------------------------------------------------------------
-// Route factories
-// ----------------------------------------------------------------------------
-
-// NewRoute registers an empty route.
-func (r *Router) NewRoute() *Route {
- route := &Route{parent: r, strictSlash: r.strictSlash}
- r.routes = append(r.routes, route)
- return route
-}
-
-// Handle registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.Handler().
-func (r *Router) Handle(path string, handler http.Handler) *Route {
- return r.NewRoute().Path(path).Handler(handler)
-}
-
-// HandleFunc registers a new route with a matcher for the URL path.
-// See Route.Path() and Route.HandlerFunc().
-func (r *Router) HandleFunc(path string, f func(http.ResponseWriter,
- *http.Request)) *Route {
- return r.NewRoute().Path(path).HandlerFunc(f)
-}
-
-// Headers registers a new route with a matcher for request header values.
-// See Route.Headers().
-func (r *Router) Headers(pairs ...string) *Route {
- return r.NewRoute().Headers(pairs...)
-}
-
-// Host registers a new route with a matcher for the URL host.
-// See Route.Host().
-func (r *Router) Host(tpl string) *Route {
- return r.NewRoute().Host(tpl)
-}
-
-// MatcherFunc registers a new route with a custom matcher function.
-// See Route.MatcherFunc().
-func (r *Router) MatcherFunc(f MatcherFunc) *Route {
- return r.NewRoute().MatcherFunc(f)
-}
-
-// Methods registers a new route with a matcher for HTTP methods.
-// See Route.Methods().
-func (r *Router) Methods(methods ...string) *Route {
- return r.NewRoute().Methods(methods...)
-}
-
-// Path registers a new route with a matcher for the URL path.
-// See Route.Path().
-func (r *Router) Path(tpl string) *Route {
- return r.NewRoute().Path(tpl)
-}
-
-// PathPrefix registers a new route with a matcher for the URL path prefix.
-// See Route.PathPrefix().
-func (r *Router) PathPrefix(tpl string) *Route {
- return r.NewRoute().PathPrefix(tpl)
-}
-
-// Queries registers a new route with a matcher for URL query values.
-// See Route.Queries().
-func (r *Router) Queries(pairs ...string) *Route {
- return r.NewRoute().Queries(pairs...)
-}
-
-// Schemes registers a new route with a matcher for URL schemes.
-// See Route.Schemes().
-func (r *Router) Schemes(schemes ...string) *Route {
- return r.NewRoute().Schemes(schemes...)
-}
-
-// BuildVars registers a new route with a custom function for modifying
-// route variables before building a URL.
-func (r *Router) BuildVarsFunc(f BuildVarsFunc) *Route {
- return r.NewRoute().BuildVarsFunc(f)
-}
-
-// Walk walks the router and all its sub-routers, calling walkFn for each route
-// in the tree. The routes are walked in the order they were added. Sub-routers
-// are explored depth-first.
-func (r *Router) Walk(walkFn WalkFunc) error {
- return r.walk(walkFn, []*Route{})
-}
-
-// SkipRouter is used as a return value from WalkFuncs to indicate that the
-// router that walk is about to descend down to should be skipped.
-var SkipRouter = errors.New("skip this router")
-
-// WalkFunc is the type of the function called for each route visited by Walk.
-// At every invocation, it is given the current route, and the current router,
-// and a list of ancestor routes that lead to the current route.
-type WalkFunc func(route *Route, router *Router, ancestors []*Route) error
-
-func (r *Router) walk(walkFn WalkFunc, ancestors []*Route) error {
- for _, t := range r.routes {
- if t.regexp == nil || t.regexp.path == nil || t.regexp.path.template == "" {
- continue
- }
-
- err := walkFn(t, r, ancestors)
- if err == SkipRouter {
- continue
- }
- for _, sr := range t.matchers {
- if h, ok := sr.(*Router); ok {
- err := h.walk(walkFn, ancestors)
- if err != nil {
- return err
- }
- }
- }
- if h, ok := t.handler.(*Router); ok {
- ancestors = append(ancestors, t)
- err := h.walk(walkFn, ancestors)
- if err != nil {
- return err
- }
- ancestors = ancestors[:len(ancestors)-1]
- }
- }
- return nil
-}
-
-// ----------------------------------------------------------------------------
-// Context
-// ----------------------------------------------------------------------------
-
-// RouteMatch stores information about a matched route.
-type RouteMatch struct {
- Route *Route
- Handler http.Handler
- Vars map[string]string
-}
-
-type contextKey int
-
-const (
- varsKey contextKey = iota
- routeKey
-)
-
-// Vars returns the route variables for the current request, if any.
-func Vars(r *http.Request) map[string]string {
- if rv := context.Get(r, varsKey); rv != nil {
- return rv.(map[string]string)
- }
- return nil
-}
-
-// CurrentRoute returns the matched route for the current request, if any.
-// This only works when called inside the handler of the matched route
-// because the matched route is stored in the request context which is cleared
-// after the handler returns, unless the KeepContext option is set on the
-// Router.
-func CurrentRoute(r *http.Request) *Route {
- if rv := context.Get(r, routeKey); rv != nil {
- return rv.(*Route)
- }
- return nil
-}
-
-func setVars(r *http.Request, val interface{}) {
- if val != nil {
- context.Set(r, varsKey, val)
- }
-}
-
-func setCurrentRoute(r *http.Request, val interface{}) {
- if val != nil {
- context.Set(r, routeKey, val)
- }
-}
-
-// ----------------------------------------------------------------------------
-// Helpers
-// ----------------------------------------------------------------------------
-
-// cleanPath returns the canonical path for p, eliminating . and .. elements.
-// Borrowed from the net/http package.
-func cleanPath(p string) string {
- if p == "" {
- return "/"
- }
- if p[0] != '/' {
- p = "/" + p
- }
- np := path.Clean(p)
- // path.Clean removes trailing slash except for root;
- // put the trailing slash back if necessary.
- if p[len(p)-1] == '/' && np != "/" {
- np += "/"
- }
- return np
-}
-
-// uniqueVars returns an error if two slices contain duplicated strings.
-func uniqueVars(s1, s2 []string) error {
- for _, v1 := range s1 {
- for _, v2 := range s2 {
- if v1 == v2 {
- return fmt.Errorf("mux: duplicated route variable %q", v2)
- }
- }
- }
- return nil
-}
-
-// checkPairs returns the count of strings passed in, and an error if
-// the count is not an even number.
-func checkPairs(pairs ...string) (int, error) {
- length := len(pairs)
- if length%2 != 0 {
- return length, fmt.Errorf(
- "mux: number of parameters must be multiple of 2, got %v", pairs)
- }
- return length, nil
-}
-
-// mapFromPairsToString converts variadic string parameters to a
-// string to string map.
-func mapFromPairsToString(pairs ...string) (map[string]string, error) {
- length, err := checkPairs(pairs...)
- if err != nil {
- return nil, err
- }
- m := make(map[string]string, length/2)
- for i := 0; i < length; i += 2 {
- m[pairs[i]] = pairs[i+1]
- }
- return m, nil
-}
-
-// mapFromPairsToRegex converts variadic string paramers to a
-// string to regex map.
-func mapFromPairsToRegex(pairs ...string) (map[string]*regexp.Regexp, error) {
- length, err := checkPairs(pairs...)
- if err != nil {
- return nil, err
- }
- m := make(map[string]*regexp.Regexp, length/2)
- for i := 0; i < length; i += 2 {
- regex, err := regexp.Compile(pairs[i+1])
- if err != nil {
- return nil, err
- }
- m[pairs[i]] = regex
- }
- return m, nil
-}
-
-// matchInArray returns true if the given string value is in the array.
-func matchInArray(arr []string, value string) bool {
- for _, v := range arr {
- if v == value {
- return true
- }
- }
- return false
-}
-
-// matchMapWithString returns true if the given key/value pairs exist in a given map.
-func matchMapWithString(toCheck map[string]string, toMatch map[string][]string, canonicalKey bool) bool {
- for k, v := range toCheck {
- // Check if key exists.
- if canonicalKey {
- k = http.CanonicalHeaderKey(k)
- }
- if values := toMatch[k]; values == nil {
- return false
- } else if v != "" {
- // If value was defined as an empty string we only check that the
- // key exists. Otherwise we also check for equality.
- valueExists := false
- for _, value := range values {
- if v == value {
- valueExists = true
- break
- }
- }
- if !valueExists {
- return false
- }
- }
- }
- return true
-}
-
-// matchMapWithRegex returns true if the given key/value pairs exist in a given map compiled against
-// the given regex
-func matchMapWithRegex(toCheck map[string]*regexp.Regexp, toMatch map[string][]string, canonicalKey bool) bool {
- for k, v := range toCheck {
- // Check if key exists.
- if canonicalKey {
- k = http.CanonicalHeaderKey(k)
- }
- if values := toMatch[k]; values == nil {
- return false
- } else if v != nil {
- // If value was defined as an empty string we only check that the
- // key exists. Otherwise we also check for equality.
- valueExists := false
- for _, value := range values {
- if v.MatchString(value) {
- valueExists = true
- break
- }
- }
- if !valueExists {
- return false
- }
- }
- }
- return true
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux_test.go
deleted file mode 100644
index 98f73fe9c25dd1d4deb688fd0a293f4b244e6a88..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/mux_test.go
+++ /dev/null
@@ -1,1358 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
- "fmt"
- "net/http"
- "strings"
- "testing"
-
- "github.com/fsouza/go-dockerclient/external/github.com/gorilla/context"
-)
-
-func (r *Route) GoString() string {
- matchers := make([]string, len(r.matchers))
- for i, m := range r.matchers {
- matchers[i] = fmt.Sprintf("%#v", m)
- }
- return fmt.Sprintf("&Route{matchers:[]matcher{%s}}", strings.Join(matchers, ", "))
-}
-
-func (r *routeRegexp) GoString() string {
- return fmt.Sprintf("&routeRegexp{template: %q, matchHost: %t, matchQuery: %t, strictSlash: %t, regexp: regexp.MustCompile(%q), reverse: %q, varsN: %v, varsR: %v", r.template, r.matchHost, r.matchQuery, r.strictSlash, r.regexp.String(), r.reverse, r.varsN, r.varsR)
-}
-
-type routeTest struct {
- title string // title of the test
- route *Route // the route being tested
- request *http.Request // a request to test the route
- vars map[string]string // the expected vars of the match
- host string // the expected host of the match
- path string // the expected path of the match
- shouldMatch bool // whether the request is expected to match the route at all
- shouldRedirect bool // whether the request should result in a redirect
-}
-
-func TestHost(t *testing.T) {
- // newRequestHost a new request with a method, url, and host header
- newRequestHost := func(method, url, host string) *http.Request {
- req, err := http.NewRequest(method, url, nil)
- if err != nil {
- panic(err)
- }
- req.Host = host
- return req
- }
-
- tests := []routeTest{
- {
- title: "Host route match",
- route: new(Route).Host("aaa.bbb.ccc"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route, wrong host in request URL",
- route: new(Route).Host("aaa.bbb.ccc"),
- request: newRequest("GET", "http://aaa.222.ccc/111/222/333"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Host route with port, match",
- route: new(Route).Host("aaa.bbb.ccc:1234"),
- request: newRequest("GET", "http://aaa.bbb.ccc:1234/111/222/333"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc:1234",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route with port, wrong port in request URL",
- route: new(Route).Host("aaa.bbb.ccc:1234"),
- request: newRequest("GET", "http://aaa.bbb.ccc:9999/111/222/333"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc:1234",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Host route, match with host in request header",
- route: new(Route).Host("aaa.bbb.ccc"),
- request: newRequestHost("GET", "/111/222/333", "aaa.bbb.ccc"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route, wrong host in request header",
- route: new(Route).Host("aaa.bbb.ccc"),
- request: newRequestHost("GET", "/111/222/333", "aaa.222.ccc"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: false,
- },
- // BUG {new(Route).Host("aaa.bbb.ccc:1234"), newRequestHost("GET", "/111/222/333", "aaa.bbb.ccc:1234"), map[string]string{}, "aaa.bbb.ccc:1234", "", true},
- {
- title: "Host route with port, wrong host in request header",
- route: new(Route).Host("aaa.bbb.ccc:1234"),
- request: newRequestHost("GET", "/111/222/333", "aaa.bbb.ccc:9999"),
- vars: map[string]string{},
- host: "aaa.bbb.ccc:1234",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Host route with pattern, match",
- route: new(Route).Host("aaa.{v1:[a-z]{3}}.ccc"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v1": "bbb"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route with pattern, additional capturing group, match",
- route: new(Route).Host("aaa.{v1:[a-z]{2}(b|c)}.ccc"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v1": "bbb"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route with pattern, wrong host in request URL",
- route: new(Route).Host("aaa.{v1:[a-z]{3}}.ccc"),
- request: newRequest("GET", "http://aaa.222.ccc/111/222/333"),
- vars: map[string]string{"v1": "bbb"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Host route with multiple patterns, match",
- route: new(Route).Host("{v1:[a-z]{3}}.{v2:[a-z]{3}}.{v3:[a-z]{3}}"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v1": "aaa", "v2": "bbb", "v3": "ccc"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route with multiple patterns, wrong host in request URL",
- route: new(Route).Host("{v1:[a-z]{3}}.{v2:[a-z]{3}}.{v3:[a-z]{3}}"),
- request: newRequest("GET", "http://aaa.222.ccc/111/222/333"),
- vars: map[string]string{"v1": "aaa", "v2": "bbb", "v3": "ccc"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Host route with hyphenated name and pattern, match",
- route: new(Route).Host("aaa.{v-1:[a-z]{3}}.ccc"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v-1": "bbb"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route with hyphenated name and pattern, additional capturing group, match",
- route: new(Route).Host("aaa.{v-1:[a-z]{2}(b|c)}.ccc"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v-1": "bbb"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host route with multiple hyphenated names and patterns, match",
- route: new(Route).Host("{v-1:[a-z]{3}}.{v-2:[a-z]{3}}.{v-3:[a-z]{3}}"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v-1": "aaa", "v-2": "bbb", "v-3": "ccc"},
- host: "aaa.bbb.ccc",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Path route with single pattern with pipe, match",
- route: new(Route).Path("/{category:a|b/c}"),
- request: newRequest("GET", "http://localhost/a"),
- vars: map[string]string{"category": "a"},
- host: "",
- path: "/a",
- shouldMatch: true,
- },
- {
- title: "Path route with single pattern with pipe, match",
- route: new(Route).Path("/{category:a|b/c}"),
- request: newRequest("GET", "http://localhost/b/c"),
- vars: map[string]string{"category": "b/c"},
- host: "",
- path: "/b/c",
- shouldMatch: true,
- },
- {
- title: "Path route with multiple patterns with pipe, match",
- route: new(Route).Path("/{category:a|b/c}/{product}/{id:[0-9]+}"),
- request: newRequest("GET", "http://localhost/a/product_name/1"),
- vars: map[string]string{"category": "a", "product": "product_name", "id": "1"},
- host: "",
- path: "/a/product_name/1",
- shouldMatch: true,
- },
- {
- title: "Path route with multiple patterns with pipe, match",
- route: new(Route).Path("/{category:a|b/c}/{product}/{id:[0-9]+}"),
- request: newRequest("GET", "http://localhost/b/c/product_name/1"),
- vars: map[string]string{"category": "b/c", "product": "product_name", "id": "1"},
- host: "",
- path: "/b/c/product_name/1",
- shouldMatch: true,
- },
- }
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestPath(t *testing.T) {
- tests := []routeTest{
- {
- title: "Path route, match",
- route: new(Route).Path("/111/222/333"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{},
- host: "",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Path route, match with trailing slash in request and path",
- route: new(Route).Path("/111/"),
- request: newRequest("GET", "http://localhost/111/"),
- vars: map[string]string{},
- host: "",
- path: "/111/",
- shouldMatch: true,
- },
- {
- title: "Path route, do not match with trailing slash in path",
- route: new(Route).Path("/111/"),
- request: newRequest("GET", "http://localhost/111"),
- vars: map[string]string{},
- host: "",
- path: "/111",
- shouldMatch: false,
- },
- {
- title: "Path route, do not match with trailing slash in request",
- route: new(Route).Path("/111"),
- request: newRequest("GET", "http://localhost/111/"),
- vars: map[string]string{},
- host: "",
- path: "/111/",
- shouldMatch: false,
- },
- {
- title: "Path route, wrong path in request in request URL",
- route: new(Route).Path("/111/222/333"),
- request: newRequest("GET", "http://localhost/1/2/3"),
- vars: map[string]string{},
- host: "",
- path: "/111/222/333",
- shouldMatch: false,
- },
- {
- title: "Path route with pattern, match",
- route: new(Route).Path("/111/{v1:[0-9]{3}}/333"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{"v1": "222"},
- host: "",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Path route with pattern, URL in request does not match",
- route: new(Route).Path("/111/{v1:[0-9]{3}}/333"),
- request: newRequest("GET", "http://localhost/111/aaa/333"),
- vars: map[string]string{"v1": "222"},
- host: "",
- path: "/111/222/333",
- shouldMatch: false,
- },
- {
- title: "Path route with multiple patterns, match",
- route: new(Route).Path("/{v1:[0-9]{3}}/{v2:[0-9]{3}}/{v3:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{"v1": "111", "v2": "222", "v3": "333"},
- host: "",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Path route with multiple patterns, URL in request does not match",
- route: new(Route).Path("/{v1:[0-9]{3}}/{v2:[0-9]{3}}/{v3:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/aaa/333"),
- vars: map[string]string{"v1": "111", "v2": "222", "v3": "333"},
- host: "",
- path: "/111/222/333",
- shouldMatch: false,
- },
- {
- title: "Path route with multiple patterns with pipe, match",
- route: new(Route).Path("/{category:a|(b/c)}/{product}/{id:[0-9]+}"),
- request: newRequest("GET", "http://localhost/a/product_name/1"),
- vars: map[string]string{"category": "a", "product": "product_name", "id": "1"},
- host: "",
- path: "/a/product_name/1",
- shouldMatch: true,
- },
- {
- title: "Path route with hyphenated name and pattern, match",
- route: new(Route).Path("/111/{v-1:[0-9]{3}}/333"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{"v-1": "222"},
- host: "",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Path route with multiple hyphenated names and patterns, match",
- route: new(Route).Path("/{v-1:[0-9]{3}}/{v-2:[0-9]{3}}/{v-3:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{"v-1": "111", "v-2": "222", "v-3": "333"},
- host: "",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Path route with multiple hyphenated names and patterns with pipe, match",
- route: new(Route).Path("/{product-category:a|(b/c)}/{product-name}/{product-id:[0-9]+}"),
- request: newRequest("GET", "http://localhost/a/product_name/1"),
- vars: map[string]string{"product-category": "a", "product-name": "product_name", "product-id": "1"},
- host: "",
- path: "/a/product_name/1",
- shouldMatch: true,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestPathPrefix(t *testing.T) {
- tests := []routeTest{
- {
- title: "PathPrefix route, match",
- route: new(Route).PathPrefix("/111"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{},
- host: "",
- path: "/111",
- shouldMatch: true,
- },
- {
- title: "PathPrefix route, match substring",
- route: new(Route).PathPrefix("/1"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{},
- host: "",
- path: "/1",
- shouldMatch: true,
- },
- {
- title: "PathPrefix route, URL prefix in request does not match",
- route: new(Route).PathPrefix("/111"),
- request: newRequest("GET", "http://localhost/1/2/3"),
- vars: map[string]string{},
- host: "",
- path: "/111",
- shouldMatch: false,
- },
- {
- title: "PathPrefix route with pattern, match",
- route: new(Route).PathPrefix("/111/{v1:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{"v1": "222"},
- host: "",
- path: "/111/222",
- shouldMatch: true,
- },
- {
- title: "PathPrefix route with pattern, URL prefix in request does not match",
- route: new(Route).PathPrefix("/111/{v1:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/aaa/333"),
- vars: map[string]string{"v1": "222"},
- host: "",
- path: "/111/222",
- shouldMatch: false,
- },
- {
- title: "PathPrefix route with multiple patterns, match",
- route: new(Route).PathPrefix("/{v1:[0-9]{3}}/{v2:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/222/333"),
- vars: map[string]string{"v1": "111", "v2": "222"},
- host: "",
- path: "/111/222",
- shouldMatch: true,
- },
- {
- title: "PathPrefix route with multiple patterns, URL prefix in request does not match",
- route: new(Route).PathPrefix("/{v1:[0-9]{3}}/{v2:[0-9]{3}}"),
- request: newRequest("GET", "http://localhost/111/aaa/333"),
- vars: map[string]string{"v1": "111", "v2": "222"},
- host: "",
- path: "/111/222",
- shouldMatch: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestHostPath(t *testing.T) {
- tests := []routeTest{
- {
- title: "Host and Path route, match",
- route: new(Route).Host("aaa.bbb.ccc").Path("/111/222/333"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Host and Path route, wrong host in request URL",
- route: new(Route).Host("aaa.bbb.ccc").Path("/111/222/333"),
- request: newRequest("GET", "http://aaa.222.ccc/111/222/333"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Host and Path route with pattern, match",
- route: new(Route).Host("aaa.{v1:[a-z]{3}}.ccc").Path("/111/{v2:[0-9]{3}}/333"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v1": "bbb", "v2": "222"},
- host: "aaa.bbb.ccc",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Host and Path route with pattern, URL in request does not match",
- route: new(Route).Host("aaa.{v1:[a-z]{3}}.ccc").Path("/111/{v2:[0-9]{3}}/333"),
- request: newRequest("GET", "http://aaa.222.ccc/111/222/333"),
- vars: map[string]string{"v1": "bbb", "v2": "222"},
- host: "aaa.bbb.ccc",
- path: "/111/222/333",
- shouldMatch: false,
- },
- {
- title: "Host and Path route with multiple patterns, match",
- route: new(Route).Host("{v1:[a-z]{3}}.{v2:[a-z]{3}}.{v3:[a-z]{3}}").Path("/{v4:[0-9]{3}}/{v5:[0-9]{3}}/{v6:[0-9]{3}}"),
- request: newRequest("GET", "http://aaa.bbb.ccc/111/222/333"),
- vars: map[string]string{"v1": "aaa", "v2": "bbb", "v3": "ccc", "v4": "111", "v5": "222", "v6": "333"},
- host: "aaa.bbb.ccc",
- path: "/111/222/333",
- shouldMatch: true,
- },
- {
- title: "Host and Path route with multiple patterns, URL in request does not match",
- route: new(Route).Host("{v1:[a-z]{3}}.{v2:[a-z]{3}}.{v3:[a-z]{3}}").Path("/{v4:[0-9]{3}}/{v5:[0-9]{3}}/{v6:[0-9]{3}}"),
- request: newRequest("GET", "http://aaa.222.ccc/111/222/333"),
- vars: map[string]string{"v1": "aaa", "v2": "bbb", "v3": "ccc", "v4": "111", "v5": "222", "v6": "333"},
- host: "aaa.bbb.ccc",
- path: "/111/222/333",
- shouldMatch: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestHeaders(t *testing.T) {
- // newRequestHeaders creates a new request with a method, url, and headers
- newRequestHeaders := func(method, url string, headers map[string]string) *http.Request {
- req, err := http.NewRequest(method, url, nil)
- if err != nil {
- panic(err)
- }
- for k, v := range headers {
- req.Header.Add(k, v)
- }
- return req
- }
-
- tests := []routeTest{
- {
- title: "Headers route, match",
- route: new(Route).Headers("foo", "bar", "baz", "ding"),
- request: newRequestHeaders("GET", "http://localhost", map[string]string{"foo": "bar", "baz": "ding"}),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Headers route, bad header values",
- route: new(Route).Headers("foo", "bar", "baz", "ding"),
- request: newRequestHeaders("GET", "http://localhost", map[string]string{"foo": "bar", "baz": "dong"}),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Headers route, regex header values to match",
- route: new(Route).Headers("foo", "ba[zr]"),
- request: newRequestHeaders("GET", "http://localhost", map[string]string{"foo": "bar"}),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Headers route, regex header values to match",
- route: new(Route).HeadersRegexp("foo", "ba[zr]"),
- request: newRequestHeaders("GET", "http://localhost", map[string]string{"foo": "baz"}),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-
-}
-
-func TestMethods(t *testing.T) {
- tests := []routeTest{
- {
- title: "Methods route, match GET",
- route: new(Route).Methods("GET", "POST"),
- request: newRequest("GET", "http://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Methods route, match POST",
- route: new(Route).Methods("GET", "POST"),
- request: newRequest("POST", "http://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Methods route, bad method",
- route: new(Route).Methods("GET", "POST"),
- request: newRequest("PUT", "http://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestQueries(t *testing.T) {
- tests := []routeTest{
- {
- title: "Queries route, match",
- route: new(Route).Queries("foo", "bar", "baz", "ding"),
- request: newRequest("GET", "http://localhost?foo=bar&baz=ding"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route, match with a query string",
- route: new(Route).Host("www.example.com").Path("/api").Queries("foo", "bar", "baz", "ding"),
- request: newRequest("GET", "http://www.example.com/api?foo=bar&baz=ding"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route, match with a query string out of order",
- route: new(Route).Host("www.example.com").Path("/api").Queries("foo", "bar", "baz", "ding"),
- request: newRequest("GET", "http://www.example.com/api?baz=ding&foo=bar"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route, bad query",
- route: new(Route).Queries("foo", "bar", "baz", "ding"),
- request: newRequest("GET", "http://localhost?foo=bar&baz=dong"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with pattern, match",
- route: new(Route).Queries("foo", "{v1}"),
- request: newRequest("GET", "http://localhost?foo=bar"),
- vars: map[string]string{"v1": "bar"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with multiple patterns, match",
- route: new(Route).Queries("foo", "{v1}", "baz", "{v2}"),
- request: newRequest("GET", "http://localhost?foo=bar&baz=ding"),
- vars: map[string]string{"v1": "bar", "v2": "ding"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with regexp pattern, match",
- route: new(Route).Queries("foo", "{v1:[0-9]+}"),
- request: newRequest("GET", "http://localhost?foo=10"),
- vars: map[string]string{"v1": "10"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with regexp pattern, regexp does not match",
- route: new(Route).Queries("foo", "{v1:[0-9]+}"),
- request: newRequest("GET", "http://localhost?foo=a"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with regexp pattern with quantifier, match",
- route: new(Route).Queries("foo", "{v1:[0-9]{1}}"),
- request: newRequest("GET", "http://localhost?foo=1"),
- vars: map[string]string{"v1": "1"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with regexp pattern with quantifier, additional variable in query string, match",
- route: new(Route).Queries("foo", "{v1:[0-9]{1}}"),
- request: newRequest("GET", "http://localhost?bar=2&foo=1"),
- vars: map[string]string{"v1": "1"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with regexp pattern with quantifier, regexp does not match",
- route: new(Route).Queries("foo", "{v1:[0-9]{1}}"),
- request: newRequest("GET", "http://localhost?foo=12"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with regexp pattern with quantifier, additional capturing group",
- route: new(Route).Queries("foo", "{v1:[0-9]{1}(a|b)}"),
- request: newRequest("GET", "http://localhost?foo=1a"),
- vars: map[string]string{"v1": "1a"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with regexp pattern with quantifier, additional variable in query string, regexp does not match",
- route: new(Route).Queries("foo", "{v1:[0-9]{1}}"),
- request: newRequest("GET", "http://localhost?foo=12"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with hyphenated name, match",
- route: new(Route).Queries("foo", "{v-1}"),
- request: newRequest("GET", "http://localhost?foo=bar"),
- vars: map[string]string{"v-1": "bar"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with multiple hyphenated names, match",
- route: new(Route).Queries("foo", "{v-1}", "baz", "{v-2}"),
- request: newRequest("GET", "http://localhost?foo=bar&baz=ding"),
- vars: map[string]string{"v-1": "bar", "v-2": "ding"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with hyphenate name and pattern, match",
- route: new(Route).Queries("foo", "{v-1:[0-9]+}"),
- request: newRequest("GET", "http://localhost?foo=10"),
- vars: map[string]string{"v-1": "10"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with hyphenated name and pattern with quantifier, additional capturing group",
- route: new(Route).Queries("foo", "{v-1:[0-9]{1}(a|b)}"),
- request: newRequest("GET", "http://localhost?foo=1a"),
- vars: map[string]string{"v-1": "1a"},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with empty value, should match",
- route: new(Route).Queries("foo", ""),
- request: newRequest("GET", "http://localhost?foo=bar"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with empty value and no parameter in request, should not match",
- route: new(Route).Queries("foo", ""),
- request: newRequest("GET", "http://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with empty value and empty parameter in request, should match",
- route: new(Route).Queries("foo", ""),
- request: newRequest("GET", "http://localhost?foo="),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route with overlapping value, should not match",
- route: new(Route).Queries("foo", "bar"),
- request: newRequest("GET", "http://localhost?foo=barfoo"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with no parameter in request, should not match",
- route: new(Route).Queries("foo", "{bar}"),
- request: newRequest("GET", "http://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- {
- title: "Queries route with empty parameter in request, should match",
- route: new(Route).Queries("foo", "{bar}"),
- request: newRequest("GET", "http://localhost?foo="),
- vars: map[string]string{"foo": ""},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Queries route, bad submatch",
- route: new(Route).Queries("foo", "bar", "baz", "ding"),
- request: newRequest("GET", "http://localhost?fffoo=bar&baz=dingggg"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestSchemes(t *testing.T) {
- tests := []routeTest{
- // Schemes
- {
- title: "Schemes route, match https",
- route: new(Route).Schemes("https", "ftp"),
- request: newRequest("GET", "https://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Schemes route, match ftp",
- route: new(Route).Schemes("https", "ftp"),
- request: newRequest("GET", "ftp://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "Schemes route, bad scheme",
- route: new(Route).Schemes("https", "ftp"),
- request: newRequest("GET", "http://localhost"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- }
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestMatcherFunc(t *testing.T) {
- m := func(r *http.Request, m *RouteMatch) bool {
- if r.URL.Host == "aaa.bbb.ccc" {
- return true
- }
- return false
- }
-
- tests := []routeTest{
- {
- title: "MatchFunc route, match",
- route: new(Route).MatcherFunc(m),
- request: newRequest("GET", "http://aaa.bbb.ccc"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: true,
- },
- {
- title: "MatchFunc route, non-match",
- route: new(Route).MatcherFunc(m),
- request: newRequest("GET", "http://aaa.222.ccc"),
- vars: map[string]string{},
- host: "",
- path: "",
- shouldMatch: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestBuildVarsFunc(t *testing.T) {
- tests := []routeTest{
- {
- title: "BuildVarsFunc set on route",
- route: new(Route).Path(`/111/{v1:\d}{v2:.*}`).BuildVarsFunc(func(vars map[string]string) map[string]string {
- vars["v1"] = "3"
- vars["v2"] = "a"
- return vars
- }),
- request: newRequest("GET", "http://localhost/111/2"),
- path: "/111/3a",
- shouldMatch: true,
- },
- {
- title: "BuildVarsFunc set on route and parent route",
- route: new(Route).PathPrefix(`/{v1:\d}`).BuildVarsFunc(func(vars map[string]string) map[string]string {
- vars["v1"] = "2"
- return vars
- }).Subrouter().Path(`/{v2:\w}`).BuildVarsFunc(func(vars map[string]string) map[string]string {
- vars["v2"] = "b"
- return vars
- }),
- request: newRequest("GET", "http://localhost/1/a"),
- path: "/2/b",
- shouldMatch: true,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestSubRouter(t *testing.T) {
- subrouter1 := new(Route).Host("{v1:[a-z]+}.google.com").Subrouter()
- subrouter2 := new(Route).PathPrefix("/foo/{v1}").Subrouter()
-
- tests := []routeTest{
- {
- route: subrouter1.Path("/{v2:[a-z]+}"),
- request: newRequest("GET", "http://aaa.google.com/bbb"),
- vars: map[string]string{"v1": "aaa", "v2": "bbb"},
- host: "aaa.google.com",
- path: "/bbb",
- shouldMatch: true,
- },
- {
- route: subrouter1.Path("/{v2:[a-z]+}"),
- request: newRequest("GET", "http://111.google.com/111"),
- vars: map[string]string{"v1": "aaa", "v2": "bbb"},
- host: "aaa.google.com",
- path: "/bbb",
- shouldMatch: false,
- },
- {
- route: subrouter2.Path("/baz/{v2}"),
- request: newRequest("GET", "http://localhost/foo/bar/baz/ding"),
- vars: map[string]string{"v1": "bar", "v2": "ding"},
- host: "",
- path: "/foo/bar/baz/ding",
- shouldMatch: true,
- },
- {
- route: subrouter2.Path("/baz/{v2}"),
- request: newRequest("GET", "http://localhost/foo/bar"),
- vars: map[string]string{"v1": "bar", "v2": "ding"},
- host: "",
- path: "/foo/bar/baz/ding",
- shouldMatch: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestNamedRoutes(t *testing.T) {
- r1 := NewRouter()
- r1.NewRoute().Name("a")
- r1.NewRoute().Name("b")
- r1.NewRoute().Name("c")
-
- r2 := r1.NewRoute().Subrouter()
- r2.NewRoute().Name("d")
- r2.NewRoute().Name("e")
- r2.NewRoute().Name("f")
-
- r3 := r2.NewRoute().Subrouter()
- r3.NewRoute().Name("g")
- r3.NewRoute().Name("h")
- r3.NewRoute().Name("i")
-
- if r1.namedRoutes == nil || len(r1.namedRoutes) != 9 {
- t.Errorf("Expected 9 named routes, got %v", r1.namedRoutes)
- } else if r1.Get("i") == nil {
- t.Errorf("Subroute name not registered")
- }
-}
-
-func TestStrictSlash(t *testing.T) {
- r := NewRouter()
- r.StrictSlash(true)
-
- tests := []routeTest{
- {
- title: "Redirect path without slash",
- route: r.NewRoute().Path("/111/"),
- request: newRequest("GET", "http://localhost/111"),
- vars: map[string]string{},
- host: "",
- path: "/111/",
- shouldMatch: true,
- shouldRedirect: true,
- },
- {
- title: "Do not redirect path with slash",
- route: r.NewRoute().Path("/111/"),
- request: newRequest("GET", "http://localhost/111/"),
- vars: map[string]string{},
- host: "",
- path: "/111/",
- shouldMatch: true,
- shouldRedirect: false,
- },
- {
- title: "Redirect path with slash",
- route: r.NewRoute().Path("/111"),
- request: newRequest("GET", "http://localhost/111/"),
- vars: map[string]string{},
- host: "",
- path: "/111",
- shouldMatch: true,
- shouldRedirect: true,
- },
- {
- title: "Do not redirect path without slash",
- route: r.NewRoute().Path("/111"),
- request: newRequest("GET", "http://localhost/111"),
- vars: map[string]string{},
- host: "",
- path: "/111",
- shouldMatch: true,
- shouldRedirect: false,
- },
- {
- title: "Propagate StrictSlash to subrouters",
- route: r.NewRoute().PathPrefix("/static/").Subrouter().Path("/images/"),
- request: newRequest("GET", "http://localhost/static/images"),
- vars: map[string]string{},
- host: "",
- path: "/static/images/",
- shouldMatch: true,
- shouldRedirect: true,
- },
- {
- title: "Ignore StrictSlash for path prefix",
- route: r.NewRoute().PathPrefix("/static/"),
- request: newRequest("GET", "http://localhost/static/logo.png"),
- vars: map[string]string{},
- host: "",
- path: "/static/",
- shouldMatch: true,
- shouldRedirect: false,
- },
- }
-
- for _, test := range tests {
- testRoute(t, test)
- }
-}
-
-func TestWalkSingleDepth(t *testing.T) {
- r0 := NewRouter()
- r1 := NewRouter()
- r2 := NewRouter()
-
- r0.Path("/g")
- r0.Path("/o")
- r0.Path("/d").Handler(r1)
- r0.Path("/r").Handler(r2)
- r0.Path("/a")
-
- r1.Path("/z")
- r1.Path("/i")
- r1.Path("/l")
- r1.Path("/l")
-
- r2.Path("/i")
- r2.Path("/l")
- r2.Path("/l")
-
- paths := []string{"g", "o", "r", "i", "l", "l", "a"}
- depths := []int{0, 0, 0, 1, 1, 1, 0}
- i := 0
- err := r0.Walk(func(route *Route, router *Router, ancestors []*Route) error {
- matcher := route.matchers[0].(*routeRegexp)
- if matcher.template == "/d" {
- return SkipRouter
- }
- if len(ancestors) != depths[i] {
- t.Errorf(`Expected depth of %d at i = %d; got "%d"`, depths[i], i, len(ancestors))
- }
- if matcher.template != "/"+paths[i] {
- t.Errorf(`Expected "/%s" at i = %d; got "%s"`, paths[i], i, matcher.template)
- }
- i++
- return nil
- })
- if err != nil {
- panic(err)
- }
- if i != len(paths) {
- t.Errorf("Expected %d routes, found %d", len(paths), i)
- }
-}
-
-func TestWalkNested(t *testing.T) {
- router := NewRouter()
-
- g := router.Path("/g").Subrouter()
- o := g.PathPrefix("/o").Subrouter()
- r := o.PathPrefix("/r").Subrouter()
- i := r.PathPrefix("/i").Subrouter()
- l1 := i.PathPrefix("/l").Subrouter()
- l2 := l1.PathPrefix("/l").Subrouter()
- l2.Path("/a")
-
- paths := []string{"/g", "/g/o", "/g/o/r", "/g/o/r/i", "/g/o/r/i/l", "/g/o/r/i/l/l", "/g/o/r/i/l/l/a"}
- idx := 0
- err := router.Walk(func(route *Route, router *Router, ancestors []*Route) error {
- path := paths[idx]
- tpl := route.regexp.path.template
- if tpl != path {
- t.Errorf(`Expected %s got %s`, path, tpl)
- }
- idx++
- return nil
- })
- if err != nil {
- panic(err)
- }
- if idx != len(paths) {
- t.Errorf("Expected %d routes, found %d", len(paths), idx)
- }
-}
-
-func TestSubrouterErrorHandling(t *testing.T) {
- superRouterCalled := false
- subRouterCalled := false
-
- router := NewRouter()
- router.NotFoundHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- superRouterCalled = true
- })
- subRouter := router.PathPrefix("/bign8").Subrouter()
- subRouter.NotFoundHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- subRouterCalled = true
- })
-
- req, _ := http.NewRequest("GET", "http://localhost/bign8/was/here", nil)
- router.ServeHTTP(NewRecorder(), req)
-
- if superRouterCalled {
- t.Error("Super router 404 handler called when sub-router 404 handler is available.")
- }
- if !subRouterCalled {
- t.Error("Sub-router 404 handler was not called.")
- }
-}
-
-// ----------------------------------------------------------------------------
-// Helpers
-// ----------------------------------------------------------------------------
-
-func getRouteTemplate(route *Route) string {
- host, path := "none", "none"
- if route.regexp != nil {
- if route.regexp.host != nil {
- host = route.regexp.host.template
- }
- if route.regexp.path != nil {
- path = route.regexp.path.template
- }
- }
- return fmt.Sprintf("Host: %v, Path: %v", host, path)
-}
-
-func testRoute(t *testing.T, test routeTest) {
- request := test.request
- route := test.route
- vars := test.vars
- shouldMatch := test.shouldMatch
- host := test.host
- path := test.path
- url := test.host + test.path
- shouldRedirect := test.shouldRedirect
-
- var match RouteMatch
- ok := route.Match(request, &match)
- if ok != shouldMatch {
- msg := "Should match"
- if !shouldMatch {
- msg = "Should not match"
- }
- t.Errorf("(%v) %v:\nRoute: %#v\nRequest: %#v\nVars: %v\n", test.title, msg, route, request, vars)
- return
- }
- if shouldMatch {
- if test.vars != nil && !stringMapEqual(test.vars, match.Vars) {
- t.Errorf("(%v) Vars not equal: expected %v, got %v", test.title, vars, match.Vars)
- return
- }
- if host != "" {
- u, _ := test.route.URLHost(mapToPairs(match.Vars)...)
- if host != u.Host {
- t.Errorf("(%v) URLHost not equal: expected %v, got %v -- %v", test.title, host, u.Host, getRouteTemplate(route))
- return
- }
- }
- if path != "" {
- u, _ := route.URLPath(mapToPairs(match.Vars)...)
- if path != u.Path {
- t.Errorf("(%v) URLPath not equal: expected %v, got %v -- %v", test.title, path, u.Path, getRouteTemplate(route))
- return
- }
- }
- if url != "" {
- u, _ := route.URL(mapToPairs(match.Vars)...)
- if url != u.Host+u.Path {
- t.Errorf("(%v) URL not equal: expected %v, got %v -- %v", test.title, url, u.Host+u.Path, getRouteTemplate(route))
- return
- }
- }
- if shouldRedirect && match.Handler == nil {
- t.Errorf("(%v) Did not redirect", test.title)
- return
- }
- if !shouldRedirect && match.Handler != nil {
- t.Errorf("(%v) Unexpected redirect", test.title)
- return
- }
- }
-}
-
-// Tests that the context is cleared or not cleared properly depending on
-// the configuration of the router
-func TestKeepContext(t *testing.T) {
- func1 := func(w http.ResponseWriter, r *http.Request) {}
-
- r := NewRouter()
- r.HandleFunc("/", func1).Name("func1")
-
- req, _ := http.NewRequest("GET", "http://localhost/", nil)
- context.Set(req, "t", 1)
-
- res := new(http.ResponseWriter)
- r.ServeHTTP(*res, req)
-
- if _, ok := context.GetOk(req, "t"); ok {
- t.Error("Context should have been cleared at end of request")
- }
-
- r.KeepContext = true
-
- req, _ = http.NewRequest("GET", "http://localhost/", nil)
- context.Set(req, "t", 1)
-
- r.ServeHTTP(*res, req)
- if _, ok := context.GetOk(req, "t"); !ok {
- t.Error("Context should NOT have been cleared at end of request")
- }
-
-}
-
-type TestA301ResponseWriter struct {
- hh http.Header
- status int
-}
-
-func (ho TestA301ResponseWriter) Header() http.Header {
- return http.Header(ho.hh)
-}
-
-func (ho TestA301ResponseWriter) Write(b []byte) (int, error) {
- return 0, nil
-}
-
-func (ho TestA301ResponseWriter) WriteHeader(code int) {
- ho.status = code
-}
-
-func Test301Redirect(t *testing.T) {
- m := make(http.Header)
-
- func1 := func(w http.ResponseWriter, r *http.Request) {}
- func2 := func(w http.ResponseWriter, r *http.Request) {}
-
- r := NewRouter()
- r.HandleFunc("/api/", func2).Name("func2")
- r.HandleFunc("/", func1).Name("func1")
-
- req, _ := http.NewRequest("GET", "http://localhost//api/?abc=def", nil)
-
- res := TestA301ResponseWriter{
- hh: m,
- status: 0,
- }
- r.ServeHTTP(&res, req)
-
- if "http://localhost/api/?abc=def" != res.hh["Location"][0] {
- t.Errorf("Should have complete URL with query string")
- }
-}
-
-// https://plus.google.com/101022900381697718949/posts/eWy6DjFJ6uW
-func TestSubrouterHeader(t *testing.T) {
- expected := "func1 response"
- func1 := func(w http.ResponseWriter, r *http.Request) {
- fmt.Fprint(w, expected)
- }
- func2 := func(http.ResponseWriter, *http.Request) {}
-
- r := NewRouter()
- s := r.Headers("SomeSpecialHeader", "").Subrouter()
- s.HandleFunc("/", func1).Name("func1")
- r.HandleFunc("/", func2).Name("func2")
-
- req, _ := http.NewRequest("GET", "http://localhost/", nil)
- req.Header.Add("SomeSpecialHeader", "foo")
- match := new(RouteMatch)
- matched := r.Match(req, match)
- if !matched {
- t.Errorf("Should match request")
- }
- if match.Route.GetName() != "func1" {
- t.Errorf("Expecting func1 handler, got %s", match.Route.GetName())
- }
- resp := NewRecorder()
- match.Handler.ServeHTTP(resp, req)
- if resp.Body.String() != expected {
- t.Errorf("Expecting %q", expected)
- }
-}
-
-// mapToPairs converts a string map to a slice of string pairs
-func mapToPairs(m map[string]string) []string {
- var i int
- p := make([]string, len(m)*2)
- for k, v := range m {
- p[i] = k
- p[i+1] = v
- i += 2
- }
- return p
-}
-
-// stringMapEqual checks the equality of two string maps
-func stringMapEqual(m1, m2 map[string]string) bool {
- nil1 := m1 == nil
- nil2 := m2 == nil
- if nil1 != nil2 || len(m1) != len(m2) {
- return false
- }
- for k, v := range m1 {
- if v != m2[k] {
- return false
- }
- }
- return true
-}
-
-// newRequest is a helper function to create a new request with a method and url
-func newRequest(method, url string) *http.Request {
- req, err := http.NewRequest(method, url, nil)
- if err != nil {
- panic(err)
- }
- return req
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/old_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/old_test.go
deleted file mode 100644
index 755db483e8f387040c98487c9e577e20703eaa51..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/old_test.go
+++ /dev/null
@@ -1,714 +0,0 @@
-// Old tests ported to Go1. This is a mess. Want to drop it one day.
-
-// Copyright 2011 Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
- "bytes"
- "net/http"
- "testing"
-)
-
-// ----------------------------------------------------------------------------
-// ResponseRecorder
-// ----------------------------------------------------------------------------
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// ResponseRecorder is an implementation of http.ResponseWriter that
-// records its mutations for later inspection in tests.
-type ResponseRecorder struct {
- Code int // the HTTP response code from WriteHeader
- HeaderMap http.Header // the HTTP response headers
- Body *bytes.Buffer // if non-nil, the bytes.Buffer to append written data to
- Flushed bool
-}
-
-// NewRecorder returns an initialized ResponseRecorder.
-func NewRecorder() *ResponseRecorder {
- return &ResponseRecorder{
- HeaderMap: make(http.Header),
- Body: new(bytes.Buffer),
- }
-}
-
-// DefaultRemoteAddr is the default remote address to return in RemoteAddr if
-// an explicit DefaultRemoteAddr isn't set on ResponseRecorder.
-const DefaultRemoteAddr = "1.2.3.4"
-
-// Header returns the response headers.
-func (rw *ResponseRecorder) Header() http.Header {
- return rw.HeaderMap
-}
-
-// Write always succeeds and writes to rw.Body, if not nil.
-func (rw *ResponseRecorder) Write(buf []byte) (int, error) {
- if rw.Body != nil {
- rw.Body.Write(buf)
- }
- if rw.Code == 0 {
- rw.Code = http.StatusOK
- }
- return len(buf), nil
-}
-
-// WriteHeader sets rw.Code.
-func (rw *ResponseRecorder) WriteHeader(code int) {
- rw.Code = code
-}
-
-// Flush sets rw.Flushed to true.
-func (rw *ResponseRecorder) Flush() {
- rw.Flushed = true
-}
-
-// ----------------------------------------------------------------------------
-
-func TestRouteMatchers(t *testing.T) {
- var scheme, host, path, query, method string
- var headers map[string]string
- var resultVars map[bool]map[string]string
-
- router := NewRouter()
- router.NewRoute().Host("{var1}.google.com").
- Path("/{var2:[a-z]+}/{var3:[0-9]+}").
- Queries("foo", "bar").
- Methods("GET").
- Schemes("https").
- Headers("x-requested-with", "XMLHttpRequest")
- router.NewRoute().Host("www.{var4}.com").
- PathPrefix("/foo/{var5:[a-z]+}/{var6:[0-9]+}").
- Queries("baz", "ding").
- Methods("POST").
- Schemes("http").
- Headers("Content-Type", "application/json")
-
- reset := func() {
- // Everything match.
- scheme = "https"
- host = "www.google.com"
- path = "/product/42"
- query = "?foo=bar"
- method = "GET"
- headers = map[string]string{"X-Requested-With": "XMLHttpRequest"}
- resultVars = map[bool]map[string]string{
- true: {"var1": "www", "var2": "product", "var3": "42"},
- false: {},
- }
- }
-
- reset2 := func() {
- // Everything match.
- scheme = "http"
- host = "www.google.com"
- path = "/foo/product/42/path/that/is/ignored"
- query = "?baz=ding"
- method = "POST"
- headers = map[string]string{"Content-Type": "application/json"}
- resultVars = map[bool]map[string]string{
- true: {"var4": "google", "var5": "product", "var6": "42"},
- false: {},
- }
- }
-
- match := func(shouldMatch bool) {
- url := scheme + "://" + host + path + query
- request, _ := http.NewRequest(method, url, nil)
- for key, value := range headers {
- request.Header.Add(key, value)
- }
-
- var routeMatch RouteMatch
- matched := router.Match(request, &routeMatch)
- if matched != shouldMatch {
- // Need better messages. :)
- if matched {
- t.Errorf("Should match.")
- } else {
- t.Errorf("Should not match.")
- }
- }
-
- if matched {
- currentRoute := routeMatch.Route
- if currentRoute == nil {
- t.Errorf("Expected a current route.")
- }
- vars := routeMatch.Vars
- expectedVars := resultVars[shouldMatch]
- if len(vars) != len(expectedVars) {
- t.Errorf("Expected vars: %v Got: %v.", expectedVars, vars)
- }
- for name, value := range vars {
- if expectedVars[name] != value {
- t.Errorf("Expected vars: %v Got: %v.", expectedVars, vars)
- }
- }
- }
- }
-
- // 1st route --------------------------------------------------------------
-
- // Everything match.
- reset()
- match(true)
-
- // Scheme doesn't match.
- reset()
- scheme = "http"
- match(false)
-
- // Host doesn't match.
- reset()
- host = "www.mygoogle.com"
- match(false)
-
- // Path doesn't match.
- reset()
- path = "/product/notdigits"
- match(false)
-
- // Query doesn't match.
- reset()
- query = "?foo=baz"
- match(false)
-
- // Method doesn't match.
- reset()
- method = "POST"
- match(false)
-
- // Header doesn't match.
- reset()
- headers = map[string]string{}
- match(false)
-
- // Everything match, again.
- reset()
- match(true)
-
- // 2nd route --------------------------------------------------------------
-
- // Everything match.
- reset2()
- match(true)
-
- // Scheme doesn't match.
- reset2()
- scheme = "https"
- match(false)
-
- // Host doesn't match.
- reset2()
- host = "sub.google.com"
- match(false)
-
- // Path doesn't match.
- reset2()
- path = "/bar/product/42"
- match(false)
-
- // Query doesn't match.
- reset2()
- query = "?foo=baz"
- match(false)
-
- // Method doesn't match.
- reset2()
- method = "GET"
- match(false)
-
- // Header doesn't match.
- reset2()
- headers = map[string]string{}
- match(false)
-
- // Everything match, again.
- reset2()
- match(true)
-}
-
-type headerMatcherTest struct {
- matcher headerMatcher
- headers map[string]string
- result bool
-}
-
-var headerMatcherTests = []headerMatcherTest{
- {
- matcher: headerMatcher(map[string]string{"x-requested-with": "XMLHttpRequest"}),
- headers: map[string]string{"X-Requested-With": "XMLHttpRequest"},
- result: true,
- },
- {
- matcher: headerMatcher(map[string]string{"x-requested-with": ""}),
- headers: map[string]string{"X-Requested-With": "anything"},
- result: true,
- },
- {
- matcher: headerMatcher(map[string]string{"x-requested-with": "XMLHttpRequest"}),
- headers: map[string]string{},
- result: false,
- },
-}
-
-type hostMatcherTest struct {
- matcher *Route
- url string
- vars map[string]string
- result bool
-}
-
-var hostMatcherTests = []hostMatcherTest{
- {
- matcher: NewRouter().NewRoute().Host("{foo:[a-z][a-z][a-z]}.{bar:[a-z][a-z][a-z]}.{baz:[a-z][a-z][a-z]}"),
- url: "http://abc.def.ghi/",
- vars: map[string]string{"foo": "abc", "bar": "def", "baz": "ghi"},
- result: true,
- },
- {
- matcher: NewRouter().NewRoute().Host("{foo:[a-z][a-z][a-z]}.{bar:[a-z][a-z][a-z]}.{baz:[a-z][a-z][a-z]}"),
- url: "http://a.b.c/",
- vars: map[string]string{"foo": "abc", "bar": "def", "baz": "ghi"},
- result: false,
- },
-}
-
-type methodMatcherTest struct {
- matcher methodMatcher
- method string
- result bool
-}
-
-var methodMatcherTests = []methodMatcherTest{
- {
- matcher: methodMatcher([]string{"GET", "POST", "PUT"}),
- method: "GET",
- result: true,
- },
- {
- matcher: methodMatcher([]string{"GET", "POST", "PUT"}),
- method: "POST",
- result: true,
- },
- {
- matcher: methodMatcher([]string{"GET", "POST", "PUT"}),
- method: "PUT",
- result: true,
- },
- {
- matcher: methodMatcher([]string{"GET", "POST", "PUT"}),
- method: "DELETE",
- result: false,
- },
-}
-
-type pathMatcherTest struct {
- matcher *Route
- url string
- vars map[string]string
- result bool
-}
-
-var pathMatcherTests = []pathMatcherTest{
- {
- matcher: NewRouter().NewRoute().Path("/{foo:[0-9][0-9][0-9]}/{bar:[0-9][0-9][0-9]}/{baz:[0-9][0-9][0-9]}"),
- url: "http://localhost:8080/123/456/789",
- vars: map[string]string{"foo": "123", "bar": "456", "baz": "789"},
- result: true,
- },
- {
- matcher: NewRouter().NewRoute().Path("/{foo:[0-9][0-9][0-9]}/{bar:[0-9][0-9][0-9]}/{baz:[0-9][0-9][0-9]}"),
- url: "http://localhost:8080/1/2/3",
- vars: map[string]string{"foo": "123", "bar": "456", "baz": "789"},
- result: false,
- },
-}
-
-type schemeMatcherTest struct {
- matcher schemeMatcher
- url string
- result bool
-}
-
-var schemeMatcherTests = []schemeMatcherTest{
- {
- matcher: schemeMatcher([]string{"http", "https"}),
- url: "http://localhost:8080/",
- result: true,
- },
- {
- matcher: schemeMatcher([]string{"http", "https"}),
- url: "https://localhost:8080/",
- result: true,
- },
- {
- matcher: schemeMatcher([]string{"https"}),
- url: "http://localhost:8080/",
- result: false,
- },
- {
- matcher: schemeMatcher([]string{"http"}),
- url: "https://localhost:8080/",
- result: false,
- },
-}
-
-type urlBuildingTest struct {
- route *Route
- vars []string
- url string
-}
-
-var urlBuildingTests = []urlBuildingTest{
- {
- route: new(Route).Host("foo.domain.com"),
- vars: []string{},
- url: "http://foo.domain.com",
- },
- {
- route: new(Route).Host("{subdomain}.domain.com"),
- vars: []string{"subdomain", "bar"},
- url: "http://bar.domain.com",
- },
- {
- route: new(Route).Host("foo.domain.com").Path("/articles"),
- vars: []string{},
- url: "http://foo.domain.com/articles",
- },
- {
- route: new(Route).Path("/articles"),
- vars: []string{},
- url: "/articles",
- },
- {
- route: new(Route).Path("/articles/{category}/{id:[0-9]+}"),
- vars: []string{"category", "technology", "id", "42"},
- url: "/articles/technology/42",
- },
- {
- route: new(Route).Host("{subdomain}.domain.com").Path("/articles/{category}/{id:[0-9]+}"),
- vars: []string{"subdomain", "foo", "category", "technology", "id", "42"},
- url: "http://foo.domain.com/articles/technology/42",
- },
-}
-
-func TestHeaderMatcher(t *testing.T) {
- for _, v := range headerMatcherTests {
- request, _ := http.NewRequest("GET", "http://localhost:8080/", nil)
- for key, value := range v.headers {
- request.Header.Add(key, value)
- }
- var routeMatch RouteMatch
- result := v.matcher.Match(request, &routeMatch)
- if result != v.result {
- if v.result {
- t.Errorf("%#v: should match %v.", v.matcher, request.Header)
- } else {
- t.Errorf("%#v: should not match %v.", v.matcher, request.Header)
- }
- }
- }
-}
-
-func TestHostMatcher(t *testing.T) {
- for _, v := range hostMatcherTests {
- request, _ := http.NewRequest("GET", v.url, nil)
- var routeMatch RouteMatch
- result := v.matcher.Match(request, &routeMatch)
- vars := routeMatch.Vars
- if result != v.result {
- if v.result {
- t.Errorf("%#v: should match %v.", v.matcher, v.url)
- } else {
- t.Errorf("%#v: should not match %v.", v.matcher, v.url)
- }
- }
- if result {
- if len(vars) != len(v.vars) {
- t.Errorf("%#v: vars length should be %v, got %v.", v.matcher, len(v.vars), len(vars))
- }
- for name, value := range vars {
- if v.vars[name] != value {
- t.Errorf("%#v: expected value %v for key %v, got %v.", v.matcher, v.vars[name], name, value)
- }
- }
- } else {
- if len(vars) != 0 {
- t.Errorf("%#v: vars length should be 0, got %v.", v.matcher, len(vars))
- }
- }
- }
-}
-
-func TestMethodMatcher(t *testing.T) {
- for _, v := range methodMatcherTests {
- request, _ := http.NewRequest(v.method, "http://localhost:8080/", nil)
- var routeMatch RouteMatch
- result := v.matcher.Match(request, &routeMatch)
- if result != v.result {
- if v.result {
- t.Errorf("%#v: should match %v.", v.matcher, v.method)
- } else {
- t.Errorf("%#v: should not match %v.", v.matcher, v.method)
- }
- }
- }
-}
-
-func TestPathMatcher(t *testing.T) {
- for _, v := range pathMatcherTests {
- request, _ := http.NewRequest("GET", v.url, nil)
- var routeMatch RouteMatch
- result := v.matcher.Match(request, &routeMatch)
- vars := routeMatch.Vars
- if result != v.result {
- if v.result {
- t.Errorf("%#v: should match %v.", v.matcher, v.url)
- } else {
- t.Errorf("%#v: should not match %v.", v.matcher, v.url)
- }
- }
- if result {
- if len(vars) != len(v.vars) {
- t.Errorf("%#v: vars length should be %v, got %v.", v.matcher, len(v.vars), len(vars))
- }
- for name, value := range vars {
- if v.vars[name] != value {
- t.Errorf("%#v: expected value %v for key %v, got %v.", v.matcher, v.vars[name], name, value)
- }
- }
- } else {
- if len(vars) != 0 {
- t.Errorf("%#v: vars length should be 0, got %v.", v.matcher, len(vars))
- }
- }
- }
-}
-
-func TestSchemeMatcher(t *testing.T) {
- for _, v := range schemeMatcherTests {
- request, _ := http.NewRequest("GET", v.url, nil)
- var routeMatch RouteMatch
- result := v.matcher.Match(request, &routeMatch)
- if result != v.result {
- if v.result {
- t.Errorf("%#v: should match %v.", v.matcher, v.url)
- } else {
- t.Errorf("%#v: should not match %v.", v.matcher, v.url)
- }
- }
- }
-}
-
-func TestUrlBuilding(t *testing.T) {
-
- for _, v := range urlBuildingTests {
- u, _ := v.route.URL(v.vars...)
- url := u.String()
- if url != v.url {
- t.Errorf("expected %v, got %v", v.url, url)
- /*
- reversePath := ""
- reverseHost := ""
- if v.route.pathTemplate != nil {
- reversePath = v.route.pathTemplate.Reverse
- }
- if v.route.hostTemplate != nil {
- reverseHost = v.route.hostTemplate.Reverse
- }
-
- t.Errorf("%#v:\nexpected: %q\ngot: %q\nreverse path: %q\nreverse host: %q", v.route, v.url, url, reversePath, reverseHost)
- */
- }
- }
-
- ArticleHandler := func(w http.ResponseWriter, r *http.Request) {
- }
-
- router := NewRouter()
- router.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).Name("article")
-
- url, _ := router.Get("article").URL("category", "technology", "id", "42")
- expected := "/articles/technology/42"
- if url.String() != expected {
- t.Errorf("Expected %v, got %v", expected, url.String())
- }
-}
-
-func TestMatchedRouteName(t *testing.T) {
- routeName := "stock"
- router := NewRouter()
- route := router.NewRoute().Path("/products/").Name(routeName)
-
- url := "http://www.example.com/products/"
- request, _ := http.NewRequest("GET", url, nil)
- var rv RouteMatch
- ok := router.Match(request, &rv)
-
- if !ok || rv.Route != route {
- t.Errorf("Expected same route, got %+v.", rv.Route)
- }
-
- retName := rv.Route.GetName()
- if retName != routeName {
- t.Errorf("Expected %q, got %q.", routeName, retName)
- }
-}
-
-func TestSubRouting(t *testing.T) {
- // Example from docs.
- router := NewRouter()
- subrouter := router.NewRoute().Host("www.example.com").Subrouter()
- route := subrouter.NewRoute().Path("/products/").Name("products")
-
- url := "http://www.example.com/products/"
- request, _ := http.NewRequest("GET", url, nil)
- var rv RouteMatch
- ok := router.Match(request, &rv)
-
- if !ok || rv.Route != route {
- t.Errorf("Expected same route, got %+v.", rv.Route)
- }
-
- u, _ := router.Get("products").URL()
- builtUrl := u.String()
- // Yay, subroute aware of the domain when building!
- if builtUrl != url {
- t.Errorf("Expected %q, got %q.", url, builtUrl)
- }
-}
-
-func TestVariableNames(t *testing.T) {
- route := new(Route).Host("{arg1}.domain.com").Path("/{arg1}/{arg2:[0-9]+}")
- if route.err == nil {
- t.Errorf("Expected error for duplicated variable names")
- }
-}
-
-func TestRedirectSlash(t *testing.T) {
- var route *Route
- var routeMatch RouteMatch
- r := NewRouter()
-
- r.StrictSlash(false)
- route = r.NewRoute()
- if route.strictSlash != false {
- t.Errorf("Expected false redirectSlash.")
- }
-
- r.StrictSlash(true)
- route = r.NewRoute()
- if route.strictSlash != true {
- t.Errorf("Expected true redirectSlash.")
- }
-
- route = new(Route)
- route.strictSlash = true
- route.Path("/{arg1}/{arg2:[0-9]+}/")
- request, _ := http.NewRequest("GET", "http://localhost/foo/123", nil)
- routeMatch = RouteMatch{}
- _ = route.Match(request, &routeMatch)
- vars := routeMatch.Vars
- if vars["arg1"] != "foo" {
- t.Errorf("Expected foo.")
- }
- if vars["arg2"] != "123" {
- t.Errorf("Expected 123.")
- }
- rsp := NewRecorder()
- routeMatch.Handler.ServeHTTP(rsp, request)
- if rsp.HeaderMap.Get("Location") != "http://localhost/foo/123/" {
- t.Errorf("Expected redirect header.")
- }
-
- route = new(Route)
- route.strictSlash = true
- route.Path("/{arg1}/{arg2:[0-9]+}")
- request, _ = http.NewRequest("GET", "http://localhost/foo/123/", nil)
- routeMatch = RouteMatch{}
- _ = route.Match(request, &routeMatch)
- vars = routeMatch.Vars
- if vars["arg1"] != "foo" {
- t.Errorf("Expected foo.")
- }
- if vars["arg2"] != "123" {
- t.Errorf("Expected 123.")
- }
- rsp = NewRecorder()
- routeMatch.Handler.ServeHTTP(rsp, request)
- if rsp.HeaderMap.Get("Location") != "http://localhost/foo/123" {
- t.Errorf("Expected redirect header.")
- }
-}
-
-// Test for the new regexp library, still not available in stable Go.
-func TestNewRegexp(t *testing.T) {
- var p *routeRegexp
- var matches []string
-
- tests := map[string]map[string][]string{
- "/{foo:a{2}}": {
- "/a": nil,
- "/aa": {"aa"},
- "/aaa": nil,
- "/aaaa": nil,
- },
- "/{foo:a{2,}}": {
- "/a": nil,
- "/aa": {"aa"},
- "/aaa": {"aaa"},
- "/aaaa": {"aaaa"},
- },
- "/{foo:a{2,3}}": {
- "/a": nil,
- "/aa": {"aa"},
- "/aaa": {"aaa"},
- "/aaaa": nil,
- },
- "/{foo:[a-z]{3}}/{bar:[a-z]{2}}": {
- "/a": nil,
- "/ab": nil,
- "/abc": nil,
- "/abcd": nil,
- "/abc/ab": {"abc", "ab"},
- "/abc/abc": nil,
- "/abcd/ab": nil,
- },
- `/{foo:\w{3,}}/{bar:\d{2,}}`: {
- "/a": nil,
- "/ab": nil,
- "/abc": nil,
- "/abc/1": nil,
- "/abc/12": {"abc", "12"},
- "/abcd/12": {"abcd", "12"},
- "/abcd/123": {"abcd", "123"},
- },
- }
-
- for pattern, paths := range tests {
- p, _ = newRouteRegexp(pattern, false, false, false, false)
- for path, result := range paths {
- matches = p.regexp.FindStringSubmatch(path)
- if result == nil {
- if matches != nil {
- t.Errorf("%v should not match %v.", pattern, path)
- }
- } else {
- if len(matches) != len(result)+1 {
- t.Errorf("Expected %v matches, got %v.", len(result)+1, len(matches))
- } else {
- for k, v := range result {
- if matches[k+1] != v {
- t.Errorf("Expected %v, got %v.", v, matches[k+1])
- }
- }
- }
- }
- }
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
deleted file mode 100644
index 06728dd545e0283d4d590be47013abc47387f1d2..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/regexp.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
- "bytes"
- "fmt"
- "net/http"
- "net/url"
- "regexp"
- "strconv"
- "strings"
-)
-
-// newRouteRegexp parses a route template and returns a routeRegexp,
-// used to match a host, a path or a query string.
-//
-// It will extract named variables, assemble a regexp to be matched, create
-// a "reverse" template to build URLs and compile regexps to validate variable
-// values used in URL building.
-//
-// Previously we accepted only Python-like identifiers for variable
-// names ([a-zA-Z_][a-zA-Z0-9_]*), but currently the only restriction is that
-// name and pattern can't be empty, and names can't contain a colon.
-func newRouteRegexp(tpl string, matchHost, matchPrefix, matchQuery, strictSlash bool) (*routeRegexp, error) {
- // Check if it is well-formed.
- idxs, errBraces := braceIndices(tpl)
- if errBraces != nil {
- return nil, errBraces
- }
- // Backup the original.
- template := tpl
- // Now let's parse it.
- defaultPattern := "[^/]+"
- if matchQuery {
- defaultPattern = "[^?&]*"
- } else if matchHost {
- defaultPattern = "[^.]+"
- matchPrefix = false
- }
- // Only match strict slash if not matching
- if matchPrefix || matchHost || matchQuery {
- strictSlash = false
- }
- // Set a flag for strictSlash.
- endSlash := false
- if strictSlash && strings.HasSuffix(tpl, "/") {
- tpl = tpl[:len(tpl)-1]
- endSlash = true
- }
- varsN := make([]string, len(idxs)/2)
- varsR := make([]*regexp.Regexp, len(idxs)/2)
- pattern := bytes.NewBufferString("")
- pattern.WriteByte('^')
- reverse := bytes.NewBufferString("")
- var end int
- var err error
- for i := 0; i < len(idxs); i += 2 {
- // Set all values we are interested in.
- raw := tpl[end:idxs[i]]
- end = idxs[i+1]
- parts := strings.SplitN(tpl[idxs[i]+1:end-1], ":", 2)
- name := parts[0]
- patt := defaultPattern
- if len(parts) == 2 {
- patt = parts[1]
- }
- // Name or pattern can't be empty.
- if name == "" || patt == "" {
- return nil, fmt.Errorf("mux: missing name or pattern in %q",
- tpl[idxs[i]:end])
- }
- // Build the regexp pattern.
- varIdx := i / 2
- fmt.Fprintf(pattern, "%s(?P<%s>%s)", regexp.QuoteMeta(raw), varGroupName(varIdx), patt)
- // Build the reverse template.
- fmt.Fprintf(reverse, "%s%%s", raw)
-
- // Append variable name and compiled pattern.
- varsN[varIdx] = name
- varsR[varIdx], err = regexp.Compile(fmt.Sprintf("^%s$", patt))
- if err != nil {
- return nil, err
- }
- }
- // Add the remaining.
- raw := tpl[end:]
- pattern.WriteString(regexp.QuoteMeta(raw))
- if strictSlash {
- pattern.WriteString("[/]?")
- }
- if matchQuery {
- // Add the default pattern if the query value is empty
- if queryVal := strings.SplitN(template, "=", 2)[1]; queryVal == "" {
- pattern.WriteString(defaultPattern)
- }
- }
- if !matchPrefix {
- pattern.WriteByte('$')
- }
- reverse.WriteString(raw)
- if endSlash {
- reverse.WriteByte('/')
- }
- // Compile full regexp.
- reg, errCompile := regexp.Compile(pattern.String())
- if errCompile != nil {
- return nil, errCompile
- }
- // Done!
- return &routeRegexp{
- template: template,
- matchHost: matchHost,
- matchQuery: matchQuery,
- strictSlash: strictSlash,
- regexp: reg,
- reverse: reverse.String(),
- varsN: varsN,
- varsR: varsR,
- }, nil
-}
-
-// routeRegexp stores a regexp to match a host or path and information to
-// collect and validate route variables.
-type routeRegexp struct {
- // The unmodified template.
- template string
- // True for host match, false for path or query string match.
- matchHost bool
- // True for query string match, false for path and host match.
- matchQuery bool
- // The strictSlash value defined on the route, but disabled if PathPrefix was used.
- strictSlash bool
- // Expanded regexp.
- regexp *regexp.Regexp
- // Reverse template.
- reverse string
- // Variable names.
- varsN []string
- // Variable regexps (validators).
- varsR []*regexp.Regexp
-}
-
-// Match matches the regexp against the URL host or path.
-func (r *routeRegexp) Match(req *http.Request, match *RouteMatch) bool {
- if !r.matchHost {
- if r.matchQuery {
- return r.matchQueryString(req)
- } else {
- return r.regexp.MatchString(req.URL.Path)
- }
- }
- return r.regexp.MatchString(getHost(req))
-}
-
-// url builds a URL part using the given values.
-func (r *routeRegexp) url(values map[string]string) (string, error) {
- urlValues := make([]interface{}, len(r.varsN))
- for k, v := range r.varsN {
- value, ok := values[v]
- if !ok {
- return "", fmt.Errorf("mux: missing route variable %q", v)
- }
- urlValues[k] = value
- }
- rv := fmt.Sprintf(r.reverse, urlValues...)
- if !r.regexp.MatchString(rv) {
- // The URL is checked against the full regexp, instead of checking
- // individual variables. This is faster but to provide a good error
- // message, we check individual regexps if the URL doesn't match.
- for k, v := range r.varsN {
- if !r.varsR[k].MatchString(values[v]) {
- return "", fmt.Errorf(
- "mux: variable %q doesn't match, expected %q", values[v],
- r.varsR[k].String())
- }
- }
- }
- return rv, nil
-}
-
-// getUrlQuery returns a single query parameter from a request URL.
-// For a URL with foo=bar&baz=ding, we return only the relevant key
-// value pair for the routeRegexp.
-func (r *routeRegexp) getUrlQuery(req *http.Request) string {
- if !r.matchQuery {
- return ""
- }
- templateKey := strings.SplitN(r.template, "=", 2)[0]
- for key, vals := range req.URL.Query() {
- if key == templateKey && len(vals) > 0 {
- return key + "=" + vals[0]
- }
- }
- return ""
-}
-
-func (r *routeRegexp) matchQueryString(req *http.Request) bool {
- return r.regexp.MatchString(r.getUrlQuery(req))
-}
-
-// braceIndices returns the first level curly brace indices from a string.
-// It returns an error in case of unbalanced braces.
-func braceIndices(s string) ([]int, error) {
- var level, idx int
- idxs := make([]int, 0)
- for i := 0; i < len(s); i++ {
- switch s[i] {
- case '{':
- if level++; level == 1 {
- idx = i
- }
- case '}':
- if level--; level == 0 {
- idxs = append(idxs, idx, i+1)
- } else if level < 0 {
- return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
- }
- }
- }
- if level != 0 {
- return nil, fmt.Errorf("mux: unbalanced braces in %q", s)
- }
- return idxs, nil
-}
-
-// varGroupName builds a capturing group name for the indexed variable.
-func varGroupName(idx int) string {
- return "v" + strconv.Itoa(idx)
-}
-
-// ----------------------------------------------------------------------------
-// routeRegexpGroup
-// ----------------------------------------------------------------------------
-
-// routeRegexpGroup groups the route matchers that carry variables.
-type routeRegexpGroup struct {
- host *routeRegexp
- path *routeRegexp
- queries []*routeRegexp
-}
-
-// setMatch extracts the variables from the URL once a route matches.
-func (v *routeRegexpGroup) setMatch(req *http.Request, m *RouteMatch, r *Route) {
- // Store host variables.
- if v.host != nil {
- hostVars := v.host.regexp.FindStringSubmatch(getHost(req))
- if hostVars != nil {
- subexpNames := v.host.regexp.SubexpNames()
- varName := 0
- for i, name := range subexpNames[1:] {
- if name != "" && name == varGroupName(varName) {
- m.Vars[v.host.varsN[varName]] = hostVars[i+1]
- varName++
- }
- }
- }
- }
- // Store path variables.
- if v.path != nil {
- pathVars := v.path.regexp.FindStringSubmatch(req.URL.Path)
- if pathVars != nil {
- subexpNames := v.path.regexp.SubexpNames()
- varName := 0
- for i, name := range subexpNames[1:] {
- if name != "" && name == varGroupName(varName) {
- m.Vars[v.path.varsN[varName]] = pathVars[i+1]
- varName++
- }
- }
- // Check if we should redirect.
- if v.path.strictSlash {
- p1 := strings.HasSuffix(req.URL.Path, "/")
- p2 := strings.HasSuffix(v.path.template, "/")
- if p1 != p2 {
- u, _ := url.Parse(req.URL.String())
- if p1 {
- u.Path = u.Path[:len(u.Path)-1]
- } else {
- u.Path += "/"
- }
- m.Handler = http.RedirectHandler(u.String(), 301)
- }
- }
- }
- }
- // Store query string variables.
- for _, q := range v.queries {
- queryVars := q.regexp.FindStringSubmatch(q.getUrlQuery(req))
- if queryVars != nil {
- subexpNames := q.regexp.SubexpNames()
- varName := 0
- for i, name := range subexpNames[1:] {
- if name != "" && name == varGroupName(varName) {
- m.Vars[q.varsN[varName]] = queryVars[i+1]
- varName++
- }
- }
- }
- }
-}
-
-// getHost tries its best to return the request host.
-func getHost(r *http.Request) string {
- if r.URL.IsAbs() {
- return r.URL.Host
- }
- host := r.Host
- // Slice off any port information.
- if i := strings.Index(host, ":"); i != -1 {
- host = host[:i]
- }
- return host
-
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
deleted file mode 100644
index 913432c1c0d1c2581aa858785c52d155ccd384bf..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux/route.go
+++ /dev/null
@@ -1,595 +0,0 @@
-// Copyright 2012 The Gorilla Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mux
-
-import (
- "errors"
- "fmt"
- "net/http"
- "net/url"
- "regexp"
- "strings"
-)
-
-// Route stores information to match a request and build URLs.
-type Route struct {
- // Parent where the route was registered (a Router).
- parent parentRoute
- // Request handler for the route.
- handler http.Handler
- // List of matchers.
- matchers []matcher
- // Manager for the variables from host and path.
- regexp *routeRegexpGroup
- // If true, when the path pattern is "/path/", accessing "/path" will
- // redirect to the former and vice versa.
- strictSlash bool
- // If true, this route never matches: it is only used to build URLs.
- buildOnly bool
- // The name used to build URLs.
- name string
- // Error resulted from building a route.
- err error
-
- buildVarsFunc BuildVarsFunc
-}
-
-// Match matches the route against the request.
-func (r *Route) Match(req *http.Request, match *RouteMatch) bool {
- if r.buildOnly || r.err != nil {
- return false
- }
- // Match everything.
- for _, m := range r.matchers {
- if matched := m.Match(req, match); !matched {
- return false
- }
- }
- // Yay, we have a match. Let's collect some info about it.
- if match.Route == nil {
- match.Route = r
- }
- if match.Handler == nil {
- match.Handler = r.handler
- }
- if match.Vars == nil {
- match.Vars = make(map[string]string)
- }
- // Set variables.
- if r.regexp != nil {
- r.regexp.setMatch(req, match, r)
- }
- return true
-}
-
-// ----------------------------------------------------------------------------
-// Route attributes
-// ----------------------------------------------------------------------------
-
-// GetError returns an error resulted from building the route, if any.
-func (r *Route) GetError() error {
- return r.err
-}
-
-// BuildOnly sets the route to never match: it is only used to build URLs.
-func (r *Route) BuildOnly() *Route {
- r.buildOnly = true
- return r
-}
-
-// Handler --------------------------------------------------------------------
-
-// Handler sets a handler for the route.
-func (r *Route) Handler(handler http.Handler) *Route {
- if r.err == nil {
- r.handler = handler
- }
- return r
-}
-
-// HandlerFunc sets a handler function for the route.
-func (r *Route) HandlerFunc(f func(http.ResponseWriter, *http.Request)) *Route {
- return r.Handler(http.HandlerFunc(f))
-}
-
-// GetHandler returns the handler for the route, if any.
-func (r *Route) GetHandler() http.Handler {
- return r.handler
-}
-
-// Name -----------------------------------------------------------------------
-
-// Name sets the name for the route, used to build URLs.
-// If the name was registered already it will be overwritten.
-func (r *Route) Name(name string) *Route {
- if r.name != "" {
- r.err = fmt.Errorf("mux: route already has name %q, can't set %q",
- r.name, name)
- }
- if r.err == nil {
- r.name = name
- r.getNamedRoutes()[name] = r
- }
- return r
-}
-
-// GetName returns the name for the route, if any.
-func (r *Route) GetName() string {
- return r.name
-}
-
-// ----------------------------------------------------------------------------
-// Matchers
-// ----------------------------------------------------------------------------
-
-// matcher types try to match a request.
-type matcher interface {
- Match(*http.Request, *RouteMatch) bool
-}
-
-// addMatcher adds a matcher to the route.
-func (r *Route) addMatcher(m matcher) *Route {
- if r.err == nil {
- r.matchers = append(r.matchers, m)
- }
- return r
-}
-
-// addRegexpMatcher adds a host or path matcher and builder to a route.
-func (r *Route) addRegexpMatcher(tpl string, matchHost, matchPrefix, matchQuery bool) error {
- if r.err != nil {
- return r.err
- }
- r.regexp = r.getRegexpGroup()
- if !matchHost && !matchQuery {
- if len(tpl) == 0 || tpl[0] != '/' {
- return fmt.Errorf("mux: path must start with a slash, got %q", tpl)
- }
- if r.regexp.path != nil {
- tpl = strings.TrimRight(r.regexp.path.template, "/") + tpl
- }
- }
- rr, err := newRouteRegexp(tpl, matchHost, matchPrefix, matchQuery, r.strictSlash)
- if err != nil {
- return err
- }
- for _, q := range r.regexp.queries {
- if err = uniqueVars(rr.varsN, q.varsN); err != nil {
- return err
- }
- }
- if matchHost {
- if r.regexp.path != nil {
- if err = uniqueVars(rr.varsN, r.regexp.path.varsN); err != nil {
- return err
- }
- }
- r.regexp.host = rr
- } else {
- if r.regexp.host != nil {
- if err = uniqueVars(rr.varsN, r.regexp.host.varsN); err != nil {
- return err
- }
- }
- if matchQuery {
- r.regexp.queries = append(r.regexp.queries, rr)
- } else {
- r.regexp.path = rr
- }
- }
- r.addMatcher(rr)
- return nil
-}
-
-// Headers --------------------------------------------------------------------
-
-// headerMatcher matches the request against header values.
-type headerMatcher map[string]string
-
-func (m headerMatcher) Match(r *http.Request, match *RouteMatch) bool {
- return matchMapWithString(m, r.Header, true)
-}
-
-// Headers adds a matcher for request header values.
-// It accepts a sequence of key/value pairs to be matched. For example:
-//
-// r := mux.NewRouter()
-// r.Headers("Content-Type", "application/json",
-// "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both request header values match.
-// If the value is an empty string, it will match any value if the key is set.
-func (r *Route) Headers(pairs ...string) *Route {
- if r.err == nil {
- var headers map[string]string
- headers, r.err = mapFromPairsToString(pairs...)
- return r.addMatcher(headerMatcher(headers))
- }
- return r
-}
-
-// headerRegexMatcher matches the request against the route given a regex for the header
-type headerRegexMatcher map[string]*regexp.Regexp
-
-func (m headerRegexMatcher) Match(r *http.Request, match *RouteMatch) bool {
- return matchMapWithRegex(m, r.Header, true)
-}
-
-// Regular expressions can be used with headers as well.
-// It accepts a sequence of key/value pairs, where the value has regex support. For example
-// r := mux.NewRouter()
-// r.HeadersRegexp("Content-Type", "application/(text|json)",
-// "X-Requested-With", "XMLHttpRequest")
-//
-// The above route will only match if both the request header matches both regular expressions.
-// It the value is an empty string, it will match any value if the key is set.
-func (r *Route) HeadersRegexp(pairs ...string) *Route {
- if r.err == nil {
- var headers map[string]*regexp.Regexp
- headers, r.err = mapFromPairsToRegex(pairs...)
- return r.addMatcher(headerRegexMatcher(headers))
- }
- return r
-}
-
-// Host -----------------------------------------------------------------------
-
-// Host adds a matcher for the URL host.
-// It accepts a template with zero or more URL variables enclosed by {}.
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next dot.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-// r := mux.NewRouter()
-// r.Host("www.example.com")
-// r.Host("{subdomain}.domain.com")
-// r.Host("{subdomain:[a-z]+}.domain.com")
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Host(tpl string) *Route {
- r.err = r.addRegexpMatcher(tpl, true, false, false)
- return r
-}
-
-// MatcherFunc ----------------------------------------------------------------
-
-// MatcherFunc is the function signature used by custom matchers.
-type MatcherFunc func(*http.Request, *RouteMatch) bool
-
-func (m MatcherFunc) Match(r *http.Request, match *RouteMatch) bool {
- return m(r, match)
-}
-
-// MatcherFunc adds a custom function to be used as request matcher.
-func (r *Route) MatcherFunc(f MatcherFunc) *Route {
- return r.addMatcher(f)
-}
-
-// Methods --------------------------------------------------------------------
-
-// methodMatcher matches the request against HTTP methods.
-type methodMatcher []string
-
-func (m methodMatcher) Match(r *http.Request, match *RouteMatch) bool {
- return matchInArray(m, r.Method)
-}
-
-// Methods adds a matcher for HTTP methods.
-// It accepts a sequence of one or more methods to be matched, e.g.:
-// "GET", "POST", "PUT".
-func (r *Route) Methods(methods ...string) *Route {
- for k, v := range methods {
- methods[k] = strings.ToUpper(v)
- }
- return r.addMatcher(methodMatcher(methods))
-}
-
-// Path -----------------------------------------------------------------------
-
-// Path adds a matcher for the URL path.
-// It accepts a template with zero or more URL variables enclosed by {}. The
-// template must start with a "/".
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-//
-// For example:
-//
-// r := mux.NewRouter()
-// r.Path("/products/").Handler(ProductsHandler)
-// r.Path("/products/{key}").Handler(ProductsHandler)
-// r.Path("/articles/{category}/{id:[0-9]+}").
-// Handler(ArticleHandler)
-//
-// Variable names must be unique in a given route. They can be retrieved
-// calling mux.Vars(request).
-func (r *Route) Path(tpl string) *Route {
- r.err = r.addRegexpMatcher(tpl, false, false, false)
- return r
-}
-
-// PathPrefix -----------------------------------------------------------------
-
-// PathPrefix adds a matcher for the URL path prefix. This matches if the given
-// template is a prefix of the full URL path. See Route.Path() for details on
-// the tpl argument.
-//
-// Note that it does not treat slashes specially ("/foobar/" will be matched by
-// the prefix "/foo") so you may want to use a trailing slash here.
-//
-// Also note that the setting of Router.StrictSlash() has no effect on routes
-// with a PathPrefix matcher.
-func (r *Route) PathPrefix(tpl string) *Route {
- r.err = r.addRegexpMatcher(tpl, false, true, false)
- return r
-}
-
-// Query ----------------------------------------------------------------------
-
-// Queries adds a matcher for URL query values.
-// It accepts a sequence of key/value pairs. Values may define variables.
-// For example:
-//
-// r := mux.NewRouter()
-// r.Queries("foo", "bar", "id", "{id:[0-9]+}")
-//
-// The above route will only match if the URL contains the defined queries
-// values, e.g.: ?foo=bar&id=42.
-//
-// It the value is an empty string, it will match any value if the key is set.
-//
-// Variables can define an optional regexp pattern to be matched:
-//
-// - {name} matches anything until the next slash.
-//
-// - {name:pattern} matches the given regexp pattern.
-func (r *Route) Queries(pairs ...string) *Route {
- length := len(pairs)
- if length%2 != 0 {
- r.err = fmt.Errorf(
- "mux: number of parameters must be multiple of 2, got %v", pairs)
- return nil
- }
- for i := 0; i < length; i += 2 {
- if r.err = r.addRegexpMatcher(pairs[i]+"="+pairs[i+1], false, false, true); r.err != nil {
- return r
- }
- }
-
- return r
-}
-
-// Schemes --------------------------------------------------------------------
-
-// schemeMatcher matches the request against URL schemes.
-type schemeMatcher []string
-
-func (m schemeMatcher) Match(r *http.Request, match *RouteMatch) bool {
- return matchInArray(m, r.URL.Scheme)
-}
-
-// Schemes adds a matcher for URL schemes.
-// It accepts a sequence of schemes to be matched, e.g.: "http", "https".
-func (r *Route) Schemes(schemes ...string) *Route {
- for k, v := range schemes {
- schemes[k] = strings.ToLower(v)
- }
- return r.addMatcher(schemeMatcher(schemes))
-}
-
-// BuildVarsFunc --------------------------------------------------------------
-
-// BuildVarsFunc is the function signature used by custom build variable
-// functions (which can modify route variables before a route's URL is built).
-type BuildVarsFunc func(map[string]string) map[string]string
-
-// BuildVarsFunc adds a custom function to be used to modify build variables
-// before a route's URL is built.
-func (r *Route) BuildVarsFunc(f BuildVarsFunc) *Route {
- r.buildVarsFunc = f
- return r
-}
-
-// Subrouter ------------------------------------------------------------------
-
-// Subrouter creates a subrouter for the route.
-//
-// It will test the inner routes only if the parent route matched. For example:
-//
-// r := mux.NewRouter()
-// s := r.Host("www.example.com").Subrouter()
-// s.HandleFunc("/products/", ProductsHandler)
-// s.HandleFunc("/products/{key}", ProductHandler)
-// s.HandleFunc("/articles/{category}/{id:[0-9]+}"), ArticleHandler)
-//
-// Here, the routes registered in the subrouter won't be tested if the host
-// doesn't match.
-func (r *Route) Subrouter() *Router {
- router := &Router{parent: r, strictSlash: r.strictSlash}
- r.addMatcher(router)
- return router
-}
-
-// ----------------------------------------------------------------------------
-// URL building
-// ----------------------------------------------------------------------------
-
-// URL builds a URL for the route.
-//
-// It accepts a sequence of key/value pairs for the route variables. For
-// example, given this route:
-//
-// r := mux.NewRouter()
-// r.HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-// Name("article")
-//
-// ...a URL for it can be built using:
-//
-// url, err := r.Get("article").URL("category", "technology", "id", "42")
-//
-// ...which will return an url.URL with the following path:
-//
-// "/articles/technology/42"
-//
-// This also works for host variables:
-//
-// r := mux.NewRouter()
-// r.Host("{subdomain}.domain.com").
-// HandleFunc("/articles/{category}/{id:[0-9]+}", ArticleHandler).
-// Name("article")
-//
-// // url.String() will be "http://news.domain.com/articles/technology/42"
-// url, err := r.Get("article").URL("subdomain", "news",
-// "category", "technology",
-// "id", "42")
-//
-// All variables defined in the route are required, and their values must
-// conform to the corresponding patterns.
-func (r *Route) URL(pairs ...string) (*url.URL, error) {
- if r.err != nil {
- return nil, r.err
- }
- if r.regexp == nil {
- return nil, errors.New("mux: route doesn't have a host or path")
- }
- values, err := r.prepareVars(pairs...)
- if err != nil {
- return nil, err
- }
- var scheme, host, path string
- if r.regexp.host != nil {
- // Set a default scheme.
- scheme = "http"
- if host, err = r.regexp.host.url(values); err != nil {
- return nil, err
- }
- }
- if r.regexp.path != nil {
- if path, err = r.regexp.path.url(values); err != nil {
- return nil, err
- }
- }
- return &url.URL{
- Scheme: scheme,
- Host: host,
- Path: path,
- }, nil
-}
-
-// URLHost builds the host part of the URL for a route. See Route.URL().
-//
-// The route must have a host defined.
-func (r *Route) URLHost(pairs ...string) (*url.URL, error) {
- if r.err != nil {
- return nil, r.err
- }
- if r.regexp == nil || r.regexp.host == nil {
- return nil, errors.New("mux: route doesn't have a host")
- }
- values, err := r.prepareVars(pairs...)
- if err != nil {
- return nil, err
- }
- host, err := r.regexp.host.url(values)
- if err != nil {
- return nil, err
- }
- return &url.URL{
- Scheme: "http",
- Host: host,
- }, nil
-}
-
-// URLPath builds the path part of the URL for a route. See Route.URL().
-//
-// The route must have a path defined.
-func (r *Route) URLPath(pairs ...string) (*url.URL, error) {
- if r.err != nil {
- return nil, r.err
- }
- if r.regexp == nil || r.regexp.path == nil {
- return nil, errors.New("mux: route doesn't have a path")
- }
- values, err := r.prepareVars(pairs...)
- if err != nil {
- return nil, err
- }
- path, err := r.regexp.path.url(values)
- if err != nil {
- return nil, err
- }
- return &url.URL{
- Path: path,
- }, nil
-}
-
-// prepareVars converts the route variable pairs into a map. If the route has a
-// BuildVarsFunc, it is invoked.
-func (r *Route) prepareVars(pairs ...string) (map[string]string, error) {
- m, err := mapFromPairsToString(pairs...)
- if err != nil {
- return nil, err
- }
- return r.buildVars(m), nil
-}
-
-func (r *Route) buildVars(m map[string]string) map[string]string {
- if r.parent != nil {
- m = r.parent.buildVars(m)
- }
- if r.buildVarsFunc != nil {
- m = r.buildVarsFunc(m)
- }
- return m
-}
-
-// ----------------------------------------------------------------------------
-// parentRoute
-// ----------------------------------------------------------------------------
-
-// parentRoute allows routes to know about parent host and path definitions.
-type parentRoute interface {
- getNamedRoutes() map[string]*Route
- getRegexpGroup() *routeRegexpGroup
- buildVars(map[string]string) map[string]string
-}
-
-// getNamedRoutes returns the map where named routes are registered.
-func (r *Route) getNamedRoutes() map[string]*Route {
- if r.parent == nil {
- // During tests router is not always set.
- r.parent = NewRouter()
- }
- return r.parent.getNamedRoutes()
-}
-
-// getRegexpGroup returns regexp definitions from this route.
-func (r *Route) getRegexpGroup() *routeRegexpGroup {
- if r.regexp == nil {
- if r.parent == nil {
- // During tests router is not always set.
- r.parent = NewRouter()
- }
- regexp := r.parent.getRegexpGroup()
- if regexp == nil {
- r.regexp = new(routeRegexpGroup)
- } else {
- // Copy.
- r.regexp = &routeRegexpGroup{
- host: regexp.host,
- path: regexp.path,
- queries: regexp.queries,
- }
- }
- }
- return r.regexp
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go
deleted file mode 100644
index c7544a643ede814c3e4a13abb5e18fb50d05ed88..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image_test.go
+++ /dev/null
@@ -1,1018 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "bytes"
- "encoding/base64"
- "encoding/json"
- "io/ioutil"
- "net"
- "net/http"
- "net/url"
- "os"
- "reflect"
- "strings"
- "testing"
- "time"
-)
-
-func newTestClient(rt *FakeRoundTripper) Client {
- endpoint := "http://localhost:4243"
- u, _ := parseEndpoint("http://localhost:4243", false)
- testAPIVersion, _ := NewAPIVersion("1.17")
- client := Client{
- HTTPClient: &http.Client{Transport: rt},
- Dialer: &net.Dialer{},
- endpoint: endpoint,
- endpointURL: u,
- SkipServerVersionCheck: true,
- serverAPIVersion: testAPIVersion,
- }
- return client
-}
-
-type stdoutMock struct {
- *bytes.Buffer
-}
-
-func (m stdoutMock) Close() error {
- return nil
-}
-
-type stdinMock struct {
- *bytes.Buffer
-}
-
-func (m stdinMock) Close() error {
- return nil
-}
-
-func TestListImages(t *testing.T) {
- body := `[
- {
- "Repository":"base",
- "Tag":"ubuntu-12.10",
- "Id":"b750fe79269d",
- "Created":1364102658
- },
- {
- "Repository":"base",
- "Tag":"ubuntu-quantal",
- "Id":"b750fe79269d",
- "Created":1364102658
- },
- {
- "RepoTag": [
- "ubuntu:12.04",
- "ubuntu:precise",
- "ubuntu:latest"
- ],
- "Id": "8dbd9e392a964c",
- "Created": 1365714795,
- "Size": 131506275,
- "VirtualSize": 131506275
- },
- {
- "RepoTag": [
- "ubuntu:12.10",
- "ubuntu:quantal"
- ],
- "ParentId": "27cf784147099545",
- "Id": "b750fe79269d2e",
- "Created": 1364102658,
- "Size": 24653,
- "VirtualSize": 180116135
- }
-]`
- var expected []APIImages
- err := json.Unmarshal([]byte(body), &expected)
- if err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
- images, err := client.ListImages(ListImagesOptions{})
- if err != nil {
- t.Error(err)
- }
- if !reflect.DeepEqual(images, expected) {
- t.Errorf("ListImages: Wrong return value. Want %#v. Got %#v.", expected, images)
- }
-}
-
-func TestListImagesParameters(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "null", status: http.StatusOK}
- client := newTestClient(fakeRT)
- _, err := client.ListImages(ListImagesOptions{All: false})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("ListImages({All: false}: Wrong HTTP method. Want GET. Got %s.", req.Method)
- }
- if all := req.URL.Query().Get("all"); all != "0" && all != "" {
- t.Errorf("ListImages({All: false}): Wrong parameter. Want all=0 or not present at all. Got all=%s", all)
- }
- fakeRT.Reset()
- _, err = client.ListImages(ListImagesOptions{All: true})
- if err != nil {
- t.Fatal(err)
- }
- req = fakeRT.requests[0]
- if all := req.URL.Query().Get("all"); all != "1" {
- t.Errorf("ListImages({All: true}): Wrong parameter. Want all=1. Got all=%s", all)
- }
- fakeRT.Reset()
- _, err = client.ListImages(ListImagesOptions{Filters: map[string][]string{
- "dangling": {"true"},
- }})
- if err != nil {
- t.Fatal(err)
- }
- req = fakeRT.requests[0]
- body := req.URL.Query().Get("filters")
- var filters map[string][]string
- err = json.Unmarshal([]byte(body), &filters)
- if err != nil {
- t.Fatal(err)
- }
- if len(filters["dangling"]) != 1 || filters["dangling"][0] != "true" {
- t.Errorf("ListImages(dangling=[true]): Wrong filter map. Want dangling=[true], got dangling=%v", filters["dangling"])
- }
-}
-
-func TestImageHistory(t *testing.T) {
- body := `[
- {
- "Id": "25daec02219d2d852f7526137213a9b199926b4b24e732eab5b8bc6c49bd470e",
- "Tags": [
- "debian:7.6",
- "debian:latest",
- "debian:7",
- "debian:wheezy"
- ],
- "Created": 1409856216,
- "CreatedBy": "/bin/sh -c #(nop) CMD [/bin/bash]"
- },
- {
- "Id": "41026a5347fb5be6ed16115bf22df8569697139f246186de9ae8d4f67c335dce",
- "Created": 1409856213,
- "CreatedBy": "/bin/sh -c #(nop) ADD file:1ee9e97209d00e3416a4543b23574cc7259684741a46bbcbc755909b8a053a38 in /",
- "Size": 85178663
- },
- {
- "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
- "Tags": [
- "scratch:latest"
- ],
- "Created": 1371157430
- }
-]`
- var expected []ImageHistory
- err := json.Unmarshal([]byte(body), &expected)
- if err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
- history, err := client.ImageHistory("debian:latest")
- if err != nil {
- t.Error(err)
- }
- if !reflect.DeepEqual(history, expected) {
- t.Errorf("ImageHistory: Wrong return value. Want %#v. Got %#v.", expected, history)
- }
-}
-
-func TestRemoveImage(t *testing.T) {
- name := "test"
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- err := client.RemoveImage(name)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedMethod := "DELETE"
- if req.Method != expectedMethod {
- t.Errorf("RemoveImage(%q): Wrong HTTP method. Want %s. Got %s.", name, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/images/" + name))
- if req.URL.Path != u.Path {
- t.Errorf("RemoveImage(%q): Wrong request path. Want %q. Got %q.", name, u.Path, req.URL.Path)
- }
-}
-
-func TestRemoveImageNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such image", status: http.StatusNotFound})
- err := client.RemoveImage("test:")
- if err != ErrNoSuchImage {
- t.Errorf("RemoveImage: wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
- }
-}
-
-func TestRemoveImageExtended(t *testing.T) {
- name := "test"
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- err := client.RemoveImageExtended(name, RemoveImageOptions{Force: true, NoPrune: true})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedMethod := "DELETE"
- if req.Method != expectedMethod {
- t.Errorf("RemoveImage(%q): Wrong HTTP method. Want %s. Got %s.", name, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/images/" + name))
- if req.URL.Path != u.Path {
- t.Errorf("RemoveImage(%q): Wrong request path. Want %q. Got %q.", name, u.Path, req.URL.Path)
- }
- expectedQuery := "force=1&noprune=1"
- if query := req.URL.Query().Encode(); query != expectedQuery {
- t.Errorf("PushImage: Wrong query string. Want %q. Got %q.", expectedQuery, query)
- }
-}
-
-func TestInspectImage(t *testing.T) {
- body := `{
- "Id":"b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
- "Parent":"27cf784147099545",
- "Created":"2013-03-23T22:24:18.818426Z",
- "Container":"3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
- "ContainerConfig":{"Memory":1},
- "VirtualSize":12345
-}`
-
- created, err := time.Parse(time.RFC3339Nano, "2013-03-23T22:24:18.818426Z")
- if err != nil {
- t.Fatal(err)
- }
-
- expected := Image{
- ID: "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
- Parent: "27cf784147099545",
- Created: created,
- Container: "3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
- ContainerConfig: Config{
- Memory: 1,
- },
- VirtualSize: 12345,
- }
- fakeRT := &FakeRoundTripper{message: body, status: http.StatusOK}
- client := newTestClient(fakeRT)
- image, err := client.InspectImage(expected.ID)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(*image, expected) {
- t.Errorf("InspectImage(%q): Wrong image returned. Want %#v. Got %#v.", expected.ID, expected, *image)
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("InspectImage(%q): Wrong HTTP method. Want GET. Got %s.", expected.ID, req.Method)
- }
- u, _ := url.Parse(client.getURL("/images/" + expected.ID + "/json"))
- if req.URL.Path != u.Path {
- t.Errorf("InspectImage(%q): Wrong request URL. Want %q. Got %q.", expected.ID, u.Path, req.URL.Path)
- }
-}
-
-func TestInspectImageNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such image", status: http.StatusNotFound})
- name := "test"
- image, err := client.InspectImage(name)
- if image != nil {
- t.Errorf("InspectImage(%q): expected <nil> image, got %#v.", name, image)
- }
- if err != ErrNoSuchImage {
- t.Errorf("InspectImage(%q): wrong error. Want %#v. Got %#v.", name, ErrNoSuchImage, err)
- }
-}
-
-func TestPushImage(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- err := client.PushImage(PushImageOptions{Name: "test", OutputStream: &buf}, AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- expected := "Pushing 1/100"
- if buf.String() != expected {
- t.Errorf("PushImage: Wrong output. Want %q. Got %q.", expected, buf.String())
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("PushImage: Wrong HTTP method. Want POST. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/images/test/push"))
- if req.URL.Path != u.Path {
- t.Errorf("PushImage: Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
- if query := req.URL.Query().Encode(); query != "" {
- t.Errorf("PushImage: Wrong query string. Want no parameters, got %q.", query)
- }
-
- auth, err := base64.URLEncoding.DecodeString(req.Header.Get("X-Registry-Auth"))
- if err != nil {
- t.Errorf("PushImage: caught error decoding auth. %#v", err.Error())
- }
- if strings.TrimSpace(string(auth)) != "{}" {
- t.Errorf("PushImage: wrong body. Want %q. Got %q.",
- base64.URLEncoding.EncodeToString([]byte("{}")), req.Header.Get("X-Registry-Auth"))
- }
-}
-
-func TestPushImageWithRawJSON(t *testing.T) {
- body := `
- {"status":"Pushing..."}
- {"status":"Pushing", "progress":"1/? (n/a)", "progressDetail":{"current":1}}}
- {"status":"Image successfully pushed"}
- `
- fakeRT := &FakeRoundTripper{
- message: body,
- status: http.StatusOK,
- header: map[string]string{
- "Content-Type": "application/json",
- },
- }
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
-
- err := client.PushImage(PushImageOptions{
- Name: "test",
- OutputStream: &buf,
- RawJSONStream: true,
- }, AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- if buf.String() != body {
- t.Errorf("PushImage: Wrong raw output. Want %q. Got %q.", body, buf.String())
- }
-}
-
-func TestPushImageWithAuthentication(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- inputAuth := AuthConfiguration{
- Username: "gopher",
- Password: "gopher123",
- Email: "gopher@tsuru.io",
- }
- err := client.PushImage(PushImageOptions{Name: "test", OutputStream: &buf}, inputAuth)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- var gotAuth AuthConfiguration
-
- auth, err := base64.URLEncoding.DecodeString(req.Header.Get("X-Registry-Auth"))
- if err != nil {
- t.Errorf("PushImage: caught error decoding auth. %#v", err.Error())
- }
-
- err = json.Unmarshal(auth, &gotAuth)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(gotAuth, inputAuth) {
- t.Errorf("PushImage: wrong auth configuration. Want %#v. Got %#v.", inputAuth, gotAuth)
- }
-}
-
-func TestPushImageCustomRegistry(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pushing 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var authConfig AuthConfiguration
- var buf bytes.Buffer
- opts := PushImageOptions{
- Name: "test", Registry: "docker.tsuru.io",
- OutputStream: &buf,
- }
- err := client.PushImage(opts, authConfig)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedQuery := "registry=docker.tsuru.io"
- if query := req.URL.Query().Encode(); query != expectedQuery {
- t.Errorf("PushImage: Wrong query string. Want %q. Got %q.", expectedQuery, query)
- }
-}
-
-func TestPushImageNoName(t *testing.T) {
- client := Client{}
- err := client.PushImage(PushImageOptions{}, AuthConfiguration{})
- if err != ErrNoSuchImage {
- t.Errorf("PushImage: got wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
- }
-}
-
-func TestPullImage(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- err := client.PullImage(PullImageOptions{Repository: "base", OutputStream: &buf},
- AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- expected := "Pulling 1/100"
- if buf.String() != expected {
- t.Errorf("PullImage: Wrong output. Want %q. Got %q.", expected, buf.String())
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("PullImage: Wrong HTTP method. Want POST. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/images/create"))
- if req.URL.Path != u.Path {
- t.Errorf("PullImage: Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
- expectedQuery := "fromImage=base"
- if query := req.URL.Query().Encode(); query != expectedQuery {
- t.Errorf("PullImage: Wrong query strin. Want %q. Got %q.", expectedQuery, query)
- }
-}
-
-func TestPullImageWithRawJSON(t *testing.T) {
- body := `
- {"status":"Pulling..."}
- {"status":"Pulling", "progress":"1 B/ 100 B", "progressDetail":{"current":1, "total":100}}
- `
- fakeRT := &FakeRoundTripper{
- message: body,
- status: http.StatusOK,
- header: map[string]string{
- "Content-Type": "application/json",
- },
- }
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- err := client.PullImage(PullImageOptions{
- Repository: "base",
- OutputStream: &buf,
- RawJSONStream: true,
- }, AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- if buf.String() != body {
- t.Errorf("PullImage: Wrong raw output. Want %q. Got %q", body, buf.String())
- }
-}
-
-func TestPullImageWithoutOutputStream(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := PullImageOptions{
- Repository: "base",
- Registry: "docker.tsuru.io",
- }
- err := client.PullImage(opts, AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestPullImageCustomRegistry(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := PullImageOptions{
- Repository: "base",
- Registry: "docker.tsuru.io",
- OutputStream: &buf,
- }
- err := client.PullImage(opts, AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestPullImageTag(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "Pulling 1/100", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := PullImageOptions{
- Repository: "base",
- Registry: "docker.tsuru.io",
- Tag: "latest",
- OutputStream: &buf,
- }
- err := client.PullImage(opts, AuthConfiguration{})
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromImage": {"base"}, "registry": {"docker.tsuru.io"}, "tag": {"latest"}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("PullImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestPullImageNoRepository(t *testing.T) {
- var opts PullImageOptions
- client := Client{}
- err := client.PullImage(opts, AuthConfiguration{})
- if err != ErrNoSuchImage {
- t.Errorf("PullImage: got wrong error. Want %#v. Got %#v.", ErrNoSuchImage, err)
- }
-}
-
-func TestImportImageFromUrl(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := ImportImageOptions{
- Source: "http://mycompany.com/file.tar",
- Repository: "testimage",
- Tag: "tag",
- OutputStream: &buf,
- }
- err := client.ImportImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}, "tag": {opts.Tag}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestImportImageFromInput(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- in := bytes.NewBufferString("tar content")
- var buf bytes.Buffer
- opts := ImportImageOptions{
- Source: "-", Repository: "testimage",
- InputStream: in, OutputStream: &buf,
- Tag: "tag",
- }
- err := client.ImportImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}, "tag": {opts.Tag}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
- body, err := ioutil.ReadAll(req.Body)
- if err != nil {
- t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
- }
- e := "tar content"
- if string(body) != e {
- t.Errorf("ImportImage: wrong body. Want %#v. Got %#v.", e, string(body))
- }
-}
-
-func TestImportImageDoesNotPassesInputIfSourceIsNotDash(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- in := bytes.NewBufferString("foo")
- opts := ImportImageOptions{
- Source: "http://test.com/container.tar", Repository: "testimage",
- InputStream: in, OutputStream: &buf,
- }
- err := client.ImportImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromSrc": {opts.Source}, "repo": {opts.Repository}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
- body, err := ioutil.ReadAll(req.Body)
- if err != nil {
- t.Errorf("ImportImage: caugth error while reading body %#v", err.Error())
- }
- if string(body) != "" {
- t.Errorf("ImportImage: wrong body. Want nothing. Got %#v.", string(body))
- }
-}
-
-func TestImportImageShouldPassTarContentToBodyWhenSourceIsFilePath(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- tarPath := "testing/data/container.tar"
- opts := ImportImageOptions{
- Source: tarPath, Repository: "testimage",
- OutputStream: &buf,
- }
- err := client.ImportImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- tar, err := os.Open(tarPath)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- tarContent, err := ioutil.ReadAll(tar)
- body, err := ioutil.ReadAll(req.Body)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(tarContent, body) {
- t.Errorf("ImportImage: wrong body. Want %#v content. Got %#v.", tarPath, body)
- }
-}
-
-func TestImportImageShouldChangeSourceToDashWhenItsAFilePath(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- tarPath := "testing/data/container.tar"
- opts := ImportImageOptions{
- Source: tarPath, Repository: "testimage",
- OutputStream: &buf,
- }
- err := client.ImportImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"fromSrc": {"-"}, "repo": {opts.Repository}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ImportImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestBuildImageParameters(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- NoCache: true,
- SuppressOutput: true,
- Pull: true,
- RmTmpContainer: true,
- ForceRmTmpContainer: true,
- Memory: 1024,
- Memswap: 2048,
- CPUShares: 10,
- CPUQuota: 7500,
- CPUPeriod: 100000,
- CPUSetCPUs: "0-3",
- Ulimits: []ULimit{{Name: "nofile", Soft: 100, Hard: 200}},
- InputStream: &buf,
- OutputStream: &buf,
- }
- err := client.BuildImage(opts)
- if err != nil && strings.Index(err.Error(), "build image fail") == -1 {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{
- "t": {opts.Name},
- "nocache": {"1"},
- "q": {"1"},
- "pull": {"1"},
- "rm": {"1"},
- "forcerm": {"1"},
- "memory": {"1024"},
- "memswap": {"2048"},
- "cpushares": {"10"},
- "cpuquota": {"7500"},
- "cpuperiod": {"100000"},
- "cpusetcpus": {"0-3"},
- "ulimits": {"[{\"Name\":\"nofile\",\"Soft\":100,\"Hard\":200}]"},
- }
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestBuildImageParametersForRemoteBuild(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- Remote: "testing/data/container.tar",
- SuppressOutput: true,
- OutputStream: &buf,
- }
- err := client.BuildImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"t": {opts.Name}, "remote": {opts.Remote}, "q": {"1"}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestBuildImageMissingRepoAndNilInput(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- SuppressOutput: true,
- OutputStream: &buf,
- }
- err := client.BuildImage(opts)
- if err != ErrMissingRepo {
- t.Errorf("BuildImage: wrong error returned. Want %#v. Got %#v.", ErrMissingRepo, err)
- }
-}
-
-func TestBuildImageMissingOutputStream(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := BuildImageOptions{Name: "testImage"}
- err := client.BuildImage(opts)
- if err != ErrMissingOutputStream {
- t.Errorf("BuildImage: wrong error returned. Want %#v. Got %#v.", ErrMissingOutputStream, err)
- }
-}
-
-func TestBuildImageWithRawJSON(t *testing.T) {
- body := `
- {"stream":"Step 0 : FROM ubuntu:latest\n"}
- {"stream":" ---\u003e 4300eb9d3c8d\n"}
- {"stream":"Step 1 : MAINTAINER docker <eng@docker.com>\n"}
- {"stream":" ---\u003e Using cache\n"}
- {"stream":" ---\u003e 3a3ed758c370\n"}
- {"stream":"Step 2 : CMD /usr/bin/top\n"}
- {"stream":" ---\u003e Running in 36b1479cc2e4\n"}
- {"stream":" ---\u003e 4b6188aebe39\n"}
- {"stream":"Removing intermediate container 36b1479cc2e4\n"}
- {"stream":"Successfully built 4b6188aebe39\n"}
- `
- fakeRT := &FakeRoundTripper{
- message: body,
- status: http.StatusOK,
- header: map[string]string{
- "Content-Type": "application/json",
- },
- }
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Name: "testImage",
- RmTmpContainer: true,
- InputStream: &buf,
- OutputStream: &buf,
- RawJSONStream: true,
- }
- err := client.BuildImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- if buf.String() != body {
- t.Errorf("BuildImage: Wrong raw output. Want %q. Got %q.", body, buf.String())
- }
-}
-
-func TestBuildImageRemoteWithoutName(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- var buf bytes.Buffer
- opts := BuildImageOptions{
- Remote: "testing/data/container.tar",
- SuppressOutput: true,
- OutputStream: &buf,
- }
- err := client.BuildImage(opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := map[string][]string{"t": {opts.Remote}, "remote": {opts.Remote}, "q": {"1"}}
- got := map[string][]string(req.URL.Query())
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("BuildImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestTagImageParameters(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := TagImageOptions{Repo: "testImage"}
- err := client.TagImage("base", opts)
- if err != nil && strings.Index(err.Error(), "tag image fail") == -1 {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expected := "http://localhost:4243/images/base/tag?repo=testImage"
- got := req.URL.String()
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("TagImage: wrong query string. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestTagImageMissingRepo(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := TagImageOptions{Repo: "testImage"}
- err := client.TagImage("", opts)
- if err != ErrNoSuchImage {
- t.Errorf("TestTag: wrong error returned. Want %#v. Got %#v.",
- ErrNoSuchImage, err)
- }
-}
-
-func TestIsUrl(t *testing.T) {
- url := "http://foo.bar/"
- result := isURL(url)
- if !result {
- t.Errorf("isURL: wrong match. Expected %#v to be a url. Got %#v.", url, result)
- }
- url = "/foo/bar.tar"
- result = isURL(url)
- if result {
- t.Errorf("isURL: wrong match. Expected %#v to not be a url. Got %#v", url, result)
- }
-}
-
-func TestLoadImage(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- tar, err := os.Open("testing/data/container.tar")
- if err != nil {
- t.Fatal(err)
- } else {
- defer tar.Close()
- }
- opts := LoadImageOptions{InputStream: tar}
- err = client.LoadImage(opts)
- if nil != err {
- t.Error(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "POST" {
- t.Errorf("LoadImage: wrong method. Expected %q. Got %q.", "POST", req.Method)
- }
- if req.URL.Path != "/images/load" {
- t.Errorf("LoadImage: wrong URL. Expected %q. Got %q.", "/images/load", req.URL.Path)
- }
-}
-
-func TestExportImage(t *testing.T) {
- var buf bytes.Buffer
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := ExportImageOptions{Name: "testimage", OutputStream: &buf}
- err := client.ExportImage(opts)
- if nil != err {
- t.Error(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("ExportImage: wrong method. Expected %q. Got %q.", "GET", req.Method)
- }
- expectedPath := "/images/testimage/get"
- if req.URL.Path != expectedPath {
- t.Errorf("ExportIMage: wrong path. Expected %q. Got %q.", expectedPath, req.URL.Path)
- }
-}
-
-func TestExportImages(t *testing.T) {
- var buf bytes.Buffer
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := ExportImagesOptions{Names: []string{"testimage1", "testimage2:latest"}, OutputStream: &buf}
- err := client.ExportImages(opts)
- if nil != err {
- t.Error(err)
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("ExportImage: wrong method. Expected %q. Got %q.", "GET", req.Method)
- }
- expected := "http://localhost:4243/images/get?names=testimage1&names=testimage2%3Alatest"
- got := req.URL.String()
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ExportIMage: wrong path. Expected %q. Got %q.", expected, got)
- }
-}
-
-func TestExportImagesNoNames(t *testing.T) {
- var buf bytes.Buffer
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusOK}
- client := newTestClient(fakeRT)
- opts := ExportImagesOptions{Names: []string{}, OutputStream: &buf}
- err := client.ExportImages(opts)
- if err == nil {
- t.Error("Expected an error")
- }
- if err != ErrMustSpecifyNames {
- t.Error(err)
- }
-}
-
-func TestSearchImages(t *testing.T) {
- body := `[
- {
- "description":"A container with Cassandra 2.0.3",
- "is_official":true,
- "is_automated":true,
- "name":"poklet/cassandra",
- "star_count":17
- },
- {
- "description":"A container with Cassandra 2.0.3",
- "is_official":true,
- "is_automated":false,
- "name":"poklet/cassandra",
- "star_count":17
- }
- ,
- {
- "description":"A container with Cassandra 2.0.3",
- "is_official":false,
- "is_automated":true,
- "name":"poklet/cassandra",
- "star_count":17
- }
-]`
- var expected []APIImageSearch
- err := json.Unmarshal([]byte(body), &expected)
- if err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
- result, err := client.SearchImages("cassandra")
- if err != nil {
- t.Error(err)
- }
- if !reflect.DeepEqual(result, expected) {
- t.Errorf("SearchImages: Wrong return value. Want %#v. Got %#v.", expected, result)
- }
-}
-
-func TestSearchImagesEx(t *testing.T) {
- body := `[
- {
- "description":"A container with Cassandra 2.0.3",
- "is_official":true,
- "is_automated":true,
- "name":"poklet/cassandra",
- "star_count":17
- },
- {
- "description":"A container with Cassandra 2.0.3",
- "is_official":true,
- "is_automated":false,
- "name":"poklet/cassandra",
- "star_count":17
- }
- ,
- {
- "description":"A container with Cassandra 2.0.3",
- "is_official":false,
- "is_automated":true,
- "name":"poklet/cassandra",
- "star_count":17
- }
-]`
- var expected []APIImageSearch
- err := json.Unmarshal([]byte(body), &expected)
- if err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
- auth := AuthConfiguration{}
- result, err := client.SearchImagesEx("cassandra", auth)
- if err != nil {
- t.Error(err)
- }
- if !reflect.DeepEqual(result, expected) {
- t.Errorf("SearchImages: Wrong return value. Want %#v. Got %#v.", expected, result)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/integration_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/integration_test.go
deleted file mode 100644
index f5aeea27a084aa95dfb70b1eb704835e34fb762e..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/integration_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build docker_integration
-
-package docker
-
-import (
- "bytes"
- "os"
- "testing"
-)
-
-var dockerEndpoint string
-
-func init() {
- dockerEndpoint = os.Getenv("DOCKER_HOST")
- if dockerEndpoint == "" {
- dockerEndpoint = "unix:///var/run/docker.sock"
- }
-}
-
-func TestIntegrationPullCreateStartLogs(t *testing.T) {
- imageName := pullImage(t)
- client := getClient()
- hostConfig := HostConfig{PublishAllPorts: true}
- createOpts := CreateContainerOptions{
- Config: &Config{
- Image: imageName,
- Cmd: []string{"cat", "/home/gopher/file.txt"},
- User: "gopher",
- },
- HostConfig: &hostConfig,
- }
- container, err := client.CreateContainer(createOpts)
- if err != nil {
- t.Fatal(err)
- }
- err = client.StartContainer(container.ID, &hostConfig)
- if err != nil {
- t.Fatal(err)
- }
- status, err := client.WaitContainer(container.ID)
- if err != nil {
- t.Error(err)
- }
- if status != 0 {
- t.Error("WaitContainer(%q): wrong status. Want 0. Got %d", container.ID, status)
- }
- var stdout, stderr bytes.Buffer
- logsOpts := LogsOptions{
- Container: container.ID,
- OutputStream: &stdout,
- ErrorStream: &stderr,
- Stdout: true,
- Stderr: true,
- }
- err = client.Logs(logsOpts)
- if err != nil {
- t.Error(err)
- }
- if stderr.String() != "" {
- t.Errorf("Got unexpected stderr from logs: %q", stderr.String())
- }
- expected := `Welcome to reality, wake up and rejoice
-Welcome to reality, you've made the right choice
-Welcome to reality, and let them hear your voice, shout it out!
-`
- if stdout.String() != expected {
- t.Errorf("Got wrong stdout from logs.\nWant:\n%#v.\n\nGot:\n%#v.", expected, stdout.String())
- }
-}
-
-func pullImage(t *testing.T) string {
- imageName := "fsouza/go-dockerclient-integration"
- var buf bytes.Buffer
- pullOpts := PullImageOptions{
- Repository: imageName,
- OutputStream: &buf,
- }
- client := getClient()
- err := client.PullImage(pullOpts, AuthConfiguration{})
- if err != nil {
- t.Logf("Pull output: %s", buf.String())
- t.Fatal(err)
- }
- return imageName
-}
-
-func getClient() *Client {
- client, _ := NewClient(dockerEndpoint)
- return client
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go
deleted file mode 100644
index ceaf076eda6829f6cf0f275d1c758f110e903ad5..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2014 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "net/http"
- "net/url"
- "reflect"
- "sort"
- "testing"
-)
-
-type DockerVersion struct {
- Version string
- GitCommit string
- GoVersion string
-}
-
-func TestVersion(t *testing.T) {
- body := `{
- "Version":"0.2.2",
- "GitCommit":"5a2a5cc+CHANGES",
- "GoVersion":"go1.0.3"
-}`
- fakeRT := FakeRoundTripper{message: body, status: http.StatusOK}
- client := newTestClient(&fakeRT)
- expected := DockerVersion{
- Version: "0.2.2",
- GitCommit: "5a2a5cc+CHANGES",
- GoVersion: "go1.0.3",
- }
- version, err := client.Version()
- if err != nil {
- t.Fatal(err)
- }
-
- if result := version.Get("Version"); result != expected.Version {
- t.Errorf("Version(): Wrong result. Want %#v. Got %#v.", expected.Version, version.Get("Version"))
- }
- if result := version.Get("GitCommit"); result != expected.GitCommit {
- t.Errorf("GitCommit(): Wrong result. Want %#v. Got %#v.", expected.GitCommit, version.Get("GitCommit"))
- }
- if result := version.Get("GoVersion"); result != expected.GoVersion {
- t.Errorf("GoVersion(): Wrong result. Want %#v. Got %#v.", expected.GoVersion, version.Get("GoVersion"))
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("Version(): wrong request method. Want GET. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/version"))
- if req.URL.Path != u.Path {
- t.Errorf("Version(): wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
-}
-
-func TestVersionError(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "internal error", status: http.StatusInternalServerError}
- client := newTestClient(fakeRT)
- version, err := client.Version()
- if version != nil {
- t.Errorf("Version(): expected <nil> value, got %#v.", version)
- }
- if err == nil {
- t.Error("Version(): unexpected <nil> error")
- }
-}
-
-func TestInfo(t *testing.T) {
- body := `{
- "Containers":11,
- "Images":16,
- "Debug":0,
- "NFd":11,
- "NGoroutines":21,
- "MemoryLimit":1,
- "SwapLimit":0
-}`
- fakeRT := FakeRoundTripper{message: body, status: http.StatusOK}
- client := newTestClient(&fakeRT)
- expected := Env{}
- expected.SetInt("Containers", 11)
- expected.SetInt("Images", 16)
- expected.SetBool("Debug", false)
- expected.SetInt("NFd", 11)
- expected.SetInt("NGoroutines", 21)
- expected.SetBool("MemoryLimit", true)
- expected.SetBool("SwapLimit", false)
- info, err := client.Info()
- if err != nil {
- t.Fatal(err)
- }
- infoSlice := []string(*info)
- expectedSlice := []string(expected)
- sort.Strings(infoSlice)
- sort.Strings(expectedSlice)
- if !reflect.DeepEqual(expectedSlice, infoSlice) {
- t.Errorf("Info(): Wrong result.\nWant %#v.\nGot %#v.", expected, *info)
- }
- req := fakeRT.requests[0]
- if req.Method != "GET" {
- t.Errorf("Info(): Wrong HTTP method. Want GET. Got %s.", req.Method)
- }
- u, _ := url.Parse(client.getURL("/info"))
- if req.URL.Path != u.Path {
- t.Errorf("Info(): Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
-}
-
-func TestInfoError(t *testing.T) {
- fakeRT := &FakeRoundTripper{message: "internal error", status: http.StatusInternalServerError}
- client := newTestClient(fakeRT)
- version, err := client.Info()
- if version != nil {
- t.Errorf("Info(): expected <nil> value, got %#v.", version)
- }
- if err == nil {
- t.Error("Info(): unexpected <nil> error")
- }
-}
-
-func TestParseRepositoryTag(t *testing.T) {
- var tests = []struct {
- input string
- expectedRepo string
- expectedTag string
- }{
- {
- "localhost.localdomain:5000/samalba/hipache:latest",
- "localhost.localdomain:5000/samalba/hipache",
- "latest",
- },
- {
- "localhost.localdomain:5000/samalba/hipache",
- "localhost.localdomain:5000/samalba/hipache",
- "",
- },
- {
- "tsuru/python",
- "tsuru/python",
- "",
- },
- {
- "tsuru/python:2.7",
- "tsuru/python",
- "2.7",
- },
- }
- for _, tt := range tests {
- repo, tag := ParseRepositoryTag(tt.input)
- if repo != tt.expectedRepo {
- t.Errorf("ParseRepositoryTag(%q): wrong repository. Want %q. Got %q", tt.input, tt.expectedRepo, repo)
- }
- if tag != tt.expectedTag {
- t.Errorf("ParseRepositoryTag(%q): wrong tag. Want %q. Got %q", tt.input, tt.expectedTag, tag)
- }
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network_test.go
deleted file mode 100644
index 2bff70fe42b970061499ae6c815d585aba4483ee..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network_test.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "encoding/json"
- "net/http"
- "net/url"
- "reflect"
- "testing"
-)
-
-func TestListNetworks(t *testing.T) {
- jsonNetworks := `[
- {
- "ID": "8dfafdbc3a40",
- "Name": "blah",
- "Type": "bridge",
- "Endpoints":[{"ID": "918c11c8288a", "Name": "dsafdsaf", "Network": "8dfafdbc3a40"}]
- },
- {
- "ID": "9fb1e39c",
- "Name": "foo",
- "Type": "bridge",
- "Endpoints":[{"ID": "c080be979dda", "Name": "lllll2222", "Network": "9fb1e39c"}]
- }
-]`
- var expected []Network
- err := json.Unmarshal([]byte(jsonNetworks), &expected)
- if err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: jsonNetworks, status: http.StatusOK})
- containers, err := client.ListNetworks()
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(containers, expected) {
- t.Errorf("ListNetworks: Expected %#v. Got %#v.", expected, containers)
- }
-}
-
-func TestNetworkInfo(t *testing.T) {
- jsonNetwork := `{
- "ID": "8dfafdbc3a40",
- "Name": "blah",
- "Type": "bridge",
- "Endpoints":[{"ID": "918c11c8288a", "Name": "dsafdsaf", "Network": "8dfafdbc3a40"}]
- }`
- var expected Network
- err := json.Unmarshal([]byte(jsonNetwork), &expected)
- if err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: jsonNetwork, status: http.StatusOK}
- client := newTestClient(fakeRT)
- id := "8dfafdbc3a40"
- network, err := client.NetworkInfo(id)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(*network, expected) {
- t.Errorf("NetworkInfo(%q): Expected %#v. Got %#v.", id, expected, network)
- }
- expectedURL, _ := url.Parse(client.getURL("/networks/8dfafdbc3a40"))
- if gotPath := fakeRT.requests[0].URL.Path; gotPath != expectedURL.Path {
- t.Errorf("NetworkInfo(%q): Wrong path in request. Want %q. Got %q.", id, expectedURL.Path, gotPath)
- }
-}
-
-func TestNetworkCreate(t *testing.T) {
- jsonID := `{"ID": "8dfafdbc3a40"}`
- jsonNetwork := `{
- "ID": "8dfafdbc3a40",
- "Name": "foobar",
- "Driver": "bridge"
- }`
- var expected Network
- err := json.Unmarshal([]byte(jsonNetwork), &expected)
- if err != nil {
- t.Fatal(err)
- }
-
- client := newTestClient(&FakeRoundTripper{message: jsonID, status: http.StatusOK})
- opts := CreateNetworkOptions{"foobar", false, "bridge", IPAMOptions{}, nil}
- network, err := client.CreateNetwork(opts)
- if err != nil {
- t.Fatal(err)
- }
-
- if !reflect.DeepEqual(*network, expected) {
- t.Errorf("CreateNetwork: Expected %#v. Got %#v.", expected, network)
- }
-}
-
-func TestNetworkRemove(t *testing.T) {
- id := "8dfafdbc3a40"
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- err := client.RemoveNetwork(id)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedMethod := "DELETE"
- if req.Method != expectedMethod {
- t.Errorf("RemoveNetwork(%q): Wrong HTTP method. Want %s. Got %s.", id, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/networks/" + id))
- if req.URL.Path != u.Path {
- t.Errorf("RemoveNetwork(%q): Wrong request path. Want %q. Got %q.", id, u.Path, req.URL.Path)
- }
-}
-
-func TestNetworkConnect(t *testing.T) {
- id := "8dfafdbc3a40"
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- opts := NetworkConnectionOptions{"foobar"}
- err := client.ConnectNetwork(id, opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedMethod := "POST"
- if req.Method != expectedMethod {
- t.Errorf("ConnectNetwork(%q): Wrong HTTP method. Want %s. Got %s.", id, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/networks/" + id + "/connect"))
- if req.URL.Path != u.Path {
- t.Errorf("ConnectNetwork(%q): Wrong request path. Want %q. Got %q.", id, u.Path, req.URL.Path)
- }
-}
-
-func TestNetworkConnectNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such network container", status: http.StatusNotFound})
- opts := NetworkConnectionOptions{"foobar"}
- err := client.ConnectNetwork("8dfafdbc3a40", opts)
- if serr, ok := err.(*NoSuchNetworkOrContainer); !ok {
- t.Errorf("ConnectNetwork: wrong error type: %s.", serr)
- }
-}
-
-func TestNetworkDisconnect(t *testing.T) {
- id := "8dfafdbc3a40"
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- opts := NetworkConnectionOptions{"foobar"}
- err := client.DisconnectNetwork(id, opts)
- if err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedMethod := "POST"
- if req.Method != expectedMethod {
- t.Errorf("DisconnectNetwork(%q): Wrong HTTP method. Want %s. Got %s.", id, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/networks/" + id + "/disconnect"))
- if req.URL.Path != u.Path {
- t.Errorf("DisconnectNetwork(%q): Wrong request path. Want %q. Got %q.", id, u.Path, req.URL.Path)
- }
-}
-
-func TestNetworkDisconnectNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such network container", status: http.StatusNotFound})
- opts := NetworkConnectionOptions{"foobar"}
- err := client.DisconnectNetwork("8dfafdbc3a40", opts)
- if serr, ok := err.(*NoSuchNetworkOrContainer); !ok {
- t.Errorf("DisconnectNetwork: wrong error type: %s.", serr)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
deleted file mode 100644
index 027e8c20e6166f9ba8bdd78fefd3343c03d22d51..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/.dockerignore
+++ /dev/null
@@ -1,3 +0,0 @@
-container.tar
-dockerfile.tar
-foofile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
deleted file mode 100644
index 0948dcfa8cc5e58cfa4f9325ed0520158d0c9b16..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# this file describes how to build tsuru python image
-# to run it:
-# 1- install docker
-# 2- run: $ docker build -t tsuru/python https://raw.github.com/tsuru/basebuilder/master/python/Dockerfile
-
-from base:ubuntu-quantal
-run apt-get install wget -y --force-yes
-run wget http://github.com/tsuru/basebuilder/tarball/master -O basebuilder.tar.gz --no-check-certificate
-run mkdir /var/lib/tsuru
-run tar -xvf basebuilder.tar.gz -C /var/lib/tsuru --strip 1
-run cp /var/lib/tsuru/python/deploy /var/lib/tsuru
-run cp /var/lib/tsuru/base/restart /var/lib/tsuru
-run cp /var/lib/tsuru/base/start /var/lib/tsuru
-run /var/lib/tsuru/base/install
-run /var/lib/tsuru/base/setup
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/barfile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/barfile
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem
deleted file mode 100644
index 8e38bba13c694b48c34dd619a5358a998dfa315b..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/ca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC1TCCAb+gAwIBAgIQJ9MsNxrUxumNbAytGi3GEDALBgkqhkiG9w0BAQswFjEU
-MBIGA1UEChMLQm9vdDJEb2NrZXIwHhcNMTQxMDE2MjAyMTM4WhcNMTcwOTMwMjAy
-MTM4WjAWMRQwEgYDVQQKEwtCb290MkRvY2tlcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALpFCSARjG+5yXoqr7UMzuE0df7RRZfeRZI06lJ02ZqV4Iii
-rgL7ML9yPxX50NbLnjiilSDTUhnyocYFItokzUzz8qpX/nlYhuN2Iqwh4d0aWS8z
-f5y248F+H1z+HY2W8NPl/6DVlVwYaNW1/k+RPMlHS0INLR6j+3Ievew7RNE0NnM2
-znELW6NetekDt3GUcz0Z95vDUDfdPnIk1eIFMmYvLxZh23xOca4Q37a3S8F3d+dN
-+OOpwjdgY9Qme0NQUaXpgp58jWuQfB8q7mZrdnLlLqRa8gx1HeDSotX7UmWtWPkb
-vd9EdlKLYw5PVpxMV1rkwf2t4TdgD5NfkpXlXkkCAwEAAaMjMCEwDgYDVR0PAQH/
-BAQDAgCkMA8GA1UdEwEB/wQFMAMBAf8wCwYJKoZIhvcNAQELA4IBAQBxYjHVSKqE
-MJw7CW0GddesULtXXVWGJuZdWJLQlPvPMfIfjIvlcZyS4cdVNiQ3sREFIZz8TpII
-CT0/Pg3sgv/FcOQe1CN0xZYZcyiAZHK1z0fJQq2qVpdv7+tJcjI2vvU6NI24iQCo
-W1wz25trJz9QbdB2MRLMjyz7TSWuafztIvcfEzaIdQ0Whqund/cSuPGQx5IwF83F
-rvlkOyJSH2+VIEBTCIuykJeL0DLTt8cePBQR5L1ISXb4RUMK9ZtqRscBRv8sn7o2
-ixG3wtL0gYF4xLtsQWVxI3iFVrU3WzOH/3c5shVRkWBd+AQRSwCJI4mKH7penJCF
-i3/zzlkvOnjV
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem
deleted file mode 100644
index 5e7244b24fffe2ae75c37dae73d35c5e3ea4a957..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/cert.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC6DCCAdKgAwIBAgIRANO6ymxQAjp66KmEka1G6b0wCwYJKoZIhvcNAQELMBYx
-FDASBgNVBAoTC0Jvb3QyRG9ja2VyMB4XDTE0MTAxNjIwMjE1MloXDTE3MDkzMDIw
-MjE1MlowFjEUMBIGA1UEChMLQm9vdDJEb2NrZXIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDGA1mAhSOpZspD1dpZ7qVEQrIJw4Xo8252jHaORnEdDiFm
-b6brEmr6jw8t4P3IGxbqBc/TqRV+SSXxwYEVvfpeQKH+SmqStoMNtD3Ura161az4
-V0BcxMtSlsUGpoz+//QCAq8qiaxMwgiyc5253mkQm88anj2cNt7xbewiu/KFWuf7
-BVpNK1+ltpJmlukfcj/G+I1bw7j1KxBjDrFqe5cyDuuZcDL2tmUXP/ZWDyXwSv+H
-AOckqn44z6aXlBkVvOXDBZJqY76d/vWVDNCuZeXRnqlhP3t1kH4V0RQXo+JD2tgt
-JgdU0unzyoFOSWNUBPm73tqmjUGGAmGHBmeegJr/AgMBAAGjNTAzMA4GA1UdDwEB
-/wQEAwIAgDATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMAsGCSqG
-SIb3DQEBCwOCAQEABVTWl5SmBP+j5He5bQsgnIXjviSKqe40/10V4LJAOmilycRF
-zLrzM+YMwfjg6PLIs8CldAMWHw9y9ktZY4MxkgCktaiaN/QmMTMwFWEcN4wy5IpM
-U5l93eAg7xsnY430h3QBBADujX4wdF3fs8rSL8zAAQFL0ihurwU124K3yXKsrwpb
-CiVUGfIN4sPwjy8Ws9oxHFDC9/P8lgjHZ1nBIf8KSHnMzlxDGj7isQfhtH+7mcCL
-cM1qO2NirS2v7uaEPPY+MJstAz+W7EJCW9dfMSmHna2SDC37Xkin7uEY9z+qaKFL
-8d/XxOB/L8Ucy8VZhdsv0dsBq5KfJntITM0ksQ==
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar
deleted file mode 100644
index e4b066e3b6df8cb78ac445a34234f3780d164cf4..0000000000000000000000000000000000000000
Binary files a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/container.tar and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar
deleted file mode 100644
index 32c9ce64704835cd096b85ac44c35b5087b5ccdd..0000000000000000000000000000000000000000
Binary files a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/dockerfile.tar and /dev/null differ
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/foofile b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/foofile
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem
deleted file mode 100644
index a9346bcf45ad5e41c339456d44a2f777a66cefc6..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAxgNZgIUjqWbKQ9XaWe6lREKyCcOF6PNudox2jkZxHQ4hZm+m
-6xJq+o8PLeD9yBsW6gXP06kVfkkl8cGBFb36XkCh/kpqkraDDbQ91K2tetWs+FdA
-XMTLUpbFBqaM/v/0AgKvKomsTMIIsnOdud5pEJvPGp49nDbe8W3sIrvyhVrn+wVa
-TStfpbaSZpbpH3I/xviNW8O49SsQYw6xanuXMg7rmXAy9rZlFz/2Vg8l8Er/hwDn
-JKp+OM+ml5QZFbzlwwWSamO+nf71lQzQrmXl0Z6pYT97dZB+FdEUF6PiQ9rYLSYH
-VNLp88qBTkljVAT5u97apo1BhgJhhwZnnoCa/wIDAQABAoIBAQCaGy9EC9pmU95l
-DwGh7k5nIrUnTilg1FwLHWSDdCVCZKXv8ENrPelOWZqJrUo1u4eI2L8XTsewgkNq
-tJu/DRzWz9yDaO0qg6rZNobMh+K076lvmZA44twOydJLS8H+D7ua+PXU2FLlZjmY
-kMyXRJZmW6zCXZc7haTbJx6ZJccoquk/DkS4FcFurJP177u1YrWS9TTw9kensUtU
-jQ63uf56UTN1i+0+Rxl7OW1TZlqwlri5I4njg5249+FxwwHzIq8+l7zD7K9pl8c/
-nG1HuulvU2bVlDlRdyslMPAH34vw9Sku1BD8furrJLr1na5lRSLKJODEaIPEsLwv
-CdEUwP9JAoGBAO76ZW80RyNB2fA+wbTq70Sr8CwrXxYemXrez5LKDC7SsohKFCPE
-IedpO/n+nmymiiJvMm874EExoG6BVrbkWkeb+2vinEfOQNlDMsDx7WLjPekP3t6i
-rXHO3CjFooVFq2z3mZa/Nc5NZqu8fNWNCKJxZDJphdoj6sORNJIUvZVjAoGBANQd
-++J+ITcu3/+A6JrGcgLunBFQYPqkiItk0J4QKYKuX5ik9rWcQDN8TTtfW2mDuiQ4
-NrCwuVPq1V1kB16JzH017SsYLo9g8I20YjnBZge9pKTeUaLVTb3C50LW8FBylop0
-Bnm597dNbtSjphjoTMg0XyC19o3Esf2YeWG0QNS1AoGAWWDfFRNJU99qIldmXULM
-0DM6NVrXSk+ReYnhunXEzrJQwXZrR+EwCPurydk36Uz0NuK9yypquhdUeF/5TZfk
-SAoHo5byekyipl9imRUigqyY2BTudvgCxKDoaHtaSFwBPFTyZZYICquaLbrmOXxw
-8UhVgCFFRYvPXuts7QHC0h8CgYBWEvy9gfU0kV7wLX02IUTuj6jhFb7ktpN6DSTi
-nyhZES1VoctDEu6ydcRZTW6ouH12aSE4Pd5WgTqntQmQgVZrkNB25k8ue2Xh+srJ
-KQOgLIJ9LIHwE6KCWG7DnrjRzE3uTPq7to0g4tkQjH/AJ7PQof/gJDayfJjFkXPg
-A+cy6QKBgEPbKpiqscm03gT2QanBut5pg4dqPOxp0SlErA3kSFNTRK3oYBQPC+LH
-qA5nD5brdkeNBB58Rll8Zpzxiff50bcvLP/7/Sb3NjaXFTEY0gVbdRof3n6N0YP3
-Hu5XDNJ9RNkNzE5RIG1g86KE+aKlcrKMaigqAiuIy2PSnjkQeGk8
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem
deleted file mode 100644
index 89cc445e1ba1e90dea70b8c3c336df0dc2015612..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/server.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC/DCCAeagAwIBAgIQMUILcXtvmSOK63zEBo0VXzALBgkqhkiG9w0BAQswFjEU
-MBIGA1UEChMLQm9vdDJEb2NrZXIwHhcNMTQxMDE2MjAyMTQ2WhcNMTcwOTMwMjAy
-MTQ2WjAWMRQwEgYDVQQKEwtCb290MkRvY2tlcjCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANxUOUhNnqFnrTlLsBYzfFRZWQo268l+4K4lOJCVbfDonP3g
-Mz0vGi9fcyFqEWSA8Y+ShXna625HTnReCwFdsu0861qCIq7v95hFFCyOe0iIxpd0
-AKLnl90d+1vonE7andgFgoobbTiMly4UK4H6z8D148fFNIihoteOG3PIF89TFxP7
-CJ/3wXnx/IKpdlO8PAnub3tBPJHvGDj7KORLy4IBxRX5VBAdfGNybE66fcrehEva
-rLA4m9pgiaR/Nnr9FdKhPyqYdjflLNvzydxNvMIV4M0hFlhXmYvpMjA5/XsTnsyV
-t9JHJa5Upwqsbne08t7rsm7liZNxZlko8xPOTQcCAwEAAaNKMEgwDgYDVR0PAQH/
-BAQDAgCgMAwGA1UdEwEB/wQCMAAwKAYDVR0RBCEwH4ILYm9vdDJkb2NrZXKHBH8A
-AAGHBAoAAg+HBMCoO2cwCwYJKoZIhvcNAQELA4IBAQAYoYcDkDWkl73FZ0WnPmAj
-LiF7HU95Qg3KyEpFsAJeShSLPPbQntmwhdekEzY4tQ3eKQB/+zHFjzsCr/lmDUmH
-Ea/ryQ17C+jyH+Ykg0IWW6L6veZhvRDg6Z9focVtPVBRxPTqC/Qhb54blWRASV+W
-UreMuXQ5+1dQptAM7ixOeLVHjBi/bd9TL3jvwBVCr9QedteMjjK4TCF9Tbcou+MF
-2w3OJJZMDhcD+YwoK9uJDqlKmcTm/vVMbSsp/pTMcnQ7jxCeR8/XyX+VwTZwaHAa
-o92Q/eg3THAiWhvyT/SzyH9dHHBAyXynUwGCggKawHktfvW4QXRPuLxLrJ7iB5cy
------END CERTIFICATE-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
deleted file mode 100644
index c897e5da5501e21eb196bab338e5fc503b70a59c..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/data/serverkey.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEoAIBAAKCAQEA3FQ5SE2eoWetOUuwFjN8VFlZCjbryX7griU4kJVt8Oic/eAz
-PS8aL19zIWoRZIDxj5KFedrrbkdOdF4LAV2y7TzrWoIiru/3mEUULI57SIjGl3QA
-oueX3R37W+icTtqd2AWCihttOIyXLhQrgfrPwPXjx8U0iKGi144bc8gXz1MXE/sI
-n/fBefH8gql2U7w8Ce5ve0E8ke8YOPso5EvLggHFFflUEB18Y3JsTrp9yt6ES9qs
-sDib2mCJpH82ev0V0qE/Kph2N+Us2/PJ3E28whXgzSEWWFeZi+kyMDn9exOezJW3
-0kclrlSnCqxud7Ty3uuybuWJk3FmWSjzE85NBwIDAQABAoIBAG0ak+cW8LeShHf7
-3+2Of0GxoOLrAWWdG5uAuPr31CJYve0FybnBimDtDjD8ujIfm/7xmoEWBEFutA3x
-x9dcU88gvJbsHEqub9gKVQwfXjMz78tt2SbSMiR/xUnk7QorPcCMMfE71aEMFYzu
-1gCed6Rg3vO81t/V0rKVH0j9S7UQz5v/oX15eVDV5LOqyCHwAi6K0eXXbqnbI0TH
-SOQ/nexM2msVXWbO9t6ra6f5V7FXziDK5Xi+rPxRbX9mkrDzxDAevfuRqYBx5vtL
-W2Q2hKjUAHFgXFniNSZBS7dCdAtz0el/3ct+cNmpuTMhhs7M6wC1CuYiZ/DxLiFh
-Si73VckCgYEA+/ceh3+VjtQ0rgEw8sD9bqYEA8IaBiObjneIoFnKBYRG7yZd8JMm
-HD4M/aQ1qhcRLPN7GR03YQULgQJURbKSjJHnhfTXHyeHC3NN4gMVHQXewu2MHCh6
-7FCQ9CfK0KcYLgegVVvL3PrF3hyWGnmTu+G0UkDQRYVnaNrB7snrW6UCgYEA39tq
-+MCQdu0moJ5szSZf02undg9EeW6isk9qzi7TId3/MLci2eH7PEnipipPUK3+DERq
-aba0y0TKgBR2EXvXLFJA/+kfdo2loIEHOfox85HVfxgUaFRti63ZI0uF8D0QT2Yy
-oJal+RFghVoSnv4LjhRKEPbIkScTXGjdK+7wFjsCfz79iKRXQQx0ALd/lL0bgkAn
-QNmvrNHcFQeI2p8700WNzC39aX67SsvEt3qxkrjzC1gxhpTAuReIK1gVPPwvqHN8
-BmV20FD5kMlMCix2mNCopwgUWvKvLAvoGFTxncKMA39+aJbuXAjiqJTekKgNvOE7
-i9kEWw0GTNPp3JHV6QECgYAPwb0M11kT1euDIMOdyRazpf86kyaJuZzgGjD1ZFxe
-JOcigbGFTp/FhZnbglzk2+pm6KXo3QBq0mPCki4hWusxZnTGzpz1VlETNCHTFeZQ
-M7KoaIR/N3oie9Et59H8r/+m5xWnMhNqratyl316DX24uXrhKM3DUdHODl+LCR2D
-IwKBgE1MbHuwolUPEw3HeO4R7NMFVTFei7E/fpUsimPfArGg8UydwvloNT1myJos
-N2JzfGGjN2KPVcBk9fOs71mJ6VcK3C3g5JIccplk6h9VNaw55+zdQvKPTzoBoTvy
-A+Fwx2AlF61KeRF87DL2YTRJ6B9MHmWgf7+GVZOxomLgEAcZ
------END RSA PRIVATE KEY-----
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
deleted file mode 100644
index b16e713676ebd2cb5ad97532639c74ce8c3945e2..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server.go
+++ /dev/null
@@ -1,1246 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package testing provides a fake implementation of the Docker API, useful for
-// testing purpose.
-package testing
-
-import (
- "archive/tar"
- "crypto/rand"
- "encoding/json"
- "errors"
- "fmt"
- "io/ioutil"
- mathrand "math/rand"
- "net"
- "net/http"
- "regexp"
- "strconv"
- "strings"
- "sync"
- "time"
-
- "github.com/fsouza/go-dockerclient"
- "github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy"
- "github.com/fsouza/go-dockerclient/external/github.com/gorilla/mux"
-)
-
-var nameRegexp = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`)
-
-// DockerServer represents a programmable, concurrent (not much), HTTP server
-// implementing a fake version of the Docker remote API.
-//
-// It can used in standalone mode, listening for connections or as an arbitrary
-// HTTP handler.
-//
-// For more details on the remote API, check http://goo.gl/G3plxW.
-type DockerServer struct {
- containers []*docker.Container
- uploadedFiles map[string]string
- execs []*docker.ExecInspect
- execMut sync.RWMutex
- cMut sync.RWMutex
- images []docker.Image
- iMut sync.RWMutex
- imgIDs map[string]string
- networks []*docker.Network
- netMut sync.RWMutex
- listener net.Listener
- mux *mux.Router
- hook func(*http.Request)
- failures map[string]string
- multiFailures []map[string]string
- execCallbacks map[string]func()
- statsCallbacks map[string]func(string) docker.Stats
- customHandlers map[string]http.Handler
- handlerMutex sync.RWMutex
- cChan chan<- *docker.Container
- volStore map[string]*volumeCounter
- volMut sync.RWMutex
-}
-
-type volumeCounter struct {
- volume docker.Volume
- count int
-}
-
-// NewServer returns a new instance of the fake server, in standalone mode. Use
-// the method URL to get the URL of the server.
-//
-// It receives the bind address (use 127.0.0.1:0 for getting an available port
-// on the host), a channel of containers and a hook function, that will be
-// called on every request.
-//
-// The fake server will send containers in the channel whenever the container
-// changes its state, via the HTTP API (i.e.: create, start and stop). This
-// channel may be nil, which means that the server won't notify on state
-// changes.
-func NewServer(bind string, containerChan chan<- *docker.Container, hook func(*http.Request)) (*DockerServer, error) {
- listener, err := net.Listen("tcp", bind)
- if err != nil {
- return nil, err
- }
- server := DockerServer{
- listener: listener,
- imgIDs: make(map[string]string),
- hook: hook,
- failures: make(map[string]string),
- execCallbacks: make(map[string]func()),
- statsCallbacks: make(map[string]func(string) docker.Stats),
- customHandlers: make(map[string]http.Handler),
- uploadedFiles: make(map[string]string),
- cChan: containerChan,
- }
- server.buildMuxer()
- go http.Serve(listener, &server)
- return &server, nil
-}
-
-func (s *DockerServer) notify(container *docker.Container) {
- if s.cChan != nil {
- s.cChan <- container
- }
-}
-
-func (s *DockerServer) buildMuxer() {
- s.mux = mux.NewRouter()
- s.mux.Path("/commit").Methods("POST").HandlerFunc(s.handlerWrapper(s.commitContainer))
- s.mux.Path("/containers/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listContainers))
- s.mux.Path("/containers/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.createContainer))
- s.mux.Path("/containers/{id:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectContainer))
- s.mux.Path("/containers/{id:.*}/rename").Methods("POST").HandlerFunc(s.handlerWrapper(s.renameContainer))
- s.mux.Path("/containers/{id:.*}/top").Methods("GET").HandlerFunc(s.handlerWrapper(s.topContainer))
- s.mux.Path("/containers/{id:.*}/start").Methods("POST").HandlerFunc(s.handlerWrapper(s.startContainer))
- s.mux.Path("/containers/{id:.*}/kill").Methods("POST").HandlerFunc(s.handlerWrapper(s.stopContainer))
- s.mux.Path("/containers/{id:.*}/stop").Methods("POST").HandlerFunc(s.handlerWrapper(s.stopContainer))
- s.mux.Path("/containers/{id:.*}/pause").Methods("POST").HandlerFunc(s.handlerWrapper(s.pauseContainer))
- s.mux.Path("/containers/{id:.*}/unpause").Methods("POST").HandlerFunc(s.handlerWrapper(s.unpauseContainer))
- s.mux.Path("/containers/{id:.*}/wait").Methods("POST").HandlerFunc(s.handlerWrapper(s.waitContainer))
- s.mux.Path("/containers/{id:.*}/attach").Methods("POST").HandlerFunc(s.handlerWrapper(s.attachContainer))
- s.mux.Path("/containers/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeContainer))
- s.mux.Path("/containers/{id:.*}/exec").Methods("POST").HandlerFunc(s.handlerWrapper(s.createExecContainer))
- s.mux.Path("/containers/{id:.*}/stats").Methods("GET").HandlerFunc(s.handlerWrapper(s.statsContainer))
- s.mux.Path("/containers/{id:.*}/archive").Methods("PUT").HandlerFunc(s.handlerWrapper(s.uploadToContainer))
- s.mux.Path("/exec/{id:.*}/resize").Methods("POST").HandlerFunc(s.handlerWrapper(s.resizeExecContainer))
- s.mux.Path("/exec/{id:.*}/start").Methods("POST").HandlerFunc(s.handlerWrapper(s.startExecContainer))
- s.mux.Path("/exec/{id:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectExecContainer))
- s.mux.Path("/images/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.pullImage))
- s.mux.Path("/build").Methods("POST").HandlerFunc(s.handlerWrapper(s.buildImage))
- s.mux.Path("/images/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.listImages))
- s.mux.Path("/images/{id:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeImage))
- s.mux.Path("/images/{name:.*}/json").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectImage))
- s.mux.Path("/images/{name:.*}/push").Methods("POST").HandlerFunc(s.handlerWrapper(s.pushImage))
- s.mux.Path("/images/{name:.*}/tag").Methods("POST").HandlerFunc(s.handlerWrapper(s.tagImage))
- s.mux.Path("/events").Methods("GET").HandlerFunc(s.listEvents)
- s.mux.Path("/_ping").Methods("GET").HandlerFunc(s.handlerWrapper(s.pingDocker))
- s.mux.Path("/images/load").Methods("POST").HandlerFunc(s.handlerWrapper(s.loadImage))
- s.mux.Path("/images/{id:.*}/get").Methods("GET").HandlerFunc(s.handlerWrapper(s.getImage))
- s.mux.Path("/networks").Methods("GET").HandlerFunc(s.handlerWrapper(s.listNetworks))
- s.mux.Path("/networks/{id:.*}").Methods("GET").HandlerFunc(s.handlerWrapper(s.networkInfo))
- s.mux.Path("/networks").Methods("POST").HandlerFunc(s.handlerWrapper(s.createNetwork))
- s.mux.Path("/volumes").Methods("GET").HandlerFunc(s.handlerWrapper(s.listVolumes))
- s.mux.Path("/volumes/create").Methods("POST").HandlerFunc(s.handlerWrapper(s.createVolume))
- s.mux.Path("/volumes/{name:.*}").Methods("GET").HandlerFunc(s.handlerWrapper(s.inspectVolume))
- s.mux.Path("/volumes/{name:.*}").Methods("DELETE").HandlerFunc(s.handlerWrapper(s.removeVolume))
-}
-
-// SetHook changes the hook function used by the server.
-//
-// The hook function is a function called on every request.
-func (s *DockerServer) SetHook(hook func(*http.Request)) {
- s.hook = hook
-}
-
-// PrepareExec adds a callback to a container exec in the fake server.
-//
-// This function will be called whenever the given exec id is started, and the
-// given exec id will remain in the "Running" start while the function is
-// running, so it's useful for emulating an exec that runs for two seconds, for
-// example:
-//
-// opts := docker.CreateExecOptions{
-// AttachStdin: true,
-// AttachStdout: true,
-// AttachStderr: true,
-// Tty: true,
-// Cmd: []string{"/bin/bash", "-l"},
-// }
-// // Client points to a fake server.
-// exec, err := client.CreateExec(opts)
-// // handle error
-// server.PrepareExec(exec.ID, func() {time.Sleep(2 * time.Second)})
-// err = client.StartExec(exec.ID, docker.StartExecOptions{Tty: true}) // will block for 2 seconds
-// // handle error
-func (s *DockerServer) PrepareExec(id string, callback func()) {
- s.execCallbacks[id] = callback
-}
-
-// PrepareStats adds a callback that will be called for each container stats
-// call.
-//
-// This callback function will be called multiple times if stream is set to
-// true when stats is called.
-func (s *DockerServer) PrepareStats(id string, callback func(string) docker.Stats) {
- s.statsCallbacks[id] = callback
-}
-
-// PrepareFailure adds a new expected failure based on a URL regexp it receives
-// an id for the failure.
-func (s *DockerServer) PrepareFailure(id string, urlRegexp string) {
- s.failures[id] = urlRegexp
-}
-
-// PrepareMultiFailures enqueues a new expected failure based on a URL regexp
-// it receives an id for the failure.
-func (s *DockerServer) PrepareMultiFailures(id string, urlRegexp string) {
- s.multiFailures = append(s.multiFailures, map[string]string{"error": id, "url": urlRegexp})
-}
-
-// ResetFailure removes an expected failure identified by the given id.
-func (s *DockerServer) ResetFailure(id string) {
- delete(s.failures, id)
-}
-
-// ResetMultiFailures removes all enqueued failures.
-func (s *DockerServer) ResetMultiFailures() {
- s.multiFailures = []map[string]string{}
-}
-
-// CustomHandler registers a custom handler for a specific path.
-//
-// For example:
-//
-// server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-// http.Error(w, "Something wrong is not right", http.StatusInternalServerError)
-// }))
-func (s *DockerServer) CustomHandler(path string, handler http.Handler) {
- s.handlerMutex.Lock()
- s.customHandlers[path] = handler
- s.handlerMutex.Unlock()
-}
-
-// MutateContainer changes the state of a container, returning an error if the
-// given id does not match to any container "running" in the server.
-func (s *DockerServer) MutateContainer(id string, state docker.State) error {
- for _, container := range s.containers {
- if container.ID == id {
- container.State = state
- return nil
- }
- }
- return errors.New("container not found")
-}
-
-// Stop stops the server.
-func (s *DockerServer) Stop() {
- if s.listener != nil {
- s.listener.Close()
- }
-}
-
-// URL returns the HTTP URL of the server.
-func (s *DockerServer) URL() string {
- if s.listener == nil {
- return ""
- }
- return "http://" + s.listener.Addr().String() + "/"
-}
-
-// ServeHTTP handles HTTP requests sent to the server.
-func (s *DockerServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- s.handlerMutex.RLock()
- defer s.handlerMutex.RUnlock()
- for re, handler := range s.customHandlers {
- if m, _ := regexp.MatchString(re, r.URL.Path); m {
- handler.ServeHTTP(w, r)
- return
- }
- }
- s.mux.ServeHTTP(w, r)
- if s.hook != nil {
- s.hook(r)
- }
-}
-
-// DefaultHandler returns default http.Handler mux, it allows customHandlers to
-// call the default behavior if wanted.
-func (s *DockerServer) DefaultHandler() http.Handler {
- return s.mux
-}
-
-func (s *DockerServer) handlerWrapper(f func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
- return func(w http.ResponseWriter, r *http.Request) {
- for errorID, urlRegexp := range s.failures {
- matched, err := regexp.MatchString(urlRegexp, r.URL.Path)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- if !matched {
- continue
- }
- http.Error(w, errorID, http.StatusBadRequest)
- return
- }
- for i, failure := range s.multiFailures {
- matched, err := regexp.MatchString(failure["url"], r.URL.Path)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- if !matched {
- continue
- }
- http.Error(w, failure["error"], http.StatusBadRequest)
- s.multiFailures = append(s.multiFailures[:i], s.multiFailures[i+1:]...)
- return
- }
- f(w, r)
- }
-}
-
-func (s *DockerServer) listContainers(w http.ResponseWriter, r *http.Request) {
- all := r.URL.Query().Get("all")
- s.cMut.RLock()
- result := make([]docker.APIContainers, 0, len(s.containers))
- for _, container := range s.containers {
- if all == "1" || container.State.Running {
- result = append(result, docker.APIContainers{
- ID: container.ID,
- Image: container.Image,
- Command: fmt.Sprintf("%s %s", container.Path, strings.Join(container.Args, " ")),
- Created: container.Created.Unix(),
- Status: container.State.String(),
- Ports: container.NetworkSettings.PortMappingAPI(),
- Names: []string{fmt.Sprintf("/%s", container.Name)},
- })
- }
- }
- s.cMut.RUnlock()
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) listImages(w http.ResponseWriter, r *http.Request) {
- s.cMut.RLock()
- result := make([]docker.APIImages, len(s.images))
- for i, image := range s.images {
- result[i] = docker.APIImages{
- ID: image.ID,
- Created: image.Created.Unix(),
- }
- for tag, id := range s.imgIDs {
- if id == image.ID {
- result[i].RepoTags = append(result[i].RepoTags, tag)
- }
- }
- }
- s.cMut.RUnlock()
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) findImage(id string) (string, error) {
- s.iMut.RLock()
- defer s.iMut.RUnlock()
- image, ok := s.imgIDs[id]
- if ok {
- return image, nil
- }
- image, _, err := s.findImageByID(id)
- return image, err
-}
-
-func (s *DockerServer) findImageByID(id string) (string, int, error) {
- s.iMut.RLock()
- defer s.iMut.RUnlock()
- for i, image := range s.images {
- if image.ID == id {
- return image.ID, i, nil
- }
- }
- return "", -1, errors.New("No such image")
-}
-
-func (s *DockerServer) createContainer(w http.ResponseWriter, r *http.Request) {
- var config struct {
- *docker.Config
- HostConfig *docker.HostConfig
- }
- defer r.Body.Close()
- err := json.NewDecoder(r.Body).Decode(&config)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- name := r.URL.Query().Get("name")
- if name != "" && !nameRegexp.MatchString(name) {
- http.Error(w, "Invalid container name", http.StatusInternalServerError)
- return
- }
- if _, err := s.findImage(config.Image); err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- ports := map[docker.Port][]docker.PortBinding{}
- for port := range config.ExposedPorts {
- ports[port] = []docker.PortBinding{{
- HostIP: "0.0.0.0",
- HostPort: strconv.Itoa(mathrand.Int() % 0xffff),
- }}
- }
-
- //the container may not have cmd when using a Dockerfile
- var path string
- var args []string
- if len(config.Cmd) == 1 {
- path = config.Cmd[0]
- } else if len(config.Cmd) > 1 {
- path = config.Cmd[0]
- args = config.Cmd[1:]
- }
-
- generatedID := s.generateID()
- config.Config.Hostname = generatedID[:12]
- container := docker.Container{
- Name: name,
- ID: generatedID,
- Created: time.Now(),
- Path: path,
- Args: args,
- Config: config.Config,
- HostConfig: config.HostConfig,
- State: docker.State{
- Running: false,
- Pid: mathrand.Int() % 50000,
- ExitCode: 0,
- StartedAt: time.Now(),
- },
- Image: config.Image,
- NetworkSettings: &docker.NetworkSettings{
- IPAddress: fmt.Sprintf("172.16.42.%d", mathrand.Int()%250+2),
- IPPrefixLen: 24,
- Gateway: "172.16.42.1",
- Bridge: "docker0",
- Ports: ports,
- },
- }
- s.cMut.Lock()
- if container.Name != "" {
- for _, c := range s.containers {
- if c.Name == container.Name {
- defer s.cMut.Unlock()
- http.Error(w, "there's already a container with this name", http.StatusConflict)
- return
- }
- }
- }
- s.containers = append(s.containers, &container)
- s.cMut.Unlock()
- w.WriteHeader(http.StatusCreated)
- s.notify(&container)
-
- json.NewEncoder(w).Encode(container)
-}
-
-func (s *DockerServer) generateID() string {
- var buf [16]byte
- rand.Read(buf[:])
- return fmt.Sprintf("%x", buf)
-}
-
-func (s *DockerServer) renameContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, index, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- copy := *container
- copy.Name = r.URL.Query().Get("name")
- s.cMut.Lock()
- defer s.cMut.Unlock()
- if s.containers[index].ID == copy.ID {
- s.containers[index] = ©
- }
- w.WriteHeader(http.StatusNoContent)
-}
-
-func (s *DockerServer) inspectContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(container)
-}
-
-func (s *DockerServer) statsContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- _, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- stream, _ := strconv.ParseBool(r.URL.Query().Get("stream"))
- callback := s.statsCallbacks[id]
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- encoder := json.NewEncoder(w)
- for {
- var stats docker.Stats
- if callback != nil {
- stats = callback(id)
- }
- encoder.Encode(stats)
- if !stream {
- break
- }
- }
-}
-
-func (s *DockerServer) uploadToContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- if !container.State.Running {
- w.WriteHeader(http.StatusInternalServerError)
- fmt.Fprintf(w, "Container %s is not running", id)
- return
- }
- path := r.URL.Query().Get("path")
- s.uploadedFiles[id] = path
- w.WriteHeader(http.StatusOK)
-}
-
-func (s *DockerServer) topContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- if !container.State.Running {
- w.WriteHeader(http.StatusInternalServerError)
- fmt.Fprintf(w, "Container %s is not running", id)
- return
- }
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- result := docker.TopResult{
- Titles: []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"},
- Processes: [][]string{
- {"root", "7535", "7516", "0", "03:20", "?", "00:00:00", container.Path + " " + strings.Join(container.Args, " ")},
- },
- }
- json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) startContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- s.cMut.Lock()
- defer s.cMut.Unlock()
- defer r.Body.Close()
- var hostConfig docker.HostConfig
- err = json.NewDecoder(r.Body).Decode(&hostConfig)
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- container.HostConfig = &hostConfig
- if len(hostConfig.PortBindings) > 0 {
- ports := map[docker.Port][]docker.PortBinding{}
- for key, items := range hostConfig.PortBindings {
- bindings := make([]docker.PortBinding, len(items))
- for i := range items {
- binding := docker.PortBinding{
- HostIP: items[i].HostIP,
- HostPort: items[i].HostPort,
- }
- if binding.HostIP == "" {
- binding.HostIP = "0.0.0.0"
- }
- if binding.HostPort == "" {
- binding.HostPort = strconv.Itoa(mathrand.Int() % 0xffff)
- }
- bindings[i] = binding
- }
- ports[key] = bindings
- }
- container.NetworkSettings.Ports = ports
- }
- if container.State.Running {
- http.Error(w, "", http.StatusNotModified)
- return
- }
- container.State.Running = true
- s.notify(container)
-}
-
-func (s *DockerServer) stopContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- s.cMut.Lock()
- defer s.cMut.Unlock()
- if !container.State.Running {
- http.Error(w, "Container not running", http.StatusBadRequest)
- return
- }
- w.WriteHeader(http.StatusNoContent)
- container.State.Running = false
- s.notify(container)
-}
-
-func (s *DockerServer) pauseContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- s.cMut.Lock()
- defer s.cMut.Unlock()
- if container.State.Paused {
- http.Error(w, "Container already paused", http.StatusBadRequest)
- return
- }
- w.WriteHeader(http.StatusNoContent)
- container.State.Paused = true
-}
-
-func (s *DockerServer) unpauseContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- s.cMut.Lock()
- defer s.cMut.Unlock()
- if !container.State.Paused {
- http.Error(w, "Container not paused", http.StatusBadRequest)
- return
- }
- w.WriteHeader(http.StatusNoContent)
- container.State.Paused = false
-}
-
-func (s *DockerServer) attachContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- hijacker, ok := w.(http.Hijacker)
- if !ok {
- http.Error(w, "cannot hijack connection", http.StatusInternalServerError)
- return
- }
- w.Header().Set("Content-Type", "application/vnd.docker.raw-stream")
- w.WriteHeader(http.StatusOK)
- conn, _, err := hijacker.Hijack()
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- wg := sync.WaitGroup{}
- if r.URL.Query().Get("stdin") == "1" {
- wg.Add(1)
- go func() {
- ioutil.ReadAll(conn)
- wg.Done()
- }()
- }
- outStream := stdcopy.NewStdWriter(conn, stdcopy.Stdout)
- if container.State.Running {
- fmt.Fprintf(outStream, "Container is running\n")
- } else {
- fmt.Fprintf(outStream, "Container is not running\n")
- }
- fmt.Fprintln(outStream, "What happened?")
- fmt.Fprintln(outStream, "Something happened")
- wg.Wait()
- if r.URL.Query().Get("stream") == "1" {
- for {
- time.Sleep(1e6)
- s.cMut.RLock()
- if !container.State.Running {
- s.cMut.RUnlock()
- break
- }
- s.cMut.RUnlock()
- }
- }
- conn.Close()
-}
-
-func (s *DockerServer) waitContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- for {
- time.Sleep(1e6)
- s.cMut.RLock()
- if !container.State.Running {
- s.cMut.RUnlock()
- break
- }
- s.cMut.RUnlock()
- }
- result := map[string]int{"StatusCode": container.State.ExitCode}
- json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) removeContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- force := r.URL.Query().Get("force")
- container, index, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- if container.State.Running && force != "1" {
- msg := "Error: API error (406): Impossible to remove a running container, please stop it first"
- http.Error(w, msg, http.StatusInternalServerError)
- return
- }
- w.WriteHeader(http.StatusNoContent)
- s.cMut.Lock()
- defer s.cMut.Unlock()
- if s.containers[index].ID == id || s.containers[index].Name == id {
- s.containers[index] = s.containers[len(s.containers)-1]
- s.containers = s.containers[:len(s.containers)-1]
- }
-}
-
-func (s *DockerServer) commitContainer(w http.ResponseWriter, r *http.Request) {
- id := r.URL.Query().Get("container")
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- var config *docker.Config
- runConfig := r.URL.Query().Get("run")
- if runConfig != "" {
- config = new(docker.Config)
- err = json.Unmarshal([]byte(runConfig), config)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- }
- w.WriteHeader(http.StatusOK)
- image := docker.Image{
- ID: "img-" + container.ID,
- Parent: container.Image,
- Container: container.ID,
- Comment: r.URL.Query().Get("m"),
- Author: r.URL.Query().Get("author"),
- Config: config,
- }
- repository := r.URL.Query().Get("repo")
- tag := r.URL.Query().Get("tag")
- s.iMut.Lock()
- s.images = append(s.images, image)
- if repository != "" {
- if tag != "" {
- repository += ":" + tag
- }
- s.imgIDs[repository] = image.ID
- }
- s.iMut.Unlock()
- fmt.Fprintf(w, `{"ID":%q}`, image.ID)
-}
-
-func (s *DockerServer) findContainer(idOrName string) (*docker.Container, int, error) {
- s.cMut.RLock()
- defer s.cMut.RUnlock()
- for i, container := range s.containers {
- if container.ID == idOrName || container.Name == idOrName {
- return container, i, nil
- }
- }
- return nil, -1, errors.New("No such container")
-}
-
-func (s *DockerServer) buildImage(w http.ResponseWriter, r *http.Request) {
- if ct := r.Header.Get("Content-Type"); ct == "application/tar" {
- gotDockerFile := false
- tr := tar.NewReader(r.Body)
- for {
- header, err := tr.Next()
- if err != nil {
- break
- }
- if header.Name == "Dockerfile" {
- gotDockerFile = true
- }
- }
- if !gotDockerFile {
- w.WriteHeader(http.StatusBadRequest)
- w.Write([]byte("miss Dockerfile"))
- return
- }
- }
- //we did not use that Dockerfile to build image cause we are a fake Docker daemon
- image := docker.Image{
- ID: s.generateID(),
- Created: time.Now(),
- }
-
- query := r.URL.Query()
- repository := image.ID
- if t := query.Get("t"); t != "" {
- repository = t
- }
- s.iMut.Lock()
- s.images = append(s.images, image)
- s.imgIDs[repository] = image.ID
- s.iMut.Unlock()
- w.Write([]byte(fmt.Sprintf("Successfully built %s", image.ID)))
-}
-
-func (s *DockerServer) pullImage(w http.ResponseWriter, r *http.Request) {
- fromImageName := r.URL.Query().Get("fromImage")
- tag := r.URL.Query().Get("tag")
- image := docker.Image{
- ID: s.generateID(),
- }
- s.iMut.Lock()
- s.images = append(s.images, image)
- if fromImageName != "" {
- if tag != "" {
- fromImageName = fmt.Sprintf("%s:%s", fromImageName, tag)
- }
- s.imgIDs[fromImageName] = image.ID
- }
- s.iMut.Unlock()
-}
-
-func (s *DockerServer) pushImage(w http.ResponseWriter, r *http.Request) {
- name := mux.Vars(r)["name"]
- tag := r.URL.Query().Get("tag")
- if tag != "" {
- name += ":" + tag
- }
- s.iMut.RLock()
- if _, ok := s.imgIDs[name]; !ok {
- s.iMut.RUnlock()
- http.Error(w, "No such image", http.StatusNotFound)
- return
- }
- s.iMut.RUnlock()
- fmt.Fprintln(w, "Pushing...")
- fmt.Fprintln(w, "Pushed")
-}
-
-func (s *DockerServer) tagImage(w http.ResponseWriter, r *http.Request) {
- name := mux.Vars(r)["name"]
- s.iMut.RLock()
- if _, ok := s.imgIDs[name]; !ok {
- s.iMut.RUnlock()
- http.Error(w, "No such image", http.StatusNotFound)
- return
- }
- s.iMut.RUnlock()
- s.iMut.Lock()
- defer s.iMut.Unlock()
- newRepo := r.URL.Query().Get("repo")
- newTag := r.URL.Query().Get("tag")
- if newTag != "" {
- newRepo += ":" + newTag
- }
- s.imgIDs[newRepo] = s.imgIDs[name]
- w.WriteHeader(http.StatusCreated)
-}
-
-func (s *DockerServer) removeImage(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- s.iMut.RLock()
- var tag string
- if img, ok := s.imgIDs[id]; ok {
- id, tag = img, id
- }
- var tags []string
- for tag, taggedID := range s.imgIDs {
- if taggedID == id {
- tags = append(tags, tag)
- }
- }
- s.iMut.RUnlock()
- _, index, err := s.findImageByID(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- w.WriteHeader(http.StatusNoContent)
- s.iMut.Lock()
- defer s.iMut.Unlock()
- if len(tags) < 2 {
- s.images[index] = s.images[len(s.images)-1]
- s.images = s.images[:len(s.images)-1]
- }
- if tag != "" {
- delete(s.imgIDs, tag)
- }
-}
-
-func (s *DockerServer) inspectImage(w http.ResponseWriter, r *http.Request) {
- name := mux.Vars(r)["name"]
- s.iMut.RLock()
- defer s.iMut.RUnlock()
- if id, ok := s.imgIDs[name]; ok {
- for _, img := range s.images {
- if img.ID == id {
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(img)
- return
- }
- }
- }
- http.Error(w, "not found", http.StatusNotFound)
-}
-
-func (s *DockerServer) listEvents(w http.ResponseWriter, r *http.Request) {
- w.Header().Set("Content-Type", "application/json")
- var events [][]byte
- count := mathrand.Intn(20)
- for i := 0; i < count; i++ {
- data, err := json.Marshal(s.generateEvent())
- if err != nil {
- w.WriteHeader(http.StatusInternalServerError)
- return
- }
- events = append(events, data)
- }
- w.WriteHeader(http.StatusOK)
- for _, d := range events {
- fmt.Fprintln(w, d)
- time.Sleep(time.Duration(mathrand.Intn(200)) * time.Millisecond)
- }
-}
-
-func (s *DockerServer) pingDocker(w http.ResponseWriter, r *http.Request) {
- w.WriteHeader(http.StatusOK)
-}
-
-func (s *DockerServer) generateEvent() *docker.APIEvents {
- var eventType string
- switch mathrand.Intn(4) {
- case 0:
- eventType = "create"
- case 1:
- eventType = "start"
- case 2:
- eventType = "stop"
- case 3:
- eventType = "destroy"
- }
- return &docker.APIEvents{
- ID: s.generateID(),
- Status: eventType,
- From: "mybase:latest",
- Time: time.Now().Unix(),
- }
-}
-
-func (s *DockerServer) loadImage(w http.ResponseWriter, r *http.Request) {
- w.WriteHeader(http.StatusOK)
-}
-
-func (s *DockerServer) getImage(w http.ResponseWriter, r *http.Request) {
- w.WriteHeader(http.StatusOK)
- w.Header().Set("Content-Type", "application/tar")
-}
-
-func (s *DockerServer) createExecContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- container, _, err := s.findContainer(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
-
- execID := s.generateID()
- container.ExecIDs = append(container.ExecIDs, execID)
-
- exec := docker.ExecInspect{
- ID: execID,
- Container: *container,
- }
-
- var params docker.CreateExecOptions
- err = json.NewDecoder(r.Body).Decode(¶ms)
- if err != nil {
- http.Error(w, err.Error(), http.StatusInternalServerError)
- return
- }
- if len(params.Cmd) > 0 {
- exec.ProcessConfig.EntryPoint = params.Cmd[0]
- if len(params.Cmd) > 1 {
- exec.ProcessConfig.Arguments = params.Cmd[1:]
- }
- }
-
- exec.ProcessConfig.User = params.User
- exec.ProcessConfig.Tty = params.Tty
-
- s.execMut.Lock()
- s.execs = append(s.execs, &exec)
- s.execMut.Unlock()
- w.WriteHeader(http.StatusOK)
- w.Header().Set("Content-Type", "application/json")
- json.NewEncoder(w).Encode(map[string]string{"Id": exec.ID})
-}
-
-func (s *DockerServer) startExecContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- if exec, err := s.getExec(id, false); err == nil {
- s.execMut.Lock()
- exec.Running = true
- s.execMut.Unlock()
- if callback, ok := s.execCallbacks[id]; ok {
- callback()
- delete(s.execCallbacks, id)
- } else if callback, ok := s.execCallbacks["*"]; ok {
- callback()
- delete(s.execCallbacks, "*")
- }
- s.execMut.Lock()
- exec.Running = false
- s.execMut.Unlock()
- w.WriteHeader(http.StatusOK)
- return
- }
- w.WriteHeader(http.StatusNotFound)
-}
-
-func (s *DockerServer) resizeExecContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- if _, err := s.getExec(id, false); err == nil {
- w.WriteHeader(http.StatusOK)
- return
- }
- w.WriteHeader(http.StatusNotFound)
-}
-
-func (s *DockerServer) inspectExecContainer(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- if exec, err := s.getExec(id, true); err == nil {
- w.WriteHeader(http.StatusOK)
- w.Header().Set("Content-Type", "application/json")
- json.NewEncoder(w).Encode(exec)
- return
- }
- w.WriteHeader(http.StatusNotFound)
-}
-
-func (s *DockerServer) getExec(id string, copy bool) (*docker.ExecInspect, error) {
- s.execMut.RLock()
- defer s.execMut.RUnlock()
- for _, exec := range s.execs {
- if exec.ID == id {
- if copy {
- cp := *exec
- exec = &cp
- }
- return exec, nil
- }
- }
- return nil, errors.New("exec not found")
-}
-
-func (s *DockerServer) findNetwork(idOrName string) (*docker.Network, int, error) {
- s.netMut.RLock()
- defer s.netMut.RUnlock()
- for i, network := range s.networks {
- if network.ID == idOrName || network.Name == idOrName {
- return network, i, nil
- }
- }
- return nil, -1, errors.New("No such network")
-}
-
-func (s *DockerServer) listNetworks(w http.ResponseWriter, r *http.Request) {
- s.netMut.RLock()
- result := make([]docker.Network, 0, len(s.networks))
- for _, network := range s.networks {
- result = append(result, *network)
- }
- s.netMut.RUnlock()
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) networkInfo(w http.ResponseWriter, r *http.Request) {
- id := mux.Vars(r)["id"]
- network, _, err := s.findNetwork(id)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(network)
-}
-
-// isValidName validates configuration objects supported by libnetwork
-func isValidName(name string) bool {
- if name == "" || strings.Contains(name, ".") {
- return false
- }
- return true
-}
-
-func (s *DockerServer) createNetwork(w http.ResponseWriter, r *http.Request) {
- var config *docker.CreateNetworkOptions
- defer r.Body.Close()
- err := json.NewDecoder(r.Body).Decode(&config)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- if !isValidName(config.Name) {
- http.Error(w, "Invalid network name", http.StatusBadRequest)
- return
- }
- if n, _, _ := s.findNetwork(config.Name); n != nil {
- http.Error(w, "network already exists", http.StatusForbidden)
- return
- }
-
- generatedID := s.generateID()
- network := docker.Network{
- Name: config.Name,
- ID: generatedID,
- Driver: config.Driver,
- }
- s.netMut.Lock()
- s.networks = append(s.networks, &network)
- s.netMut.Unlock()
- w.WriteHeader(http.StatusCreated)
- var c = struct{ ID string }{ID: network.ID}
- json.NewEncoder(w).Encode(c)
-}
-
-func (s *DockerServer) listVolumes(w http.ResponseWriter, r *http.Request) {
- s.volMut.RLock()
- result := make([]docker.Volume, 0, len(s.volStore))
- for _, volumeCounter := range s.volStore {
- result = append(result, volumeCounter.volume)
- }
- s.volMut.RUnlock()
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(result)
-}
-
-func (s *DockerServer) createVolume(w http.ResponseWriter, r *http.Request) {
- var data struct {
- *docker.CreateVolumeOptions
- }
- defer r.Body.Close()
- err := json.NewDecoder(r.Body).Decode(&data)
- if err != nil {
- http.Error(w, err.Error(), http.StatusBadRequest)
- return
- }
- volume := &docker.Volume{
- Name: data.CreateVolumeOptions.Name,
- Driver: data.CreateVolumeOptions.Driver,
- }
- // If the name is not specified, generate one. Just using generateID for now
- if len(volume.Name) == 0 {
- volume.Name = s.generateID()
- }
- // If driver is not specified, use local
- if len(volume.Driver) == 0 {
- volume.Driver = "local"
- }
- // Mount point is a default one with name
- volume.Mountpoint = "/var/lib/docker/volumes/" + volume.Name
-
- // If the volume already exists, don't re-add it.
- exists := false
- s.volMut.Lock()
- if s.volStore != nil {
- _, exists = s.volStore[volume.Name]
- } else {
- // No volumes, create volStore
- s.volStore = make(map[string]*volumeCounter)
- }
- if !exists {
- s.volStore[volume.Name] = &volumeCounter{
- volume: *volume,
- count: 0,
- }
- }
- s.volMut.Unlock()
- w.WriteHeader(http.StatusCreated)
- json.NewEncoder(w).Encode(volume)
-}
-
-func (s *DockerServer) inspectVolume(w http.ResponseWriter, r *http.Request) {
- s.volMut.RLock()
- defer s.volMut.RUnlock()
- name := mux.Vars(r)["name"]
- vol, err := s.findVolume(name)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(http.StatusOK)
- json.NewEncoder(w).Encode(vol.volume)
-}
-
-func (s *DockerServer) findVolume(name string) (*volumeCounter, error) {
- vol, ok := s.volStore[name]
- if !ok {
- return nil, errors.New("no such volume")
- }
- return vol, nil
-}
-
-func (s *DockerServer) removeVolume(w http.ResponseWriter, r *http.Request) {
- s.volMut.Lock()
- defer s.volMut.Unlock()
- name := mux.Vars(r)["name"]
- vol, err := s.findVolume(name)
- if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
- return
- }
- if vol.count != 0 {
- http.Error(w, "volume in use and cannot be removed", http.StatusConflict)
- return
- }
- s.volStore[vol.volume.Name] = nil
- w.WriteHeader(http.StatusNoContent)
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go
deleted file mode 100644
index ddadcaab5daf475f76db305bb2f6eebfb53666ef..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/testing/server_test.go
+++ /dev/null
@@ -1,2103 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package testing
-
-import (
- "bufio"
- "bytes"
- "encoding/json"
- "fmt"
- "io/ioutil"
- "math/rand"
- "net"
- "net/http"
- "net/http/httptest"
- "os"
- "reflect"
- "strings"
- "sync"
- "testing"
- "time"
-
- "github.com/fsouza/go-dockerclient"
-)
-
-func TestNewServer(t *testing.T) {
- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
- defer server.listener.Close()
- conn, err := net.Dial("tcp", server.listener.Addr().String())
- if err != nil {
- t.Fatal(err)
- }
- conn.Close()
-}
-
-func TestServerStop(t *testing.T) {
- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
- server.Stop()
- _, err = net.Dial("tcp", server.listener.Addr().String())
- if err == nil {
- t.Error("Unexpected <nil> error when dialing to stopped server")
- }
-}
-
-func TestServerStopNoListener(t *testing.T) {
- server := DockerServer{}
- server.Stop()
-}
-
-func TestServerURL(t *testing.T) {
- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
- defer server.Stop()
- url := server.URL()
- if expected := "http://" + server.listener.Addr().String() + "/"; url != expected {
- t.Errorf("DockerServer.URL(): Want %q. Got %q.", expected, url)
- }
-}
-
-func TestServerURLNoListener(t *testing.T) {
- server := DockerServer{}
- url := server.URL()
- if url != "" {
- t.Errorf("DockerServer.URL(): Expected empty URL on handler mode, got %q.", url)
- }
-}
-
-func TestHandleWithHook(t *testing.T) {
- var called bool
- server, _ := NewServer("127.0.0.1:0", nil, func(*http.Request) { called = true })
- defer server.Stop()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if !called {
- t.Error("ServeHTTP did not call the hook function.")
- }
-}
-
-func TestSetHook(t *testing.T) {
- var called bool
- server, _ := NewServer("127.0.0.1:0", nil, nil)
- defer server.Stop()
- server.SetHook(func(*http.Request) { called = true })
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if !called {
- t.Error("ServeHTTP did not call the hook function.")
- }
-}
-
-func TestCustomHandler(t *testing.T) {
- var called bool
- server, _ := NewServer("127.0.0.1:0", nil, nil)
- addContainers(server, 2)
- server.CustomHandler("/containers/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- called = true
- fmt.Fprint(w, "Hello world")
- }))
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if !called {
- t.Error("Did not call the custom handler")
- }
- if got := recorder.Body.String(); got != "Hello world" {
- t.Errorf("Wrong output for custom handler: want %q. Got %q.", "Hello world", got)
- }
-}
-
-func TestCustomHandlerRegexp(t *testing.T) {
- var called bool
- server, _ := NewServer("127.0.0.1:0", nil, nil)
- addContainers(server, 2)
- server.CustomHandler("/containers/.*/json", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- called = true
- fmt.Fprint(w, "Hello world")
- }))
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/.*/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if !called {
- t.Error("Did not call the custom handler")
- }
- if got := recorder.Body.String(); got != "Hello world" {
- t.Errorf("Wrong output for custom handler: want %q. Got %q.", "Hello world", got)
- }
-}
-
-func TestListContainers(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("ListContainers: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := make([]docker.APIContainers, 2)
- for i, container := range server.containers {
- expected[i] = docker.APIContainers{
- ID: container.ID,
- Image: container.Image,
- Command: strings.Join(container.Config.Cmd, " "),
- Created: container.Created.Unix(),
- Status: container.State.String(),
- Ports: container.NetworkSettings.PortMappingAPI(),
- Names: []string{"/" + container.Name},
- }
- }
- var got []docker.APIContainers
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ListContainers. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestListRunningContainers(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=0", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("ListRunningContainers: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- var got []docker.APIContainers
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if len(got) != 0 {
- t.Errorf("ListRunningContainers: Want 0. Got %d.", len(got))
- }
-}
-
-func TestCreateContainer(t *testing.T) {
- server := DockerServer{}
- server.imgIDs = map[string]string{"base": "a1234"}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Hostname":"", "User":"ubuntu", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":"","HostConfig":{"Binds":["/var/run/docker.sock:/var/run/docker.sock:rw"]}}`
- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- var returned docker.Container
- err := json.NewDecoder(recorder.Body).Decode(&returned)
- if err != nil {
- t.Fatal(err)
- }
- stored := server.containers[0]
- if returned.ID != stored.ID {
- t.Errorf("CreateContainer: ID mismatch. Stored: %q. Returned: %q.", stored.ID, returned.ID)
- }
- if stored.State.Running {
- t.Errorf("CreateContainer should not set container to running state.")
- }
- if stored.Config.User != "ubuntu" {
- t.Errorf("CreateContainer: wrong config. Expected: %q. Returned: %q.", "ubuntu", stored.Config.User)
- }
- if stored.Config.Hostname != returned.ID[:12] {
- t.Errorf("CreateContainer: wrong hostname. Expected: %q. Returned: %q.", returned.ID[:12], stored.Config.Hostname)
- }
- expectedBind := []string{"/var/run/docker.sock:/var/run/docker.sock:rw"}
- if !reflect.DeepEqual(stored.HostConfig.Binds, expectedBind) {
- t.Errorf("CreateContainer: wrong host config. Expected: %v. Returned %v.", expectedBind, stored.HostConfig.Binds)
- }
-}
-
-func TestCreateContainerWithNotifyChannel(t *testing.T) {
- ch := make(chan *docker.Container, 1)
- server := DockerServer{}
- server.imgIDs = map[string]string{"base": "a1234"}
- server.cChan = ch
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":""}`
- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- if notified := <-ch; notified != server.containers[0] {
- t.Errorf("CreateContainer: did not notify the proper container. Want %q. Got %q.", server.containers[0].ID, notified.ID)
- }
-}
-
-func TestCreateContainerInvalidBody(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader("whaaaaaat---"))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-}
-
-func TestCreateContainerDuplicateName(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- server.imgIDs = map[string]string{"base": "a1234"}
- addContainers(&server, 1)
- server.containers[0].Name = "mycontainer"
- recorder := httptest.NewRecorder()
- body := `{"Hostname":"", "User":"ubuntu", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":"","HostConfig":{"Binds":["/var/run/docker.sock:/var/run/docker.sock:rw"]}}`
- request, _ := http.NewRequest("POST", "/containers/create?name=mycontainer", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusConflict {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusConflict, recorder.Code)
- }
-}
-
-func TestCreateMultipleContainersEmptyName(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- server.imgIDs = map[string]string{"base": "a1234"}
- addContainers(&server, 1)
- server.containers[0].Name = ""
- recorder := httptest.NewRecorder()
- body := `{"Hostname":"", "User":"ubuntu", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"], "Image":"base", "Volumes":{}, "VolumesFrom":"","HostConfig":{"Binds":["/var/run/docker.sock:/var/run/docker.sock:rw"]}}`
- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- var returned docker.Container
- err := json.NewDecoder(recorder.Body).Decode(&returned)
- if err != nil {
- t.Fatal(err)
- }
- stored := server.containers[1]
- if returned.ID != stored.ID {
- t.Errorf("CreateContainer: ID mismatch. Stored: %q. Returned: %q.", stored.ID, returned.ID)
- }
- if stored.State.Running {
- t.Errorf("CreateContainer should not set container to running state.")
- }
- if stored.Config.User != "ubuntu" {
- t.Errorf("CreateContainer: wrong config. Expected: %q. Returned: %q.", "ubuntu", stored.Config.User)
- }
- expectedBind := []string{"/var/run/docker.sock:/var/run/docker.sock:rw"}
- if !reflect.DeepEqual(stored.HostConfig.Binds, expectedBind) {
- t.Errorf("CreateContainer: wrong host config. Expected: %v. Returned %v.", expectedBind, stored.HostConfig.Binds)
- }
-}
-
-func TestCreateContainerInvalidName(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"],
-"Image":"base", "Volumes":{}, "VolumesFrom":""}`
- request, _ := http.NewRequest("POST", "/containers/create?name=myapp/container1", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusInternalServerError {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
- }
- expectedBody := "Invalid container name\n"
- if got := recorder.Body.String(); got != expectedBody {
- t.Errorf("CreateContainer: wrong body. Want %q. Got %q.", expectedBody, got)
- }
-}
-
-func TestCreateContainerImageNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Hostname":"", "User":"", "Memory":0, "MemorySwap":0, "AttachStdin":false, "AttachStdout":true, "AttachStderr":true,
-"PortSpecs":null, "Tty":false, "OpenStdin":false, "StdinOnce":false, "Env":null, "Cmd":["date"],
-"Image":"base", "Volumes":{}, "VolumesFrom":""}`
- request, _ := http.NewRequest("POST", "/containers/create", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("CreateContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestRenameContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- newName := server.containers[0].Name + "abc"
- path := fmt.Sprintf("/containers/%s/rename?name=%s", server.containers[0].ID, newName)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RenameContainer: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- container := server.containers[0]
- if container.Name != newName {
- t.Errorf("RenameContainer: did not rename the container. Want %q. Got %q.", newName, container.Name)
- }
-}
-
-func TestRenameContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/containers/blabla/rename?name=something", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("RenameContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestCommitContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/commit?container="+server.containers[0].ID, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("CommitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := fmt.Sprintf(`{"ID":"%s"}`, server.images[0].ID)
- if got := recorder.Body.String(); got != expected {
- t.Errorf("CommitContainer: wrong response body. Want %q. Got %q.", expected, got)
- }
-}
-
-func TestCommitContainerComplete(t *testing.T) {
- server := DockerServer{}
- server.imgIDs = make(map[string]string)
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- queryString := "container=" + server.containers[0].ID + "&repo=tsuru/python&m=saving&author=developers"
- queryString += `&run={"Cmd": ["cat", "/world"],"PortSpecs":["22"]}`
- request, _ := http.NewRequest("POST", "/commit?"+queryString, nil)
- server.ServeHTTP(recorder, request)
- image := server.images[0]
- if image.Parent != server.containers[0].Image {
- t.Errorf("CommitContainer: wrong parent image. Want %q. Got %q.", server.containers[0].Image, image.Parent)
- }
- if image.Container != server.containers[0].ID {
- t.Errorf("CommitContainer: wrong container. Want %q. Got %q.", server.containers[0].ID, image.Container)
- }
- message := "saving"
- if image.Comment != message {
- t.Errorf("CommitContainer: wrong comment (commit message). Want %q. Got %q.", message, image.Comment)
- }
- author := "developers"
- if image.Author != author {
- t.Errorf("CommitContainer: wrong author. Want %q. Got %q.", author, image.Author)
- }
- if id := server.imgIDs["tsuru/python"]; id != image.ID {
- t.Errorf("CommitContainer: wrong ID saved for repository. Want %q. Got %q.", image.ID, id)
- }
- portSpecs := []string{"22"}
- if !reflect.DeepEqual(image.Config.PortSpecs, portSpecs) {
- t.Errorf("CommitContainer: wrong port spec in config. Want %#v. Got %#v.", portSpecs, image.Config.PortSpecs)
- }
- cmd := []string{"cat", "/world"}
- if !reflect.DeepEqual(image.Config.Cmd, cmd) {
- t.Errorf("CommitContainer: wrong cmd in config. Want %#v. Got %#v.", cmd, image.Config.Cmd)
- }
-}
-
-func TestCommitContainerWithTag(t *testing.T) {
- server := DockerServer{}
- server.imgIDs = make(map[string]string)
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- queryString := "container=" + server.containers[0].ID + "&repo=tsuru/python&tag=v1"
- request, _ := http.NewRequest("POST", "/commit?"+queryString, nil)
- server.ServeHTTP(recorder, request)
- image := server.images[0]
- if image.Parent != server.containers[0].Image {
- t.Errorf("CommitContainer: wrong parent image. Want %q. Got %q.", server.containers[0].Image, image.Parent)
- }
- if image.Container != server.containers[0].ID {
- t.Errorf("CommitContainer: wrong container. Want %q. Got %q.", server.containers[0].ID, image.Container)
- }
- if id := server.imgIDs["tsuru/python:v1"]; id != image.ID {
- t.Errorf("CommitContainer: wrong ID saved for repository. Want %q. Got %q.", image.ID, id)
- }
-}
-
-func TestCommitContainerInvalidRun(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/commit?container="+server.containers[0].ID+"&run=abc---", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("CommitContainer. Wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-}
-
-func TestCommitContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/commit?container=abc123", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("CommitContainer. Wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestInspectContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/json", server.containers[0].ID)
- request, _ := http.NewRequest("GET", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("InspectContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := server.containers[0]
- var got docker.Container
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(got.Config, expected.Config) {
- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
- }
- if !reflect.DeepEqual(got.NetworkSettings, expected.NetworkSettings) {
- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
- }
- got.State.StartedAt = expected.State.StartedAt
- got.State.FinishedAt = expected.State.FinishedAt
- got.Config = expected.Config
- got.Created = expected.Created
- got.NetworkSettings = expected.NetworkSettings
- if !reflect.DeepEqual(got, *expected) {
- t.Errorf("InspectContainer: wrong value. Want %#v. Got %#v.", *expected, got)
- }
-}
-
-func TestInspectContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/abc123/json", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("InspectContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestTopContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/top", server.containers[0].ID)
- request, _ := http.NewRequest("GET", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- var got docker.TopResult
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(got.Titles, []string{"UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"}) {
- t.Fatalf("TopContainer: Unexpected titles, got: %#v", got.Titles)
- }
- if len(got.Processes) != 1 {
- t.Fatalf("TopContainer: Unexpected process len, got: %d", len(got.Processes))
- }
- if got.Processes[0][len(got.Processes[0])-1] != "ls -la .." {
- t.Fatalf("TopContainer: Unexpected command name, got: %s", got.Processes[0][len(got.Processes[0])-1])
- }
-}
-
-func TestTopContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/xyz/top", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestTopContainerStopped(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/top", server.containers[0].ID)
- request, _ := http.NewRequest("GET", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusInternalServerError {
- t.Errorf("TopContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
- }
-}
-
-func TestStartContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- memory := int64(536870912)
- hostConfig := docker.HostConfig{Memory: memory}
- configBytes, err := json.Marshal(hostConfig)
- if err != nil {
- t.Fatal(err)
- }
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, bytes.NewBuffer(configBytes))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- if !server.containers[0].State.Running {
- t.Error("StartContainer: did not set the container to running state")
- }
- if gotMemory := server.containers[0].HostConfig.Memory; gotMemory != memory {
- t.Errorf("StartContainer: wrong HostConfig. Wants %d of memory. Got %d", memory, gotMemory)
- }
-}
-
-func TestStartContainerChangeNetwork(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- hostConfig := docker.HostConfig{
- PortBindings: map[docker.Port][]docker.PortBinding{
- "8888/tcp": {{HostIP: "", HostPort: "12345"}},
- },
- }
- configBytes, err := json.Marshal(hostConfig)
- if err != nil {
- t.Fatal(err)
- }
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, bytes.NewBuffer(configBytes))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- if !server.containers[0].State.Running {
- t.Error("StartContainer: did not set the container to running state")
- }
- portMapping := server.containers[0].NetworkSettings.Ports["8888/tcp"]
- expected := []docker.PortBinding{{HostIP: "0.0.0.0", HostPort: "12345"}}
- if !reflect.DeepEqual(portMapping, expected) {
- t.Errorf("StartContainer: network not updated. Wants %#v ports. Got %#v", expected, portMapping)
- }
-}
-
-func TestStartContainerWithNotifyChannel(t *testing.T) {
- ch := make(chan *docker.Container, 1)
- server := DockerServer{}
- server.cChan = ch
- addContainers(&server, 1)
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/start", server.containers[1].ID)
- request, _ := http.NewRequest("POST", path, bytes.NewBuffer([]byte("{}")))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- if notified := <-ch; notified != server.containers[1] {
- t.Errorf("StartContainer: did not notify the proper container. Want %q. Got %q.", server.containers[1].ID, notified.ID)
- }
-}
-
-func TestStartContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := "/containers/abc123/start"
- request, _ := http.NewRequest("POST", path, bytes.NewBuffer([]byte("null")))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestStartContainerAlreadyRunning(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/start", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, bytes.NewBuffer([]byte("null")))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotModified {
- t.Errorf("StartContainer: wrong status code. Want %d. Got %d.", http.StatusNotModified, recorder.Code)
- }
-}
-
-func TestStopContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/stop", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if server.containers[0].State.Running {
- t.Error("StopContainer: did not stop the container")
- }
-}
-
-func TestKillContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/kill", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("KillContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if server.containers[0].State.Running {
- t.Error("KillContainer: did not stop the container")
- }
-}
-
-func TestStopContainerWithNotifyChannel(t *testing.T) {
- ch := make(chan *docker.Container, 1)
- server := DockerServer{}
- server.cChan = ch
- addContainers(&server, 1)
- addContainers(&server, 1)
- server.containers[1].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/stop", server.containers[1].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if notified := <-ch; notified != server.containers[1] {
- t.Errorf("StopContainer: did not notify the proper container. Want %q. Got %q.", server.containers[1].ID, notified.ID)
- }
-}
-
-func TestStopContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := "/containers/abc123/stop"
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestStopContainerNotRunning(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/stop", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("StopContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-}
-
-func TestPauseContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/pause", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if !server.containers[0].State.Paused {
- t.Error("PauseContainer: did not pause the container")
- }
-}
-
-func TestPauseContainerAlreadyPaused(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Paused = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/pause", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-}
-
-func TestPauseContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := "/containers/abc123/pause"
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("PauseContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestUnpauseContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Paused = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/unpause", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if server.containers[0].State.Paused {
- t.Error("UnpauseContainer: did not unpause the container")
- }
-}
-
-func TestUnpauseContainerNotPaused(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/unpause", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-}
-
-func TestUnpauseContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := "/containers/abc123/unpause"
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("UnpauseContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestWaitContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/wait", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- go func() {
- server.cMut.Lock()
- server.containers[0].State.Running = false
- server.cMut.Unlock()
- }()
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("WaitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := `{"StatusCode":0}` + "\n"
- if body := recorder.Body.String(); body != expected {
- t.Errorf("WaitContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-}
-
-func TestWaitContainerStatus(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- server.containers[0].State.ExitCode = 63
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/wait", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("WaitContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := `{"StatusCode":63}` + "\n"
- if body := recorder.Body.String(); body != expected {
- t.Errorf("WaitContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-}
-
-func TestWaitContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := "/containers/abc123/wait"
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("WaitContainer: wrong status code. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-type HijackableResponseRecorder struct {
- httptest.ResponseRecorder
- readCh chan []byte
-}
-
-func (r *HijackableResponseRecorder) Hijack() (net.Conn, *bufio.ReadWriter, error) {
- myConn, otherConn := net.Pipe()
- r.readCh = make(chan []byte)
- go func() {
- data, _ := ioutil.ReadAll(myConn)
- r.readCh <- data
- }()
- return otherConn, nil, nil
-}
-
-func (r *HijackableResponseRecorder) HijackBuffer() string {
- return string(<-r.readCh)
-}
-
-func TestAttachContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := &HijackableResponseRecorder{}
- path := fmt.Sprintf("/containers/%s/attach?logs=1", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- lines := []string{
- "\x01\x00\x00\x00\x00\x00\x00\x15Container is running",
- "\x01\x00\x00\x00\x00\x00\x00\x0fWhat happened?",
- "\x01\x00\x00\x00\x00\x00\x00\x13Something happened",
- }
- expected := strings.Join(lines, "\n") + "\n"
- if body := recorder.HijackBuffer(); body != expected {
- t.Errorf("AttachContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-}
-
-func TestAttachContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := &HijackableResponseRecorder{}
- path := "/containers/abc123/attach?logs=1"
- request, _ := http.NewRequest("POST", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("AttachContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestAttachContainerWithStreamBlocks(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- path := fmt.Sprintf("/containers/%s/attach?logs=1&stdout=1&stream=1", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, nil)
- done := make(chan string)
- go func() {
- recorder := &HijackableResponseRecorder{}
- server.ServeHTTP(recorder, request)
- done <- recorder.HijackBuffer()
- }()
- select {
- case <-done:
- t.Fatalf("attach stream returned before container is stopped")
- case <-time.After(500 * time.Millisecond):
- }
- server.cMut.Lock()
- server.containers[0].State.Running = false
- server.cMut.Unlock()
- var body string
- select {
- case body = <-done:
- case <-time.After(5 * time.Second):
- t.Fatalf("timed out waiting for attach to finish")
- }
- lines := []string{
- "\x01\x00\x00\x00\x00\x00\x00\x15Container is running",
- "\x01\x00\x00\x00\x00\x00\x00\x0fWhat happened?",
- "\x01\x00\x00\x00\x00\x00\x00\x13Something happened",
- }
- expected := strings.Join(lines, "\n") + "\n"
- if body != expected {
- t.Errorf("AttachContainer: wrong body. Want %q. Got %q.", expected, body)
- }
-}
-
-func TestRemoveContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s", server.containers[0].ID)
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if len(server.containers) > 0 {
- t.Error("RemoveContainer: did not remove the container.")
- }
-}
-
-func TestRemoveContainerByName(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s", server.containers[0].Name)
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if len(server.containers) > 0 {
- t.Error("RemoveContainer: did not remove the container.")
- }
-}
-
-func TestRemoveContainerNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/abc123")
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestRemoveContainerRunning(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s", server.containers[0].ID)
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusInternalServerError {
- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusInternalServerError, recorder.Code)
- }
- if len(server.containers) < 1 {
- t.Error("RemoveContainer: should not remove the container.")
- }
-}
-
-func TestRemoveContainerRunningForce(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.containers[0].State.Running = true
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s?%s", server.containers[0].ID, "force=1")
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RemoveContainer: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if len(server.containers) > 0 {
- t.Error("RemoveContainer: did not remove the container.")
- }
-}
-
-func TestPullImage(t *testing.T) {
- server := DockerServer{imgIDs: make(map[string]string)}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/create?fromImage=base", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("PullImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- if len(server.images) != 1 {
- t.Errorf("PullImage: Want 1 image. Got %d.", len(server.images))
- }
- if _, ok := server.imgIDs["base"]; !ok {
- t.Error("PullImage: Repository should not be empty.")
- }
-}
-
-func TestPullImageWithTag(t *testing.T) {
- server := DockerServer{imgIDs: make(map[string]string)}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/create?fromImage=base&tag=tag", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("PullImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- if len(server.images) != 1 {
- t.Errorf("PullImage: Want 1 image. Got %d.", len(server.images))
- }
- if _, ok := server.imgIDs["base:tag"]; !ok {
- t.Error("PullImage: Repository should not be empty.")
- }
-}
-
-func TestPushImage(t *testing.T) {
- server := DockerServer{imgIDs: map[string]string{"tsuru/python": "a123"}}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/tsuru/python/push", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-}
-
-func TestPushImageWithTag(t *testing.T) {
- server := DockerServer{imgIDs: map[string]string{"tsuru/python:v1": "a123"}}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/tsuru/python/push?tag=v1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-}
-
-func TestPushImageNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/tsuru/python/push", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("PushImage: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestTagImage(t *testing.T) {
- server := DockerServer{imgIDs: map[string]string{"tsuru/python": "a123"}}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/tsuru/python/tag?repo=tsuru/new-python", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("TagImage: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- if server.imgIDs["tsuru/python"] != server.imgIDs["tsuru/new-python"] {
- t.Errorf("TagImage: did not tag the image")
- }
-}
-
-func TestTagImageWithRepoAndTag(t *testing.T) {
- server := DockerServer{imgIDs: map[string]string{"tsuru/python": "a123"}}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/tsuru/python/tag?repo=tsuru/new-python&tag=v1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("TagImage: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- if server.imgIDs["tsuru/python"] != server.imgIDs["tsuru/new-python:v1"] {
- t.Errorf("TagImage: did not tag the image")
- }
-}
-
-func TestTagImageNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/images/tsuru/python/tag", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("TagImage: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func addContainers(server *DockerServer, n int) {
- server.cMut.Lock()
- defer server.cMut.Unlock()
- for i := 0; i < n; i++ {
- date := time.Now().Add(time.Duration((rand.Int() % (i + 1))) * time.Hour)
- container := docker.Container{
- Name: fmt.Sprintf("%x", rand.Int()%10000),
- ID: fmt.Sprintf("%x", rand.Int()%10000),
- Created: date,
- Path: "ls",
- Args: []string{"-la", ".."},
- Config: &docker.Config{
- Hostname: fmt.Sprintf("docker-%d", i),
- AttachStdout: true,
- AttachStderr: true,
- Env: []string{"ME=you", fmt.Sprintf("NUMBER=%d", i)},
- Cmd: []string{"ls", "-la", ".."},
- Image: "base",
- },
- State: docker.State{
- Running: false,
- Pid: 400 + i,
- ExitCode: 0,
- StartedAt: date,
- },
- Image: "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
- NetworkSettings: &docker.NetworkSettings{
- IPAddress: fmt.Sprintf("10.10.10.%d", i+2),
- IPPrefixLen: 24,
- Gateway: "10.10.10.1",
- Bridge: "docker0",
- PortMapping: map[string]docker.PortMapping{
- "Tcp": {"8888": fmt.Sprintf("%d", 49600+i)},
- },
- Ports: map[docker.Port][]docker.PortBinding{
- "8888/tcp": {
- {HostIP: "0.0.0.0", HostPort: fmt.Sprintf("%d", 49600+i)},
- },
- },
- },
- ResolvConfPath: "/etc/resolv.conf",
- }
- server.containers = append(server.containers, &container)
- }
-}
-
-func addImages(server *DockerServer, n int, repo bool) {
- server.iMut.Lock()
- defer server.iMut.Unlock()
- if server.imgIDs == nil {
- server.imgIDs = make(map[string]string)
- }
- for i := 0; i < n; i++ {
- date := time.Now().Add(time.Duration((rand.Int() % (i + 1))) * time.Hour)
- image := docker.Image{
- ID: fmt.Sprintf("%x", rand.Int()%10000),
- Created: date,
- }
- server.images = append(server.images, image)
- if repo {
- repo := "docker/python-" + image.ID
- server.imgIDs[repo] = image.ID
- }
- }
-}
-
-func TestListImages(t *testing.T) {
- server := DockerServer{}
- addImages(&server, 2, true)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/images/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("ListImages: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := make([]docker.APIImages, 2)
- for i, image := range server.images {
- expected[i] = docker.APIImages{
- ID: image.ID,
- Created: image.Created.Unix(),
- RepoTags: []string{"docker/python-" + image.ID},
- }
- }
- var got []docker.APIImages
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ListImages. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestRemoveImage(t *testing.T) {
- server := DockerServer{}
- addImages(&server, 1, false)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/images/%s", server.images[0].ID)
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RemoveImage: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if len(server.images) > 0 {
- t.Error("RemoveImage: did not remove the image.")
- }
-}
-
-func TestRemoveImageByName(t *testing.T) {
- server := DockerServer{}
- addImages(&server, 1, true)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- imgName := "docker/python-" + server.images[0].ID
- path := "/images/" + imgName
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RemoveImage: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
- if len(server.images) > 0 {
- t.Error("RemoveImage: did not remove the image.")
- }
- _, ok := server.imgIDs[imgName]
- if ok {
- t.Error("RemoveImage: did not remove image tag name.")
- }
-}
-
-func TestRemoveImageWithMultipleTags(t *testing.T) {
- server := DockerServer{}
- addImages(&server, 1, true)
- server.buildMuxer()
- imgID := server.images[0].ID
- imgName := "docker/python-" + imgID
- server.imgIDs["docker/python-wat"] = imgID
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/images/%s", imgName)
- request, _ := http.NewRequest("DELETE", path, nil)
- server.ServeHTTP(recorder, request)
- _, ok := server.imgIDs[imgName]
- if ok {
- t.Error("RemoveImage: did not remove image tag name.")
- }
- id, ok := server.imgIDs["docker/python-wat"]
- if !ok {
- t.Error("RemoveImage: removed the wrong tag name.")
- }
- if id != imgID {
- t.Error("RemoveImage: disassociated the wrong ID from the tag")
- }
- if len(server.images) < 1 {
- t.Fatal("RemoveImage: removed the image, but should keep it")
- }
- if server.images[0].ID != imgID {
- t.Error("RemoveImage: changed the ID of the image!")
- }
-}
-
-func TestPrepareFailure(t *testing.T) {
- server := DockerServer{failures: make(map[string]string)}
- server.buildMuxer()
- errorID := "my_error"
- server.PrepareFailure(errorID, "containers/json")
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
- if recorder.Body.String() != errorID+"\n" {
- t.Errorf("PrepareFailure: wrong message. Want %s. Got %s.", errorID, recorder.Body.String())
- }
-}
-
-func TestPrepareMultiFailures(t *testing.T) {
- server := DockerServer{multiFailures: []map[string]string{}}
- server.buildMuxer()
- errorID := "multi error"
- server.PrepareMultiFailures(errorID, "containers/json")
- server.PrepareMultiFailures(errorID, "containers/json")
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
- if recorder.Body.String() != errorID+"\n" {
- t.Errorf("PrepareFailure: wrong message. Want %s. Got %s.", errorID, recorder.Body.String())
- }
- recorder = httptest.NewRecorder()
- request, _ = http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
- if recorder.Body.String() != errorID+"\n" {
- t.Errorf("PrepareFailure: wrong message. Want %s. Got %s.", errorID, recorder.Body.String())
- }
- recorder = httptest.NewRecorder()
- request, _ = http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- if recorder.Body.String() == errorID+"\n" {
- t.Errorf("PrepareFailure: wrong message. Want %s. Got %s.", errorID, recorder.Body.String())
- }
-}
-
-func TestRemoveFailure(t *testing.T) {
- server := DockerServer{failures: make(map[string]string)}
- server.buildMuxer()
- errorID := "my_error"
- server.PrepareFailure(errorID, "containers/json")
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("PrepareFailure: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
- server.ResetFailure(errorID)
- recorder = httptest.NewRecorder()
- request, _ = http.NewRequest("GET", "/containers/json?all=1", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("RemoveFailure: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-}
-
-func TestResetMultiFailures(t *testing.T) {
- server := DockerServer{multiFailures: []map[string]string{}}
- server.buildMuxer()
- errorID := "multi error"
- server.PrepareMultiFailures(errorID, "containers/json")
- server.PrepareMultiFailures(errorID, "containers/json")
- if len(server.multiFailures) != 2 {
- t.Errorf("PrepareMultiFailures: error adding multi failures.")
- }
- server.ResetMultiFailures()
- if len(server.multiFailures) != 0 {
- t.Errorf("ResetMultiFailures: error reseting multi failures.")
- }
-}
-
-func TestMutateContainer(t *testing.T) {
- server := DockerServer{failures: make(map[string]string)}
- server.buildMuxer()
- server.containers = append(server.containers, &docker.Container{ID: "id123"})
- state := docker.State{Running: false, ExitCode: 1}
- err := server.MutateContainer("id123", state)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(server.containers[0].State, state) {
- t.Errorf("Wrong state after mutation.\nWant %#v.\nGot %#v.",
- state, server.containers[0].State)
- }
-}
-
-func TestMutateContainerNotFound(t *testing.T) {
- server := DockerServer{failures: make(map[string]string)}
- server.buildMuxer()
- state := docker.State{Running: false, ExitCode: 1}
- err := server.MutateContainer("id123", state)
- if err == nil {
- t.Error("Unexpected <nil> error")
- }
- if err.Error() != "container not found" {
- t.Errorf("wrong error message. Want %q. Got %q.", "container not found", err)
- }
-}
-
-func TestBuildImageWithContentTypeTar(t *testing.T) {
- server := DockerServer{imgIDs: make(map[string]string)}
- imageName := "teste"
- recorder := httptest.NewRecorder()
- tarFile, err := os.Open("data/dockerfile.tar")
- if err != nil {
- t.Fatal(err)
- }
- defer tarFile.Close()
- request, _ := http.NewRequest("POST", "/build?t=teste", tarFile)
- request.Header.Add("Content-Type", "application/tar")
- server.buildImage(recorder, request)
- if recorder.Body.String() == "miss Dockerfile" {
- t.Errorf("BuildImage: miss Dockerfile")
- return
- }
- if _, ok := server.imgIDs[imageName]; ok == false {
- t.Errorf("BuildImage: image %s not builded", imageName)
- }
-}
-
-func TestBuildImageWithRemoteDockerfile(t *testing.T) {
- server := DockerServer{imgIDs: make(map[string]string)}
- imageName := "teste"
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/build?t=teste&remote=http://localhost/Dockerfile", nil)
- server.buildImage(recorder, request)
- if _, ok := server.imgIDs[imageName]; ok == false {
- t.Errorf("BuildImage: image %s not builded", imageName)
- }
-}
-
-func TestPing(t *testing.T) {
- server := DockerServer{}
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/_ping", nil)
- server.pingDocker(recorder, request)
- if recorder.Body.String() != "" {
- t.Errorf("Ping: Unexpected body: %s", recorder.Body.String())
- }
- if recorder.Code != http.StatusOK {
- t.Errorf("Ping: Expected code %d, got: %d", http.StatusOK, recorder.Code)
- }
-}
-
-func TestDefaultHandler(t *testing.T) {
- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
- defer server.listener.Close()
- if server.mux != server.DefaultHandler() {
- t.Fatalf("DefaultHandler: Expected to return server.mux, got: %#v", server.DefaultHandler())
- }
-}
-
-func TestCreateExecContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Cmd": ["bash", "-c", "ls"]}`
- path := fmt.Sprintf("/containers/%s/exec", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Fatalf("CreateExec: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- serverExec := server.execs[0]
- var got docker.Exec
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if got.ID != serverExec.ID {
- t.Errorf("CreateExec: wrong value. Want %#v. Got %#v.", serverExec.ID, got.ID)
- }
-
- expected := docker.ExecInspect{
- ID: got.ID,
- ProcessConfig: docker.ExecProcessConfig{
- EntryPoint: "bash",
- Arguments: []string{"-c", "ls"},
- },
- Container: *server.containers[0],
- }
-
- if !reflect.DeepEqual(*serverExec, expected) {
- t.Errorf("InspectContainer: wrong value. Want:\n%#v\nGot:\n%#v\n", expected, *serverExec)
- }
-}
-
-func TestInspectExecContainer(t *testing.T) {
- server := DockerServer{}
- addContainers(&server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Cmd": ["bash", "-c", "ls"]}`
- path := fmt.Sprintf("/containers/%s/exec", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Fatalf("CreateExec: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- var got docker.Exec
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- path = fmt.Sprintf("/exec/%s/json", got.ID)
- request, _ = http.NewRequest("GET", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Fatalf("CreateExec: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- var got2 docker.ExecInspect
- err = json.NewDecoder(recorder.Body).Decode(&got2)
- if err != nil {
- t.Fatal(err)
- }
- expected := docker.ExecInspect{
- ID: got.ID,
- ProcessConfig: docker.ExecProcessConfig{
- EntryPoint: "bash",
- Arguments: []string{"-c", "ls"},
- },
- Container: *server.containers[0],
- }
- got2.Container.State.StartedAt = expected.Container.State.StartedAt
- got2.Container.State.FinishedAt = expected.Container.State.FinishedAt
- got2.Container.Config = expected.Container.Config
- got2.Container.Created = expected.Container.Created
- got2.Container.NetworkSettings = expected.Container.NetworkSettings
- got2.Container.ExecIDs = expected.Container.ExecIDs
-
- if !reflect.DeepEqual(got2, expected) {
- t.Errorf("InspectContainer: wrong value. Want:\n%#v\nGot:\n%#v\n", expected, got2)
- }
-}
-
-func TestStartExecContainer(t *testing.T) {
- server, _ := NewServer("127.0.0.1:0", nil, nil)
- addContainers(server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Cmd": ["bash", "-c", "ls"]}`
- path := fmt.Sprintf("/containers/%s/exec", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Fatalf("CreateExec: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- var exec docker.Exec
- err := json.NewDecoder(recorder.Body).Decode(&exec)
- if err != nil {
- t.Fatal(err)
- }
- unleash := make(chan bool)
- server.PrepareExec(exec.ID, func() {
- <-unleash
- })
- codes := make(chan int, 1)
- sent := make(chan bool)
- go func() {
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/exec/%s/start", exec.ID)
- body := `{"Tty":true}`
- request, _ := http.NewRequest("POST", path, strings.NewReader(body))
- close(sent)
- server.ServeHTTP(recorder, request)
- codes <- recorder.Code
- }()
- <-sent
- execInfo, err := waitExec(server.URL(), exec.ID, true, 5)
- if err != nil {
- t.Fatal(err)
- }
- if !execInfo.Running {
- t.Error("StartExec: expected exec to be running, but it's not running")
- }
- close(unleash)
- if code := <-codes; code != http.StatusOK {
- t.Errorf("StartExec: wrong status. Want %d. Got %d.", http.StatusOK, code)
- }
- execInfo, err = waitExec(server.URL(), exec.ID, false, 5)
- if err != nil {
- t.Fatal(err)
- }
- if execInfo.Running {
- t.Error("StartExec: expected exec to be not running after start returns, but it's running")
- }
-}
-
-func TestStartExecContainerWildcardCallback(t *testing.T) {
- server, _ := NewServer("127.0.0.1:0", nil, nil)
- addContainers(server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Cmd": ["bash", "-c", "ls"]}`
- path := fmt.Sprintf("/containers/%s/exec", server.containers[0].ID)
- request, _ := http.NewRequest("POST", path, strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Fatalf("CreateExec: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- unleash := make(chan bool)
- server.PrepareExec("*", func() {
- <-unleash
- })
- var exec docker.Exec
- err := json.NewDecoder(recorder.Body).Decode(&exec)
- if err != nil {
- t.Fatal(err)
- }
- codes := make(chan int, 1)
- sent := make(chan bool)
- go func() {
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/exec/%s/start", exec.ID)
- body := `{"Tty":true}`
- request, _ := http.NewRequest("POST", path, strings.NewReader(body))
- close(sent)
- server.ServeHTTP(recorder, request)
- codes <- recorder.Code
- }()
- <-sent
- execInfo, err := waitExec(server.URL(), exec.ID, true, 5)
- if err != nil {
- t.Fatal(err)
- }
- if !execInfo.Running {
- t.Error("StartExec: expected exec to be running, but it's not running")
- }
- close(unleash)
- if code := <-codes; code != http.StatusOK {
- t.Errorf("StartExec: wrong status. Want %d. Got %d.", http.StatusOK, code)
- }
- execInfo, err = waitExec(server.URL(), exec.ID, false, 5)
- if err != nil {
- t.Fatal(err)
- }
- if execInfo.Running {
- t.Error("StartExec: expected exec to be not running after start returns, but it's running")
- }
-}
-
-func TestStartExecContainerNotFound(t *testing.T) {
- server, _ := NewServer("127.0.0.1:0", nil, nil)
- addContainers(server, 1)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Tty":true}`
- request, _ := http.NewRequest("POST", "/exec/something-wat/start", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
-}
-
-func waitExec(url, execID string, running bool, maxTry int) (*docker.ExecInspect, error) {
- client, err := docker.NewClient(url)
- if err != nil {
- return nil, err
- }
- exec, err := client.InspectExec(execID)
- for i := 0; i < maxTry && exec.Running != running && err == nil; i++ {
- time.Sleep(100e6)
- exec, err = client.InspectExec(exec.ID)
- }
- return exec, err
-}
-
-func TestStatsContainer(t *testing.T) {
- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
- defer server.Stop()
- addContainers(server, 2)
- server.buildMuxer()
- expected := docker.Stats{}
- expected.CPUStats.CPUUsage.TotalUsage = 20
- server.PrepareStats(server.containers[0].ID, func(id string) docker.Stats {
- return expected
- })
- recorder := httptest.NewRecorder()
- path := fmt.Sprintf("/containers/%s/stats?stream=false", server.containers[0].ID)
- request, _ := http.NewRequest("GET", path, nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("StatsContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- body := recorder.Body.Bytes()
- var got docker.Stats
- err = json.Unmarshal(body, &got)
- if err != nil {
- t.Fatal(err)
- }
- got.Read = time.Time{}
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("StatsContainer: wrong value. Want %#v. Got %#v.", expected, got)
- }
-}
-
-type safeWriter struct {
- sync.Mutex
- *httptest.ResponseRecorder
-}
-
-func (w *safeWriter) Write(buf []byte) (int, error) {
- w.Lock()
- defer w.Unlock()
- return w.ResponseRecorder.Write(buf)
-}
-
-func TestStatsContainerStream(t *testing.T) {
- server, err := NewServer("127.0.0.1:0", nil, nil)
- if err != nil {
- t.Fatal(err)
- }
- defer server.Stop()
- addContainers(server, 2)
- server.buildMuxer()
- expected := docker.Stats{}
- expected.CPUStats.CPUUsage.TotalUsage = 20
- server.PrepareStats(server.containers[0].ID, func(id string) docker.Stats {
- time.Sleep(50 * time.Millisecond)
- return expected
- })
- recorder := &safeWriter{
- ResponseRecorder: httptest.NewRecorder(),
- }
- path := fmt.Sprintf("/containers/%s/stats?stream=true", server.containers[0].ID)
- request, _ := http.NewRequest("GET", path, nil)
- go func() {
- server.ServeHTTP(recorder, request)
- }()
- time.Sleep(200 * time.Millisecond)
- recorder.Lock()
- defer recorder.Unlock()
- body := recorder.Body.Bytes()
- parts := bytes.Split(body, []byte("\n"))
- if len(parts) < 2 {
- t.Errorf("StatsContainer: wrong number of parts. Want at least 2. Got %#v.", len(parts))
- }
- var got docker.Stats
- err = json.Unmarshal(parts[0], &got)
- if err != nil {
- t.Fatal(err)
- }
- got.Read = time.Time{}
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("StatsContainer: wrong value. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func addNetworks(server *DockerServer, n int) {
- server.netMut.Lock()
- defer server.netMut.Unlock()
- for i := 0; i < n; i++ {
- netid := fmt.Sprintf("%x", rand.Int()%10000)
- network := docker.Network{
- Name: netid,
- ID: fmt.Sprintf("%x", rand.Int()%10000),
- Driver: "bridge",
- Containers: map[string]docker.Endpoint{
- "blah": {
- Name: "blah",
- ID: fmt.Sprintf("%x", rand.Int()%10000),
- },
- },
- }
- server.networks = append(server.networks, &network)
- }
-}
-
-func TestListNetworks(t *testing.T) {
- server := DockerServer{}
- addNetworks(&server, 2)
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/networks", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("ListNetworks: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
- expected := make([]docker.Network, 2)
- for i, network := range server.networks {
- expected[i] = docker.Network{
- ID: network.ID,
- Name: network.Name,
- Driver: network.Driver,
- Containers: network.Containers,
- }
- }
- var got []docker.Network
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ListNetworks. Want %#v. Got %#v.", expected, got)
- }
-}
-
-type createNetworkResponse struct {
- ID string `json:"ID"`
-}
-
-func TestCreateNetwork(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- netid := fmt.Sprintf("%x", rand.Int()%10000)
- netname := fmt.Sprintf("%x", rand.Int()%10000)
- body := fmt.Sprintf(`{"ID": "%s", "Name": "%s", "Type": "bridge" }`, netid, netname)
- request, _ := http.NewRequest("POST", "/networks", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("CreateNetwork: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
-
- var returned createNetworkResponse
- err := json.NewDecoder(recorder.Body).Decode(&returned)
- if err != nil {
- t.Fatal(err)
- }
- stored := server.networks[0]
- if returned.ID != stored.ID {
- t.Errorf("CreateNetwork: ID mismatch. Stored: %q. Returned: %q.", stored.ID, returned)
- }
-}
-
-func TestCreateNetworkInvalidBody(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/networks", strings.NewReader("whaaaaaat---"))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusBadRequest {
- t.Errorf("CreateNetwork: wrong status. Want %d. Got %d.", http.StatusBadRequest, recorder.Code)
- }
-}
-
-func TestCreateNetworkDuplicateName(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- addNetworks(&server, 1)
- server.networks[0].Name = "mynetwork"
- recorder := httptest.NewRecorder()
- body := fmt.Sprintf(`{"ID": "%s", "Name": "mynetwork", "Type": "bridge" }`, fmt.Sprintf("%x", rand.Int()%10000))
- request, _ := http.NewRequest("POST", "/networks", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusForbidden {
- t.Errorf("CreateNetwork: wrong status. Want %d. Got %d.", http.StatusForbidden, recorder.Code)
- }
-}
-
-func TestListVolumes(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- expected := []docker.Volume{{
- Name: "test-vol-1",
- Driver: "local",
- Mountpoint: "/var/lib/docker/volumes/test-vol-1",
- }}
- server.volStore = make(map[string]*volumeCounter)
- for _, vol := range expected {
- server.volStore[vol.Name] = &volumeCounter{
- volume: vol,
- count: 0,
- }
- }
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/volumes", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("ListVolumes: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- var got []docker.Volume
- err := json.NewDecoder(recorder.Body).Decode(&got)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(got, expected) {
- t.Errorf("ListVolumes. Want %#v. Got %#v.", expected, got)
- }
-}
-
-func TestCreateVolume(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- body := `{"Name":"test-volume"}`
- request, _ := http.NewRequest("POST", "/volumes/create", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("CreateVolume: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- var returned docker.Volume
- err := json.NewDecoder(recorder.Body).Decode(&returned)
- if err != nil {
- t.Error(err)
- }
- if returned.Name != "test-volume" {
- t.Errorf("CreateVolume: Name mismatch. Expected: test-volume. Returned %q.", returned.Name)
- }
- if returned.Driver != "local" {
- t.Errorf("CreateVolume: Driver mismatch. Expected: local. Returned: %q", returned.Driver)
- }
- if returned.Mountpoint != "/var/lib/docker/volumes/test-volume" {
- t.Errorf("CreateVolume: Mountpoint mismatch. Expected: /var/lib/docker/volumes/test-volume. Returned: %q.", returned.Mountpoint)
- }
-}
-
-func TestCreateVolumeAlreadExists(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- server.volStore = make(map[string]*volumeCounter)
- server.volStore["test-volume"] = &volumeCounter{
- volume: docker.Volume{
- Name: "test-volume",
- Driver: "local",
- Mountpoint: "/var/lib/docker/volumes/test-volume",
- },
- count: 0,
- }
- body := `{"Name":"test-volume"}`
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("POST", "/volumes/create", strings.NewReader(body))
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusCreated {
- t.Errorf("CreateVolumeAlreadExists: wrong status. Want %d. Got %d.", http.StatusCreated, recorder.Code)
- }
- var returned docker.Volume
- err := json.NewDecoder(recorder.Body).Decode(&returned)
- if err != nil {
- t.Error(err)
- }
- if returned.Name != "test-volume" {
- t.Errorf("CreateVolumeAlreadExists: Name mismatch. Expected: test-volume. Returned %q.", returned.Name)
- }
- if returned.Driver != "local" {
- t.Errorf("CreateVolumeAlreadExists: Driver mismatch. Expected: local. Returned: %q", returned.Driver)
- }
- if returned.Mountpoint != "/var/lib/docker/volumes/test-volume" {
- t.Errorf("CreateVolumeAlreadExists: Mountpoint mismatch. Expected: /var/lib/docker/volumes/test-volume. Returned: %q.", returned.Mountpoint)
- }
-}
-
-func TestInspectVolume(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- expected := docker.Volume{
- Name: "test-volume",
- Driver: "local",
- Mountpoint: "/var/lib/docker/volumes/test-volume",
- }
- volC := &volumeCounter{
- volume: expected,
- count: 0,
- }
- volStore := make(map[string]*volumeCounter)
- volStore["test-volume"] = volC
- server.volStore = volStore
- request, _ := http.NewRequest("GET", "/volumes/test-volume", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("InspectVolume: wrong status. Want %d. God %d.", http.StatusOK, recorder.Code)
- }
- var returned docker.Volume
- err := json.NewDecoder(recorder.Body).Decode(&returned)
- if err != nil {
- t.Error(err)
- }
- if returned.Name != "test-volume" {
- t.Errorf("InspectVolume: Name mismatch. Expected: test-volume. Returned %q.", returned.Name)
- }
- if returned.Driver != "local" {
- t.Errorf("InspectVolume: Driver mismatch. Expected: local. Returned: %q", returned.Driver)
- }
- if returned.Mountpoint != "/var/lib/docker/volumes/test-volume" {
- t.Errorf("InspectVolume: Mountpoint mismatch. Expected: /var/lib/docker/volumes/test-volume. Returned: %q.", returned.Mountpoint)
- }
-}
-
-func TestInspectVolumeNotFound(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("GET", "/volumes/test-volume", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("RemoveMissingVolume: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestRemoveVolume(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- server.volStore = make(map[string]*volumeCounter)
- server.volStore["test-volume"] = &volumeCounter{
- volume: docker.Volume{
- Name: "test-volume",
- Driver: "local",
- Mountpoint: "/var/lib/docker/volumes/test-volume",
- },
- count: 0,
- }
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("DELETE", "/volumes/test-volume", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNoContent {
- t.Errorf("RemoveVolume: wrong status. Want %d. Got %d.", http.StatusNoContent, recorder.Code)
- }
-}
-
-func TestRemoveMissingVolume(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("DELETE", "/volumes/test-volume", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("RemoveMissingVolume: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
-
-func TestRemoveVolumeInuse(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- server.volStore = make(map[string]*volumeCounter)
- server.volStore["test-volume"] = &volumeCounter{
- volume: docker.Volume{
- Name: "test-volume",
- Driver: "local",
- Mountpoint: "/var/lib/docker/volumes/test-volume",
- },
- count: 1,
- }
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("DELETE", "/volumes/test-volume", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusConflict {
- t.Errorf("RemoveVolume: wrong status. Want %d. Got %d.", http.StatusConflict, recorder.Code)
- }
-}
-
-func TestUploadToContainer(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- cont := &docker.Container{
- ID: "id123",
- State: docker.State{
- Running: true,
- ExitCode: 0,
- },
- }
- server.containers = append(server.containers, cont)
- server.uploadedFiles = make(map[string]string)
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("PUT", fmt.Sprintf("/containers/%s/archive?path=abcd", cont.ID), nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusOK {
- t.Errorf("UploadToContainer: wrong status. Want %d. Got %d.", http.StatusOK, recorder.Code)
- }
-}
-
-func TestUploadToContainerMissingContainer(t *testing.T) {
- server := DockerServer{}
- server.buildMuxer()
- recorder := httptest.NewRecorder()
- request, _ := http.NewRequest("PUT", "/containers/missing-container/archive?path=abcd", nil)
- server.ServeHTTP(recorder, request)
- if recorder.Code != http.StatusNotFound {
- t.Errorf("UploadToContainer: wrong status. Want %d. Got %d.", http.StatusNotFound, recorder.Code)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume_test.go b/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume_test.go
deleted file mode 100644
index e6bcca95ff8f1bea7bed0e323212709cf0aa0b89..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2015 go-dockerclient authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package docker
-
-import (
- "encoding/json"
- "net/http"
- "net/url"
- "reflect"
- "testing"
-)
-
-func TestListVolumes(t *testing.T) {
- volumesData := `[
- {
- "Name": "tardis",
- "Driver": "local",
- "Mountpoint": "/var/lib/docker/volumes/tardis"
- },
- {
- "Name": "foo",
- "Driver": "bar",
- "Mountpoint": "/var/lib/docker/volumes/bar"
- }
-]`
- body := `{ "Volumes": ` + volumesData + ` }`
- var expected []Volume
- if err := json.Unmarshal([]byte(volumesData), &expected); err != nil {
- t.Fatal(err)
- }
- client := newTestClient(&FakeRoundTripper{message: body, status: http.StatusOK})
- volumes, err := client.ListVolumes(ListVolumesOptions{})
- if err != nil {
- t.Error(err)
- }
- if !reflect.DeepEqual(volumes, expected) {
- t.Errorf("ListVolumes: Wrong return value. Want %#v. Got %#v.", expected, volumes)
- }
-}
-
-func TestCreateVolume(t *testing.T) {
- body := `{
- "Name": "tardis",
- "Driver": "local",
- "Mountpoint": "/var/lib/docker/volumes/tardis"
- }`
- var expected Volume
- if err := json.Unmarshal([]byte(body), &expected); err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: body, status: http.StatusOK}
- client := newTestClient(fakeRT)
- volume, err := client.CreateVolume(
- CreateVolumeOptions{
- Name: "tardis",
- Driver: "local",
- DriverOpts: map[string]string{
- "foo": "bar",
- },
- },
- )
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(volume, &expected) {
- t.Errorf("CreateVolume: Wrong return value. Want %#v. Got %#v.", expected, volume)
- }
- req := fakeRT.requests[0]
- expectedMethod := "POST"
- if req.Method != expectedMethod {
- t.Errorf("CreateVolume(): Wrong HTTP method. Want %s. Got %s.", expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/volumes/create"))
- if req.URL.Path != u.Path {
- t.Errorf("CreateVolume(): Wrong request path. Want %q. Got %q.", u.Path, req.URL.Path)
- }
-}
-
-func TestInspectVolume(t *testing.T) {
- body := `{
- "Name": "tardis",
- "Driver": "local",
- "Mountpoint": "/var/lib/docker/volumes/tardis"
- }`
- var expected Volume
- if err := json.Unmarshal([]byte(body), &expected); err != nil {
- t.Fatal(err)
- }
- fakeRT := &FakeRoundTripper{message: body, status: http.StatusOK}
- client := newTestClient(fakeRT)
- name := "tardis"
- volume, err := client.InspectVolume(name)
- if err != nil {
- t.Fatal(err)
- }
- if !reflect.DeepEqual(volume, &expected) {
- t.Errorf("InspectVolume: Wrong return value. Want %#v. Got %#v.", expected, volume)
- }
- req := fakeRT.requests[0]
- expectedMethod := "GET"
- if req.Method != expectedMethod {
- t.Errorf("InspectVolume(%q): Wrong HTTP method. Want %s. Got %s.", name, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/volumes/" + name))
- if req.URL.Path != u.Path {
- t.Errorf("CreateVolume(%q): Wrong request path. Want %q. Got %q.", name, u.Path, req.URL.Path)
- }
-}
-
-func TestRemoveVolume(t *testing.T) {
- name := "test"
- fakeRT := &FakeRoundTripper{message: "", status: http.StatusNoContent}
- client := newTestClient(fakeRT)
- if err := client.RemoveVolume(name); err != nil {
- t.Fatal(err)
- }
- req := fakeRT.requests[0]
- expectedMethod := "DELETE"
- if req.Method != expectedMethod {
- t.Errorf("RemoveVolume(%q): Wrong HTTP method. Want %s. Got %s.", name, expectedMethod, req.Method)
- }
- u, _ := url.Parse(client.getURL("/volumes/" + name))
- if req.URL.Path != u.Path {
- t.Errorf("RemoveVolume(%q): Wrong request path. Want %q. Got %q.", name, u.Path, req.URL.Path)
- }
-}
-
-func TestRemoveVolumeNotFound(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "no such volume", status: http.StatusNotFound})
- if err := client.RemoveVolume("test:"); err != ErrNoSuchVolume {
- t.Errorf("RemoveVolume: wrong error. Want %#v. Got %#v.", ErrNoSuchVolume, err)
- }
-}
-
-func TestRemoveVolumeInUse(t *testing.T) {
- client := newTestClient(&FakeRoundTripper{message: "volume in use and cannot be removed", status: http.StatusConflict})
- if err := client.RemoveVolume("test:"); err != ErrVolumeInUse {
- t.Errorf("RemoveVolume: wrong error. Want %#v. Got %#v.", ErrVolumeInUse, err)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go b/Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go
deleted file mode 100644
index 5aafa3af2d23cf1f2b44c2ca76081767bf782488..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin linux freebsd netbsd windows
-
-package osext
-
-import (
- "bytes"
- "fmt"
- "io"
- "os"
- "os/exec"
- "path/filepath"
- "runtime"
- "testing"
-)
-
-const (
- executableEnvVar = "OSTEST_OUTPUT_EXECUTABLE"
-
- executableEnvValueMatch = "match"
- executableEnvValueDelete = "delete"
-)
-
-func TestExecutableMatch(t *testing.T) {
- ep, err := Executable()
- if err != nil {
- t.Fatalf("Executable failed: %v", err)
- }
-
- // fullpath to be of the form "dir/prog".
- dir := filepath.Dir(filepath.Dir(ep))
- fullpath, err := filepath.Rel(dir, ep)
- if err != nil {
- t.Fatalf("filepath.Rel: %v", err)
- }
- // Make child start with a relative program path.
- // Alter argv[0] for child to verify getting real path without argv[0].
- cmd := &exec.Cmd{
- Dir: dir,
- Path: fullpath,
- Env: []string{fmt.Sprintf("%s=%s", executableEnvVar, executableEnvValueMatch)},
- }
- out, err := cmd.CombinedOutput()
- if err != nil {
- t.Fatalf("exec(self) failed: %v", err)
- }
- outs := string(out)
- if !filepath.IsAbs(outs) {
- t.Fatalf("Child returned %q, want an absolute path", out)
- }
- if !sameFile(outs, ep) {
- t.Fatalf("Child returned %q, not the same file as %q", out, ep)
- }
-}
-
-func TestExecutableDelete(t *testing.T) {
- if runtime.GOOS != "linux" {
- t.Skip()
- }
- fpath, err := Executable()
- if err != nil {
- t.Fatalf("Executable failed: %v", err)
- }
-
- r, w := io.Pipe()
- stderrBuff := &bytes.Buffer{}
- stdoutBuff := &bytes.Buffer{}
- cmd := &exec.Cmd{
- Path: fpath,
- Env: []string{fmt.Sprintf("%s=%s", executableEnvVar, executableEnvValueDelete)},
- Stdin: r,
- Stderr: stderrBuff,
- Stdout: stdoutBuff,
- }
- err = cmd.Start()
- if err != nil {
- t.Fatalf("exec(self) start failed: %v", err)
- }
-
- tempPath := fpath + "_copy"
- _ = os.Remove(tempPath)
-
- err = copyFile(tempPath, fpath)
- if err != nil {
- t.Fatalf("copy file failed: %v", err)
- }
- err = os.Remove(fpath)
- if err != nil {
- t.Fatalf("remove running test file failed: %v", err)
- }
- err = os.Rename(tempPath, fpath)
- if err != nil {
- t.Fatalf("rename copy to previous name failed: %v", err)
- }
-
- w.Write([]byte{0})
- w.Close()
-
- err = cmd.Wait()
- if err != nil {
- t.Fatalf("exec wait failed: %v", err)
- }
-
- childPath := stderrBuff.String()
- if !filepath.IsAbs(childPath) {
- t.Fatalf("Child returned %q, want an absolute path", childPath)
- }
- if !sameFile(childPath, fpath) {
- t.Fatalf("Child returned %q, not the same file as %q", childPath, fpath)
- }
-}
-
-func sameFile(fn1, fn2 string) bool {
- fi1, err := os.Stat(fn1)
- if err != nil {
- return false
- }
- fi2, err := os.Stat(fn2)
- if err != nil {
- return false
- }
- return os.SameFile(fi1, fi2)
-}
-func copyFile(dest, src string) error {
- df, err := os.Create(dest)
- if err != nil {
- return err
- }
- defer df.Close()
-
- sf, err := os.Open(src)
- if err != nil {
- return err
- }
- defer sf.Close()
-
- _, err = io.Copy(df, sf)
- return err
-}
-
-func TestMain(m *testing.M) {
- env := os.Getenv(executableEnvVar)
- switch env {
- case "":
- os.Exit(m.Run())
- case executableEnvValueMatch:
- // First chdir to another path.
- dir := "/"
- if runtime.GOOS == "windows" {
- dir = filepath.VolumeName(".")
- }
- os.Chdir(dir)
- if ep, err := Executable(); err != nil {
- fmt.Fprint(os.Stderr, "ERROR: ", err)
- } else {
- fmt.Fprint(os.Stderr, ep)
- }
- case executableEnvValueDelete:
- bb := make([]byte, 1)
- var err error
- n, err := os.Stdin.Read(bb)
- if err != nil {
- fmt.Fprint(os.Stderr, "ERROR: ", err)
- os.Exit(2)
- }
- if n != 1 {
- fmt.Fprint(os.Stderr, "ERROR: n != 1, n == ", n)
- os.Exit(2)
- }
- if ep, err := Executable(); err != nil {
- fmt.Fprint(os.Stderr, "ERROR: ", err)
- } else {
- fmt.Fprint(os.Stderr, ep)
- }
- }
- os.Exit(0)
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/bucketexists.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/bucketexists.go
deleted file mode 100644
index 52de8e660f58d169476cf2e123fa5f87c934b16d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/bucketexists.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- err = s3Client.BucketExists("my-bucketname")
- if err != nil {
- log.Fatalln(err)
- }
-
- log.Println("Success")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/copyobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/copyobject.go
deleted file mode 100644
index 56d2c3d66df99527bdaff14fa7c30961db5523ab..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/copyobject.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
- "time"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-testfile, my-bucketname and
- // my-objectname are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- // Enable trace.
- // s3Client.TraceOn(os.Stderr)
-
- // All following conditions are allowed and can be combined together.
-
- // Set copy conditions.
- var copyConds = minio.NewCopyConditions()
- // Set modified condition, copy object modified since 2014 April.
- copyConds.SetModified(time.Date(2014, time.April, 0, 0, 0, 0, 0, time.UTC))
-
- // Set unmodified condition, copy object unmodified since 2014 April.
- // copyConds.SetUnmodified(time.Date(2014, time.April, 0, 0, 0, 0, 0, time.UTC))
-
- // Set matching ETag condition, copy object which matches the following ETag.
- // copyConds.SetMatchETag("31624deb84149d2f8ef9c385918b653a")
-
- // Set matching ETag except condition, copy object which does not match the following ETag.
- // copyConds.SetMatchETagExcept("31624deb84149d2f8ef9c385918b653a")
-
- // Initiate copy object.
- err = s3Client.CopyObject("my-bucketname", "my-objectname", "/my-sourcebucketname/my-sourceobjectname", copyConds)
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Copied source object /my-sourcebucketname/my-sourceobjectname to destination /my-bucketname/my-objectname Successfully.")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fgetobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fgetobject.go
deleted file mode 100644
index e050e435fe300ff9a3853b49ebb34a05df2369d1..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fgetobject.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname, my-objectname
- // and my-filename.csv are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- if err := s3Client.FGetObject("my-bucketname", "my-objectname", "my-filename.csv"); err != nil {
- log.Fatalln(err)
- }
- log.Println("Successfully saved my-filename.csv")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fputobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fputobject.go
deleted file mode 100644
index c966e93bccd7ac14b41be928895d74bca7ca04b1..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/fputobject.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname, my-objectname
- // and my-filename.csv are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- if _, err := s3Client.FPutObject("my-bucketname", "my-objectname", "my-filename.csv", "application/csv"); err != nil {
- log.Fatalln(err)
- }
- log.Println("Successfully uploaded my-filename.csv")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getbucketpolicy.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getbucketpolicy.go
deleted file mode 100644
index 1cbd62af3ecd35b76e5665e04e15f7002c99da2f..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getbucketpolicy.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- // s3Client.TraceOn(os.Stderr)
-
- policy, err := s3Client.GetBucketPolicy("my-bucketname", "my-objectprefix")
- if err != nil {
- log.Fatalln(err)
- }
- // Description of policy output.
- // "none" - The specified bucket does not have a bucket policy.
- // "readonly" - Read only operatoins are allowed.
- // "writeonly" - Write only operations are allowed.
- // "readwrite" - both read and write operations are allowed, the bucket is public.
- log.Println("Success - ", policy)
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getobject.go
deleted file mode 100644
index 22ac62dd7cf1b65f6ac3df4172d5d7298d51d11a..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/getobject.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "io"
- "log"
- "os"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname, my-objectname and
- // my-testfile are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESS-KEY-HERE", "YOUR-SECRET-KEY-HERE", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- reader, err := s3Client.GetObject("my-bucketname", "my-objectname")
- if err != nil {
- log.Fatalln(err)
- }
- defer reader.Close()
-
- localFile, err := os.Create("my-testfile")
- if err != nil {
- log.Fatalln(err)
- }
- defer localFile.Close()
-
- stat, err := reader.Stat()
- if err != nil {
- log.Fatalln(err)
- }
-
- if _, err := io.CopyN(localFile, reader, stat.Size); err != nil {
- log.Fatalln(err)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listbuckets.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listbuckets.go
deleted file mode 100644
index ac5b54d24bda2e62487ebafff89e8379f7383eca..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listbuckets.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID and YOUR-SECRETACCESSKEY are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- buckets, err := s3Client.ListBuckets()
- if err != nil {
- log.Fatalln(err)
- }
- for _, bucket := range buckets {
- log.Println(bucket)
- }
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go
deleted file mode 100644
index 819c5673becbed4552e8f116d399c104aabb960d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listincompleteuploads.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "fmt"
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-prefixname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- // Create a done channel to control 'ListObjects' go routine.
- doneCh := make(chan struct{})
-
- // Indicate to our routine to exit cleanly upon return.
- defer close(doneCh)
-
- // List all multipart uploads from a bucket-name with a matching prefix.
- for multipartObject := range s3Client.ListIncompleteUploads("my-bucketname", "my-prefixname", true, doneCh) {
- if multipartObject.Err != nil {
- fmt.Println(multipartObject.Err)
- return
- }
- fmt.Println(multipartObject)
- }
- return
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects-N.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects-N.go
deleted file mode 100644
index d1e3e84b1911295da86a41644568a7364f4fb40f..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects-N.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "fmt"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-prefixname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- // List 'N' number of objects from a bucket-name with a matching prefix.
- listObjectsN := func(bucket, prefix string, recursive bool, N int) (objsInfo []minio.ObjectInfo, err error) {
- // Create a done channel to control 'ListObjects' go routine.
- doneCh := make(chan struct{}, 1)
-
- // Free the channel upon return.
- defer close(doneCh)
-
- i := 1
- for object := range s3Client.ListObjects(bucket, prefix, recursive, doneCh) {
- if object.Err != nil {
- return nil, object.Err
- }
- i++
- // Verify if we have printed N objects.
- if i == N {
- // Indicate ListObjects go-routine to exit and stop
- // feeding the objectInfo channel.
- doneCh <- struct{}{}
- }
- objsInfo = append(objsInfo, object)
- }
- return objsInfo, nil
- }
-
- // List recursively first 100 entries for prefix 'my-prefixname'.
- recursive := true
- objsInfo, err := listObjectsN("my-bucketname", "my-prefixname", recursive, 100)
- if err != nil {
- fmt.Println(err)
- }
-
- // Print all the entries.
- fmt.Println(objsInfo)
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects.go
deleted file mode 100644
index e06b2f658b83cfe64f0ce7f3b9f98df18f7f53d3..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/listobjects.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "fmt"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-prefixname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- fmt.Println(err)
- return
- }
-
- // Create a done channel to control 'ListObjects' go routine.
- doneCh := make(chan struct{})
-
- // Indicate to our routine to exit cleanly upon return.
- defer close(doneCh)
-
- // List all objects from a bucket-name with a matching prefix.
- for object := range s3Client.ListObjects("my-bucketname", "my-prefixname", true, doneCh) {
- if object.Err != nil {
- fmt.Println(object.Err)
- return
- }
- fmt.Println(object)
- }
- return
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/makebucket.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/makebucket.go
deleted file mode 100644
index dc8c0ecdaa6aab7f2404a3bbb24848e2b0ebbad5..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/makebucket.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- err = s3Client.MakeBucket("my-bucketname", "us-east-1")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Success")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go
deleted file mode 100644
index ff72ce9c21469dacb368281e82f8d0484d3b68af..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedgetobject.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
- "net/url"
- "time"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- // Set request parameters
- reqParams := make(url.Values)
- reqParams.Set("response-content-disposition", "attachment; filename=\"your-filename.txt\"")
-
- // Gernerate presigned get object url.
- presignedURL, err := s3Client.PresignedGetObject("my-bucketname", "my-objectname", time.Duration(1000)*time.Second, reqParams)
- if err != nil {
- log.Fatalln(err)
- }
- log.Println(presignedURL)
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go
deleted file mode 100644
index 92008e37f2041995cd086e4de00bbdc11292eb69..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedpostpolicy.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "fmt"
- "log"
- "time"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- policy := minio.NewPostPolicy()
- policy.SetBucket("my-bucketname")
- policy.SetKey("my-objectname")
- // Expires in 10 days.
- policy.SetExpires(time.Now().UTC().AddDate(0, 0, 10))
- // Returns form data for POST form request.
- url, formData, err := s3Client.PresignedPostPolicy(policy)
- if err != nil {
- log.Fatalln(err)
- }
- fmt.Printf("curl ")
- for k, v := range formData {
- fmt.Printf("-F %s=%s ", k, v)
- }
- fmt.Printf("-F file=@/etc/bash.bashrc ")
- fmt.Printf("%s\n", url)
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedputobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedputobject.go
deleted file mode 100644
index 3e14709c2abc358246162e4f63dd47f406e8205f..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/presignedputobject.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
- "time"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- presignedURL, err := s3Client.PresignedPutObject("my-bucketname", "my-objectname", time.Duration(1000)*time.Second)
- if err != nil {
- log.Fatalln(err)
- }
- log.Println(presignedURL)
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject-progress.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject-progress.go
deleted file mode 100644
index 62f1b8df66b5492712202400a3156daca68eb26d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject-progress.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
- "github.com/minio/pb"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-testfile, my-bucketname and
- // my-objectname are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- reader, err := s3Client.GetObject("my-bucketname", "my-objectname")
- if err != nil {
- log.Fatalln(err)
- }
- defer reader.Close()
-
- objectInfo, err := reader.Stat()
- if err != nil {
- log.Fatalln(err)
- }
-
- // progress reader is notified as PutObject makes progress with
- // the read. For partial resume put object, progress reader is
- // appropriately advanced.
- progress := pb.New64(objectInfo.Size)
- progress.Start()
-
- n, err := s3Client.PutObjectWithProgress("my-bucketname", "my-objectname-progress", reader, "application/octet-stream", progress)
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Uploaded", "my-objectname", " of size: ", n, "Successfully.")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject.go
deleted file mode 100644
index 73a427f0cfb9abfb6b828890673fd739ef675c9e..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/putobject.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
- "os"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-testfile, my-bucketname and
- // my-objectname are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- object, err := os.Open("my-testfile")
- if err != nil {
- log.Fatalln(err)
- }
- defer object.Close()
-
- n, err := s3Client.PutObject("my-bucketname", "my-objectname", object, "application/octet-stream")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Uploaded", "my-objectname", " of size: ", n, "Successfully.")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucket.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucket.go
deleted file mode 100644
index c9576e1890d725ac2c24331e1f3e7a542dc0bd85..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucket.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- // This operation will only work if your bucket is empty.
- err = s3Client.RemoveBucket("my-bucketname")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Success")
-
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucketpolicy.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucketpolicy.go
deleted file mode 100644
index a76f499857c5db18d3a1c5a48597164c6da6bb01..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removebucketpolicy.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- err = s3Client.RemoveBucketPolicy("my-bucketname", "my-objectprefix")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Success")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go
deleted file mode 100644
index c0c05491446b8f28b8f1451485f4fc88fd8b7bfa..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeincompleteupload.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- err = s3Client.RemoveIncompleteUpload("my-bucketname", "my-objectname")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Success")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeobject.go
deleted file mode 100644
index 1d622a6b111d7edca0cdccf63772b215c8557b90..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/removeobject.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
- err = s3Client.RemoveObject("my-bucketname", "my-objectname")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Success")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/setbucketpolicy.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/setbucketpolicy.go
deleted file mode 100644
index 10e02bcb5c1fb5f7f282a05932b066cd887b7078..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/setbucketpolicy.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015, 2016 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY and my-bucketname are
- // dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
-
- err = s3Client.SetBucketPolicy("my-bucketname", "my-objectprefix", minio.BucketPolicyReadWrite)
- if err != nil {
- log.Fatalln(err)
- }
- log.Println("Success")
-}
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/statobject.go b/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/statobject.go
deleted file mode 100644
index 96c96db2a3ffddf0117bb3b9d58831ac16c78d35..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/minio/minio-go/examples/s3/statobject.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-/*
- * Minio Go Library for Amazon S3 Compatible Cloud Storage (C) 2015 Minio, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package main
-
-import (
- "log"
-
- "github.com/minio/minio-go"
-)
-
-func main() {
- // Note: YOUR-ACCESSKEYID, YOUR-SECRETACCESSKEY, my-bucketname and my-objectname
- // are dummy values, please replace them with original values.
-
- // Requests are always secure (HTTPS) by default. Set insecure=true to enable insecure (HTTP) access.
- // This boolean value is the last argument for New().
-
- // New returns an Amazon S3 compatible client object. API compatibility (v2 or v4) is automatically
- // determined based on the Endpoint value.
- s3Client, err := minio.New("s3.amazonaws.com", "YOUR-ACCESSKEYID", "YOUR-SECRETACCESSKEY", false)
- if err != nil {
- log.Fatalln(err)
- }
- stat, err := s3Client.StatObject("my-bucketname", "my-objectname")
- if err != nil {
- log.Fatalln(err)
- }
- log.Println(stat)
-}
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user_test.go b/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user_test.go
deleted file mode 100644
index 53b2289bf039c735a3d991806aebe97dd3435ff6..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user_test.go
+++ /dev/null
@@ -1,472 +0,0 @@
-package user
-
-import (
- "io"
- "reflect"
- "sort"
- "strconv"
- "strings"
- "testing"
-)
-
-func TestUserParseLine(t *testing.T) {
- var (
- a, b string
- c []string
- d int
- )
-
- parseLine("", &a, &b)
- if a != "" || b != "" {
- t.Fatalf("a and b should be empty ('%v', '%v')", a, b)
- }
-
- parseLine("a", &a, &b)
- if a != "a" || b != "" {
- t.Fatalf("a should be 'a' and b should be empty ('%v', '%v')", a, b)
- }
-
- parseLine("bad boys:corny cows", &a, &b)
- if a != "bad boys" || b != "corny cows" {
- t.Fatalf("a should be 'bad boys' and b should be 'corny cows' ('%v', '%v')", a, b)
- }
-
- parseLine("", &c)
- if len(c) != 0 {
- t.Fatalf("c should be empty (%#v)", c)
- }
-
- parseLine("d,e,f:g:h:i,j,k", &c, &a, &b, &c)
- if a != "g" || b != "h" || len(c) != 3 || c[0] != "i" || c[1] != "j" || c[2] != "k" {
- t.Fatalf("a should be 'g', b should be 'h', and c should be ['i','j','k'] ('%v', '%v', '%#v')", a, b, c)
- }
-
- parseLine("::::::::::", &a, &b, &c)
- if a != "" || b != "" || len(c) != 0 {
- t.Fatalf("a, b, and c should all be empty ('%v', '%v', '%#v')", a, b, c)
- }
-
- parseLine("not a number", &d)
- if d != 0 {
- t.Fatalf("d should be 0 (%v)", d)
- }
-
- parseLine("b:12:c", &a, &d, &b)
- if a != "b" || b != "c" || d != 12 {
- t.Fatalf("a should be 'b' and b should be 'c', and d should be 12 ('%v', '%v', %v)", a, b, d)
- }
-}
-
-func TestUserParsePasswd(t *testing.T) {
- users, err := ParsePasswdFilter(strings.NewReader(`
-root:x:0:0:root:/root:/bin/bash
-adm:x:3:4:adm:/var/adm:/bin/false
-this is just some garbage data
-`), nil)
- if err != nil {
- t.Fatalf("Unexpected error: %v", err)
- }
- if len(users) != 3 {
- t.Fatalf("Expected 3 users, got %v", len(users))
- }
- if users[0].Uid != 0 || users[0].Name != "root" {
- t.Fatalf("Expected users[0] to be 0 - root, got %v - %v", users[0].Uid, users[0].Name)
- }
- if users[1].Uid != 3 || users[1].Name != "adm" {
- t.Fatalf("Expected users[1] to be 3 - adm, got %v - %v", users[1].Uid, users[1].Name)
- }
-}
-
-func TestUserParseGroup(t *testing.T) {
- groups, err := ParseGroupFilter(strings.NewReader(`
-root:x:0:root
-adm:x:4:root,adm,daemon
-this is just some garbage data
-`), nil)
- if err != nil {
- t.Fatalf("Unexpected error: %v", err)
- }
- if len(groups) != 3 {
- t.Fatalf("Expected 3 groups, got %v", len(groups))
- }
- if groups[0].Gid != 0 || groups[0].Name != "root" || len(groups[0].List) != 1 {
- t.Fatalf("Expected groups[0] to be 0 - root - 1 member, got %v - %v - %v", groups[0].Gid, groups[0].Name, len(groups[0].List))
- }
- if groups[1].Gid != 4 || groups[1].Name != "adm" || len(groups[1].List) != 3 {
- t.Fatalf("Expected groups[1] to be 4 - adm - 3 members, got %v - %v - %v", groups[1].Gid, groups[1].Name, len(groups[1].List))
- }
-}
-
-func TestValidGetExecUser(t *testing.T) {
- const passwdContent = `
-root:x:0:0:root user:/root:/bin/bash
-adm:x:42:43:adm:/var/adm:/bin/false
-this is just some garbage data
-`
- const groupContent = `
-root:x:0:root
-adm:x:43:
-grp:x:1234:root,adm
-this is just some garbage data
-`
- defaultExecUser := ExecUser{
- Uid: 8888,
- Gid: 8888,
- Sgids: []int{8888},
- Home: "/8888",
- }
-
- tests := []struct {
- ref string
- expected ExecUser
- }{
- {
- ref: "root",
- expected: ExecUser{
- Uid: 0,
- Gid: 0,
- Sgids: []int{0, 1234},
- Home: "/root",
- },
- },
- {
- ref: "adm",
- expected: ExecUser{
- Uid: 42,
- Gid: 43,
- Sgids: []int{1234},
- Home: "/var/adm",
- },
- },
- {
- ref: "root:adm",
- expected: ExecUser{
- Uid: 0,
- Gid: 43,
- Sgids: defaultExecUser.Sgids,
- Home: "/root",
- },
- },
- {
- ref: "adm:1234",
- expected: ExecUser{
- Uid: 42,
- Gid: 1234,
- Sgids: defaultExecUser.Sgids,
- Home: "/var/adm",
- },
- },
- {
- ref: "42:1234",
- expected: ExecUser{
- Uid: 42,
- Gid: 1234,
- Sgids: defaultExecUser.Sgids,
- Home: "/var/adm",
- },
- },
- {
- ref: "1337:1234",
- expected: ExecUser{
- Uid: 1337,
- Gid: 1234,
- Sgids: defaultExecUser.Sgids,
- Home: defaultExecUser.Home,
- },
- },
- {
- ref: "1337",
- expected: ExecUser{
- Uid: 1337,
- Gid: defaultExecUser.Gid,
- Sgids: defaultExecUser.Sgids,
- Home: defaultExecUser.Home,
- },
- },
- {
- ref: "",
- expected: ExecUser{
- Uid: defaultExecUser.Uid,
- Gid: defaultExecUser.Gid,
- Sgids: defaultExecUser.Sgids,
- Home: defaultExecUser.Home,
- },
- },
- }
-
- for _, test := range tests {
- passwd := strings.NewReader(passwdContent)
- group := strings.NewReader(groupContent)
-
- execUser, err := GetExecUser(test.ref, &defaultExecUser, passwd, group)
- if err != nil {
- t.Logf("got unexpected error when parsing '%s': %s", test.ref, err.Error())
- t.Fail()
- continue
- }
-
- if !reflect.DeepEqual(test.expected, *execUser) {
- t.Logf("got: %#v", execUser)
- t.Logf("expected: %#v", test.expected)
- t.Fail()
- continue
- }
- }
-}
-
-func TestInvalidGetExecUser(t *testing.T) {
- const passwdContent = `
-root:x:0:0:root user:/root:/bin/bash
-adm:x:42:43:adm:/var/adm:/bin/false
-this is just some garbage data
-`
- const groupContent = `
-root:x:0:root
-adm:x:43:
-grp:x:1234:root,adm
-this is just some garbage data
-`
-
- tests := []string{
- // No such user/group.
- "notuser",
- "notuser:notgroup",
- "root:notgroup",
- "notuser:adm",
- "8888:notgroup",
- "notuser:8888",
-
- // Invalid user/group values.
- "-1:0",
- "0:-3",
- "-5:-2",
- }
-
- for _, test := range tests {
- passwd := strings.NewReader(passwdContent)
- group := strings.NewReader(groupContent)
-
- execUser, err := GetExecUser(test, nil, passwd, group)
- if err == nil {
- t.Logf("got unexpected success when parsing '%s': %#v", test, execUser)
- t.Fail()
- continue
- }
- }
-}
-
-func TestGetExecUserNilSources(t *testing.T) {
- const passwdContent = `
-root:x:0:0:root user:/root:/bin/bash
-adm:x:42:43:adm:/var/adm:/bin/false
-this is just some garbage data
-`
- const groupContent = `
-root:x:0:root
-adm:x:43:
-grp:x:1234:root,adm
-this is just some garbage data
-`
-
- defaultExecUser := ExecUser{
- Uid: 8888,
- Gid: 8888,
- Sgids: []int{8888},
- Home: "/8888",
- }
-
- tests := []struct {
- ref string
- passwd, group bool
- expected ExecUser
- }{
- {
- ref: "",
- passwd: false,
- group: false,
- expected: ExecUser{
- Uid: 8888,
- Gid: 8888,
- Sgids: []int{8888},
- Home: "/8888",
- },
- },
- {
- ref: "root",
- passwd: true,
- group: false,
- expected: ExecUser{
- Uid: 0,
- Gid: 0,
- Sgids: []int{8888},
- Home: "/root",
- },
- },
- {
- ref: "0",
- passwd: false,
- group: false,
- expected: ExecUser{
- Uid: 0,
- Gid: 8888,
- Sgids: []int{8888},
- Home: "/8888",
- },
- },
- {
- ref: "0:0",
- passwd: false,
- group: false,
- expected: ExecUser{
- Uid: 0,
- Gid: 0,
- Sgids: []int{8888},
- Home: "/8888",
- },
- },
- }
-
- for _, test := range tests {
- var passwd, group io.Reader
-
- if test.passwd {
- passwd = strings.NewReader(passwdContent)
- }
-
- if test.group {
- group = strings.NewReader(groupContent)
- }
-
- execUser, err := GetExecUser(test.ref, &defaultExecUser, passwd, group)
- if err != nil {
- t.Logf("got unexpected error when parsing '%s': %s", test.ref, err.Error())
- t.Fail()
- continue
- }
-
- if !reflect.DeepEqual(test.expected, *execUser) {
- t.Logf("got: %#v", execUser)
- t.Logf("expected: %#v", test.expected)
- t.Fail()
- continue
- }
- }
-}
-
-func TestGetAdditionalGroups(t *testing.T) {
- const groupContent = `
-root:x:0:root
-adm:x:43:
-grp:x:1234:root,adm
-adm:x:4343:root,adm-duplicate
-this is just some garbage data
-`
- tests := []struct {
- groups []string
- expected []int
- hasError bool
- }{
- {
- // empty group
- groups: []string{},
- expected: []int{},
- },
- {
- // single group
- groups: []string{"adm"},
- expected: []int{43},
- },
- {
- // multiple groups
- groups: []string{"adm", "grp"},
- expected: []int{43, 1234},
- },
- {
- // invalid group
- groups: []string{"adm", "grp", "not-exist"},
- expected: nil,
- hasError: true,
- },
- {
- // group with numeric id
- groups: []string{"43"},
- expected: []int{43},
- },
- {
- // group with unknown numeric id
- groups: []string{"adm", "10001"},
- expected: []int{43, 10001},
- },
- {
- // groups specified twice with numeric and name
- groups: []string{"adm", "43"},
- expected: []int{43},
- },
- {
- // groups with too small id
- groups: []string{"-1"},
- expected: nil,
- hasError: true,
- },
- {
- // groups with too large id
- groups: []string{strconv.Itoa(1 << 31)},
- expected: nil,
- hasError: true,
- },
- }
-
- for _, test := range tests {
- group := strings.NewReader(groupContent)
-
- gids, err := GetAdditionalGroups(test.groups, group)
- if test.hasError && err == nil {
- t.Errorf("Parse(%#v) expects error but has none", test)
- continue
- }
- if !test.hasError && err != nil {
- t.Errorf("Parse(%#v) has error %v", test, err)
- continue
- }
- sort.Sort(sort.IntSlice(gids))
- if !reflect.DeepEqual(gids, test.expected) {
- t.Errorf("Gids(%v), expect %v from groups %v", gids, test.expected, test.groups)
- }
- }
-}
-
-func TestGetAdditionalGroupsNumeric(t *testing.T) {
- tests := []struct {
- groups []string
- expected []int
- hasError bool
- }{
- {
- // numeric groups only
- groups: []string{"1234", "5678"},
- expected: []int{1234, 5678},
- },
- {
- // numeric and alphabetic
- groups: []string{"1234", "fake"},
- expected: nil,
- hasError: true,
- },
- }
-
- for _, test := range tests {
- gids, err := GetAdditionalGroups(test.groups, nil)
- if test.hasError && err == nil {
- t.Errorf("Parse(%#v) expects error but has none", test)
- continue
- }
- if !test.hasError && err != nil {
- t.Errorf("Parse(%#v) has error %v", test, err)
- continue
- }
- sort.Sort(sort.IntSlice(gids))
- if !reflect.DeepEqual(gids, test.expected) {
- t.Errorf("Gids(%v), expect %v from groups %v", gids, test.expected, test.groups)
- }
- }
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go
deleted file mode 100644
index d043c5bec291e87b2bb5cb3b98719e29b02003da..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/client.go
+++ /dev/null
@@ -1,615 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
- Package agent implements a client to an ssh-agent daemon.
-
-References:
- [PROTOCOL.agent]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.agent?rev=HEAD
-*/
-package agent
-
-import (
- "bytes"
- "crypto/dsa"
- "crypto/ecdsa"
- "crypto/elliptic"
- "crypto/rsa"
- "encoding/base64"
- "encoding/binary"
- "errors"
- "fmt"
- "io"
- "math/big"
- "sync"
-
- "golang.org/x/crypto/ssh"
-)
-
-// Agent represents the capabilities of an ssh-agent.
-type Agent interface {
- // List returns the identities known to the agent.
- List() ([]*Key, error)
-
- // Sign has the agent sign the data using a protocol 2 key as defined
- // in [PROTOCOL.agent] section 2.6.2.
- Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error)
-
- // Add adds a private key to the agent.
- Add(key AddedKey) error
-
- // Remove removes all identities with the given public key.
- Remove(key ssh.PublicKey) error
-
- // RemoveAll removes all identities.
- RemoveAll() error
-
- // Lock locks the agent. Sign and Remove will fail, and List will empty an empty list.
- Lock(passphrase []byte) error
-
- // Unlock undoes the effect of Lock
- Unlock(passphrase []byte) error
-
- // Signers returns signers for all the known keys.
- Signers() ([]ssh.Signer, error)
-}
-
-// AddedKey describes an SSH key to be added to an Agent.
-type AddedKey struct {
- // PrivateKey must be a *rsa.PrivateKey, *dsa.PrivateKey or
- // *ecdsa.PrivateKey, which will be inserted into the agent.
- PrivateKey interface{}
- // Certificate, if not nil, is communicated to the agent and will be
- // stored with the key.
- Certificate *ssh.Certificate
- // Comment is an optional, free-form string.
- Comment string
- // LifetimeSecs, if not zero, is the number of seconds that the
- // agent will store the key for.
- LifetimeSecs uint32
- // ConfirmBeforeUse, if true, requests that the agent confirm with the
- // user before each use of this key.
- ConfirmBeforeUse bool
-}
-
-// See [PROTOCOL.agent], section 3.
-const (
- agentRequestV1Identities = 1
-
- // 3.2 Requests from client to agent for protocol 2 key operations
- agentAddIdentity = 17
- agentRemoveIdentity = 18
- agentRemoveAllIdentities = 19
- agentAddIdConstrained = 25
-
- // 3.3 Key-type independent requests from client to agent
- agentAddSmartcardKey = 20
- agentRemoveSmartcardKey = 21
- agentLock = 22
- agentUnlock = 23
- agentAddSmartcardKeyConstrained = 26
-
- // 3.7 Key constraint identifiers
- agentConstrainLifetime = 1
- agentConstrainConfirm = 2
-)
-
-// maxAgentResponseBytes is the maximum agent reply size that is accepted. This
-// is a sanity check, not a limit in the spec.
-const maxAgentResponseBytes = 16 << 20
-
-// Agent messages:
-// These structures mirror the wire format of the corresponding ssh agent
-// messages found in [PROTOCOL.agent].
-
-// 3.4 Generic replies from agent to client
-const agentFailure = 5
-
-type failureAgentMsg struct{}
-
-const agentSuccess = 6
-
-type successAgentMsg struct{}
-
-// See [PROTOCOL.agent], section 2.5.2.
-const agentRequestIdentities = 11
-
-type requestIdentitiesAgentMsg struct{}
-
-// See [PROTOCOL.agent], section 2.5.2.
-const agentIdentitiesAnswer = 12
-
-type identitiesAnswerAgentMsg struct {
- NumKeys uint32 `sshtype:"12"`
- Keys []byte `ssh:"rest"`
-}
-
-// See [PROTOCOL.agent], section 2.6.2.
-const agentSignRequest = 13
-
-type signRequestAgentMsg struct {
- KeyBlob []byte `sshtype:"13"`
- Data []byte
- Flags uint32
-}
-
-// See [PROTOCOL.agent], section 2.6.2.
-
-// 3.6 Replies from agent to client for protocol 2 key operations
-const agentSignResponse = 14
-
-type signResponseAgentMsg struct {
- SigBlob []byte `sshtype:"14"`
-}
-
-type publicKey struct {
- Format string
- Rest []byte `ssh:"rest"`
-}
-
-// Key represents a protocol 2 public key as defined in
-// [PROTOCOL.agent], section 2.5.2.
-type Key struct {
- Format string
- Blob []byte
- Comment string
-}
-
-func clientErr(err error) error {
- return fmt.Errorf("agent: client error: %v", err)
-}
-
-// String returns the storage form of an agent key with the format, base64
-// encoded serialized key, and the comment if it is not empty.
-func (k *Key) String() string {
- s := string(k.Format) + " " + base64.StdEncoding.EncodeToString(k.Blob)
-
- if k.Comment != "" {
- s += " " + k.Comment
- }
-
- return s
-}
-
-// Type returns the public key type.
-func (k *Key) Type() string {
- return k.Format
-}
-
-// Marshal returns key blob to satisfy the ssh.PublicKey interface.
-func (k *Key) Marshal() []byte {
- return k.Blob
-}
-
-// Verify satisfies the ssh.PublicKey interface, but is not
-// implemented for agent keys.
-func (k *Key) Verify(data []byte, sig *ssh.Signature) error {
- return errors.New("agent: agent key does not know how to verify")
-}
-
-type wireKey struct {
- Format string
- Rest []byte `ssh:"rest"`
-}
-
-func parseKey(in []byte) (out *Key, rest []byte, err error) {
- var record struct {
- Blob []byte
- Comment string
- Rest []byte `ssh:"rest"`
- }
-
- if err := ssh.Unmarshal(in, &record); err != nil {
- return nil, nil, err
- }
-
- var wk wireKey
- if err := ssh.Unmarshal(record.Blob, &wk); err != nil {
- return nil, nil, err
- }
-
- return &Key{
- Format: wk.Format,
- Blob: record.Blob,
- Comment: record.Comment,
- }, record.Rest, nil
-}
-
-// client is a client for an ssh-agent process.
-type client struct {
- // conn is typically a *net.UnixConn
- conn io.ReadWriter
- // mu is used to prevent concurrent access to the agent
- mu sync.Mutex
-}
-
-// NewClient returns an Agent that talks to an ssh-agent process over
-// the given connection.
-func NewClient(rw io.ReadWriter) Agent {
- return &client{conn: rw}
-}
-
-// call sends an RPC to the agent. On success, the reply is
-// unmarshaled into reply and replyType is set to the first byte of
-// the reply, which contains the type of the message.
-func (c *client) call(req []byte) (reply interface{}, err error) {
- c.mu.Lock()
- defer c.mu.Unlock()
-
- msg := make([]byte, 4+len(req))
- binary.BigEndian.PutUint32(msg, uint32(len(req)))
- copy(msg[4:], req)
- if _, err = c.conn.Write(msg); err != nil {
- return nil, clientErr(err)
- }
-
- var respSizeBuf [4]byte
- if _, err = io.ReadFull(c.conn, respSizeBuf[:]); err != nil {
- return nil, clientErr(err)
- }
- respSize := binary.BigEndian.Uint32(respSizeBuf[:])
- if respSize > maxAgentResponseBytes {
- return nil, clientErr(err)
- }
-
- buf := make([]byte, respSize)
- if _, err = io.ReadFull(c.conn, buf); err != nil {
- return nil, clientErr(err)
- }
- reply, err = unmarshal(buf)
- if err != nil {
- return nil, clientErr(err)
- }
- return reply, err
-}
-
-func (c *client) simpleCall(req []byte) error {
- resp, err := c.call(req)
- if err != nil {
- return err
- }
- if _, ok := resp.(*successAgentMsg); ok {
- return nil
- }
- return errors.New("agent: failure")
-}
-
-func (c *client) RemoveAll() error {
- return c.simpleCall([]byte{agentRemoveAllIdentities})
-}
-
-func (c *client) Remove(key ssh.PublicKey) error {
- req := ssh.Marshal(&agentRemoveIdentityMsg{
- KeyBlob: key.Marshal(),
- })
- return c.simpleCall(req)
-}
-
-func (c *client) Lock(passphrase []byte) error {
- req := ssh.Marshal(&agentLockMsg{
- Passphrase: passphrase,
- })
- return c.simpleCall(req)
-}
-
-func (c *client) Unlock(passphrase []byte) error {
- req := ssh.Marshal(&agentUnlockMsg{
- Passphrase: passphrase,
- })
- return c.simpleCall(req)
-}
-
-// List returns the identities known to the agent.
-func (c *client) List() ([]*Key, error) {
- // see [PROTOCOL.agent] section 2.5.2.
- req := []byte{agentRequestIdentities}
-
- msg, err := c.call(req)
- if err != nil {
- return nil, err
- }
-
- switch msg := msg.(type) {
- case *identitiesAnswerAgentMsg:
- if msg.NumKeys > maxAgentResponseBytes/8 {
- return nil, errors.New("agent: too many keys in agent reply")
- }
- keys := make([]*Key, msg.NumKeys)
- data := msg.Keys
- for i := uint32(0); i < msg.NumKeys; i++ {
- var key *Key
- var err error
- if key, data, err = parseKey(data); err != nil {
- return nil, err
- }
- keys[i] = key
- }
- return keys, nil
- case *failureAgentMsg:
- return nil, errors.New("agent: failed to list keys")
- }
- panic("unreachable")
-}
-
-// Sign has the agent sign the data using a protocol 2 key as defined
-// in [PROTOCOL.agent] section 2.6.2.
-func (c *client) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
- req := ssh.Marshal(signRequestAgentMsg{
- KeyBlob: key.Marshal(),
- Data: data,
- })
-
- msg, err := c.call(req)
- if err != nil {
- return nil, err
- }
-
- switch msg := msg.(type) {
- case *signResponseAgentMsg:
- var sig ssh.Signature
- if err := ssh.Unmarshal(msg.SigBlob, &sig); err != nil {
- return nil, err
- }
-
- return &sig, nil
- case *failureAgentMsg:
- return nil, errors.New("agent: failed to sign challenge")
- }
- panic("unreachable")
-}
-
-// unmarshal parses an agent message in packet, returning the parsed
-// form and the message type of packet.
-func unmarshal(packet []byte) (interface{}, error) {
- if len(packet) < 1 {
- return nil, errors.New("agent: empty packet")
- }
- var msg interface{}
- switch packet[0] {
- case agentFailure:
- return new(failureAgentMsg), nil
- case agentSuccess:
- return new(successAgentMsg), nil
- case agentIdentitiesAnswer:
- msg = new(identitiesAnswerAgentMsg)
- case agentSignResponse:
- msg = new(signResponseAgentMsg)
- default:
- return nil, fmt.Errorf("agent: unknown type tag %d", packet[0])
- }
- if err := ssh.Unmarshal(packet, msg); err != nil {
- return nil, err
- }
- return msg, nil
-}
-
-type rsaKeyMsg struct {
- Type string `sshtype:"17"`
- N *big.Int
- E *big.Int
- D *big.Int
- Iqmp *big.Int // IQMP = Inverse Q Mod P
- P *big.Int
- Q *big.Int
- Comments string
- Constraints []byte `ssh:"rest"`
-}
-
-type dsaKeyMsg struct {
- Type string `sshtype:"17"`
- P *big.Int
- Q *big.Int
- G *big.Int
- Y *big.Int
- X *big.Int
- Comments string
- Constraints []byte `ssh:"rest"`
-}
-
-type ecdsaKeyMsg struct {
- Type string `sshtype:"17"`
- Curve string
- KeyBytes []byte
- D *big.Int
- Comments string
- Constraints []byte `ssh:"rest"`
-}
-
-// Insert adds a private key to the agent.
-func (c *client) insertKey(s interface{}, comment string, constraints []byte) error {
- var req []byte
- switch k := s.(type) {
- case *rsa.PrivateKey:
- if len(k.Primes) != 2 {
- return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
- }
- k.Precompute()
- req = ssh.Marshal(rsaKeyMsg{
- Type: ssh.KeyAlgoRSA,
- N: k.N,
- E: big.NewInt(int64(k.E)),
- D: k.D,
- Iqmp: k.Precomputed.Qinv,
- P: k.Primes[0],
- Q: k.Primes[1],
- Comments: comment,
- Constraints: constraints,
- })
- case *dsa.PrivateKey:
- req = ssh.Marshal(dsaKeyMsg{
- Type: ssh.KeyAlgoDSA,
- P: k.P,
- Q: k.Q,
- G: k.G,
- Y: k.Y,
- X: k.X,
- Comments: comment,
- Constraints: constraints,
- })
- case *ecdsa.PrivateKey:
- nistID := fmt.Sprintf("nistp%d", k.Params().BitSize)
- req = ssh.Marshal(ecdsaKeyMsg{
- Type: "ecdsa-sha2-" + nistID,
- Curve: nistID,
- KeyBytes: elliptic.Marshal(k.Curve, k.X, k.Y),
- D: k.D,
- Comments: comment,
- Constraints: constraints,
- })
- default:
- return fmt.Errorf("agent: unsupported key type %T", s)
- }
-
- // if constraints are present then the message type needs to be changed.
- if len(constraints) != 0 {
- req[0] = agentAddIdConstrained
- }
-
- resp, err := c.call(req)
- if err != nil {
- return err
- }
- if _, ok := resp.(*successAgentMsg); ok {
- return nil
- }
- return errors.New("agent: failure")
-}
-
-type rsaCertMsg struct {
- Type string `sshtype:"17"`
- CertBytes []byte
- D *big.Int
- Iqmp *big.Int // IQMP = Inverse Q Mod P
- P *big.Int
- Q *big.Int
- Comments string
- Constraints []byte `ssh:"rest"`
-}
-
-type dsaCertMsg struct {
- Type string `sshtype:"17"`
- CertBytes []byte
- X *big.Int
- Comments string
- Constraints []byte `ssh:"rest"`
-}
-
-type ecdsaCertMsg struct {
- Type string `sshtype:"17"`
- CertBytes []byte
- D *big.Int
- Comments string
- Constraints []byte `ssh:"rest"`
-}
-
-// Insert adds a private key to the agent. If a certificate is given,
-// that certificate is added instead as public key.
-func (c *client) Add(key AddedKey) error {
- var constraints []byte
-
- if secs := key.LifetimeSecs; secs != 0 {
- constraints = append(constraints, agentConstrainLifetime)
-
- var secsBytes [4]byte
- binary.BigEndian.PutUint32(secsBytes[:], secs)
- constraints = append(constraints, secsBytes[:]...)
- }
-
- if key.ConfirmBeforeUse {
- constraints = append(constraints, agentConstrainConfirm)
- }
-
- if cert := key.Certificate; cert == nil {
- return c.insertKey(key.PrivateKey, key.Comment, constraints)
- } else {
- return c.insertCert(key.PrivateKey, cert, key.Comment, constraints)
- }
-}
-
-func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string, constraints []byte) error {
- var req []byte
- switch k := s.(type) {
- case *rsa.PrivateKey:
- if len(k.Primes) != 2 {
- return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
- }
- k.Precompute()
- req = ssh.Marshal(rsaCertMsg{
- Type: cert.Type(),
- CertBytes: cert.Marshal(),
- D: k.D,
- Iqmp: k.Precomputed.Qinv,
- P: k.Primes[0],
- Q: k.Primes[1],
- Comments: comment,
- Constraints: constraints,
- })
- case *dsa.PrivateKey:
- req = ssh.Marshal(dsaCertMsg{
- Type: cert.Type(),
- CertBytes: cert.Marshal(),
- X: k.X,
- Comments: comment,
- })
- case *ecdsa.PrivateKey:
- req = ssh.Marshal(ecdsaCertMsg{
- Type: cert.Type(),
- CertBytes: cert.Marshal(),
- D: k.D,
- Comments: comment,
- })
- default:
- return fmt.Errorf("agent: unsupported key type %T", s)
- }
-
- // if constraints are present then the message type needs to be changed.
- if len(constraints) != 0 {
- req[0] = agentAddIdConstrained
- }
-
- signer, err := ssh.NewSignerFromKey(s)
- if err != nil {
- return err
- }
- if bytes.Compare(cert.Key.Marshal(), signer.PublicKey().Marshal()) != 0 {
- return errors.New("agent: signer and cert have different public key")
- }
-
- resp, err := c.call(req)
- if err != nil {
- return err
- }
- if _, ok := resp.(*successAgentMsg); ok {
- return nil
- }
- return errors.New("agent: failure")
-}
-
-// Signers provides a callback for client authentication.
-func (c *client) Signers() ([]ssh.Signer, error) {
- keys, err := c.List()
- if err != nil {
- return nil, err
- }
-
- var result []ssh.Signer
- for _, k := range keys {
- result = append(result, &agentKeyringSigner{c, k})
- }
- return result, nil
-}
-
-type agentKeyringSigner struct {
- agent *client
- pub ssh.PublicKey
-}
-
-func (s *agentKeyringSigner) PublicKey() ssh.PublicKey {
- return s.pub
-}
-
-func (s *agentKeyringSigner) Sign(rand io.Reader, data []byte) (*ssh.Signature, error) {
- // The agent has its own entropy source, so the rand argument is ignored.
- return s.agent.Sign(s.pub, data)
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go
deleted file mode 100644
index fd24ba900d2541ff523678b62b424086d5ee853d..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/forward.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
- "errors"
- "io"
- "net"
- "sync"
-
- "golang.org/x/crypto/ssh"
-)
-
-// RequestAgentForwarding sets up agent forwarding for the session.
-// ForwardToAgent or ForwardToRemote should be called to route
-// the authentication requests.
-func RequestAgentForwarding(session *ssh.Session) error {
- ok, err := session.SendRequest("auth-agent-req@openssh.com", true, nil)
- if err != nil {
- return err
- }
- if !ok {
- return errors.New("forwarding request denied")
- }
- return nil
-}
-
-// ForwardToAgent routes authentication requests to the given keyring.
-func ForwardToAgent(client *ssh.Client, keyring Agent) error {
- channels := client.HandleChannelOpen(channelType)
- if channels == nil {
- return errors.New("agent: already have handler for " + channelType)
- }
-
- go func() {
- for ch := range channels {
- channel, reqs, err := ch.Accept()
- if err != nil {
- continue
- }
- go ssh.DiscardRequests(reqs)
- go func() {
- ServeAgent(keyring, channel)
- channel.Close()
- }()
- }
- }()
- return nil
-}
-
-const channelType = "auth-agent@openssh.com"
-
-// ForwardToRemote routes authentication requests to the ssh-agent
-// process serving on the given unix socket.
-func ForwardToRemote(client *ssh.Client, addr string) error {
- channels := client.HandleChannelOpen(channelType)
- if channels == nil {
- return errors.New("agent: already have handler for " + channelType)
- }
- conn, err := net.Dial("unix", addr)
- if err != nil {
- return err
- }
- conn.Close()
-
- go func() {
- for ch := range channels {
- channel, reqs, err := ch.Accept()
- if err != nil {
- continue
- }
- go ssh.DiscardRequests(reqs)
- go forwardUnixSocket(channel, addr)
- }
- }()
- return nil
-}
-
-func forwardUnixSocket(channel ssh.Channel, addr string) {
- conn, err := net.Dial("unix", addr)
- if err != nil {
- return
- }
-
- var wg sync.WaitGroup
- wg.Add(2)
- go func() {
- io.Copy(conn, channel)
- conn.(*net.UnixConn).CloseWrite()
- wg.Done()
- }()
- go func() {
- io.Copy(channel, conn)
- channel.CloseWrite()
- wg.Done()
- }()
-
- wg.Wait()
- conn.Close()
- channel.Close()
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go
deleted file mode 100644
index 12ffa82b1a02a233140bcb620bcdffccc67751a7..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/keyring.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
- "bytes"
- "crypto/rand"
- "crypto/subtle"
- "errors"
- "fmt"
- "sync"
-
- "golang.org/x/crypto/ssh"
-)
-
-type privKey struct {
- signer ssh.Signer
- comment string
-}
-
-type keyring struct {
- mu sync.Mutex
- keys []privKey
-
- locked bool
- passphrase []byte
-}
-
-var errLocked = errors.New("agent: locked")
-
-// NewKeyring returns an Agent that holds keys in memory. It is safe
-// for concurrent use by multiple goroutines.
-func NewKeyring() Agent {
- return &keyring{}
-}
-
-// RemoveAll removes all identities.
-func (r *keyring) RemoveAll() error {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- return errLocked
- }
-
- r.keys = nil
- return nil
-}
-
-// Remove removes all identities with the given public key.
-func (r *keyring) Remove(key ssh.PublicKey) error {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- return errLocked
- }
-
- want := key.Marshal()
- found := false
- for i := 0; i < len(r.keys); {
- if bytes.Equal(r.keys[i].signer.PublicKey().Marshal(), want) {
- found = true
- r.keys[i] = r.keys[len(r.keys)-1]
- r.keys = r.keys[:len(r.keys)-1]
- continue
- } else {
- i++
- }
- }
-
- if !found {
- return errors.New("agent: key not found")
- }
- return nil
-}
-
-// Lock locks the agent. Sign and Remove will fail, and List will empty an empty list.
-func (r *keyring) Lock(passphrase []byte) error {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- return errLocked
- }
-
- r.locked = true
- r.passphrase = passphrase
- return nil
-}
-
-// Unlock undoes the effect of Lock
-func (r *keyring) Unlock(passphrase []byte) error {
- r.mu.Lock()
- defer r.mu.Unlock()
- if !r.locked {
- return errors.New("agent: not locked")
- }
- if len(passphrase) != len(r.passphrase) || 1 != subtle.ConstantTimeCompare(passphrase, r.passphrase) {
- return fmt.Errorf("agent: incorrect passphrase")
- }
-
- r.locked = false
- r.passphrase = nil
- return nil
-}
-
-// List returns the identities known to the agent.
-func (r *keyring) List() ([]*Key, error) {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- // section 2.7: locked agents return empty.
- return nil, nil
- }
-
- var ids []*Key
- for _, k := range r.keys {
- pub := k.signer.PublicKey()
- ids = append(ids, &Key{
- Format: pub.Type(),
- Blob: pub.Marshal(),
- Comment: k.comment})
- }
- return ids, nil
-}
-
-// Insert adds a private key to the keyring. If a certificate
-// is given, that certificate is added as public key. Note that
-// any constraints given are ignored.
-func (r *keyring) Add(key AddedKey) error {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- return errLocked
- }
- signer, err := ssh.NewSignerFromKey(key.PrivateKey)
-
- if err != nil {
- return err
- }
-
- if cert := key.Certificate; cert != nil {
- signer, err = ssh.NewCertSigner(cert, signer)
- if err != nil {
- return err
- }
- }
-
- r.keys = append(r.keys, privKey{signer, key.Comment})
-
- return nil
-}
-
-// Sign returns a signature for the data.
-func (r *keyring) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- return nil, errLocked
- }
-
- wanted := key.Marshal()
- for _, k := range r.keys {
- if bytes.Equal(k.signer.PublicKey().Marshal(), wanted) {
- return k.signer.Sign(rand.Reader, data)
- }
- }
- return nil, errors.New("not found")
-}
-
-// Signers returns signers for all the known keys.
-func (r *keyring) Signers() ([]ssh.Signer, error) {
- r.mu.Lock()
- defer r.mu.Unlock()
- if r.locked {
- return nil, errLocked
- }
-
- s := make([]ssh.Signer, 0, len(r.keys))
- for _, k := range r.keys {
- s = append(s, k.signer)
- }
- return s, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go
deleted file mode 100644
index b21a20180fec12d4c5ffb5019a7e0a2582d19094..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/agent/server.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
- "crypto/rsa"
- "encoding/binary"
- "fmt"
- "io"
- "log"
- "math/big"
-
- "golang.org/x/crypto/ssh"
-)
-
-// Server wraps an Agent and uses it to implement the agent side of
-// the SSH-agent, wire protocol.
-type server struct {
- agent Agent
-}
-
-func (s *server) processRequestBytes(reqData []byte) []byte {
- rep, err := s.processRequest(reqData)
- if err != nil {
- if err != errLocked {
- // TODO(hanwen): provide better logging interface?
- log.Printf("agent %d: %v", reqData[0], err)
- }
- return []byte{agentFailure}
- }
-
- if err == nil && rep == nil {
- return []byte{agentSuccess}
- }
-
- return ssh.Marshal(rep)
-}
-
-func marshalKey(k *Key) []byte {
- var record struct {
- Blob []byte
- Comment string
- }
- record.Blob = k.Marshal()
- record.Comment = k.Comment
-
- return ssh.Marshal(&record)
-}
-
-type agentV1IdentityMsg struct {
- Numkeys uint32 `sshtype:"2"`
-}
-
-type agentRemoveIdentityMsg struct {
- KeyBlob []byte `sshtype:"18"`
-}
-
-type agentLockMsg struct {
- Passphrase []byte `sshtype:"22"`
-}
-
-type agentUnlockMsg struct {
- Passphrase []byte `sshtype:"23"`
-}
-
-func (s *server) processRequest(data []byte) (interface{}, error) {
- switch data[0] {
- case agentRequestV1Identities:
- return &agentV1IdentityMsg{0}, nil
- case agentRemoveIdentity:
- var req agentRemoveIdentityMsg
- if err := ssh.Unmarshal(data, &req); err != nil {
- return nil, err
- }
-
- var wk wireKey
- if err := ssh.Unmarshal(req.KeyBlob, &wk); err != nil {
- return nil, err
- }
-
- return nil, s.agent.Remove(&Key{Format: wk.Format, Blob: req.KeyBlob})
-
- case agentRemoveAllIdentities:
- return nil, s.agent.RemoveAll()
-
- case agentLock:
- var req agentLockMsg
- if err := ssh.Unmarshal(data, &req); err != nil {
- return nil, err
- }
-
- return nil, s.agent.Lock(req.Passphrase)
-
- case agentUnlock:
- var req agentLockMsg
- if err := ssh.Unmarshal(data, &req); err != nil {
- return nil, err
- }
- return nil, s.agent.Unlock(req.Passphrase)
-
- case agentSignRequest:
- var req signRequestAgentMsg
- if err := ssh.Unmarshal(data, &req); err != nil {
- return nil, err
- }
-
- var wk wireKey
- if err := ssh.Unmarshal(req.KeyBlob, &wk); err != nil {
- return nil, err
- }
-
- k := &Key{
- Format: wk.Format,
- Blob: req.KeyBlob,
- }
-
- sig, err := s.agent.Sign(k, req.Data) // TODO(hanwen): flags.
- if err != nil {
- return nil, err
- }
- return &signResponseAgentMsg{SigBlob: ssh.Marshal(sig)}, nil
- case agentRequestIdentities:
- keys, err := s.agent.List()
- if err != nil {
- return nil, err
- }
-
- rep := identitiesAnswerAgentMsg{
- NumKeys: uint32(len(keys)),
- }
- for _, k := range keys {
- rep.Keys = append(rep.Keys, marshalKey(k)...)
- }
- return rep, nil
- case agentAddIdentity:
- return nil, s.insertIdentity(data)
- }
-
- return nil, fmt.Errorf("unknown opcode %d", data[0])
-}
-
-func (s *server) insertIdentity(req []byte) error {
- var record struct {
- Type string `sshtype:"17"`
- Rest []byte `ssh:"rest"`
- }
- if err := ssh.Unmarshal(req, &record); err != nil {
- return err
- }
-
- switch record.Type {
- case ssh.KeyAlgoRSA:
- var k rsaKeyMsg
- if err := ssh.Unmarshal(req, &k); err != nil {
- return err
- }
-
- priv := rsa.PrivateKey{
- PublicKey: rsa.PublicKey{
- E: int(k.E.Int64()),
- N: k.N,
- },
- D: k.D,
- Primes: []*big.Int{k.P, k.Q},
- }
- priv.Precompute()
-
- return s.agent.Add(AddedKey{PrivateKey: &priv, Comment: k.Comments})
- }
- return fmt.Errorf("not implemented: %s", record.Type)
-}
-
-// ServeAgent serves the agent protocol on the given connection. It
-// returns when an I/O error occurs.
-func ServeAgent(agent Agent, c io.ReadWriter) error {
- s := &server{agent}
-
- var length [4]byte
- for {
- if _, err := io.ReadFull(c, length[:]); err != nil {
- return err
- }
- l := binary.BigEndian.Uint32(length[:])
- if l > maxAgentResponseBytes {
- // We also cap requests.
- return fmt.Errorf("agent: request too large: %d", l)
- }
-
- req := make([]byte, l)
- if _, err := io.ReadFull(c, req); err != nil {
- return err
- }
-
- repData := s.processRequestBytes(req)
- if len(repData) > maxAgentResponseBytes {
- return fmt.Errorf("agent: reply too large: %d bytes", len(repData))
- }
-
- binary.BigEndian.PutUint32(length[:], uint32(len(repData)))
- if _, err := c.Write(length[:]); err != nil {
- return err
- }
- if _, err := c.Write(repData); err != nil {
- return err
- }
- }
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
deleted file mode 100644
index 741eeb13f0fccf23c87ffd33c2487033f748a276..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/terminal.go
+++ /dev/null
@@ -1,892 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package terminal
-
-import (
- "bytes"
- "io"
- "sync"
- "unicode/utf8"
-)
-
-// EscapeCodes contains escape sequences that can be written to the terminal in
-// order to achieve different styles of text.
-type EscapeCodes struct {
- // Foreground colors
- Black, Red, Green, Yellow, Blue, Magenta, Cyan, White []byte
-
- // Reset all attributes
- Reset []byte
-}
-
-var vt100EscapeCodes = EscapeCodes{
- Black: []byte{keyEscape, '[', '3', '0', 'm'},
- Red: []byte{keyEscape, '[', '3', '1', 'm'},
- Green: []byte{keyEscape, '[', '3', '2', 'm'},
- Yellow: []byte{keyEscape, '[', '3', '3', 'm'},
- Blue: []byte{keyEscape, '[', '3', '4', 'm'},
- Magenta: []byte{keyEscape, '[', '3', '5', 'm'},
- Cyan: []byte{keyEscape, '[', '3', '6', 'm'},
- White: []byte{keyEscape, '[', '3', '7', 'm'},
-
- Reset: []byte{keyEscape, '[', '0', 'm'},
-}
-
-// Terminal contains the state for running a VT100 terminal that is capable of
-// reading lines of input.
-type Terminal struct {
- // AutoCompleteCallback, if non-null, is called for each keypress with
- // the full input line and the current position of the cursor (in
- // bytes, as an index into |line|). If it returns ok=false, the key
- // press is processed normally. Otherwise it returns a replacement line
- // and the new cursor position.
- AutoCompleteCallback func(line string, pos int, key rune) (newLine string, newPos int, ok bool)
-
- // Escape contains a pointer to the escape codes for this terminal.
- // It's always a valid pointer, although the escape codes themselves
- // may be empty if the terminal doesn't support them.
- Escape *EscapeCodes
-
- // lock protects the terminal and the state in this object from
- // concurrent processing of a key press and a Write() call.
- lock sync.Mutex
-
- c io.ReadWriter
- prompt []rune
-
- // line is the current line being entered.
- line []rune
- // pos is the logical position of the cursor in line
- pos int
- // echo is true if local echo is enabled
- echo bool
- // pasteActive is true iff there is a bracketed paste operation in
- // progress.
- pasteActive bool
-
- // cursorX contains the current X value of the cursor where the left
- // edge is 0. cursorY contains the row number where the first row of
- // the current line is 0.
- cursorX, cursorY int
- // maxLine is the greatest value of cursorY so far.
- maxLine int
-
- termWidth, termHeight int
-
- // outBuf contains the terminal data to be sent.
- outBuf []byte
- // remainder contains the remainder of any partial key sequences after
- // a read. It aliases into inBuf.
- remainder []byte
- inBuf [256]byte
-
- // history contains previously entered commands so that they can be
- // accessed with the up and down keys.
- history stRingBuffer
- // historyIndex stores the currently accessed history entry, where zero
- // means the immediately previous entry.
- historyIndex int
- // When navigating up and down the history it's possible to return to
- // the incomplete, initial line. That value is stored in
- // historyPending.
- historyPending string
-}
-
-// NewTerminal runs a VT100 terminal on the given ReadWriter. If the ReadWriter is
-// a local terminal, that terminal must first have been put into raw mode.
-// prompt is a string that is written at the start of each input line (i.e.
-// "> ").
-func NewTerminal(c io.ReadWriter, prompt string) *Terminal {
- return &Terminal{
- Escape: &vt100EscapeCodes,
- c: c,
- prompt: []rune(prompt),
- termWidth: 80,
- termHeight: 24,
- echo: true,
- historyIndex: -1,
- }
-}
-
-const (
- keyCtrlD = 4
- keyCtrlU = 21
- keyEnter = '\r'
- keyEscape = 27
- keyBackspace = 127
- keyUnknown = 0xd800 /* UTF-16 surrogate area */ + iota
- keyUp
- keyDown
- keyLeft
- keyRight
- keyAltLeft
- keyAltRight
- keyHome
- keyEnd
- keyDeleteWord
- keyDeleteLine
- keyClearScreen
- keyPasteStart
- keyPasteEnd
-)
-
-var pasteStart = []byte{keyEscape, '[', '2', '0', '0', '~'}
-var pasteEnd = []byte{keyEscape, '[', '2', '0', '1', '~'}
-
-// bytesToKey tries to parse a key sequence from b. If successful, it returns
-// the key and the remainder of the input. Otherwise it returns utf8.RuneError.
-func bytesToKey(b []byte, pasteActive bool) (rune, []byte) {
- if len(b) == 0 {
- return utf8.RuneError, nil
- }
-
- if !pasteActive {
- switch b[0] {
- case 1: // ^A
- return keyHome, b[1:]
- case 5: // ^E
- return keyEnd, b[1:]
- case 8: // ^H
- return keyBackspace, b[1:]
- case 11: // ^K
- return keyDeleteLine, b[1:]
- case 12: // ^L
- return keyClearScreen, b[1:]
- case 23: // ^W
- return keyDeleteWord, b[1:]
- }
- }
-
- if b[0] != keyEscape {
- if !utf8.FullRune(b) {
- return utf8.RuneError, b
- }
- r, l := utf8.DecodeRune(b)
- return r, b[l:]
- }
-
- if !pasteActive && len(b) >= 3 && b[0] == keyEscape && b[1] == '[' {
- switch b[2] {
- case 'A':
- return keyUp, b[3:]
- case 'B':
- return keyDown, b[3:]
- case 'C':
- return keyRight, b[3:]
- case 'D':
- return keyLeft, b[3:]
- case 'H':
- return keyHome, b[3:]
- case 'F':
- return keyEnd, b[3:]
- }
- }
-
- if !pasteActive && len(b) >= 6 && b[0] == keyEscape && b[1] == '[' && b[2] == '1' && b[3] == ';' && b[4] == '3' {
- switch b[5] {
- case 'C':
- return keyAltRight, b[6:]
- case 'D':
- return keyAltLeft, b[6:]
- }
- }
-
- if !pasteActive && len(b) >= 6 && bytes.Equal(b[:6], pasteStart) {
- return keyPasteStart, b[6:]
- }
-
- if pasteActive && len(b) >= 6 && bytes.Equal(b[:6], pasteEnd) {
- return keyPasteEnd, b[6:]
- }
-
- // If we get here then we have a key that we don't recognise, or a
- // partial sequence. It's not clear how one should find the end of a
- // sequence without knowing them all, but it seems that [a-zA-Z~] only
- // appears at the end of a sequence.
- for i, c := range b[0:] {
- if c >= 'a' && c <= 'z' || c >= 'A' && c <= 'Z' || c == '~' {
- return keyUnknown, b[i+1:]
- }
- }
-
- return utf8.RuneError, b
-}
-
-// queue appends data to the end of t.outBuf
-func (t *Terminal) queue(data []rune) {
- t.outBuf = append(t.outBuf, []byte(string(data))...)
-}
-
-var eraseUnderCursor = []rune{' ', keyEscape, '[', 'D'}
-var space = []rune{' '}
-
-func isPrintable(key rune) bool {
- isInSurrogateArea := key >= 0xd800 && key <= 0xdbff
- return key >= 32 && !isInSurrogateArea
-}
-
-// moveCursorToPos appends data to t.outBuf which will move the cursor to the
-// given, logical position in the text.
-func (t *Terminal) moveCursorToPos(pos int) {
- if !t.echo {
- return
- }
-
- x := visualLength(t.prompt) + pos
- y := x / t.termWidth
- x = x % t.termWidth
-
- up := 0
- if y < t.cursorY {
- up = t.cursorY - y
- }
-
- down := 0
- if y > t.cursorY {
- down = y - t.cursorY
- }
-
- left := 0
- if x < t.cursorX {
- left = t.cursorX - x
- }
-
- right := 0
- if x > t.cursorX {
- right = x - t.cursorX
- }
-
- t.cursorX = x
- t.cursorY = y
- t.move(up, down, left, right)
-}
-
-func (t *Terminal) move(up, down, left, right int) {
- movement := make([]rune, 3*(up+down+left+right))
- m := movement
- for i := 0; i < up; i++ {
- m[0] = keyEscape
- m[1] = '['
- m[2] = 'A'
- m = m[3:]
- }
- for i := 0; i < down; i++ {
- m[0] = keyEscape
- m[1] = '['
- m[2] = 'B'
- m = m[3:]
- }
- for i := 0; i < left; i++ {
- m[0] = keyEscape
- m[1] = '['
- m[2] = 'D'
- m = m[3:]
- }
- for i := 0; i < right; i++ {
- m[0] = keyEscape
- m[1] = '['
- m[2] = 'C'
- m = m[3:]
- }
-
- t.queue(movement)
-}
-
-func (t *Terminal) clearLineToRight() {
- op := []rune{keyEscape, '[', 'K'}
- t.queue(op)
-}
-
-const maxLineLength = 4096
-
-func (t *Terminal) setLine(newLine []rune, newPos int) {
- if t.echo {
- t.moveCursorToPos(0)
- t.writeLine(newLine)
- for i := len(newLine); i < len(t.line); i++ {
- t.writeLine(space)
- }
- t.moveCursorToPos(newPos)
- }
- t.line = newLine
- t.pos = newPos
-}
-
-func (t *Terminal) advanceCursor(places int) {
- t.cursorX += places
- t.cursorY += t.cursorX / t.termWidth
- if t.cursorY > t.maxLine {
- t.maxLine = t.cursorY
- }
- t.cursorX = t.cursorX % t.termWidth
-
- if places > 0 && t.cursorX == 0 {
- // Normally terminals will advance the current position
- // when writing a character. But that doesn't happen
- // for the last character in a line. However, when
- // writing a character (except a new line) that causes
- // a line wrap, the position will be advanced two
- // places.
- //
- // So, if we are stopping at the end of a line, we
- // need to write a newline so that our cursor can be
- // advanced to the next line.
- t.outBuf = append(t.outBuf, '\n')
- }
-}
-
-func (t *Terminal) eraseNPreviousChars(n int) {
- if n == 0 {
- return
- }
-
- if t.pos < n {
- n = t.pos
- }
- t.pos -= n
- t.moveCursorToPos(t.pos)
-
- copy(t.line[t.pos:], t.line[n+t.pos:])
- t.line = t.line[:len(t.line)-n]
- if t.echo {
- t.writeLine(t.line[t.pos:])
- for i := 0; i < n; i++ {
- t.queue(space)
- }
- t.advanceCursor(n)
- t.moveCursorToPos(t.pos)
- }
-}
-
-// countToLeftWord returns then number of characters from the cursor to the
-// start of the previous word.
-func (t *Terminal) countToLeftWord() int {
- if t.pos == 0 {
- return 0
- }
-
- pos := t.pos - 1
- for pos > 0 {
- if t.line[pos] != ' ' {
- break
- }
- pos--
- }
- for pos > 0 {
- if t.line[pos] == ' ' {
- pos++
- break
- }
- pos--
- }
-
- return t.pos - pos
-}
-
-// countToRightWord returns then number of characters from the cursor to the
-// start of the next word.
-func (t *Terminal) countToRightWord() int {
- pos := t.pos
- for pos < len(t.line) {
- if t.line[pos] == ' ' {
- break
- }
- pos++
- }
- for pos < len(t.line) {
- if t.line[pos] != ' ' {
- break
- }
- pos++
- }
- return pos - t.pos
-}
-
-// visualLength returns the number of visible glyphs in s.
-func visualLength(runes []rune) int {
- inEscapeSeq := false
- length := 0
-
- for _, r := range runes {
- switch {
- case inEscapeSeq:
- if (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z') {
- inEscapeSeq = false
- }
- case r == '\x1b':
- inEscapeSeq = true
- default:
- length++
- }
- }
-
- return length
-}
-
-// handleKey processes the given key and, optionally, returns a line of text
-// that the user has entered.
-func (t *Terminal) handleKey(key rune) (line string, ok bool) {
- if t.pasteActive && key != keyEnter {
- t.addKeyToLine(key)
- return
- }
-
- switch key {
- case keyBackspace:
- if t.pos == 0 {
- return
- }
- t.eraseNPreviousChars(1)
- case keyAltLeft:
- // move left by a word.
- t.pos -= t.countToLeftWord()
- t.moveCursorToPos(t.pos)
- case keyAltRight:
- // move right by a word.
- t.pos += t.countToRightWord()
- t.moveCursorToPos(t.pos)
- case keyLeft:
- if t.pos == 0 {
- return
- }
- t.pos--
- t.moveCursorToPos(t.pos)
- case keyRight:
- if t.pos == len(t.line) {
- return
- }
- t.pos++
- t.moveCursorToPos(t.pos)
- case keyHome:
- if t.pos == 0 {
- return
- }
- t.pos = 0
- t.moveCursorToPos(t.pos)
- case keyEnd:
- if t.pos == len(t.line) {
- return
- }
- t.pos = len(t.line)
- t.moveCursorToPos(t.pos)
- case keyUp:
- entry, ok := t.history.NthPreviousEntry(t.historyIndex + 1)
- if !ok {
- return "", false
- }
- if t.historyIndex == -1 {
- t.historyPending = string(t.line)
- }
- t.historyIndex++
- runes := []rune(entry)
- t.setLine(runes, len(runes))
- case keyDown:
- switch t.historyIndex {
- case -1:
- return
- case 0:
- runes := []rune(t.historyPending)
- t.setLine(runes, len(runes))
- t.historyIndex--
- default:
- entry, ok := t.history.NthPreviousEntry(t.historyIndex - 1)
- if ok {
- t.historyIndex--
- runes := []rune(entry)
- t.setLine(runes, len(runes))
- }
- }
- case keyEnter:
- t.moveCursorToPos(len(t.line))
- t.queue([]rune("\r\n"))
- line = string(t.line)
- ok = true
- t.line = t.line[:0]
- t.pos = 0
- t.cursorX = 0
- t.cursorY = 0
- t.maxLine = 0
- case keyDeleteWord:
- // Delete zero or more spaces and then one or more characters.
- t.eraseNPreviousChars(t.countToLeftWord())
- case keyDeleteLine:
- // Delete everything from the current cursor position to the
- // end of line.
- for i := t.pos; i < len(t.line); i++ {
- t.queue(space)
- t.advanceCursor(1)
- }
- t.line = t.line[:t.pos]
- t.moveCursorToPos(t.pos)
- case keyCtrlD:
- // Erase the character under the current position.
- // The EOF case when the line is empty is handled in
- // readLine().
- if t.pos < len(t.line) {
- t.pos++
- t.eraseNPreviousChars(1)
- }
- case keyCtrlU:
- t.eraseNPreviousChars(t.pos)
- case keyClearScreen:
- // Erases the screen and moves the cursor to the home position.
- t.queue([]rune("\x1b[2J\x1b[H"))
- t.queue(t.prompt)
- t.cursorX, t.cursorY = 0, 0
- t.advanceCursor(visualLength(t.prompt))
- t.setLine(t.line, t.pos)
- default:
- if t.AutoCompleteCallback != nil {
- prefix := string(t.line[:t.pos])
- suffix := string(t.line[t.pos:])
-
- t.lock.Unlock()
- newLine, newPos, completeOk := t.AutoCompleteCallback(prefix+suffix, len(prefix), key)
- t.lock.Lock()
-
- if completeOk {
- t.setLine([]rune(newLine), utf8.RuneCount([]byte(newLine)[:newPos]))
- return
- }
- }
- if !isPrintable(key) {
- return
- }
- if len(t.line) == maxLineLength {
- return
- }
- t.addKeyToLine(key)
- }
- return
-}
-
-// addKeyToLine inserts the given key at the current position in the current
-// line.
-func (t *Terminal) addKeyToLine(key rune) {
- if len(t.line) == cap(t.line) {
- newLine := make([]rune, len(t.line), 2*(1+len(t.line)))
- copy(newLine, t.line)
- t.line = newLine
- }
- t.line = t.line[:len(t.line)+1]
- copy(t.line[t.pos+1:], t.line[t.pos:])
- t.line[t.pos] = key
- if t.echo {
- t.writeLine(t.line[t.pos:])
- }
- t.pos++
- t.moveCursorToPos(t.pos)
-}
-
-func (t *Terminal) writeLine(line []rune) {
- for len(line) != 0 {
- remainingOnLine := t.termWidth - t.cursorX
- todo := len(line)
- if todo > remainingOnLine {
- todo = remainingOnLine
- }
- t.queue(line[:todo])
- t.advanceCursor(visualLength(line[:todo]))
- line = line[todo:]
- }
-}
-
-func (t *Terminal) Write(buf []byte) (n int, err error) {
- t.lock.Lock()
- defer t.lock.Unlock()
-
- if t.cursorX == 0 && t.cursorY == 0 {
- // This is the easy case: there's nothing on the screen that we
- // have to move out of the way.
- return t.c.Write(buf)
- }
-
- // We have a prompt and possibly user input on the screen. We
- // have to clear it first.
- t.move(0 /* up */, 0 /* down */, t.cursorX /* left */, 0 /* right */)
- t.cursorX = 0
- t.clearLineToRight()
-
- for t.cursorY > 0 {
- t.move(1 /* up */, 0, 0, 0)
- t.cursorY--
- t.clearLineToRight()
- }
-
- if _, err = t.c.Write(t.outBuf); err != nil {
- return
- }
- t.outBuf = t.outBuf[:0]
-
- if n, err = t.c.Write(buf); err != nil {
- return
- }
-
- t.writeLine(t.prompt)
- if t.echo {
- t.writeLine(t.line)
- }
-
- t.moveCursorToPos(t.pos)
-
- if _, err = t.c.Write(t.outBuf); err != nil {
- return
- }
- t.outBuf = t.outBuf[:0]
- return
-}
-
-// ReadPassword temporarily changes the prompt and reads a password, without
-// echo, from the terminal.
-func (t *Terminal) ReadPassword(prompt string) (line string, err error) {
- t.lock.Lock()
- defer t.lock.Unlock()
-
- oldPrompt := t.prompt
- t.prompt = []rune(prompt)
- t.echo = false
-
- line, err = t.readLine()
-
- t.prompt = oldPrompt
- t.echo = true
-
- return
-}
-
-// ReadLine returns a line of input from the terminal.
-func (t *Terminal) ReadLine() (line string, err error) {
- t.lock.Lock()
- defer t.lock.Unlock()
-
- return t.readLine()
-}
-
-func (t *Terminal) readLine() (line string, err error) {
- // t.lock must be held at this point
-
- if t.cursorX == 0 && t.cursorY == 0 {
- t.writeLine(t.prompt)
- t.c.Write(t.outBuf)
- t.outBuf = t.outBuf[:0]
- }
-
- lineIsPasted := t.pasteActive
-
- for {
- rest := t.remainder
- lineOk := false
- for !lineOk {
- var key rune
- key, rest = bytesToKey(rest, t.pasteActive)
- if key == utf8.RuneError {
- break
- }
- if !t.pasteActive {
- if key == keyCtrlD {
- if len(t.line) == 0 {
- return "", io.EOF
- }
- }
- if key == keyPasteStart {
- t.pasteActive = true
- if len(t.line) == 0 {
- lineIsPasted = true
- }
- continue
- }
- } else if key == keyPasteEnd {
- t.pasteActive = false
- continue
- }
- if !t.pasteActive {
- lineIsPasted = false
- }
- line, lineOk = t.handleKey(key)
- }
- if len(rest) > 0 {
- n := copy(t.inBuf[:], rest)
- t.remainder = t.inBuf[:n]
- } else {
- t.remainder = nil
- }
- t.c.Write(t.outBuf)
- t.outBuf = t.outBuf[:0]
- if lineOk {
- if t.echo {
- t.historyIndex = -1
- t.history.Add(line)
- }
- if lineIsPasted {
- err = ErrPasteIndicator
- }
- return
- }
-
- // t.remainder is a slice at the beginning of t.inBuf
- // containing a partial key sequence
- readBuf := t.inBuf[len(t.remainder):]
- var n int
-
- t.lock.Unlock()
- n, err = t.c.Read(readBuf)
- t.lock.Lock()
-
- if err != nil {
- return
- }
-
- t.remainder = t.inBuf[:n+len(t.remainder)]
- }
-
- panic("unreachable") // for Go 1.0.
-}
-
-// SetPrompt sets the prompt to be used when reading subsequent lines.
-func (t *Terminal) SetPrompt(prompt string) {
- t.lock.Lock()
- defer t.lock.Unlock()
-
- t.prompt = []rune(prompt)
-}
-
-func (t *Terminal) clearAndRepaintLinePlusNPrevious(numPrevLines int) {
- // Move cursor to column zero at the start of the line.
- t.move(t.cursorY, 0, t.cursorX, 0)
- t.cursorX, t.cursorY = 0, 0
- t.clearLineToRight()
- for t.cursorY < numPrevLines {
- // Move down a line
- t.move(0, 1, 0, 0)
- t.cursorY++
- t.clearLineToRight()
- }
- // Move back to beginning.
- t.move(t.cursorY, 0, 0, 0)
- t.cursorX, t.cursorY = 0, 0
-
- t.queue(t.prompt)
- t.advanceCursor(visualLength(t.prompt))
- t.writeLine(t.line)
- t.moveCursorToPos(t.pos)
-}
-
-func (t *Terminal) SetSize(width, height int) error {
- t.lock.Lock()
- defer t.lock.Unlock()
-
- if width == 0 {
- width = 1
- }
-
- oldWidth := t.termWidth
- t.termWidth, t.termHeight = width, height
-
- switch {
- case width == oldWidth:
- // If the width didn't change then nothing else needs to be
- // done.
- return nil
- case len(t.line) == 0 && t.cursorX == 0 && t.cursorY == 0:
- // If there is nothing on current line and no prompt printed,
- // just do nothing
- return nil
- case width < oldWidth:
- // Some terminals (e.g. xterm) will truncate lines that were
- // too long when shinking. Others, (e.g. gnome-terminal) will
- // attempt to wrap them. For the former, repainting t.maxLine
- // works great, but that behaviour goes badly wrong in the case
- // of the latter because they have doubled every full line.
-
- // We assume that we are working on a terminal that wraps lines
- // and adjust the cursor position based on every previous line
- // wrapping and turning into two. This causes the prompt on
- // xterms to move upwards, which isn't great, but it avoids a
- // huge mess with gnome-terminal.
- if t.cursorX >= t.termWidth {
- t.cursorX = t.termWidth - 1
- }
- t.cursorY *= 2
- t.clearAndRepaintLinePlusNPrevious(t.maxLine * 2)
- case width > oldWidth:
- // If the terminal expands then our position calculations will
- // be wrong in the future because we think the cursor is
- // |t.pos| chars into the string, but there will be a gap at
- // the end of any wrapped line.
- //
- // But the position will actually be correct until we move, so
- // we can move back to the beginning and repaint everything.
- t.clearAndRepaintLinePlusNPrevious(t.maxLine)
- }
-
- _, err := t.c.Write(t.outBuf)
- t.outBuf = t.outBuf[:0]
- return err
-}
-
-type pasteIndicatorError struct{}
-
-func (pasteIndicatorError) Error() string {
- return "terminal: ErrPasteIndicator not correctly handled"
-}
-
-// ErrPasteIndicator may be returned from ReadLine as the error, in addition
-// to valid line data. It indicates that bracketed paste mode is enabled and
-// that the returned line consists only of pasted data. Programs may wish to
-// interpret pasted data more literally than typed data.
-var ErrPasteIndicator = pasteIndicatorError{}
-
-// SetBracketedPasteMode requests that the terminal bracket paste operations
-// with markers. Not all terminals support this but, if it is supported, then
-// enabling this mode will stop any autocomplete callback from running due to
-// pastes. Additionally, any lines that are completely pasted will be returned
-// from ReadLine with the error set to ErrPasteIndicator.
-func (t *Terminal) SetBracketedPasteMode(on bool) {
- if on {
- io.WriteString(t.c, "\x1b[?2004h")
- } else {
- io.WriteString(t.c, "\x1b[?2004l")
- }
-}
-
-// stRingBuffer is a ring buffer of strings.
-type stRingBuffer struct {
- // entries contains max elements.
- entries []string
- max int
- // head contains the index of the element most recently added to the ring.
- head int
- // size contains the number of elements in the ring.
- size int
-}
-
-func (s *stRingBuffer) Add(a string) {
- if s.entries == nil {
- const defaultNumEntries = 100
- s.entries = make([]string, defaultNumEntries)
- s.max = defaultNumEntries
- }
-
- s.head = (s.head + 1) % s.max
- s.entries[s.head] = a
- if s.size < s.max {
- s.size++
- }
-}
-
-// NthPreviousEntry returns the value passed to the nth previous call to Add.
-// If n is zero then the immediately prior value is returned, if one, then the
-// next most recent, and so on. If such an element doesn't exist then ok is
-// false.
-func (s *stRingBuffer) NthPreviousEntry(n int) (value string, ok bool) {
- if n >= s.size {
- return "", false
- }
- index := s.head - n
- if index < 0 {
- index += s.max
- }
- return s.entries[index], true
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
deleted file mode 100644
index 0763c9a9789e57dd8293b5c84673a5e1a133391c..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux,!appengine netbsd openbsd
-
-// Package terminal provides support functions for dealing with terminals, as
-// commonly found on UNIX systems.
-//
-// Putting a terminal into raw mode is the most common requirement:
-//
-// oldState, err := terminal.MakeRaw(0)
-// if err != nil {
-// panic(err)
-// }
-// defer terminal.Restore(0, oldState)
-package terminal
-
-import (
- "io"
- "syscall"
- "unsafe"
-)
-
-// State contains the state of a terminal.
-type State struct {
- termios syscall.Termios
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd int) bool {
- var termios syscall.Termios
- _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
- return err == 0
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd int) (*State, error) {
- var oldState State
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
- return nil, err
- }
-
- newState := oldState.termios
- newState.Iflag &^= syscall.ISTRIP | syscall.INLCR | syscall.ICRNL | syscall.IGNCR | syscall.IXON | syscall.IXOFF
- newState.Lflag &^= syscall.ECHO | syscall.ICANON | syscall.ISIG
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
- return nil, err
- }
-
- return &oldState, nil
-}
-
-// GetState returns the current state of a terminal which may be useful to
-// restore the terminal after a signal.
-func GetState(fd int) (*State, error) {
- var oldState State
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
- return nil, err
- }
-
- return &oldState, nil
-}
-
-// Restore restores the terminal connected to the given file descriptor to a
-// previous state.
-func Restore(fd int, state *State) error {
- _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0)
- return err
-}
-
-// GetSize returns the dimensions of the given terminal.
-func GetSize(fd int) (width, height int, err error) {
- var dimensions [4]uint16
-
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(&dimensions)), 0, 0, 0); err != 0 {
- return -1, -1, err
- }
- return int(dimensions[1]), int(dimensions[0]), nil
-}
-
-// ReadPassword reads a line of input from a terminal without local echo. This
-// is commonly used for inputting passwords and other sensitive data. The slice
-// returned does not include the \n.
-func ReadPassword(fd int) ([]byte, error) {
- var oldState syscall.Termios
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); err != 0 {
- return nil, err
- }
-
- newState := oldState
- newState.Lflag &^= syscall.ECHO
- newState.Lflag |= syscall.ICANON | syscall.ISIG
- newState.Iflag |= syscall.ICRNL
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
- return nil, err
- }
-
- defer func() {
- syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0)
- }()
-
- var buf [16]byte
- var ret []byte
- for {
- n, err := syscall.Read(fd, buf[:])
- if err != nil {
- return nil, err
- }
- if n == 0 {
- if len(ret) == 0 {
- return nil, io.EOF
- }
- break
- }
- if buf[n-1] == '\n' {
- n--
- }
- ret = append(ret, buf[:n]...)
- if n < len(buf) {
- break
- }
- }
-
- return ret, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
deleted file mode 100644
index 9c1ffd145a7d5fd40ab21f59c084165a29c99574..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_bsd.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package terminal
-
-import "syscall"
-
-const ioctlReadTermios = syscall.TIOCGETA
-const ioctlWriteTermios = syscall.TIOCSETA
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
deleted file mode 100644
index 5883b22d7808acd35b92ef665c3dd5665cac5d0e..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_linux.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package terminal
-
-// These constants are declared here, rather than importing
-// them from the syscall package as some syscall packages, even
-// on linux, for example gccgo, do not declare them.
-const ioctlReadTermios = 0x5401 // syscall.TCGETS
-const ioctlWriteTermios = 0x5402 // syscall.TCSETS
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
deleted file mode 100644
index 2dd6c3d978877ca04b39773ba040b973fbfdf6e7..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/terminal/util_windows.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package terminal provides support functions for dealing with terminals, as
-// commonly found on UNIX systems.
-//
-// Putting a terminal into raw mode is the most common requirement:
-//
-// oldState, err := terminal.MakeRaw(0)
-// if err != nil {
-// panic(err)
-// }
-// defer terminal.Restore(0, oldState)
-package terminal
-
-import (
- "io"
- "syscall"
- "unsafe"
-)
-
-const (
- enableLineInput = 2
- enableEchoInput = 4
- enableProcessedInput = 1
- enableWindowInput = 8
- enableMouseInput = 16
- enableInsertMode = 32
- enableQuickEditMode = 64
- enableExtendedFlags = 128
- enableAutoPosition = 256
- enableProcessedOutput = 1
- enableWrapAtEolOutput = 2
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-var (
- procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
- procSetConsoleMode = kernel32.NewProc("SetConsoleMode")
- procGetConsoleScreenBufferInfo = kernel32.NewProc("GetConsoleScreenBufferInfo")
-)
-
-type (
- short int16
- word uint16
-
- coord struct {
- x short
- y short
- }
- smallRect struct {
- left short
- top short
- right short
- bottom short
- }
- consoleScreenBufferInfo struct {
- size coord
- cursorPosition coord
- attributes word
- window smallRect
- maximumWindowSize coord
- }
-)
-
-type State struct {
- mode uint32
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd int) bool {
- var st uint32
- r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
- return r != 0 && e == 0
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd int) (*State, error) {
- var st uint32
- _, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
- if e != 0 {
- return nil, error(e)
- }
- st &^= (enableEchoInput | enableProcessedInput | enableLineInput | enableProcessedOutput)
- _, _, e = syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(st), 0)
- if e != 0 {
- return nil, error(e)
- }
- return &State{st}, nil
-}
-
-// GetState returns the current state of a terminal which may be useful to
-// restore the terminal after a signal.
-func GetState(fd int) (*State, error) {
- var st uint32
- _, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
- if e != 0 {
- return nil, error(e)
- }
- return &State{st}, nil
-}
-
-// Restore restores the terminal connected to the given file descriptor to a
-// previous state.
-func Restore(fd int, state *State) error {
- _, _, err := syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(state.mode), 0)
- return err
-}
-
-// GetSize returns the dimensions of the given terminal.
-func GetSize(fd int) (width, height int, err error) {
- var info consoleScreenBufferInfo
- _, _, e := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&info)), 0)
- if e != 0 {
- return 0, 0, error(e)
- }
- return int(info.size.x), int(info.size.y), nil
-}
-
-// ReadPassword reads a line of input from a terminal without local echo. This
-// is commonly used for inputting passwords and other sensitive data. The slice
-// returned does not include the \n.
-func ReadPassword(fd int) ([]byte, error) {
- var st uint32
- _, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
- if e != 0 {
- return nil, error(e)
- }
- old := st
-
- st &^= (enableEchoInput)
- st |= (enableProcessedInput | enableLineInput | enableProcessedOutput)
- _, _, e = syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(st), 0)
- if e != 0 {
- return nil, error(e)
- }
-
- defer func() {
- syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(fd), uintptr(old), 0)
- }()
-
- var buf [16]byte
- var ret []byte
- for {
- n, err := syscall.Read(syscall.Handle(fd), buf[:])
- if err != nil {
- return nil, err
- }
- if n == 0 {
- if len(ret) == 0 {
- return nil, io.EOF
- }
- break
- }
- if buf[n-1] == '\n' {
- n--
- }
- if n > 0 && buf[n-1] == '\r' {
- n--
- }
- ret = append(ret, buf[:n]...)
- if n < len(buf) {
- break
- }
- }
-
- return ret, nil
-}
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go b/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go
deleted file mode 100644
index 29ad65e96cc0ef2c7e3cdd5bf1a670c0268cff9e..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/golang.org/x/crypto/ssh/test/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This package contains integration tests for the
-// golang.org/x/crypto/ssh package.
-package test
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go
deleted file mode 100644
index ef3d37fb30808be38683aaec6e0a3d6601b9f8a8..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode_test.go
+++ /dev/null
@@ -1,703 +0,0 @@
-package yaml_test
-
-import (
- . "gopkg.in/check.v1"
- "gopkg.in/yaml.v1"
- "math"
- "reflect"
- "strings"
- "time"
-)
-
-var unmarshalIntTest = 123
-
-var unmarshalTests = []struct {
- data string
- value interface{}
-}{
- {
- "",
- &struct{}{},
- }, {
- "{}", &struct{}{},
- }, {
- "v: hi",
- map[string]string{"v": "hi"},
- }, {
- "v: hi", map[string]interface{}{"v": "hi"},
- }, {
- "v: true",
- map[string]string{"v": "true"},
- }, {
- "v: true",
- map[string]interface{}{"v": true},
- }, {
- "v: 10",
- map[string]interface{}{"v": 10},
- }, {
- "v: 0b10",
- map[string]interface{}{"v": 2},
- }, {
- "v: 0xA",
- map[string]interface{}{"v": 10},
- }, {
- "v: 4294967296",
- map[string]int64{"v": 4294967296},
- }, {
- "v: 0.1",
- map[string]interface{}{"v": 0.1},
- }, {
- "v: .1",
- map[string]interface{}{"v": 0.1},
- }, {
- "v: .Inf",
- map[string]interface{}{"v": math.Inf(+1)},
- }, {
- "v: -.Inf",
- map[string]interface{}{"v": math.Inf(-1)},
- }, {
- "v: -10",
- map[string]interface{}{"v": -10},
- }, {
- "v: -.1",
- map[string]interface{}{"v": -0.1},
- },
-
- // Simple values.
- {
- "123",
- &unmarshalIntTest,
- },
-
- // Floats from spec
- {
- "canonical: 6.8523e+5",
- map[string]interface{}{"canonical": 6.8523e+5},
- }, {
- "expo: 685.230_15e+03",
- map[string]interface{}{"expo": 685.23015e+03},
- }, {
- "fixed: 685_230.15",
- map[string]interface{}{"fixed": 685230.15},
- }, {
- "neginf: -.inf",
- map[string]interface{}{"neginf": math.Inf(-1)},
- }, {
- "fixed: 685_230.15",
- map[string]float64{"fixed": 685230.15},
- },
- //{"sexa: 190:20:30.15", map[string]interface{}{"sexa": 0}}, // Unsupported
- //{"notanum: .NaN", map[string]interface{}{"notanum": math.NaN()}}, // Equality of NaN fails.
-
- // Bools from spec
- {
- "canonical: y",
- map[string]interface{}{"canonical": true},
- }, {
- "answer: NO",
- map[string]interface{}{"answer": false},
- }, {
- "logical: True",
- map[string]interface{}{"logical": true},
- }, {
- "option: on",
- map[string]interface{}{"option": true},
- }, {
- "option: on",
- map[string]bool{"option": true},
- },
- // Ints from spec
- {
- "canonical: 685230",
- map[string]interface{}{"canonical": 685230},
- }, {
- "decimal: +685_230",
- map[string]interface{}{"decimal": 685230},
- }, {
- "octal: 02472256",
- map[string]interface{}{"octal": 685230},
- }, {
- "hexa: 0x_0A_74_AE",
- map[string]interface{}{"hexa": 685230},
- }, {
- "bin: 0b1010_0111_0100_1010_1110",
- map[string]interface{}{"bin": 685230},
- }, {
- "bin: -0b101010",
- map[string]interface{}{"bin": -42},
- }, {
- "decimal: +685_230",
- map[string]int{"decimal": 685230},
- },
-
- //{"sexa: 190:20:30", map[string]interface{}{"sexa": 0}}, // Unsupported
-
- // Nulls from spec
- {
- "empty:",
- map[string]interface{}{"empty": nil},
- }, {
- "canonical: ~",
- map[string]interface{}{"canonical": nil},
- }, {
- "english: null",
- map[string]interface{}{"english": nil},
- }, {
- "~: null key",
- map[interface{}]string{nil: "null key"},
- }, {
- "empty:",
- map[string]*bool{"empty": nil},
- },
-
- // Flow sequence
- {
- "seq: [A,B]",
- map[string]interface{}{"seq": []interface{}{"A", "B"}},
- }, {
- "seq: [A,B,C,]",
- map[string][]string{"seq": []string{"A", "B", "C"}},
- }, {
- "seq: [A,1,C]",
- map[string][]string{"seq": []string{"A", "1", "C"}},
- }, {
- "seq: [A,1,C]",
- map[string][]int{"seq": []int{1}},
- }, {
- "seq: [A,1,C]",
- map[string]interface{}{"seq": []interface{}{"A", 1, "C"}},
- },
- // Block sequence
- {
- "seq:\n - A\n - B",
- map[string]interface{}{"seq": []interface{}{"A", "B"}},
- }, {
- "seq:\n - A\n - B\n - C",
- map[string][]string{"seq": []string{"A", "B", "C"}},
- }, {
- "seq:\n - A\n - 1\n - C",
- map[string][]string{"seq": []string{"A", "1", "C"}},
- }, {
- "seq:\n - A\n - 1\n - C",
- map[string][]int{"seq": []int{1}},
- }, {
- "seq:\n - A\n - 1\n - C",
- map[string]interface{}{"seq": []interface{}{"A", 1, "C"}},
- },
-
- // Literal block scalar
- {
- "scalar: | # Comment\n\n literal\n\n \ttext\n\n",
- map[string]string{"scalar": "\nliteral\n\n\ttext\n"},
- },
-
- // Folded block scalar
- {
- "scalar: > # Comment\n\n folded\n line\n \n next\n line\n * one\n * two\n\n last\n line\n\n",
- map[string]string{"scalar": "\nfolded line\nnext line\n * one\n * two\n\nlast line\n"},
- },
-
- // Map inside interface with no type hints.
- {
- "a: {b: c}",
- map[string]interface{}{"a": map[interface{}]interface{}{"b": "c"}},
- },
-
- // Structs and type conversions.
- {
- "hello: world",
- &struct{ Hello string }{"world"},
- }, {
- "a: {b: c}",
- &struct{ A struct{ B string } }{struct{ B string }{"c"}},
- }, {
- "a: {b: c}",
- &struct{ A *struct{ B string } }{&struct{ B string }{"c"}},
- }, {
- "a: {b: c}",
- &struct{ A map[string]string }{map[string]string{"b": "c"}},
- }, {
- "a: {b: c}",
- &struct{ A *map[string]string }{&map[string]string{"b": "c"}},
- }, {
- "a:",
- &struct{ A map[string]string }{},
- }, {
- "a: 1",
- &struct{ A int }{1},
- }, {
- "a: 1",
- &struct{ A float64 }{1},
- }, {
- "a: 1.0",
- &struct{ A int }{1},
- }, {
- "a: 1.0",
- &struct{ A uint }{1},
- }, {
- "a: [1, 2]",
- &struct{ A []int }{[]int{1, 2}},
- }, {
- "a: 1",
- &struct{ B int }{0},
- }, {
- "a: 1",
- &struct {
- B int "a"
- }{1},
- }, {
- "a: y",
- &struct{ A bool }{true},
- },
-
- // Some cross type conversions
- {
- "v: 42",
- map[string]uint{"v": 42},
- }, {
- "v: -42",
- map[string]uint{},
- }, {
- "v: 4294967296",
- map[string]uint64{"v": 4294967296},
- }, {
- "v: -4294967296",
- map[string]uint64{},
- },
-
- // Overflow cases.
- {
- "v: 4294967297",
- map[string]int32{},
- }, {
- "v: 128",
- map[string]int8{},
- },
-
- // Quoted values.
- {
- "'1': '\"2\"'",
- map[interface{}]interface{}{"1": "\"2\""},
- }, {
- "v:\n- A\n- 'B\n\n C'\n",
- map[string][]string{"v": []string{"A", "B\nC"}},
- },
-
- // Explicit tags.
- {
- "v: !!float '1.1'",
- map[string]interface{}{"v": 1.1},
- }, {
- "v: !!null ''",
- map[string]interface{}{"v": nil},
- }, {
- "%TAG !y! tag:yaml.org,2002:\n---\nv: !y!int '1'",
- map[string]interface{}{"v": 1},
- },
-
- // Anchors and aliases.
- {
- "a: &x 1\nb: &y 2\nc: *x\nd: *y\n",
- &struct{ A, B, C, D int }{1, 2, 1, 2},
- }, {
- "a: &a {c: 1}\nb: *a",
- &struct {
- A, B struct {
- C int
- }
- }{struct{ C int }{1}, struct{ C int }{1}},
- }, {
- "a: &a [1, 2]\nb: *a",
- &struct{ B []int }{[]int{1, 2}},
- },
-
- // Bug #1133337
- {
- "foo: ''",
- map[string]*string{"foo": new(string)},
- }, {
- "foo: null",
- map[string]string{"foo": ""},
- }, {
- "foo: null",
- map[string]interface{}{"foo": nil},
- },
-
- // Ignored field
- {
- "a: 1\nb: 2\n",
- &struct {
- A int
- B int "-"
- }{1, 0},
- },
-
- // Bug #1191981
- {
- "" +
- "%YAML 1.1\n" +
- "--- !!str\n" +
- `"Generic line break (no glyph)\n\` + "\n" +
- ` Generic line break (glyphed)\n\` + "\n" +
- ` Line separator\u2028\` + "\n" +
- ` Paragraph separator\u2029"` + "\n",
- "" +
- "Generic line break (no glyph)\n" +
- "Generic line break (glyphed)\n" +
- "Line separator\u2028Paragraph separator\u2029",
- },
-
- // Struct inlining
- {
- "a: 1\nb: 2\nc: 3\n",
- &struct {
- A int
- C inlineB `yaml:",inline"`
- }{1, inlineB{2, inlineC{3}}},
- },
-
- // bug 1243827
- {
- "a: -b_c",
- map[string]interface{}{"a": "-b_c"},
- },
- {
- "a: +b_c",
- map[string]interface{}{"a": "+b_c"},
- },
- {
- "a: 50cent_of_dollar",
- map[string]interface{}{"a": "50cent_of_dollar"},
- },
-
- // Duration
- {
- "a: 3s",
- map[string]time.Duration{"a": 3 * time.Second},
- },
-
- // Issue #24.
- {
- "a: <foo>",
- map[string]string{"a": "<foo>"},
- },
-
- // Base 60 floats are obsolete and unsupported.
- {
- "a: 1:1\n",
- map[string]string{"a": "1:1"},
- },
-
- // Binary data.
- {
- "a: !!binary gIGC\n",
- map[string]string{"a": "\x80\x81\x82"},
- }, {
- "a: !!binary |\n " + strings.Repeat("kJCQ", 17) + "kJ\n CQ\n",
- map[string]string{"a": strings.Repeat("\x90", 54)},
- }, {
- "a: !!binary |\n " + strings.Repeat("A", 70) + "\n ==\n",
- map[string]string{"a": strings.Repeat("\x00", 52)},
- },
-}
-
-type inlineB struct {
- B int
- inlineC `yaml:",inline"`
-}
-
-type inlineC struct {
- C int
-}
-
-func (s *S) TestUnmarshal(c *C) {
- for i, item := range unmarshalTests {
- t := reflect.ValueOf(item.value).Type()
- var value interface{}
- switch t.Kind() {
- case reflect.Map:
- value = reflect.MakeMap(t).Interface()
- case reflect.String:
- t := reflect.ValueOf(item.value).Type()
- v := reflect.New(t)
- value = v.Interface()
- default:
- pt := reflect.ValueOf(item.value).Type()
- pv := reflect.New(pt.Elem())
- value = pv.Interface()
- }
- err := yaml.Unmarshal([]byte(item.data), value)
- c.Assert(err, IsNil, Commentf("Item #%d", i))
- if t.Kind() == reflect.String {
- c.Assert(*value.(*string), Equals, item.value, Commentf("Item #%d", i))
- } else {
- c.Assert(value, DeepEquals, item.value, Commentf("Item #%d", i))
- }
- }
-}
-
-func (s *S) TestUnmarshalNaN(c *C) {
- value := map[string]interface{}{}
- err := yaml.Unmarshal([]byte("notanum: .NaN"), &value)
- c.Assert(err, IsNil)
- c.Assert(math.IsNaN(value["notanum"].(float64)), Equals, true)
-}
-
-var unmarshalErrorTests = []struct {
- data, error string
-}{
- {"v: !!float 'error'", "YAML error: cannot decode !!str `error` as a !!float"},
- {"v: [A,", "YAML error: line 1: did not find expected node content"},
- {"v:\n- [A,", "YAML error: line 2: did not find expected node content"},
- {"a: *b\n", "YAML error: Unknown anchor 'b' referenced"},
- {"a: &a\n b: *a\n", "YAML error: Anchor 'a' value contains itself"},
- {"value: -", "YAML error: block sequence entries are not allowed in this context"},
- {"a: !!binary ==", "YAML error: !!binary value contains invalid base64 data"},
- {"{[.]}", `YAML error: invalid map key: \[\]interface \{\}\{"\."\}`},
- {"{{.}}", `YAML error: invalid map key: map\[interface\ \{\}\]interface \{\}\{".":interface \{\}\(nil\)\}`},
-}
-
-func (s *S) TestUnmarshalErrors(c *C) {
- for _, item := range unmarshalErrorTests {
- var value interface{}
- err := yaml.Unmarshal([]byte(item.data), &value)
- c.Assert(err, ErrorMatches, item.error, Commentf("Partial unmarshal: %#v", value))
- }
-}
-
-var setterTests = []struct {
- data, tag string
- value interface{}
-}{
- {"_: {hi: there}", "!!map", map[interface{}]interface{}{"hi": "there"}},
- {"_: [1,A]", "!!seq", []interface{}{1, "A"}},
- {"_: 10", "!!int", 10},
- {"_: null", "!!null", nil},
- {`_: BAR!`, "!!str", "BAR!"},
- {`_: "BAR!"`, "!!str", "BAR!"},
- {"_: !!foo 'BAR!'", "!!foo", "BAR!"},
-}
-
-var setterResult = map[int]bool{}
-
-type typeWithSetter struct {
- tag string
- value interface{}
-}
-
-func (o *typeWithSetter) SetYAML(tag string, value interface{}) (ok bool) {
- o.tag = tag
- o.value = value
- if i, ok := value.(int); ok {
- if result, ok := setterResult[i]; ok {
- return result
- }
- }
- return true
-}
-
-type setterPointerType struct {
- Field *typeWithSetter "_"
-}
-
-type setterValueType struct {
- Field typeWithSetter "_"
-}
-
-func (s *S) TestUnmarshalWithPointerSetter(c *C) {
- for _, item := range setterTests {
- obj := &setterPointerType{}
- err := yaml.Unmarshal([]byte(item.data), obj)
- c.Assert(err, IsNil)
- c.Assert(obj.Field, NotNil, Commentf("Pointer not initialized (%#v)", item.value))
- c.Assert(obj.Field.tag, Equals, item.tag)
- c.Assert(obj.Field.value, DeepEquals, item.value)
- }
-}
-
-func (s *S) TestUnmarshalWithValueSetter(c *C) {
- for _, item := range setterTests {
- obj := &setterValueType{}
- err := yaml.Unmarshal([]byte(item.data), obj)
- c.Assert(err, IsNil)
- c.Assert(obj.Field, NotNil, Commentf("Pointer not initialized (%#v)", item.value))
- c.Assert(obj.Field.tag, Equals, item.tag)
- c.Assert(obj.Field.value, DeepEquals, item.value)
- }
-}
-
-func (s *S) TestUnmarshalWholeDocumentWithSetter(c *C) {
- obj := &typeWithSetter{}
- err := yaml.Unmarshal([]byte(setterTests[0].data), obj)
- c.Assert(err, IsNil)
- c.Assert(obj.tag, Equals, setterTests[0].tag)
- value, ok := obj.value.(map[interface{}]interface{})
- c.Assert(ok, Equals, true)
- c.Assert(value["_"], DeepEquals, setterTests[0].value)
-}
-
-func (s *S) TestUnmarshalWithFalseSetterIgnoresValue(c *C) {
- setterResult[2] = false
- setterResult[4] = false
- defer func() {
- delete(setterResult, 2)
- delete(setterResult, 4)
- }()
-
- m := map[string]*typeWithSetter{}
- data := `{abc: 1, def: 2, ghi: 3, jkl: 4}`
- err := yaml.Unmarshal([]byte(data), m)
- c.Assert(err, IsNil)
- c.Assert(m["abc"], NotNil)
- c.Assert(m["def"], IsNil)
- c.Assert(m["ghi"], NotNil)
- c.Assert(m["jkl"], IsNil)
-
- c.Assert(m["abc"].value, Equals, 1)
- c.Assert(m["ghi"].value, Equals, 3)
-}
-
-// From http://yaml.org/type/merge.html
-var mergeTests = `
-anchors:
- - &CENTER { "x": 1, "y": 2 }
- - &LEFT { "x": 0, "y": 2 }
- - &BIG { "r": 10 }
- - &SMALL { "r": 1 }
-
-# All the following maps are equal:
-
-plain:
- # Explicit keys
- "x": 1
- "y": 2
- "r": 10
- label: center/big
-
-mergeOne:
- # Merge one map
- << : *CENTER
- "r": 10
- label: center/big
-
-mergeMultiple:
- # Merge multiple maps
- << : [ *CENTER, *BIG ]
- label: center/big
-
-override:
- # Override
- << : [ *BIG, *LEFT, *SMALL ]
- "x": 1
- label: center/big
-
-shortTag:
- # Explicit short merge tag
- !!merge "<<" : [ *CENTER, *BIG ]
- label: center/big
-
-longTag:
- # Explicit merge long tag
- !<tag:yaml.org,2002:merge> "<<" : [ *CENTER, *BIG ]
- label: center/big
-
-inlineMap:
- # Inlined map
- << : {"x": 1, "y": 2, "r": 10}
- label: center/big
-
-inlineSequenceMap:
- # Inlined map in sequence
- << : [ *CENTER, {"r": 10} ]
- label: center/big
-`
-
-func (s *S) TestMerge(c *C) {
- var want = map[interface{}]interface{}{
- "x": 1,
- "y": 2,
- "r": 10,
- "label": "center/big",
- }
-
- var m map[string]interface{}
- err := yaml.Unmarshal([]byte(mergeTests), &m)
- c.Assert(err, IsNil)
- for name, test := range m {
- if name == "anchors" {
- continue
- }
- c.Assert(test, DeepEquals, want, Commentf("test %q failed", name))
- }
-}
-
-func (s *S) TestMergeStruct(c *C) {
- type Data struct {
- X, Y, R int
- Label string
- }
- want := Data{1, 2, 10, "center/big"}
-
- var m map[string]Data
- err := yaml.Unmarshal([]byte(mergeTests), &m)
- c.Assert(err, IsNil)
- for name, test := range m {
- if name == "anchors" {
- continue
- }
- c.Assert(test, Equals, want, Commentf("test %q failed", name))
- }
-}
-
-var unmarshalNullTests = []func() interface{}{
- func() interface{} { var v interface{}; v = "v"; return &v },
- func() interface{} { var s = "s"; return &s },
- func() interface{} { var s = "s"; sptr := &s; return &sptr },
- func() interface{} { var i = 1; return &i },
- func() interface{} { var i = 1; iptr := &i; return &iptr },
- func() interface{} { m := map[string]int{"s": 1}; return &m },
- func() interface{} { m := map[string]int{"s": 1}; return m },
-}
-
-func (s *S) TestUnmarshalNull(c *C) {
- for _, test := range unmarshalNullTests {
- item := test()
- zero := reflect.Zero(reflect.TypeOf(item).Elem()).Interface()
- err := yaml.Unmarshal([]byte("null"), item)
- c.Assert(err, IsNil)
- if reflect.TypeOf(item).Kind() == reflect.Map {
- c.Assert(reflect.ValueOf(item).Interface(), DeepEquals, reflect.MakeMap(reflect.TypeOf(item)).Interface())
- } else {
- c.Assert(reflect.ValueOf(item).Elem().Interface(), DeepEquals, zero)
- }
- }
-}
-
-//var data []byte
-//func init() {
-// var err error
-// data, err = ioutil.ReadFile("/tmp/file.yaml")
-// if err != nil {
-// panic(err)
-// }
-//}
-//
-//func (s *S) BenchmarkUnmarshal(c *C) {
-// var err error
-// for i := 0; i < c.N; i++ {
-// var v map[string]interface{}
-// err = yaml.Unmarshal(data, &v)
-// }
-// if err != nil {
-// panic(err)
-// }
-//}
-//
-//func (s *S) BenchmarkMarshal(c *C) {
-// var v map[string]interface{}
-// yaml.Unmarshal(data, &v)
-// c.ResetTimer()
-// for i := 0; i < c.N; i++ {
-// yaml.Marshal(&v)
-// }
-//}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go
deleted file mode 100644
index c9febc22a4592a4b7220d8479763d5987371da74..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode_test.go
+++ /dev/null
@@ -1,433 +0,0 @@
-package yaml_test
-
-import (
- "fmt"
- "math"
- "strconv"
- "strings"
- "time"
-
- . "gopkg.in/check.v1"
- "gopkg.in/yaml.v1"
-)
-
-var marshalIntTest = 123
-
-var marshalTests = []struct {
- value interface{}
- data string
-}{
- {
- nil,
- "null\n",
- }, {
- &struct{}{},
- "{}\n",
- }, {
- map[string]string{"v": "hi"},
- "v: hi\n",
- }, {
- map[string]interface{}{"v": "hi"},
- "v: hi\n",
- }, {
- map[string]string{"v": "true"},
- "v: \"true\"\n",
- }, {
- map[string]string{"v": "false"},
- "v: \"false\"\n",
- }, {
- map[string]interface{}{"v": true},
- "v: true\n",
- }, {
- map[string]interface{}{"v": false},
- "v: false\n",
- }, {
- map[string]interface{}{"v": 10},
- "v: 10\n",
- }, {
- map[string]interface{}{"v": -10},
- "v: -10\n",
- }, {
- map[string]uint{"v": 42},
- "v: 42\n",
- }, {
- map[string]interface{}{"v": int64(4294967296)},
- "v: 4294967296\n",
- }, {
- map[string]int64{"v": int64(4294967296)},
- "v: 4294967296\n",
- }, {
- map[string]uint64{"v": 4294967296},
- "v: 4294967296\n",
- }, {
- map[string]interface{}{"v": "10"},
- "v: \"10\"\n",
- }, {
- map[string]interface{}{"v": 0.1},
- "v: 0.1\n",
- }, {
- map[string]interface{}{"v": float64(0.1)},
- "v: 0.1\n",
- }, {
- map[string]interface{}{"v": -0.1},
- "v: -0.1\n",
- }, {
- map[string]interface{}{"v": math.Inf(+1)},
- "v: .inf\n",
- }, {
- map[string]interface{}{"v": math.Inf(-1)},
- "v: -.inf\n",
- }, {
- map[string]interface{}{"v": math.NaN()},
- "v: .nan\n",
- }, {
- map[string]interface{}{"v": nil},
- "v: null\n",
- }, {
- map[string]interface{}{"v": ""},
- "v: \"\"\n",
- }, {
- map[string][]string{"v": []string{"A", "B"}},
- "v:\n- A\n- B\n",
- }, {
- map[string][]string{"v": []string{"A", "B\nC"}},
- "v:\n- A\n- |-\n B\n C\n",
- }, {
- map[string][]interface{}{"v": []interface{}{"A", 1, map[string][]int{"B": []int{2, 3}}}},
- "v:\n- A\n- 1\n- B:\n - 2\n - 3\n",
- }, {
- map[string]interface{}{"a": map[interface{}]interface{}{"b": "c"}},
- "a:\n b: c\n",
- }, {
- map[string]interface{}{"a": "-"},
- "a: '-'\n",
- },
-
- // Simple values.
- {
- &marshalIntTest,
- "123\n",
- },
-
- // Structures
- {
- &struct{ Hello string }{"world"},
- "hello: world\n",
- }, {
- &struct {
- A struct {
- B string
- }
- }{struct{ B string }{"c"}},
- "a:\n b: c\n",
- }, {
- &struct {
- A *struct {
- B string
- }
- }{&struct{ B string }{"c"}},
- "a:\n b: c\n",
- }, {
- &struct {
- A *struct {
- B string
- }
- }{},
- "a: null\n",
- }, {
- &struct{ A int }{1},
- "a: 1\n",
- }, {
- &struct{ A []int }{[]int{1, 2}},
- "a:\n- 1\n- 2\n",
- }, {
- &struct {
- B int "a"
- }{1},
- "a: 1\n",
- }, {
- &struct{ A bool }{true},
- "a: true\n",
- },
-
- // Conditional flag
- {
- &struct {
- A int "a,omitempty"
- B int "b,omitempty"
- }{1, 0},
- "a: 1\n",
- }, {
- &struct {
- A int "a,omitempty"
- B int "b,omitempty"
- }{0, 0},
- "{}\n",
- }, {
- &struct {
- A *struct{ X int } "a,omitempty"
- B int "b,omitempty"
- }{nil, 0},
- "{}\n",
- },
-
- // Flow flag
- {
- &struct {
- A []int "a,flow"
- }{[]int{1, 2}},
- "a: [1, 2]\n",
- }, {
- &struct {
- A map[string]string "a,flow"
- }{map[string]string{"b": "c", "d": "e"}},
- "a: {b: c, d: e}\n",
- }, {
- &struct {
- A struct {
- B, D string
- } "a,flow"
- }{struct{ B, D string }{"c", "e"}},
- "a: {b: c, d: e}\n",
- },
-
- // Unexported field
- {
- &struct {
- u int
- A int
- }{0, 1},
- "a: 1\n",
- },
-
- // Ignored field
- {
- &struct {
- A int
- B int "-"
- }{1, 2},
- "a: 1\n",
- },
-
- // Struct inlining
- {
- &struct {
- A int
- C inlineB `yaml:",inline"`
- }{1, inlineB{2, inlineC{3}}},
- "a: 1\nb: 2\nc: 3\n",
- },
-
- // Duration
- {
- map[string]time.Duration{"a": 3 * time.Second},
- "a: 3s\n",
- },
-
- // Issue #24: bug in map merging logic.
- {
- map[string]string{"a": "<foo>"},
- "a: <foo>\n",
- },
-
- // Issue #34: marshal unsupported base 60 floats quoted for compatibility
- // with old YAML 1.1 parsers.
- {
- map[string]string{"a": "1:1"},
- "a: \"1:1\"\n",
- },
-
- // Binary data.
- {
- map[string]string{"a": "\x00"},
- "a: \"\\0\"\n",
- }, {
- map[string]string{"a": "\x80\x81\x82"},
- "a: !!binary gIGC\n",
- }, {
- map[string]string{"a": strings.Repeat("\x90", 54)},
- "a: !!binary |\n " + strings.Repeat("kJCQ", 17) + "kJ\n CQ\n",
- }, {
- map[string]interface{}{"a": typeWithGetter{"!!str", "\x80\x81\x82"}},
- "a: !!binary gIGC\n",
- },
-
- // Escaping of tags.
- {
- map[string]interface{}{"a": typeWithGetter{"foo!bar", 1}},
- "a: !<foo%21bar> 1\n",
- },
-}
-
-func (s *S) TestMarshal(c *C) {
- for _, item := range marshalTests {
- data, err := yaml.Marshal(item.value)
- c.Assert(err, IsNil)
- c.Assert(string(data), Equals, item.data)
- }
-}
-
-var marshalErrorTests = []struct {
- value interface{}
- error string
- panic string
-}{{
- value: &struct {
- B int
- inlineB ",inline"
- }{1, inlineB{2, inlineC{3}}},
- panic: `Duplicated key 'b' in struct struct \{ B int; .*`,
-}, {
- value: typeWithGetter{"!!binary", "\x80"},
- error: "YAML error: explicitly tagged !!binary data must be base64-encoded",
-}, {
- value: typeWithGetter{"!!float", "\x80"},
- error: `YAML error: cannot marshal invalid UTF-8 data as !!float`,
-}}
-
-func (s *S) TestMarshalErrors(c *C) {
- for _, item := range marshalErrorTests {
- if item.panic != "" {
- c.Assert(func() { yaml.Marshal(item.value) }, PanicMatches, item.panic)
- } else {
- _, err := yaml.Marshal(item.value)
- c.Assert(err, ErrorMatches, item.error)
- }
- }
-}
-
-var marshalTaggedIfaceTest interface{} = &struct{ A string }{"B"}
-
-var getterTests = []struct {
- data, tag string
- value interface{}
-}{
- {"_:\n hi: there\n", "", map[interface{}]interface{}{"hi": "there"}},
- {"_:\n- 1\n- A\n", "", []interface{}{1, "A"}},
- {"_: 10\n", "", 10},
- {"_: null\n", "", nil},
- {"_: !foo BAR!\n", "!foo", "BAR!"},
- {"_: !foo 1\n", "!foo", "1"},
- {"_: !foo '\"1\"'\n", "!foo", "\"1\""},
- {"_: !foo 1.1\n", "!foo", 1.1},
- {"_: !foo 1\n", "!foo", 1},
- {"_: !foo 1\n", "!foo", uint(1)},
- {"_: !foo true\n", "!foo", true},
- {"_: !foo\n- A\n- B\n", "!foo", []string{"A", "B"}},
- {"_: !foo\n A: B\n", "!foo", map[string]string{"A": "B"}},
- {"_: !foo\n a: B\n", "!foo", &marshalTaggedIfaceTest},
-}
-
-func (s *S) TestMarshalTypeCache(c *C) {
- var data []byte
- var err error
- func() {
- type T struct{ A int }
- data, err = yaml.Marshal(&T{})
- c.Assert(err, IsNil)
- }()
- func() {
- type T struct{ B int }
- data, err = yaml.Marshal(&T{})
- c.Assert(err, IsNil)
- }()
- c.Assert(string(data), Equals, "b: 0\n")
-}
-
-type typeWithGetter struct {
- tag string
- value interface{}
-}
-
-func (o typeWithGetter) GetYAML() (tag string, value interface{}) {
- return o.tag, o.value
-}
-
-type typeWithGetterField struct {
- Field typeWithGetter "_"
-}
-
-func (s *S) TestMashalWithGetter(c *C) {
- for _, item := range getterTests {
- obj := &typeWithGetterField{}
- obj.Field.tag = item.tag
- obj.Field.value = item.value
- data, err := yaml.Marshal(obj)
- c.Assert(err, IsNil)
- c.Assert(string(data), Equals, string(item.data))
- }
-}
-
-func (s *S) TestUnmarshalWholeDocumentWithGetter(c *C) {
- obj := &typeWithGetter{}
- obj.tag = ""
- obj.value = map[string]string{"hello": "world!"}
- data, err := yaml.Marshal(obj)
- c.Assert(err, IsNil)
- c.Assert(string(data), Equals, "hello: world!\n")
-}
-
-func (s *S) TestSortedOutput(c *C) {
- order := []interface{}{
- false,
- true,
- 1,
- uint(1),
- 1.0,
- 1.1,
- 1.2,
- 2,
- uint(2),
- 2.0,
- 2.1,
- "",
- ".1",
- ".2",
- ".a",
- "1",
- "2",
- "a!10",
- "a/2",
- "a/10",
- "a~10",
- "ab/1",
- "b/1",
- "b/01",
- "b/2",
- "b/02",
- "b/3",
- "b/03",
- "b1",
- "b01",
- "b3",
- "c2.10",
- "c10.2",
- "d1",
- "d12",
- "d12a",
- }
- m := make(map[interface{}]int)
- for _, k := range order {
- m[k] = 1
- }
- data, err := yaml.Marshal(m)
- c.Assert(err, IsNil)
- out := "\n" + string(data)
- last := 0
- for i, k := range order {
- repr := fmt.Sprint(k)
- if s, ok := k.(string); ok {
- if _, err = strconv.ParseFloat(repr, 32); s == "" || err == nil {
- repr = `"` + repr + `"`
- }
- }
- index := strings.Index(out, "\n"+repr+":")
- if index == -1 {
- c.Fatalf("%#v is not in the output: %#v", k, out)
- }
- if index < last {
- c.Fatalf("%#v was generated before %#v: %q", k, order[i-1], out)
- }
- last = index
- }
-}
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go b/Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go
deleted file mode 100644
index c5cf1ed4f6e6321e2f8398a9960a1c7abf2243e2..0000000000000000000000000000000000000000
--- a/Godeps/_workspace/src/gopkg.in/yaml.v1/suite_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package yaml_test
-
-import (
- . "gopkg.in/check.v1"
- "testing"
-)
-
-func Test(t *testing.T) { TestingT(t) }
-
-type S struct{}
-
-var _ = Suite(&S{})
diff --git a/Makefile b/Makefile
index 644cd66136f65b8eb91c48f0216279395fdb0604..7c663efb8d2e3881bf3c32e32a7bd3bdd1a45cbc 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,11 @@ RPM_PLATFORMS ?= el/6 el/7 \
fedora/20 fedora/21 fedora/22 fedora/23
RPM_ARCHS ?= x86_64 i686 arm armhf
COMMON_PACKAGE_NAMESPACE=$(shell go list ./common)
+
+# Packages in vendor/ are included in ./...
+# https://github.com/golang/go/issues/11659
+OUR_PACKAGES=$(shell go list ./... | grep -v '/vendor/')
+
GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \
-X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \
-X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH)
@@ -79,7 +84,7 @@ deps:
go get -u github.com/jteeuwen/go-bindata/...
go install cmd/vet
-out/docker/prebuilt-x86_64.tar.gz: $(GO_FILES)
+out/docker/prebuilt-x86_64.tar.xz: $(GO_FILES)
# Create directory
mkdir -p out/docker
@@ -96,18 +101,18 @@ ifneq (, $(shell docker info))
docker create --name=gitlab-runner-prebuilt-x86_64-$(REVISION) gitlab-runner-prebuilt-x86_64:$(REVISION) /bin/sh
docker export -o out/docker/prebuilt-x86_64.tar gitlab-runner-prebuilt-x86_64-$(REVISION)
docker rm -f gitlab-runner-prebuilt-x86_64-$(REVISION)
- gzip -f -9 out/docker/prebuilt-x86_64.tar
+ xz -f -9 out/docker/prebuilt-x86_64.tar
else
$(warning =============================================)
$(warning WARNING: downloading prebuilt docker images that will be embedded in gitlab-runner)
$(warning WARNING: to use images compiled from your code install Docker Engine)
- $(warning WARNING: and remove out/docker/prebuilt-x86_64.tar.gz)
+ $(warning WARNING: and remove out/docker/prebuilt-x86_64.tar.xz)
$(warning =============================================)
- curl -o out/docker/prebuilt-x86_64.tar.gz \
- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.gz
+ curl -o out/docker/prebuilt-x86_64.tar.xz \
+ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-x86_64.tar.xz
endif
-out/docker/prebuilt-arm.tar.gz: $(GO_FILES)
+out/docker/prebuilt-arm.tar.xz: $(GO_FILES)
# Create directory
mkdir -p out/docker
@@ -124,18 +129,18 @@ ifneq (, $(shell docker info))
docker create --name=gitlab-runner-prebuilt-arm-$(REVISION) gitlab-runner-prebuilt-arm:$(REVISION) /bin/sh
docker export -o out/docker/prebuilt-arm.tar gitlab-runner-prebuilt-arm-$(REVISION)
docker rm -f gitlab-runner-prebuilt-arm-$(REVISION)
- gzip -f -9 out/docker/prebuilt-arm.tar
+ xz -f -9 out/docker/prebuilt-arm.tar
else
$(warning =============================================)
$(warning WARNING: downloading prebuilt docker images that will be embedded in gitlab-runner)
$(warning WARNING: to use images compiled from your code install Docker Engine)
- $(warning WARNING: and remove out/docker/prebuilt-arm.tar.gz)
+ $(warning WARNING: and remove out/docker/prebuilt-arm.tar.xz)
$(warning =============================================)
- curl -o out/docker/prebuilt-arm.tar.gz \
- https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.gz
+ curl -o out/docker/prebuilt-arm.tar.xz \
+ https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/prebuilt-arm.tar.xz
endif
-executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.gz out/docker/prebuilt-arm.tar.gz
+executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.xz out/docker/prebuilt-arm.tar.xz
# Generating embedded data
go-bindata \
-pkg docker \
@@ -144,8 +149,9 @@ executors/docker/bindata.go: out/docker/prebuilt-x86_64.tar.gz out/docker/prebui
-nometadata \
-prefix out/docker/ \
-o executors/docker/bindata.go \
- out/docker/prebuilt-x86_64.tar.gz \
- out/docker/prebuilt-arm.tar.gz
+ out/docker/prebuilt-x86_64.tar.xz \
+ out/docker/prebuilt-arm.tar.xz
+ go fmt executors/docker/bindata.go
docker: executors/docker/bindata.go
@@ -165,20 +171,19 @@ build_current: executors/docker/bindata.go build_simple
fmt:
# Checking project code formatting...
- @go fmt ./... | awk '{ print "Please run go fmt"; exit 1 }'
+ @go fmt $(OUR_PACKAGES) | awk '{ print "Please run go fmt"; exit 1 }'
vet:
# Checking for suspicious constructs...
- @go vet ./...
+ @go vet $(OUR_PACKAGES)
lint:
# Checking project code style...
- @golint ./... | ( ! grep -v -e "be unexported" -e "don't use an underscore in package name" -e "ALL_CAPS" )
+ @golint ./... | ( ! grep -v -e "^vendor/" -e "be unexported" -e "don't use an underscore in package name" -e "ALL_CAPS" )
complexity:
# Checking code complexity
- @gocyclo -over 9 $(shell find . -name '*.go' | grep -v \
- -e "/Godeps" \
+ @gocyclo -over 9 $(shell find . -name '*.go' -not -path './vendor/*' | grep -v \
-e "/helpers/shell_escape.go" \
-e "/executors/kubernetes/executor_kubernetes_test.go" \
-e "/executors/kubernetes/util_test.go" \
@@ -188,7 +193,7 @@ complexity:
test: executors/docker/bindata.go
# Running tests...
- @go test ./... -cover
+ @go test $(OUR_PACKAGES) -cover
install: executors/docker/bindata.go
go install --ldflags="$(GO_LDFLAGS)"
diff --git a/README.md b/README.md
index 8782fac69fa6c9691fd6bcbec670a8bb2e5bf49c..f057ddcb1315db993404b4de1a0cf5ca91806e5f 100644
--- a/README.md
+++ b/README.md
@@ -10,13 +10,8 @@ The old name of this project was GitLab CI Multi Runner but please use "GitLab R
### Contributing
-The official repository for this project is on [GitLab.com](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner).
+Contributions are welcome, see [`CONTRIBUTING.md`](CONTRIBUTING.md) for more details.
-* [Development](docs/development/README.md)
-* [Issues](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues)
-* [Merge Requests](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests)
-
-Contributions are welcome, per the [contribution guidelines](https://gitlab.com/gitlab-org/gitlab-ce/CONTRIBUTING.md) and the contributor license agreements linked to from there.
#### Closing issues and merge requests
diff --git a/executors/docker/bindata_test.go b/executors/docker/bindata_test.go
index ec73430f3a63c888030e175aa5242cf11cdeb8bf..e81ae41d3da1d7cb148104a733fa5606be491097 100644
--- a/executors/docker/bindata_test.go
+++ b/executors/docker/bindata_test.go
@@ -1,36 +1,17 @@
package docker
import (
- "bytes"
- "compress/gzip"
- "github.com/stretchr/testify/assert"
- "io"
- "io/ioutil"
"testing"
+
+ "github.com/stretchr/testify/assert"
)
func TestPrebuiltX86_64Assets(t *testing.T) {
- data, err := Asset("prebuilt-x86_64.tar.gz")
- assert.NoError(t, err)
-
- gz, err := gzip.NewReader(bytes.NewReader(data))
- assert.NoError(t, err)
- assert.NotNil(t, gz)
- defer gz.Close()
-
- _, err = io.Copy(ioutil.Discard, gz)
+ _, err := Asset("prebuilt-x86_64" + prebuiltImageExtension)
assert.NoError(t, err)
}
func TestPrebuiltARMAssets(t *testing.T) {
- data, err := Asset("prebuilt-arm.tar.gz")
- assert.NoError(t, err)
-
- gz, err := gzip.NewReader(bytes.NewReader(data))
- assert.NoError(t, err)
- assert.NotNil(t, gz)
- defer gz.Close()
-
- _, err = io.Copy(ioutil.Discard, gz)
+ _, err := Asset("prebuilt-arm" + prebuiltImageExtension)
assert.NoError(t, err)
}
diff --git a/executors/docker/consts.go b/executors/docker/consts.go
index 8e7cc930780f91d57af2f641e88adf0d0ebbdfe9..c991f9911101cffc4d0784d69d56c15ea989c1ba 100644
--- a/executors/docker/consts.go
+++ b/executors/docker/consts.go
@@ -1,4 +1,7 @@
package docker
-const dockerAPIVersion = "1.18"
+const DockerAPIVersion = "1.18"
const dockerLabelPrefix = "com.gitlab.gitlab-runner"
+
+const prebuiltImageName = "gitlab-runner-prebuilt"
+const prebuiltImageExtension = ".tar.xz"
diff --git a/executors/docker/executor_docker.go b/executors/docker/executor_docker.go
index 963cb802d45b566b9b544678e5f2051e758d0c81..301c7e5de4ee89905a8aefd491b944702121ac55 100644
--- a/executors/docker/executor_docker.go
+++ b/executors/docker/executor_docker.go
@@ -2,7 +2,6 @@ package docker
import (
"bytes"
- "compress/gzip"
"crypto/md5"
"errors"
"fmt"
@@ -40,9 +39,6 @@ type executor struct {
info *docker.Env
}
-const prebuiltImageName = "gitlab-runner-prebuilt"
-const PrebuiltArchive = "prebuilt.tar.gz"
-
func (s *executor) getServiceVariables() []string {
return s.Build.GetAllVariables().PublicOrInternal().StringList()
}
@@ -177,23 +173,17 @@ func (s *executor) getPrebuiltImage() (image *docker.Image, err error) {
return
}
- data, err := Asset("prebuilt-" + architecture + ".tar.gz")
+ data, err := Asset("prebuilt-" + architecture + prebuiltImageExtension)
if err != nil {
return nil, fmt.Errorf("Unsupported architecture: %s: %q", architecture, err.Error())
}
- gz, err := gzip.NewReader(bytes.NewReader(data))
- if err != nil {
- return
- }
- defer gz.Close()
-
s.Debugln("Loading prebuilt image...")
err = s.client.ImportImage(docker.ImportImageOptions{
Repository: prebuiltImageName + "-" + architecture,
Tag: common.REVISION,
Source: "-",
- InputStream: gz,
+ InputStream: bytes.NewBuffer(data),
})
if err != nil {
return
@@ -844,7 +834,7 @@ func (s *executor) Prepare(globalConfig *common.Config, config *common.RunnerCon
s.Println("Using Docker executor with image", imageName, "...")
- client, err := docker_helpers.New(s.Config.Docker.DockerCredentials, dockerAPIVersion)
+ client, err := docker_helpers.New(s.Config.Docker.DockerCredentials, DockerAPIVersion)
if err != nil {
return err
}
diff --git a/executors/docker/executor_docker_command_test.go b/executors/docker/executor_docker_command_test.go
index 579e94638d9d60a8b0863580f04aaeccf97a545f..2a74d7e30556a7f57414f9ffcca49f7b36c6150b 100644
--- a/executors/docker/executor_docker_command_test.go
+++ b/executors/docker/executor_docker_command_test.go
@@ -1,14 +1,20 @@
package docker_test
import (
+ "net/url"
"os"
+ "os/exec"
+ "strings"
"testing"
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
+
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
+ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/executors/docker"
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
+ "gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers/docker"
)
func TestDockerCommandSuccessRun(t *testing.T) {
@@ -174,3 +180,135 @@ func TestDockerCommandPrivilegedServices(t *testing.T) {
err := build.Run(&common.Config{}, &common.Trace{Writer: os.Stdout})
assert.NoError(t, err)
}
+
+func runDockerInDocker(version string) (id string, err error) {
+ cmd := exec.Command("docker", "run", "--detach", "--privileged", "-p", "2375", "docker:"+version+"-dind")
+ cmd.Stderr = os.Stderr
+ data, err := cmd.Output()
+ if err != nil {
+ return
+ }
+ id = strings.TrimSpace(string(data))
+ return
+}
+
+func getDockerCredentials(id string) (credentials docker_helpers.DockerCredentials, err error) {
+ cmd := exec.Command("docker", "port", id, "2375")
+ cmd.Stderr = os.Stderr
+ data, err := cmd.Output()
+ if err != nil {
+ return
+ }
+
+ hostPort := strings.Split(strings.TrimSpace(string(data)), ":")
+ if hostPort[0] == "0.0.0.0" {
+ // When running in environment with DOCKER_HOST we usually use external servers
+ if dockerHost, err := url.Parse(os.Getenv("DOCKER_HOST")); err != nil {
+ hostPort[0] = dockerHost.Host
+ } else {
+ hostPort[0] = "localhost"
+ }
+ }
+ credentials.Host = "tcp://" + hostPort[0] + ":" + hostPort[1]
+ return
+}
+
+func waitForDocker(credentials docker_helpers.DockerCredentials) error {
+ client, err := docker_helpers.New(credentials, docker.DockerAPIVersion)
+ if err != nil {
+ return err
+ }
+
+ for i := 0; i < 20; i++ {
+ _, err = client.Info()
+ if err == nil {
+ break
+ }
+ time.Sleep(time.Second)
+ }
+ return err
+}
+
+func testDockerVersion(t *testing.T, version string) {
+ t.Log("Running docker", version, "...")
+ id, err := runDockerInDocker(version)
+ if err != nil {
+ t.Error("Docker run:", err)
+ return
+ }
+
+ defer func() {
+ exec.Command("docker", "rm", "-f", "-v", id).Run()
+ }()
+
+ t.Log("Getting address of", version, "...")
+ credentials, err := getDockerCredentials(id)
+ if err != nil {
+ t.Error("Docker credentials:", err)
+ return
+ }
+
+ err = waitForDocker(credentials)
+ if err != nil {
+ t.Error("Wait for docker:", err)
+ return
+ }
+
+ t.Log("Docker", version, "is running at", credentials.Host)
+
+ build := &common.Build{
+ GetBuildResponse: common.SuccessfulBuild,
+ Runner: &common.RunnerConfig{
+ RunnerSettings: common.RunnerSettings{
+ Executor: "docker",
+ Docker: &common.DockerConfig{
+ Image: "alpine",
+ DockerCredentials: credentials,
+ },
+ },
+ },
+ }
+
+ err = build.Run(&common.Config{}, &common.Trace{Writer: os.Stdout})
+ assert.NoError(t, err)
+}
+
+func TestDocker1_8Compatibility(t *testing.T) {
+ if helpers.SkipIntegrationTests(t, "docker", "info") {
+ return
+ }
+
+ testDockerVersion(t, "1.8")
+}
+
+func TestDocker1_9Compatibility(t *testing.T) {
+ if helpers.SkipIntegrationTests(t, "docker", "info") {
+ return
+ }
+
+ testDockerVersion(t, "1.9")
+}
+
+func TestDocker1_10Compatibility(t *testing.T) {
+ if helpers.SkipIntegrationTests(t, "docker", "info") {
+ return
+ }
+
+ testDockerVersion(t, "1.10")
+}
+
+func TestDocker1_11Compatibility(t *testing.T) {
+ if helpers.SkipIntegrationTests(t, "docker", "info") {
+ return
+ }
+
+ testDockerVersion(t, "1.12")
+}
+
+func TestDocker1_12Compatibility(t *testing.T) {
+ if helpers.SkipIntegrationTests(t, "docker", "info") {
+ return
+ }
+
+ testDockerVersion(t, "1.12")
+}
diff --git a/executors/docker/machine/provider.go b/executors/docker/machine/provider.go
index e581b26e980e0f4553bf4acc94f3e84854b7440b..f05607d7cfe79cb10eb53a933d2ac5d8a4aac1f7 100644
--- a/executors/docker/machine/provider.go
+++ b/executors/docker/machine/provider.go
@@ -214,13 +214,16 @@ func (m *machineProvider) updateMachine(config *common.RunnerConfig, data *machi
return nil
}
-func (m *machineProvider) updateMachines(machines []string, config *common.RunnerConfig) (data machinesData) {
+func (m *machineProvider) updateMachines(machines []string, config *common.RunnerConfig) (data machinesData, validMachines []string) {
data.Runner = config.ShortDescription()
+ validMachines = make([]string, 0, len(machines))
for _, name := range machines {
details := m.machineDetails(name, false)
err := m.updateMachine(config, &data, details)
- if err != nil {
+ if err == nil {
+ validMachines = append(validMachines, name)
+ } else {
m.remove(details.Name, err)
}
@@ -265,7 +268,7 @@ func (m *machineProvider) Acquire(config *common.RunnerConfig) (data common.Exec
m.acquireLock.Lock()
// Update a list of currently configured machines
- machinesData := m.updateMachines(machines, config)
+ machinesData, validMachines := m.updateMachines(machines, config)
// Pre-create machines
m.createMachines(config, &machinesData)
@@ -281,7 +284,7 @@ func (m *machineProvider) Acquire(config *common.RunnerConfig) (data common.Exec
machinesData.writeDebugInformation()
// Try to find a free machine
- details := m.findFreeMachine(machines...)
+ details := m.findFreeMachine(validMachines...)
if details != nil {
data = details
return
diff --git a/vendor b/vendor
deleted file mode 120000
index a8edbc65673ceb91bc47e5ce6add66c9a232da97..0000000000000000000000000000000000000000
--- a/vendor
+++ /dev/null
@@ -1 +0,0 @@
-Godeps/_workspace/src
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/.gitignore b/vendor/github.com/BurntSushi/toml/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/.gitignore
rename to vendor/github.com/BurntSushi/toml/.gitignore
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/.travis.yml b/vendor/github.com/BurntSushi/toml/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/.travis.yml
rename to vendor/github.com/BurntSushi/toml/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/COMPATIBLE b/vendor/github.com/BurntSushi/toml/COMPATIBLE
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/COMPATIBLE
rename to vendor/github.com/BurntSushi/toml/COMPATIBLE
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/COPYING b/vendor/github.com/BurntSushi/toml/COPYING
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/COPYING
rename to vendor/github.com/BurntSushi/toml/COPYING
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/Makefile b/vendor/github.com/BurntSushi/toml/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/Makefile
rename to vendor/github.com/BurntSushi/toml/Makefile
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/README.md b/vendor/github.com/BurntSushi/toml/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/README.md
rename to vendor/github.com/BurntSushi/toml/README.md
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/decode.go b/vendor/github.com/BurntSushi/toml/decode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/decode.go
rename to vendor/github.com/BurntSushi/toml/decode.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/decode_meta.go b/vendor/github.com/BurntSushi/toml/decode_meta.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/decode_meta.go
rename to vendor/github.com/BurntSushi/toml/decode_meta.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/doc.go b/vendor/github.com/BurntSushi/toml/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/doc.go
rename to vendor/github.com/BurntSushi/toml/doc.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/encode.go b/vendor/github.com/BurntSushi/toml/encode.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/encode.go
rename to vendor/github.com/BurntSushi/toml/encode.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/encoding_types.go b/vendor/github.com/BurntSushi/toml/encoding_types.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/encoding_types.go
rename to vendor/github.com/BurntSushi/toml/encoding_types.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/encoding_types_1.1.go b/vendor/github.com/BurntSushi/toml/encoding_types_1.1.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/encoding_types_1.1.go
rename to vendor/github.com/BurntSushi/toml/encoding_types_1.1.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/lex.go b/vendor/github.com/BurntSushi/toml/lex.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/lex.go
rename to vendor/github.com/BurntSushi/toml/lex.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/parse.go b/vendor/github.com/BurntSushi/toml/parse.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/parse.go
rename to vendor/github.com/BurntSushi/toml/parse.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/session.vim b/vendor/github.com/BurntSushi/toml/session.vim
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/session.vim
rename to vendor/github.com/BurntSushi/toml/session.vim
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/type_check.go b/vendor/github.com/BurntSushi/toml/type_check.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/type_check.go
rename to vendor/github.com/BurntSushi/toml/type_check.go
diff --git a/Godeps/_workspace/src/github.com/BurntSushi/toml/type_fields.go b/vendor/github.com/BurntSushi/toml/type_fields.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/BurntSushi/toml/type_fields.go
rename to vendor/github.com/BurntSushi/toml/type_fields.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore b/vendor/github.com/Sirupsen/logrus/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.gitignore
rename to vendor/github.com/Sirupsen/logrus/.gitignore
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml b/vendor/github.com/Sirupsen/logrus/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/.travis.yml
rename to vendor/github.com/Sirupsen/logrus/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/CHANGELOG.md
rename to vendor/github.com/Sirupsen/logrus/CHANGELOG.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/Sirupsen/logrus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/LICENSE
rename to vendor/github.com/Sirupsen/logrus/LICENSE
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md b/vendor/github.com/Sirupsen/logrus/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/README.md
rename to vendor/github.com/Sirupsen/logrus/README.md
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/doc.go b/vendor/github.com/Sirupsen/logrus/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/doc.go
rename to vendor/github.com/Sirupsen/logrus/doc.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/Sirupsen/logrus/entry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/entry.go
rename to vendor/github.com/Sirupsen/logrus/entry.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/Sirupsen/logrus/exported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/exported.go
rename to vendor/github.com/Sirupsen/logrus/exported.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/Sirupsen/logrus/formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/formatter.go
rename to vendor/github.com/Sirupsen/logrus/formatter.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/Sirupsen/logrus/hooks.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/hooks.go
rename to vendor/github.com/Sirupsen/logrus/hooks.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/Sirupsen/logrus/json_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/json_formatter.go
rename to vendor/github.com/Sirupsen/logrus/json_formatter.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/Sirupsen/logrus/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logger.go
rename to vendor/github.com/Sirupsen/logrus/logger.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/Sirupsen/logrus/logrus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/logrus.go
rename to vendor/github.com/Sirupsen/logrus/logrus.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_bsd.go
rename to vendor/github.com/Sirupsen/logrus/terminal_bsd.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/Sirupsen/logrus/terminal_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_linux.go
rename to vendor/github.com/Sirupsen/logrus/terminal_linux.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_notwindows.go
rename to vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/Sirupsen/logrus/terminal_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/terminal_windows.go
rename to vendor/github.com/Sirupsen/logrus/terminal_windows.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/Sirupsen/logrus/text_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/text_formatter.go
rename to vendor/github.com/Sirupsen/logrus/text_formatter.go
diff --git a/Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/Sirupsen/logrus/writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/Sirupsen/logrus/writer.go
rename to vendor/github.com/Sirupsen/logrus/writer.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/.gitignore b/vendor/github.com/ayufan/golang-kardianos-service/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/.gitignore
rename to vendor/github.com/ayufan/golang-kardianos-service/.gitignore
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/LICENSE b/vendor/github.com/ayufan/golang-kardianos-service/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/LICENSE
rename to vendor/github.com/ayufan/golang-kardianos-service/LICENSE
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/README.md b/vendor/github.com/ayufan/golang-kardianos-service/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/README.md
rename to vendor/github.com/ayufan/golang-kardianos-service/README.md
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/console.go b/vendor/github.com/ayufan/golang-kardianos-service/console.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/console.go
rename to vendor/github.com/ayufan/golang-kardianos-service/console.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service.go b/vendor/github.com/ayufan/golang-kardianos-service/service.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_darwin.go b/vendor/github.com/ayufan/golang-kardianos-service/service_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_darwin.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_darwin.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_linux.go b/vendor/github.com/ayufan/golang-kardianos-service/service_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_linux.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_linux.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_systemd_linux.go b/vendor/github.com/ayufan/golang-kardianos-service/service_systemd_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_systemd_linux.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_systemd_linux.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_sysv_linux.go b/vendor/github.com/ayufan/golang-kardianos-service/service_sysv_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_sysv_linux.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_sysv_linux.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_unix.go b/vendor/github.com/ayufan/golang-kardianos-service/service_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_unix.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_unix.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_upstart_linux.go b/vendor/github.com/ayufan/golang-kardianos-service/service_upstart_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_upstart_linux.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_upstart_linux.go
diff --git a/Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_windows.go b/vendor/github.com/ayufan/golang-kardianos-service/service_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/ayufan/golang-kardianos-service/service_windows.go
rename to vendor/github.com/ayufan/golang-kardianos-service/service_windows.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/.travis.yml b/vendor/github.com/codegangsta/cli/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/.travis.yml
rename to vendor/github.com/codegangsta/cli/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE b/vendor/github.com/codegangsta/cli/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/LICENSE
rename to vendor/github.com/codegangsta/cli/LICENSE
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/README.md b/vendor/github.com/codegangsta/cli/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/README.md
rename to vendor/github.com/codegangsta/cli/README.md
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/app.go b/vendor/github.com/codegangsta/cli/app.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/app.go
rename to vendor/github.com/codegangsta/cli/app.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/cli.go b/vendor/github.com/codegangsta/cli/cli.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/cli.go
rename to vendor/github.com/codegangsta/cli/cli.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/command.go b/vendor/github.com/codegangsta/cli/command.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/command.go
rename to vendor/github.com/codegangsta/cli/command.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/context.go b/vendor/github.com/codegangsta/cli/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/context.go
rename to vendor/github.com/codegangsta/cli/context.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/flag.go b/vendor/github.com/codegangsta/cli/flag.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/flag.go
rename to vendor/github.com/codegangsta/cli/flag.go
diff --git a/Godeps/_workspace/src/github.com/codegangsta/cli/help.go b/vendor/github.com/codegangsta/cli/help.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/codegangsta/cli/help.go
rename to vendor/github.com/codegangsta/cli/help.go
diff --git a/vendor/github.com/docker/docker/LICENSE b/vendor/github.com/docker/docker/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..c7a3f0cfd4562c0a99091050ae17a33878af9d20
--- /dev/null
+++ b/vendor/github.com/docker/docker/LICENSE
@@ -0,0 +1,191 @@
+
+ Apache License
+ Version 2.0, January 2004
+ https://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ Copyright 2013-2015 Docker, Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/vendor/github.com/docker/docker/NOTICE b/vendor/github.com/docker/docker/NOTICE
new file mode 100644
index 0000000000000000000000000000000000000000..6e6f469ab9b280ff337ae8a074884a2eca44cc8b
--- /dev/null
+++ b/vendor/github.com/docker/docker/NOTICE
@@ -0,0 +1,19 @@
+Docker
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (https://www.docker.com).
+
+This product contains software (https://github.com/kr/pty) developed
+by Keith Rarick, licensed under the MIT License.
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws.
+
+For more information, please see https://www.bis.doc.gov
+
+See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/Godeps/_workspace/src/github.com/docker/docker/pkg/homedir/homedir.go b/vendor/github.com/docker/docker/pkg/homedir/homedir.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/docker/docker/pkg/homedir/homedir.go
rename to vendor/github.com/docker/docker/pkg/homedir/homedir.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore b/vendor/github.com/fsouza/go-dockerclient/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.gitignore
rename to vendor/github.com/fsouza/go-dockerclient/.gitignore
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml b/vendor/github.com/fsouza/go-dockerclient/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/.travis.yml
rename to vendor/github.com/fsouza/go-dockerclient/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS b/vendor/github.com/fsouza/go-dockerclient/AUTHORS
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/AUTHORS
rename to vendor/github.com/fsouza/go-dockerclient/AUTHORS
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE b/vendor/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/DOCKER-LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE b/vendor/github.com/fsouza/go-dockerclient/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/Makefile b/vendor/github.com/fsouza/go-dockerclient/Makefile
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/Makefile
rename to vendor/github.com/fsouza/go-dockerclient/Makefile
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown b/vendor/github.com/fsouza/go-dockerclient/README.markdown
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/README.markdown
rename to vendor/github.com/fsouza/go-dockerclient/README.markdown
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go b/vendor/github.com/fsouza/go-dockerclient/auth.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/auth.go
rename to vendor/github.com/fsouza/go-dockerclient/auth.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go b/vendor/github.com/fsouza/go-dockerclient/change.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/change.go
rename to vendor/github.com/fsouza/go-dockerclient/change.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go b/vendor/github.com/fsouza/go-dockerclient/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/client.go
rename to vendor/github.com/fsouza/go-dockerclient/client.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go b/vendor/github.com/fsouza/go-dockerclient/container.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/container.go
rename to vendor/github.com/fsouza/go-dockerclient/container.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go b/vendor/github.com/fsouza/go-dockerclient/env.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/env.go
rename to vendor/github.com/fsouza/go-dockerclient/env.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go b/vendor/github.com/fsouza/go-dockerclient/event.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/event.go
rename to vendor/github.com/fsouza/go-dockerclient/event.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go b/vendor/github.com/fsouza/go-dockerclient/exec.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/exec.go
rename to vendor/github.com/fsouza/go-dockerclient/exec.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/CHANGELOG.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/doc.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/entry.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/exported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/formatter.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/hooks.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/json_formatter.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logger.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/logrus.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_bsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_notwindows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/terminal_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/text_formatter.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/Sirupsen/logrus/writer.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/envfile.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/hosts_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/ip.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/opts/opts_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/archive_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_other.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/changes_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/copy_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/diff.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/example_changes.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/time_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/whiteouts.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/archive/wrap.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/homedir/homedir.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/idtools_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/bytespipe.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/fmt.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/multireader.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/readers.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/scheduler_gccgo.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/temp_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writeflusher.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/ioutils/writers.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/longpath/longpath.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/pools/pools.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/promise/promise.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/stdcopy/stdcopy.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/chtimes.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/errors.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/events_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/filesys_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/lstat_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/meminfo_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/mknod_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/path_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/stat_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/syscall_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/umask_windows.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_darwin.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/utimes_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/docker/pkg/system/xattrs_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.code
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/LICENSE.docs
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/circle.yml
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/duration.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/size.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/docker/go-units/ulimit.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE b/vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/LICENSE
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md b/vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/README.md
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/hashicorp/go-cleanhttp/cleanhttp.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
rename to vendor/github.com/fsouza/go-dockerclient/external/github.com/opencontainers/runc/libcontainer/user/user.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/net/context/context.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_darwin_arm64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_dragonfly_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_freebsd_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_arm64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_linux_ppc64x.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_netbsd_arm.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_386.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_openbsd_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/asm_solaris_amd64.s
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/constants.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/env_unset.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/flock_linux_32bit.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_c.c
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/gccgo_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkall.sh
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mkerrors.sh
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksyscall_solaris.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysctl_openbsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_darwin.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_dragonfly.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_freebsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_linux.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_netbsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/mksysnum_openbsd.pl
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/race0.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/sockcmsg_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/str.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_bsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_linux_ppc64x.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_no_getwd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/syscall_unix.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_darwin.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_dragonfly.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_freebsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_linux.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_netbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/types_solaris.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zerrors_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysctl_openbsd.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_darwin_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_freebsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_arm64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_netbsd_arm.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_386.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go
rename to vendor/github.com/fsouza/go-dockerclient/external/golang.org/x/sys/unix/ztypes_solaris_amd64.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go b/vendor/github.com/fsouza/go-dockerclient/image.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/image.go
rename to vendor/github.com/fsouza/go-dockerclient/image.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go b/vendor/github.com/fsouza/go-dockerclient/misc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/misc.go
rename to vendor/github.com/fsouza/go-dockerclient/misc.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go b/vendor/github.com/fsouza/go-dockerclient/network.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/network.go
rename to vendor/github.com/fsouza/go-dockerclient/network.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go b/vendor/github.com/fsouza/go-dockerclient/signal.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/signal.go
rename to vendor/github.com/fsouza/go-dockerclient/signal.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go b/vendor/github.com/fsouza/go-dockerclient/tar.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tar.go
rename to vendor/github.com/fsouza/go-dockerclient/tar.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go b/vendor/github.com/fsouza/go-dockerclient/tls.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/tls.go
rename to vendor/github.com/fsouza/go-dockerclient/tls.go
diff --git a/Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go b/vendor/github.com/fsouza/go-dockerclient/volume.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/fsouza/go-dockerclient/volume.go
rename to vendor/github.com/fsouza/go-dockerclient/volume.go
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/.dockerignore b/vendor/github.com/getsentry/raven-go/.dockerignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/.dockerignore
rename to vendor/github.com/getsentry/raven-go/.dockerignore
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/.gitignore b/vendor/github.com/getsentry/raven-go/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/.gitignore
rename to vendor/github.com/getsentry/raven-go/.gitignore
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/.gitmodules b/vendor/github.com/getsentry/raven-go/.gitmodules
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/.gitmodules
rename to vendor/github.com/getsentry/raven-go/.gitmodules
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/.travis.yml b/vendor/github.com/getsentry/raven-go/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/.travis.yml
rename to vendor/github.com/getsentry/raven-go/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/LICENSE b/vendor/github.com/getsentry/raven-go/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/LICENSE
rename to vendor/github.com/getsentry/raven-go/LICENSE
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/README.md b/vendor/github.com/getsentry/raven-go/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/README.md
rename to vendor/github.com/getsentry/raven-go/README.md
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/client.go b/vendor/github.com/getsentry/raven-go/client.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/client.go
rename to vendor/github.com/getsentry/raven-go/client.go
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/exception.go b/vendor/github.com/getsentry/raven-go/exception.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/exception.go
rename to vendor/github.com/getsentry/raven-go/exception.go
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/http.go b/vendor/github.com/getsentry/raven-go/http.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/http.go
rename to vendor/github.com/getsentry/raven-go/http.go
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/interfaces.go b/vendor/github.com/getsentry/raven-go/interfaces.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/interfaces.go
rename to vendor/github.com/getsentry/raven-go/interfaces.go
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/runtests.sh b/vendor/github.com/getsentry/raven-go/runtests.sh
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/runtests.sh
rename to vendor/github.com/getsentry/raven-go/runtests.sh
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/stacktrace.go b/vendor/github.com/getsentry/raven-go/stacktrace.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/stacktrace.go
rename to vendor/github.com/getsentry/raven-go/stacktrace.go
diff --git a/Godeps/_workspace/src/github.com/getsentry/raven-go/writer.go b/vendor/github.com/getsentry/raven-go/writer.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/getsentry/raven-go/writer.go
rename to vendor/github.com/getsentry/raven-go/writer.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/LICENSE b/vendor/github.com/golang/mock/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/LICENSE
rename to vendor/github.com/golang/mock/LICENSE
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/call.go b/vendor/github.com/golang/mock/gomock/call.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/call.go
rename to vendor/github.com/golang/mock/gomock/call.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/callset.go b/vendor/github.com/golang/mock/gomock/callset.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/callset.go
rename to vendor/github.com/golang/mock/gomock/callset.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/controller.go b/vendor/github.com/golang/mock/gomock/controller.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/controller.go
rename to vendor/github.com/golang/mock/gomock/controller.go
diff --git a/Godeps/_workspace/src/github.com/golang/mock/gomock/matchers.go b/vendor/github.com/golang/mock/gomock/matchers.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/golang/mock/gomock/matchers.go
rename to vendor/github.com/golang/mock/gomock/matchers.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/LICENSE b/vendor/github.com/kardianos/osext/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/LICENSE
rename to vendor/github.com/kardianos/osext/LICENSE
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/README.md b/vendor/github.com/kardianos/osext/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/README.md
rename to vendor/github.com/kardianos/osext/README.md
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext.go b/vendor/github.com/kardianos/osext/osext.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext.go
rename to vendor/github.com/kardianos/osext/osext.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go b/vendor/github.com/kardianos/osext/osext_plan9.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go
rename to vendor/github.com/kardianos/osext/osext_plan9.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go b/vendor/github.com/kardianos/osext/osext_procfs.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go
rename to vendor/github.com/kardianos/osext/osext_procfs.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go b/vendor/github.com/kardianos/osext/osext_sysctl.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go
rename to vendor/github.com/kardianos/osext/osext_sysctl.go
diff --git a/Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go b/vendor/github.com/kardianos/osext/osext_windows.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go
rename to vendor/github.com/kardianos/osext/osext_windows.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/.gitignore b/vendor/github.com/minio/minio-go/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/.gitignore
rename to vendor/github.com/minio/minio-go/.gitignore
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/.travis.yml b/vendor/github.com/minio/minio-go/.travis.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/.travis.yml
rename to vendor/github.com/minio/minio-go/.travis.yml
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/API.md b/vendor/github.com/minio/minio-go/API.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/API.md
rename to vendor/github.com/minio/minio-go/API.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/CONTRIBUTING.md b/vendor/github.com/minio/minio-go/CONTRIBUTING.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/CONTRIBUTING.md
rename to vendor/github.com/minio/minio-go/CONTRIBUTING.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/INSTALLGO.md b/vendor/github.com/minio/minio-go/INSTALLGO.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/INSTALLGO.md
rename to vendor/github.com/minio/minio-go/INSTALLGO.md
diff --git a/vendor/github.com/minio/minio-go/LICENSE b/vendor/github.com/minio/minio-go/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7
--- /dev/null
+++ b/vendor/github.com/minio/minio-go/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/MAINTAINERS.md b/vendor/github.com/minio/minio-go/MAINTAINERS.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/MAINTAINERS.md
rename to vendor/github.com/minio/minio-go/MAINTAINERS.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/README.md b/vendor/github.com/minio/minio-go/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/README.md
rename to vendor/github.com/minio/minio-go/README.md
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-datatypes.go b/vendor/github.com/minio/minio-go/api-datatypes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-datatypes.go
rename to vendor/github.com/minio/minio-go/api-datatypes.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-error-response.go b/vendor/github.com/minio/minio-go/api-error-response.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-error-response.go
rename to vendor/github.com/minio/minio-go/api-error-response.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-get-object-file.go b/vendor/github.com/minio/minio-go/api-get-object-file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-get-object-file.go
rename to vendor/github.com/minio/minio-go/api-get-object-file.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-get-object.go b/vendor/github.com/minio/minio-go/api-get-object.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-get-object.go
rename to vendor/github.com/minio/minio-go/api-get-object.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-get-policy.go b/vendor/github.com/minio/minio-go/api-get-policy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-get-policy.go
rename to vendor/github.com/minio/minio-go/api-get-policy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-list.go b/vendor/github.com/minio/minio-go/api-list.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-list.go
rename to vendor/github.com/minio/minio-go/api-list.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-presigned.go b/vendor/github.com/minio/minio-go/api-presigned.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-presigned.go
rename to vendor/github.com/minio/minio-go/api-presigned.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-bucket.go b/vendor/github.com/minio/minio-go/api-put-bucket.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-bucket.go
rename to vendor/github.com/minio/minio-go/api-put-bucket.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-common.go b/vendor/github.com/minio/minio-go/api-put-object-common.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-common.go
rename to vendor/github.com/minio/minio-go/api-put-object-common.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-copy.go b/vendor/github.com/minio/minio-go/api-put-object-copy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-copy.go
rename to vendor/github.com/minio/minio-go/api-put-object-copy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-file.go b/vendor/github.com/minio/minio-go/api-put-object-file.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-file.go
rename to vendor/github.com/minio/minio-go/api-put-object-file.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-multipart.go b/vendor/github.com/minio/minio-go/api-put-object-multipart.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-multipart.go
rename to vendor/github.com/minio/minio-go/api-put-object-multipart.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-progress.go b/vendor/github.com/minio/minio-go/api-put-object-progress.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-progress.go
rename to vendor/github.com/minio/minio-go/api-put-object-progress.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-readat.go b/vendor/github.com/minio/minio-go/api-put-object-readat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object-readat.go
rename to vendor/github.com/minio/minio-go/api-put-object-readat.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-put-object.go b/vendor/github.com/minio/minio-go/api-put-object.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-put-object.go
rename to vendor/github.com/minio/minio-go/api-put-object.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-remove.go b/vendor/github.com/minio/minio-go/api-remove.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-remove.go
rename to vendor/github.com/minio/minio-go/api-remove.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-s3-datatypes.go b/vendor/github.com/minio/minio-go/api-s3-datatypes.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-s3-datatypes.go
rename to vendor/github.com/minio/minio-go/api-s3-datatypes.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api-stat.go b/vendor/github.com/minio/minio-go/api-stat.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api-stat.go
rename to vendor/github.com/minio/minio-go/api-stat.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/api.go b/vendor/github.com/minio/minio-go/api.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/api.go
rename to vendor/github.com/minio/minio-go/api.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/appveyor.yml b/vendor/github.com/minio/minio-go/appveyor.yml
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/appveyor.yml
rename to vendor/github.com/minio/minio-go/appveyor.yml
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/bucket-cache.go b/vendor/github.com/minio/minio-go/bucket-cache.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/bucket-cache.go
rename to vendor/github.com/minio/minio-go/bucket-cache.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/bucket-policy.go b/vendor/github.com/minio/minio-go/bucket-policy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/bucket-policy.go
rename to vendor/github.com/minio/minio-go/bucket-policy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/constants.go b/vendor/github.com/minio/minio-go/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/constants.go
rename to vendor/github.com/minio/minio-go/constants.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/copy-conditions.go b/vendor/github.com/minio/minio-go/copy-conditions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/copy-conditions.go
rename to vendor/github.com/minio/minio-go/copy-conditions.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/hook-reader.go b/vendor/github.com/minio/minio-go/hook-reader.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/hook-reader.go
rename to vendor/github.com/minio/minio-go/hook-reader.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/post-policy.go b/vendor/github.com/minio/minio-go/post-policy.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/post-policy.go
rename to vendor/github.com/minio/minio-go/post-policy.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v2.go b/vendor/github.com/minio/minio-go/request-signature-v2.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v2.go
rename to vendor/github.com/minio/minio-go/request-signature-v2.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v4.go b/vendor/github.com/minio/minio-go/request-signature-v4.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/request-signature-v4.go
rename to vendor/github.com/minio/minio-go/request-signature-v4.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/retry.go b/vendor/github.com/minio/minio-go/retry.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/retry.go
rename to vendor/github.com/minio/minio-go/retry.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/s3-endpoints.go b/vendor/github.com/minio/minio-go/s3-endpoints.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/s3-endpoints.go
rename to vendor/github.com/minio/minio-go/s3-endpoints.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/signature-type.go b/vendor/github.com/minio/minio-go/signature-type.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/signature-type.go
rename to vendor/github.com/minio/minio-go/signature-type.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/tempfile.go b/vendor/github.com/minio/minio-go/tempfile.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/tempfile.go
rename to vendor/github.com/minio/minio-go/tempfile.go
diff --git a/Godeps/_workspace/src/github.com/minio/minio-go/utils.go b/vendor/github.com/minio/minio-go/utils.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/minio/minio-go/utils.go
rename to vendor/github.com/minio/minio-go/utils.go
diff --git a/vendor/github.com/opencontainers/runc/LICENSE b/vendor/github.com/opencontainers/runc/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..27448585ad49c79581d0b3dcb76da380fb6df4b7
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/LICENSE
@@ -0,0 +1,191 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ Copyright 2014 Docker, Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/vendor/github.com/opencontainers/runc/NOTICE b/vendor/github.com/opencontainers/runc/NOTICE
new file mode 100644
index 0000000000000000000000000000000000000000..5c97abce4b9d461afe36ffcc9fc1a91ae98aa72c
--- /dev/null
+++ b/vendor/github.com/opencontainers/runc/NOTICE
@@ -0,0 +1,17 @@
+runc
+
+Copyright 2012-2015 Docker, Inc.
+
+This product includes software developed at Docker, Inc. (http://www.docker.com).
+
+The following is courtesy of our legal counsel:
+
+
+Use and transfer of Docker may be subject to certain restrictions by the
+United States and other governments.
+It is your responsibility to ensure that your use and/or transfer does not
+violate applicable laws.
+
+For more information, please see http://www.bis.doc.gov
+
+See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS b/vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
rename to vendor/github.com/opencontainers/runc/libcontainer/user/MAINTAINERS
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go b/vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unsupported.go
diff --git a/Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user.go b/vendor/github.com/opencontainers/runc/libcontainer/user/user.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/opencontainers/runc/libcontainer/user/user.go
rename to vendor/github.com/opencontainers/runc/libcontainer/user/user.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/.gitignore b/vendor/github.com/stretchr/objx/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/.gitignore
rename to vendor/github.com/stretchr/objx/.gitignore
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md b/vendor/github.com/stretchr/objx/LICENSE.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/LICENSE.md
rename to vendor/github.com/stretchr/objx/LICENSE.md
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/README.md b/vendor/github.com/stretchr/objx/README.md
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/README.md
rename to vendor/github.com/stretchr/objx/README.md
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors.go b/vendor/github.com/stretchr/objx/accessors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/accessors.go
rename to vendor/github.com/stretchr/objx/accessors.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/constants.go b/vendor/github.com/stretchr/objx/constants.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/constants.go
rename to vendor/github.com/stretchr/objx/constants.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions.go b/vendor/github.com/stretchr/objx/conversions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/conversions.go
rename to vendor/github.com/stretchr/objx/conversions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/doc.go b/vendor/github.com/stretchr/objx/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/doc.go
rename to vendor/github.com/stretchr/objx/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map.go b/vendor/github.com/stretchr/objx/map.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/map.go
rename to vendor/github.com/stretchr/objx/map.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations.go b/vendor/github.com/stretchr/objx/mutations.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/mutations.go
rename to vendor/github.com/stretchr/objx/mutations.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security.go b/vendor/github.com/stretchr/objx/security.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/security.go
rename to vendor/github.com/stretchr/objx/security.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests.go b/vendor/github.com/stretchr/objx/tests.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/tests.go
rename to vendor/github.com/stretchr/objx/tests.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go b/vendor/github.com/stretchr/objx/type_specific_codegen.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen.go
rename to vendor/github.com/stretchr/objx/type_specific_codegen.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value.go b/vendor/github.com/stretchr/objx/value.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/objx/value.go
rename to vendor/github.com/stretchr/objx/value.go
diff --git a/vendor/github.com/stretchr/testify/LICENCE.txt b/vendor/github.com/stretchr/testify/LICENCE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a009ba467ce285c479dc3f4f720d72417893e11b
--- /dev/null
+++ b/vendor/github.com/stretchr/testify/LICENCE.txt
@@ -0,0 +1,9 @@
+Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell
+
+Please consider promoting this project if you find it useful.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
rename to vendor/github.com/stretchr/testify/assert/assertions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go b/vendor/github.com/stretchr/testify/assert/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/doc.go
rename to vendor/github.com/stretchr/testify/assert/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go b/vendor/github.com/stretchr/testify/assert/errors.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/errors.go
rename to vendor/github.com/stretchr/testify/assert/errors.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go b/vendor/github.com/stretchr/testify/assert/forward_assertions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/forward_assertions.go
rename to vendor/github.com/stretchr/testify/assert/forward_assertions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go b/vendor/github.com/stretchr/testify/assert/http_assertions.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/assert/http_assertions.go
rename to vendor/github.com/stretchr/testify/assert/http_assertions.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go b/vendor/github.com/stretchr/testify/mock/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/doc.go
rename to vendor/github.com/stretchr/testify/mock/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/vendor/github.com/stretchr/testify/mock/mock.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
rename to vendor/github.com/stretchr/testify/mock/mock.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go b/vendor/github.com/stretchr/testify/require/doc.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/require/doc.go
rename to vendor/github.com/stretchr/testify/require/doc.go
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go b/vendor/github.com/stretchr/testify/require/requirements.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/stretchr/testify/require/requirements.go
rename to vendor/github.com/stretchr/testify/require/requirements.go
diff --git a/Godeps/_workspace/src/gitlab.com/ayufan/golang-cli-helpers/.gitignore b/vendor/gitlab.com/ayufan/golang-cli-helpers/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/gitlab.com/ayufan/golang-cli-helpers/.gitignore
rename to vendor/gitlab.com/ayufan/golang-cli-helpers/.gitignore
diff --git a/Godeps/_workspace/src/gitlab.com/ayufan/golang-cli-helpers/convert.go b/vendor/gitlab.com/ayufan/golang-cli-helpers/convert.go
similarity index 100%
rename from Godeps/_workspace/src/gitlab.com/ayufan/golang-cli-helpers/convert.go
rename to vendor/gitlab.com/ayufan/golang-cli-helpers/convert.go
diff --git a/Godeps/_workspace/src/gitlab.com/ayufan/golang-cli-helpers/struct_field.go b/vendor/gitlab.com/ayufan/golang-cli-helpers/struct_field.go
similarity index 100%
rename from Godeps/_workspace/src/gitlab.com/ayufan/golang-cli-helpers/struct_field.go
rename to vendor/gitlab.com/ayufan/golang-cli-helpers/struct_field.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/LICENSE b/vendor/golang.org/x/crypto/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/LICENSE
rename to vendor/golang.org/x/crypto/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/PATENTS b/vendor/golang.org/x/crypto/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/PATENTS
rename to vendor/golang.org/x/crypto/PATENTS
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/const_amd64.s b/vendor/golang.org/x/crypto/curve25519/const_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/const_amd64.s
rename to vendor/golang.org/x/crypto/curve25519/const_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/cswap_amd64.s b/vendor/golang.org/x/crypto/curve25519/cswap_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/cswap_amd64.s
rename to vendor/golang.org/x/crypto/curve25519/cswap_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/curve25519.go b/vendor/golang.org/x/crypto/curve25519/curve25519.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/curve25519.go
rename to vendor/golang.org/x/crypto/curve25519/curve25519.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/doc.go b/vendor/golang.org/x/crypto/curve25519/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/doc.go
rename to vendor/golang.org/x/crypto/curve25519/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/freeze_amd64.s b/vendor/golang.org/x/crypto/curve25519/freeze_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/freeze_amd64.s
rename to vendor/golang.org/x/crypto/curve25519/freeze_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/ladderstep_amd64.s b/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/ladderstep_amd64.s
rename to vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/mont25519_amd64.go b/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/mont25519_amd64.go
rename to vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/mul_amd64.s b/vendor/golang.org/x/crypto/curve25519/mul_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/mul_amd64.s
rename to vendor/golang.org/x/crypto/curve25519/mul_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/curve25519/square_amd64.s b/vendor/golang.org/x/crypto/curve25519/square_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/curve25519/square_amd64.s
rename to vendor/golang.org/x/crypto/curve25519/square_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go b/vendor/golang.org/x/crypto/ssh/buffer.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/buffer.go
rename to vendor/golang.org/x/crypto/ssh/buffer.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go b/vendor/golang.org/x/crypto/ssh/certs.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/certs.go
rename to vendor/golang.org/x/crypto/ssh/certs.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go b/vendor/golang.org/x/crypto/ssh/channel.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/channel.go
rename to vendor/golang.org/x/crypto/ssh/channel.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/cipher.go
rename to vendor/golang.org/x/crypto/ssh/cipher.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go b/vendor/golang.org/x/crypto/ssh/client.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client.go
rename to vendor/golang.org/x/crypto/ssh/client.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go b/vendor/golang.org/x/crypto/ssh/client_auth.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/client_auth.go
rename to vendor/golang.org/x/crypto/ssh/client_auth.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/common.go
rename to vendor/golang.org/x/crypto/ssh/common.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go b/vendor/golang.org/x/crypto/ssh/connection.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/connection.go
rename to vendor/golang.org/x/crypto/ssh/connection.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go b/vendor/golang.org/x/crypto/ssh/doc.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/doc.go
rename to vendor/golang.org/x/crypto/ssh/doc.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/handshake.go
rename to vendor/golang.org/x/crypto/ssh/handshake.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go b/vendor/golang.org/x/crypto/ssh/kex.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/kex.go
rename to vendor/golang.org/x/crypto/ssh/kex.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go b/vendor/golang.org/x/crypto/ssh/keys.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/keys.go
rename to vendor/golang.org/x/crypto/ssh/keys.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go b/vendor/golang.org/x/crypto/ssh/mac.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mac.go
rename to vendor/golang.org/x/crypto/ssh/mac.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go b/vendor/golang.org/x/crypto/ssh/messages.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/messages.go
rename to vendor/golang.org/x/crypto/ssh/messages.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go b/vendor/golang.org/x/crypto/ssh/mux.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/mux.go
rename to vendor/golang.org/x/crypto/ssh/mux.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/server.go
rename to vendor/golang.org/x/crypto/ssh/server.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go b/vendor/golang.org/x/crypto/ssh/session.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/session.go
rename to vendor/golang.org/x/crypto/ssh/session.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go b/vendor/golang.org/x/crypto/ssh/tcpip.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/tcpip.go
rename to vendor/golang.org/x/crypto/ssh/tcpip.go
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/crypto/ssh/transport.go
rename to vendor/golang.org/x/crypto/ssh/transport.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/LICENSE b/vendor/golang.org/x/sys/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/LICENSE
rename to vendor/golang.org/x/sys/LICENSE
diff --git a/Godeps/_workspace/src/golang.org/x/sys/PATENTS b/vendor/golang.org/x/sys/PATENTS
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/PATENTS
rename to vendor/golang.org/x/sys/PATENTS
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/asm.s b/vendor/golang.org/x/sys/windows/asm.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/asm.s
rename to vendor/golang.org/x/sys/windows/asm.s
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/asm_windows_386.s b/vendor/golang.org/x/sys/windows/asm_windows_386.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/asm_windows_386.s
rename to vendor/golang.org/x/sys/windows/asm_windows_386.s
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/asm_windows_amd64.s b/vendor/golang.org/x/sys/windows/asm_windows_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/asm_windows_amd64.s
rename to vendor/golang.org/x/sys/windows/asm_windows_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/dll_windows.go b/vendor/golang.org/x/sys/windows/dll_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/dll_windows.go
rename to vendor/golang.org/x/sys/windows/dll_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/env_unset.go b/vendor/golang.org/x/sys/windows/env_unset.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/env_unset.go
rename to vendor/golang.org/x/sys/windows/env_unset.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/env_windows.go b/vendor/golang.org/x/sys/windows/env_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/env_windows.go
rename to vendor/golang.org/x/sys/windows/env_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/eventlog.go b/vendor/golang.org/x/sys/windows/eventlog.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/eventlog.go
rename to vendor/golang.org/x/sys/windows/eventlog.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/exec_windows.go b/vendor/golang.org/x/sys/windows/exec_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/exec_windows.go
rename to vendor/golang.org/x/sys/windows/exec_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/race.go b/vendor/golang.org/x/sys/windows/race.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/race.go
rename to vendor/golang.org/x/sys/windows/race.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/race0.go b/vendor/golang.org/x/sys/windows/race0.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/race0.go
rename to vendor/golang.org/x/sys/windows/race0.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/registry/key.go b/vendor/golang.org/x/sys/windows/registry/key.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/registry/key.go
rename to vendor/golang.org/x/sys/windows/registry/key.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/registry/syscall.go b/vendor/golang.org/x/sys/windows/registry/syscall.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/registry/syscall.go
rename to vendor/golang.org/x/sys/windows/registry/syscall.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/registry/value.go b/vendor/golang.org/x/sys/windows/registry/value.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/registry/value.go
rename to vendor/golang.org/x/sys/windows/registry/value.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/registry/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/registry/zsyscall_windows.go
rename to vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/security_windows.go b/vendor/golang.org/x/sys/windows/security_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/security_windows.go
rename to vendor/golang.org/x/sys/windows/security_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/service.go b/vendor/golang.org/x/sys/windows/service.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/service.go
rename to vendor/golang.org/x/sys/windows/service.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/str.go b/vendor/golang.org/x/sys/windows/str.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/str.go
rename to vendor/golang.org/x/sys/windows/str.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/event.go b/vendor/golang.org/x/sys/windows/svc/event.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/event.go
rename to vendor/golang.org/x/sys/windows/svc/event.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/eventlog/install.go b/vendor/golang.org/x/sys/windows/svc/eventlog/install.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/eventlog/install.go
rename to vendor/golang.org/x/sys/windows/svc/eventlog/install.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/eventlog/log.go b/vendor/golang.org/x/sys/windows/svc/eventlog/log.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/eventlog/log.go
rename to vendor/golang.org/x/sys/windows/svc/eventlog/log.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/go12.c b/vendor/golang.org/x/sys/windows/svc/go12.c
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/go12.c
rename to vendor/golang.org/x/sys/windows/svc/go12.c
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/go12.go b/vendor/golang.org/x/sys/windows/svc/go12.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/go12.go
rename to vendor/golang.org/x/sys/windows/svc/go12.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/go13.go b/vendor/golang.org/x/sys/windows/svc/go13.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/go13.go
rename to vendor/golang.org/x/sys/windows/svc/go13.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/mgr/config.go b/vendor/golang.org/x/sys/windows/svc/mgr/config.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/mgr/config.go
rename to vendor/golang.org/x/sys/windows/svc/mgr/config.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/mgr/mgr.go b/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/mgr/mgr.go
rename to vendor/golang.org/x/sys/windows/svc/mgr/mgr.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/mgr/service.go b/vendor/golang.org/x/sys/windows/svc/mgr/service.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/mgr/service.go
rename to vendor/golang.org/x/sys/windows/svc/mgr/service.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/security.go b/vendor/golang.org/x/sys/windows/svc/security.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/security.go
rename to vendor/golang.org/x/sys/windows/svc/security.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/service.go b/vendor/golang.org/x/sys/windows/svc/service.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/service.go
rename to vendor/golang.org/x/sys/windows/svc/service.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/sys_386.s b/vendor/golang.org/x/sys/windows/svc/sys_386.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/sys_386.s
rename to vendor/golang.org/x/sys/windows/svc/sys_386.s
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/svc/sys_amd64.s b/vendor/golang.org/x/sys/windows/svc/sys_amd64.s
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/svc/sys_amd64.s
rename to vendor/golang.org/x/sys/windows/svc/sys_amd64.s
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/syscall.go b/vendor/golang.org/x/sys/windows/syscall.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/syscall.go
rename to vendor/golang.org/x/sys/windows/syscall.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/syscall_windows.go
rename to vendor/golang.org/x/sys/windows/syscall_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/zsyscall_windows.go
rename to vendor/golang.org/x/sys/windows/zsyscall_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/ztypes_windows.go b/vendor/golang.org/x/sys/windows/ztypes_windows.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/ztypes_windows.go
rename to vendor/golang.org/x/sys/windows/ztypes_windows.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/ztypes_windows_386.go b/vendor/golang.org/x/sys/windows/ztypes_windows_386.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/ztypes_windows_386.go
rename to vendor/golang.org/x/sys/windows/ztypes_windows_386.go
diff --git a/Godeps/_workspace/src/golang.org/x/sys/windows/ztypes_windows_amd64.go b/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go
similarity index 100%
rename from Godeps/_workspace/src/golang.org/x/sys/windows/ztypes_windows_amd64.go
rename to vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE b/vendor/gopkg.in/yaml.v1/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE
rename to vendor/gopkg.in/yaml.v1/LICENSE
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml b/vendor/gopkg.in/yaml.v1/LICENSE.libyaml
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/LICENSE.libyaml
rename to vendor/gopkg.in/yaml.v1/LICENSE.libyaml
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/README.md b/vendor/gopkg.in/yaml.v1/README.md
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/README.md
rename to vendor/gopkg.in/yaml.v1/README.md
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go b/vendor/gopkg.in/yaml.v1/apic.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/apic.go
rename to vendor/gopkg.in/yaml.v1/apic.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go b/vendor/gopkg.in/yaml.v1/decode.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/decode.go
rename to vendor/gopkg.in/yaml.v1/decode.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go b/vendor/gopkg.in/yaml.v1/emitterc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/emitterc.go
rename to vendor/gopkg.in/yaml.v1/emitterc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go b/vendor/gopkg.in/yaml.v1/encode.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/encode.go
rename to vendor/gopkg.in/yaml.v1/encode.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go b/vendor/gopkg.in/yaml.v1/parserc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/parserc.go
rename to vendor/gopkg.in/yaml.v1/parserc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go b/vendor/gopkg.in/yaml.v1/readerc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/readerc.go
rename to vendor/gopkg.in/yaml.v1/readerc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go b/vendor/gopkg.in/yaml.v1/resolve.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/resolve.go
rename to vendor/gopkg.in/yaml.v1/resolve.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go b/vendor/gopkg.in/yaml.v1/scannerc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/scannerc.go
rename to vendor/gopkg.in/yaml.v1/scannerc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go b/vendor/gopkg.in/yaml.v1/sorter.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/sorter.go
rename to vendor/gopkg.in/yaml.v1/sorter.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go b/vendor/gopkg.in/yaml.v1/writerc.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/writerc.go
rename to vendor/gopkg.in/yaml.v1/writerc.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go b/vendor/gopkg.in/yaml.v1/yaml.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/yaml.go
rename to vendor/gopkg.in/yaml.v1/yaml.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go b/vendor/gopkg.in/yaml.v1/yamlh.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/yamlh.go
rename to vendor/gopkg.in/yaml.v1/yamlh.go
diff --git a/Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go b/vendor/gopkg.in/yaml.v1/yamlprivateh.go
similarity index 100%
rename from Godeps/_workspace/src/gopkg.in/yaml.v1/yamlprivateh.go
rename to vendor/gopkg.in/yaml.v1/yamlprivateh.go