From 3e8271123d78d545ab149268089cbdf62a50fbcb Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 8 Jun 2016 10:33:08 -0400 Subject: [PATCH] Update deps --- .../michaelklishin/rabbit-hole/.gitignore | 24 -- .../michaelklishin/rabbit-hole/.travis.yml | 17 - .../michaelklishin/rabbit-hole/ChangeLog.md | 15 - .../aws/aws-sdk-go/aws/request/request.go | 2 +- .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../aws/aws-sdk-go/service/ec2/api.go | 14 + .../github.com/denisenkom/go-mssqldb/mssql.go | 10 +- vendor/github.com/fullsailor/pkcs7/pkcs7.go | 28 +- vendor/github.com/ghodss/yaml/yaml.go | 2 +- vendor/github.com/go-ldap/ldap/add.go | 23 +- vendor/github.com/go-ldap/ldap/modify.go | 32 +- .../hashicorp/hcl/hcl/strconv/quote.go | 11 +- vendor/github.com/hashicorp/uuid/LICENSE | 363 ++++++++++++++++++ vendor/github.com/hashicorp/uuid/README.md | 3 + vendor/github.com/hashicorp/uuid/uuid.go | 21 + .../rabbit-hole/CONTRIBUTING.md | 20 + .../michaelklishin/rabbit-hole/ChangeLog.md | 32 ++ .../michaelklishin/rabbit-hole/LICENSE | 0 .../michaelklishin/rabbit-hole/Makefile | 2 + .../michaelklishin/rabbit-hole/README.md | 27 +- .../michaelklishin/rabbit-hole/bindings.go | 0 .../michaelklishin/rabbit-hole/channels.go | 0 .../michaelklishin/rabbit-hole/client.go | 14 +- .../michaelklishin/rabbit-hole/common.go | 16 +- .../michaelklishin/rabbit-hole/connections.go | 0 .../michaelklishin/rabbit-hole/doc.go | 40 +- .../michaelklishin/rabbit-hole/exchanges.go | 0 .../michaelklishin/rabbit-hole/federation.go | 0 .../michaelklishin/rabbit-hole/misc.go | 0 .../michaelklishin/rabbit-hole/nodes.go | 0 .../michaelklishin/rabbit-hole/permissions.go | 0 .../michaelklishin/rabbit-hole/plugins.go | 0 .../michaelklishin/rabbit-hole/policies.go | 0 .../michaelklishin/rabbit-hole/queues.go | 51 +-- .../michaelklishin/rabbit-hole/users.go | 0 .../michaelklishin/rabbit-hole/vhosts.go | 8 +- .../mitchellh/go-homedir/homedir.go | 5 + vendor/golang.org/x/crypto/blowfish/cipher.go | 2 +- .../golang.org/x/crypto/ssh/agent/client.go | 29 +- vendor/vendor.json | 318 +++++++-------- 40 files changed, 796 insertions(+), 335 deletions(-) delete mode 100644 Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.gitignore delete mode 100644 Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.travis.yml delete mode 100644 Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/ChangeLog.md create mode 100644 vendor/github.com/hashicorp/uuid/LICENSE create mode 100644 vendor/github.com/hashicorp/uuid/README.md create mode 100644 vendor/github.com/hashicorp/uuid/uuid.go create mode 100644 vendor/github.com/michaelklishin/rabbit-hole/CONTRIBUTING.md create mode 100644 vendor/github.com/michaelklishin/rabbit-hole/ChangeLog.md rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/LICENSE (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/Makefile (88%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/README.md (87%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/bindings.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/channels.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/client.go (95%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/common.go (56%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/connections.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/doc.go (96%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/exchanges.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/federation.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/misc.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/nodes.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/permissions.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/plugins.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/policies.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/queues.go (83%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/users.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/michaelklishin/rabbit-hole/vhosts.go (95%) diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.gitignore b/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.gitignore deleted file mode 100644 index a7efff2e57..0000000000 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe -src/github.com -src/code.google.com diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.travis.yml b/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.travis.yml deleted file mode 100644 index ef543be8bf..0000000000 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/.travis.yml +++ /dev/null @@ -1,17 +0,0 @@ -language: go -go: - - 1.3 - - 1.4 - - tip - -services: - - rabbitmq - -before_script: ./bin/ci/before_build.sh -script: make -matrix: - allow_failures: - - go: tip -notifications: - email: - - michael@rabbitmq.com diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/ChangeLog.md b/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/ChangeLog.md deleted file mode 100644 index d0de3b5d28..0000000000 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/ChangeLog.md +++ /dev/null @@ -1,15 +0,0 @@ -## Will be in 1.0 (First Public Release) - -### TLS Support - -`rabbithole.NewTLSClient` is a new function which works -much like `NewClient` but additionally accepts a transport. - -Contributed by @GrimTheReaper. - -### Federation Support - -It is now possible to create federation links -over HTTP API. - -Contributed by Ryan Grenz. diff --git a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go index ce8087024c..711b90c9fc 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/request/request.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/request/request.go @@ -208,7 +208,7 @@ func (r *Request) Build() error { return r.Error } -// Sign will sign the request retuning error if errors are encountered. +// Sign will sign the request returning error if errors are encountered. // // Send will build the request prior to signing. All Sign Handlers will // be executed in the order they were set. diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index 79a260de05..87dd52f9ea 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.1.32" +const SDKVersion = "1.1.33" diff --git a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go index be2dd62c10..752c27fc0b 100644 --- a/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go +++ b/vendor/github.com/aws/aws-sdk-go/service/ec2/api.go @@ -4249,6 +4249,12 @@ func (c *EC2) DescribeSpotFleetRequestsRequest(input *DescribeSpotFleetRequestsI Name: opDescribeSpotFleetRequests, HTTPMethod: "POST", HTTPPath: "/", + Paginator: &request.Paginator{ + InputTokens: []string{"NextToken"}, + OutputTokens: []string{"NextToken"}, + LimitToken: "MaxResults", + TruncationToken: "", + }, } if input == nil { @@ -4268,6 +4274,14 @@ func (c *EC2) DescribeSpotFleetRequests(input *DescribeSpotFleetRequestsInput) ( return out, err } +func (c *EC2) DescribeSpotFleetRequestsPages(input *DescribeSpotFleetRequestsInput, fn func(p *DescribeSpotFleetRequestsOutput, lastPage bool) (shouldContinue bool)) error { + page, _ := c.DescribeSpotFleetRequestsRequest(input) + page.Handlers.Build.PushBack(request.MakeAddToUserAgentFreeFormHandler("Paginator")) + return page.EachPage(func(p interface{}, lastPage bool) bool { + return fn(p.(*DescribeSpotFleetRequestsOutput), lastPage) + }) +} + const opDescribeSpotInstanceRequests = "DescribeSpotInstanceRequests" // DescribeSpotInstanceRequestsRequest generates a request for the DescribeSpotInstanceRequests operation. diff --git a/vendor/github.com/denisenkom/go-mssqldb/mssql.go b/vendor/github.com/denisenkom/go-mssqldb/mssql.go index 393b613688..ae9cc2dda7 100644 --- a/vendor/github.com/denisenkom/go-mssqldb/mssql.go +++ b/vendor/github.com/denisenkom/go-mssqldb/mssql.go @@ -33,11 +33,13 @@ func CheckBadConn(err error) error { if err == io.EOF { return driver.ErrBadConn } - neterr, ok := err.(net.Error) - if !ok || (!neterr.Timeout() && neterr.Temporary()) { + + switch err.(type) { + case net.Error: + return driver.ErrBadConn + default: return err } - return driver.ErrBadConn } type MssqlConn struct { @@ -289,7 +291,7 @@ loop: // set nocount on; select 1 // see TestIgnoreEmptyResults test //case doneStruct: - //break loop + //break loop case []columnStruct: cols = make([]string, len(token)) for i, col := range token { diff --git a/vendor/github.com/fullsailor/pkcs7/pkcs7.go b/vendor/github.com/fullsailor/pkcs7/pkcs7.go index c5ee084fe8..82024d2920 100644 --- a/vendor/github.com/fullsailor/pkcs7/pkcs7.go +++ b/vendor/github.com/fullsailor/pkcs7/pkcs7.go @@ -655,22 +655,34 @@ func marshalCertificates(certs []*x509.Certificate) rawCertificates { for _, cert := range certs { buf.Write(cert.Raw) } - // Even though, the tag & length are stripped out during marshalling the - // RawContent, we have to encode it into the RawContent. If its missing, - // then `asn1.Marshal()` will strip out the certificate wrapper instead. - var val = asn1.RawValue{Bytes: buf.Bytes(), Class: 2, Tag: 0, IsCompound: true} - b, _ := asn1.Marshal(val) - return rawCertificates{Raw: b} + rawCerts, _ := marshalCertificateBytes(buf.Bytes()) + return rawCerts +} + +// Even though, the tag & length are stripped out during marshalling the +// RawContent, we have to encode it into the RawContent. If its missing, +// then `asn1.Marshal()` will strip out the certificate wrapper instead. +func marshalCertificateBytes(certs []byte) (rawCertificates, error) { + var val = asn1.RawValue{Bytes: certs, Class: 2, Tag: 0, IsCompound: true} + b, err := asn1.Marshal(val) + if err != nil { + return rawCertificates{}, err + } + return rawCertificates{Raw: b}, nil } // DegenerateCertificate creates a signed data structure containing only the -// provided certificate +// provided certificate or certificate chain. func DegenerateCertificate(cert []byte) ([]byte, error) { + rawCert, err := marshalCertificateBytes(cert) + if err != nil { + return nil, err + } emptyContent := contentInfo{ContentType: oidData} sd := signedData{ Version: 1, ContentInfo: emptyContent, - Certificates: rawCertificates{Raw: cert}, + Certificates: rawCert, CRLs: []pkix.CertificateList{}, } content, err := asn1.Marshal(sd) diff --git a/vendor/github.com/ghodss/yaml/yaml.go b/vendor/github.com/ghodss/yaml/yaml.go index aa25987bba..0bb015b44c 100644 --- a/vendor/github.com/ghodss/yaml/yaml.go +++ b/vendor/github.com/ghodss/yaml/yaml.go @@ -48,7 +48,7 @@ func JSONToYAML(j []byte) ([]byte, error) { var jsonObj interface{} // We are using yaml.Unmarshal here (instead of json.Unmarshal) because the // Go JSON library doesn't try to pick the right number type (int, float, - // etc.) when unmarshling to interface{}, it just picks float64 + // etc.) when unmarshalling to interface{}, it just picks float64 // universally. go-yaml does go through the effort of picking the right // number type, so we can preserve number type throughout this process. err := yaml.Unmarshal(j, &jsonObj) diff --git a/vendor/github.com/go-ldap/ldap/add.go b/vendor/github.com/go-ldap/ldap/add.go index 61b795e0ed..48db82125e 100644 --- a/vendor/github.com/go-ldap/ldap/add.go +++ b/vendor/github.com/go-ldap/ldap/add.go @@ -17,15 +17,17 @@ import ( ) type Attribute struct { - attrType string - attrVals []string + Type string + Vals []string } + + func (a *Attribute) encode() *ber.Packet { seq := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Attribute") - seq.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, a.attrType, "Type")) + seq.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, a.Type, "Type")) set := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSet, nil, "AttributeValue") - for _, value := range a.attrVals { + for _, value := range a.Vals { set.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, value, "Vals")) } seq.AppendChild(set) @@ -33,15 +35,16 @@ func (a *Attribute) encode() *ber.Packet { } type AddRequest struct { - dn string - attributes []Attribute + DN string + Attributes []Attribute } + func (a AddRequest) encode() *ber.Packet { request := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationAddRequest, nil, "Add Request") - request.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, a.dn, "DN")) + request.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, a.DN, "DN")) attributes := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Attributes") - for _, attribute := range a.attributes { + for _, attribute := range a.Attributes { attributes.AppendChild(attribute.encode()) } request.AppendChild(attributes) @@ -49,12 +52,12 @@ func (a AddRequest) encode() *ber.Packet { } func (a *AddRequest) Attribute(attrType string, attrVals []string) { - a.attributes = append(a.attributes, Attribute{attrType: attrType, attrVals: attrVals}) + a.Attributes = append(a.Attributes, Attribute{Type: attrType, Vals: attrVals}) } func NewAddRequest(dn string) *AddRequest { return &AddRequest{ - dn: dn, + DN: dn, } } diff --git a/vendor/github.com/go-ldap/ldap/modify.go b/vendor/github.com/go-ldap/ldap/modify.go index 5c042af79c..1c280596ea 100644 --- a/vendor/github.com/go-ldap/ldap/modify.go +++ b/vendor/github.com/go-ldap/ldap/modify.go @@ -43,15 +43,15 @@ const ( ) type PartialAttribute struct { - attrType string - attrVals []string + Type string + Vals []string } func (p *PartialAttribute) encode() *ber.Packet { seq := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "PartialAttribute") - seq.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, p.attrType, "Type")) + seq.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, p.Type, "Type")) set := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSet, nil, "AttributeValue") - for _, value := range p.attrVals { + for _, value := range p.Vals { set.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, value, "Vals")) } seq.AppendChild(set) @@ -59,41 +59,41 @@ func (p *PartialAttribute) encode() *ber.Packet { } type ModifyRequest struct { - dn string - addAttributes []PartialAttribute - deleteAttributes []PartialAttribute - replaceAttributes []PartialAttribute + DN string + AddAttributes []PartialAttribute + DeleteAttributes []PartialAttribute + ReplaceAttributes []PartialAttribute } func (m *ModifyRequest) Add(attrType string, attrVals []string) { - m.addAttributes = append(m.addAttributes, PartialAttribute{attrType: attrType, attrVals: attrVals}) + m.AddAttributes = append(m.AddAttributes, PartialAttribute{Type: attrType, Vals: attrVals}) } func (m *ModifyRequest) Delete(attrType string, attrVals []string) { - m.deleteAttributes = append(m.deleteAttributes, PartialAttribute{attrType: attrType, attrVals: attrVals}) + m.DeleteAttributes = append(m.DeleteAttributes, PartialAttribute{Type: attrType, Vals: attrVals}) } func (m *ModifyRequest) Replace(attrType string, attrVals []string) { - m.replaceAttributes = append(m.replaceAttributes, PartialAttribute{attrType: attrType, attrVals: attrVals}) + m.ReplaceAttributes = append(m.ReplaceAttributes, PartialAttribute{Type: attrType, Vals: attrVals}) } func (m ModifyRequest) encode() *ber.Packet { request := ber.Encode(ber.ClassApplication, ber.TypeConstructed, ApplicationModifyRequest, nil, "Modify Request") - request.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, m.dn, "DN")) + request.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, m.DN, "DN")) changes := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Changes") - for _, attribute := range m.addAttributes { + for _, attribute := range m.AddAttributes { change := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Change") change.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagEnumerated, uint64(AddAttribute), "Operation")) change.AppendChild(attribute.encode()) changes.AppendChild(change) } - for _, attribute := range m.deleteAttributes { + for _, attribute := range m.DeleteAttributes { change := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Change") change.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagEnumerated, uint64(DeleteAttribute), "Operation")) change.AppendChild(attribute.encode()) changes.AppendChild(change) } - for _, attribute := range m.replaceAttributes { + for _, attribute := range m.ReplaceAttributes { change := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "Change") change.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagEnumerated, uint64(ReplaceAttribute), "Operation")) change.AppendChild(attribute.encode()) @@ -107,7 +107,7 @@ func NewModifyRequest( dn string, ) *ModifyRequest { return &ModifyRequest{ - dn: dn, + DN: dn, } } diff --git a/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go b/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go index e87ac63563..6cfd8c3a5e 100644 --- a/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go +++ b/vendor/github.com/hashicorp/hcl/hcl/strconv/quote.go @@ -49,7 +49,8 @@ func Unquote(s string) (t string, err error) { for len(s) > 0 { // If we're starting a '${}' then let it through un-unquoted. // Specifically: we don't unquote any characters within the `${}` - // section, except for escaped quotes, which we handle specifically. + // section, except for escaped quotes and escaped backslashes, which we + // handle specifically. if s[0] == '$' && len(s) > 1 && s[1] == '{' { buf = append(buf, '$', '{') s = s[2:] @@ -64,10 +65,12 @@ func Unquote(s string) (t string, err error) { s = s[size:] - // We special case escaped double quotes in interpolations, converting - // them to straight double quotes. + // We special case escaped double quotes and escaped backslashes in + // interpolations, converting them to their unescaped equivalents. if r == '\\' { - if q, _ := utf8.DecodeRuneInString(s); q == '"' { + q, _ := utf8.DecodeRuneInString(s) + switch q { + case '"', '\\': continue } } diff --git a/vendor/github.com/hashicorp/uuid/LICENSE b/vendor/github.com/hashicorp/uuid/LICENSE new file mode 100644 index 0000000000..e87a115e46 --- /dev/null +++ b/vendor/github.com/hashicorp/uuid/LICENSE @@ -0,0 +1,363 @@ +Mozilla Public License, version 2.0 + +1. Definitions + +1.1. "Contributor" + + means each individual or legal entity that creates, contributes to the + creation of, or owns Covered Software. + +1.2. "Contributor Version" + + means the combination of the Contributions of others (if any) used by a + Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + + means Source Code Form to which the initial Contributor has attached the + notice in Exhibit A, the Executable Form of such Source Code Form, and + Modifications of such Source Code Form, in each case including portions + thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + a. that the initial Contributor has attached the notice described in + Exhibit B to the Covered Software; or + + b. that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the terms of + a Secondary License. + +1.6. "Executable Form" + + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + + means a work that combines Covered Software with other material, in a + separate file or files, that is not Covered Software. + +1.8. "License" + + means this document. + +1.9. "Licensable" + + means having the right to grant, to the maximum extent possible, whether + at the time of the initial grant or subsequently, any and all of the + rights conveyed by this License. + +1.10. "Modifications" + + means any of the following: + + a. any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered Software; or + + b. any new file in Source Code Form that contains any Covered Software. + +1.11. "Patent Claims" of a Contributor + + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the License, + by the making, using, selling, offering for sale, having made, import, + or transfer of either its Contributions or its Contributor Version. + +1.12. "Secondary License" + + means either the GNU General Public License, Version 2.0, the GNU Lesser + General Public License, Version 2.1, the GNU Affero General Public + License, Version 3.0, or any later versions of those licenses. + +1.13. "Source Code Form" + + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that controls, is + controlled by, or is under common control with You. For purposes of this + definition, "control" means (a) the power, direct or indirect, to cause + the direction or management of such entity, whether by contract or + otherwise, or (b) ownership of more than fifty percent (50%) of the + outstanding shares or beneficial ownership of such entity. + + +2. License Grants and Conditions + +2.1. Grants + + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + + a. under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + + b. under Patent Claims of such Contributor to make, use, sell, offer for + sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + + The licenses granted in Section 2.1 with respect to any Contribution + become effective for each Contribution on the date the Contributor first + distributes such Contribution. + +2.3. Limitations on Grant Scope + + The licenses granted in this Section 2 are the only rights granted under + this License. No additional rights or licenses will be implied from the + distribution or licensing of Covered Software under this License. + Notwithstanding Section 2.1(b) above, no patent license is granted by a + Contributor: + + a. for any code that a Contributor has removed from Covered Software; or + + b. for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + + c. under Patent Claims infringed by Covered Software in the absence of + its Contributions. + + This License does not grant any rights in the trademarks, service marks, + or logos of any Contributor (except as may be necessary to comply with + the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + + No Contributor makes additional grants as a result of Your choice to + distribute the Covered Software under a subsequent version of this + License (see Section 10.2) or under the terms of a Secondary License (if + permitted under the terms of Section 3.3). + +2.5. Representation + + Each Contributor represents that the Contributor believes its + Contributions are its original creation(s) or it has sufficient rights to + grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + + This License is not intended to limit any rights You have under + applicable copyright doctrines of fair use, fair dealing, or other + equivalents. + +2.7. Conditions + + Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in + Section 2.1. + + +3. Responsibilities + +3.1. Distribution of Source Form + + All distribution of Covered Software in Source Code Form, including any + Modifications that You create or to which You contribute, must be under + the terms of this License. You must inform recipients that the Source + Code Form of the Covered Software is governed by the terms of this + License, and how they can obtain a copy of this License. You may not + attempt to alter or restrict the recipients' rights in the Source Code + Form. + +3.2. Distribution of Executable Form + + If You distribute Covered Software in Executable Form then: + + a. such Covered Software must also be made available in Source Code Form, + as described in Section 3.1, and You must inform recipients of the + Executable Form how they can obtain a copy of such Source Code Form by + reasonable means in a timely manner, at a charge no more than the cost + of distribution to the recipient; and + + b. You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter the + recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + + You may create and distribute a Larger Work under terms of Your choice, + provided that You also comply with the requirements of this License for + the Covered Software. If the Larger Work is a combination of Covered + Software with a work governed by one or more Secondary Licenses, and the + Covered Software is not Incompatible With Secondary Licenses, this + License permits You to additionally distribute such Covered Software + under the terms of such Secondary License(s), so that the recipient of + the Larger Work may, at their option, further distribute the Covered + Software under the terms of either this License or such Secondary + License(s). + +3.4. Notices + + You may not remove or alter the substance of any license notices + (including copyright notices, patent notices, disclaimers of warranty, or + limitations of liability) contained within the Source Code Form of the + Covered Software, except that You may alter any license notices to the + extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + + You may choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of Covered + Software. However, You may do so only on Your own behalf, and not on + behalf of any Contributor. You must make it absolutely clear that any + such warranty, support, indemnity, or liability obligation is offered by + You alone, and You hereby agree to indemnify every Contributor for any + liability incurred by such Contributor as a result of warranty, support, + indemnity or liability terms You offer. You may include additional + disclaimers of warranty and limitations of liability specific to any + jurisdiction. + +4. Inability to Comply Due to Statute or Regulation + + If it is impossible for You to comply with any of the terms of this License + with respect to some or all of the Covered Software due to statute, + judicial order, or regulation then You must: (a) comply with the terms of + this License to the maximum extent possible; and (b) describe the + limitations and the code they affect. Such description must be placed in a + text file included with all distributions of the Covered Software under + this License. Except to the extent prohibited by statute or regulation, + such description must be sufficiently detailed for a recipient of ordinary + skill to be able to understand it. + +5. Termination + +5.1. The rights granted under this License will terminate automatically if You + fail to comply with any of its terms. However, if You become compliant, + then the rights granted under this License from a particular Contributor + are reinstated (a) provisionally, unless and until such Contributor + explicitly and finally terminates Your grants, and (b) on an ongoing + basis, if such Contributor fails to notify You of the non-compliance by + some reasonable means prior to 60 days after You have come back into + compliance. Moreover, Your grants from a particular Contributor are + reinstated on an ongoing basis if such Contributor notifies You of the + non-compliance by some reasonable means, this is the first time You have + received notice of non-compliance with this License from such + Contributor, and You become compliant prior to 30 days after Your receipt + of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent + infringement claim (excluding declaratory judgment actions, + counter-claims, and cross-claims) alleging that a Contributor Version + directly or indirectly infringes any patent, then the rights granted to + You by any and all Contributors for the Covered Software under Section + 2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user + license agreements (excluding distributors and resellers) which have been + validly granted by You or Your distributors under this License prior to + termination shall survive termination. + +6. Disclaimer of Warranty + + Covered Software is provided under this License on an "as is" basis, + without warranty of any kind, either expressed, implied, or statutory, + including, without limitation, warranties that the Covered Software is free + of defects, merchantable, fit for a particular purpose or non-infringing. + The entire risk as to the quality and performance of the Covered Software + is with You. Should any Covered Software prove defective in any respect, + You (not any Contributor) assume the cost of any necessary servicing, + repair, or correction. This disclaimer of warranty constitutes an essential + part of this License. No use of any Covered Software is authorized under + this License except under this disclaimer. + +7. Limitation of Liability + + Under no circumstances and under no legal theory, whether tort (including + negligence), contract, or otherwise, shall any Contributor, or anyone who + distributes Covered Software as permitted above, be liable to You for any + direct, indirect, special, incidental, or consequential damages of any + character including, without limitation, damages for lost profits, loss of + goodwill, work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses, even if such party shall have been + informed of the possibility of such damages. This limitation of liability + shall not apply to liability for death or personal injury resulting from + such party's negligence to the extent applicable law prohibits such + limitation. Some jurisdictions do not allow the exclusion or limitation of + incidental or consequential damages, so this exclusion and limitation may + not apply to You. + +8. Litigation + + Any litigation relating to this License may be brought only in the courts + of a jurisdiction where the defendant maintains its principal place of + business and such litigation shall be governed by laws of that + jurisdiction, without reference to its conflict-of-law provisions. Nothing + in this Section shall prevent a party's ability to bring cross-claims or + counter-claims. + +9. Miscellaneous + + This License represents the complete agreement concerning the subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. Any law or regulation which provides that + the language of a contract shall be construed against the drafter shall not + be used to construe this License against a Contributor. + + +10. Versions of the License + +10.1. New Versions + + Mozilla Foundation is the license steward. Except as provided in Section + 10.3, no one other than the license steward has the right to modify or + publish new versions of this License. Each version will be given a + distinguishing version number. + +10.2. Effect of New Versions + + You may distribute the Covered Software under the terms of the version + of the License under which You originally received the Covered Software, + or under the terms of any subsequent version published by the license + steward. + +10.3. Modified Versions + + If you create software not governed by this License, and you want to + create a new license for such software, you may create and use a + modified version of this License if you rename the license and remove + any references to the name of the license steward (except to note that + such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary + Licenses If You choose to distribute Source Code Form that is + Incompatible With Secondary Licenses under the terms of this version of + the License, the notice described in Exhibit B of this License must be + attached. + +Exhibit A - Source Code Form License Notice + + This Source Code Form is subject to the + terms of the Mozilla Public License, v. + 2.0. If a copy of the MPL was not + distributed with this file, You can + obtain one at + http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular file, +then You may include the notice in a location (such as a LICENSE file in a +relevant directory) where a recipient would be likely to look for such a +notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice + + This Source Code Form is "Incompatible + With Secondary Licenses", as defined by + the Mozilla Public License, v. 2.0. + diff --git a/vendor/github.com/hashicorp/uuid/README.md b/vendor/github.com/hashicorp/uuid/README.md new file mode 100644 index 0000000000..ce75dbc2bd --- /dev/null +++ b/vendor/github.com/hashicorp/uuid/README.md @@ -0,0 +1,3 @@ +Deprecated; only here for compatibility with people using it. + +Use https://github.com/hashicorp/go-uuid instead. diff --git a/vendor/github.com/hashicorp/uuid/uuid.go b/vendor/github.com/hashicorp/uuid/uuid.go new file mode 100644 index 0000000000..ae9bffef39 --- /dev/null +++ b/vendor/github.com/hashicorp/uuid/uuid.go @@ -0,0 +1,21 @@ +package uuid + +import ( + "crypto/rand" + "fmt" +) + +// GenerateUUID is used to generate a random UUID +func GenerateUUID() string { + buf := make([]byte, 16) + if _, err := rand.Read(buf); err != nil { + panic(fmt.Errorf("failed to read random bytes: %v", err)) + } + + return fmt.Sprintf("%08x-%04x-%04x-%04x-%12x", + buf[0:4], + buf[4:6], + buf[6:8], + buf[8:10], + buf[10:16]) +} diff --git a/vendor/github.com/michaelklishin/rabbit-hole/CONTRIBUTING.md b/vendor/github.com/michaelklishin/rabbit-hole/CONTRIBUTING.md new file mode 100644 index 0000000000..a0d6f6eef3 --- /dev/null +++ b/vendor/github.com/michaelklishin/rabbit-hole/CONTRIBUTING.md @@ -0,0 +1,20 @@ +## Contributing + +The workflow is pretty standard: + +1. Fork it +2. Create your feature branch (`git checkout -b my-new-feature`) +3. Commit your changes (`git commit -am 'Add some feature'`) +4. Push to the branch (`git push -u origin my-new-feature`) +5. Create new Pull Request + +## Running Tests + +First run `bin/ci/before_build.sh` that will create a vhost and user(s) needed +by the test suite. + +The project uses [Ginkgo](http://onsi.github.io/ginkgo/) and [Gomega](https://github.com/onsi/gomega). + +To clone dependencies and run tests, use `make`. It is also possible +to use the brilliant [Ginkgo CLI runner](http://onsi.github.io/ginkgo/#the-ginkgo-cli) e.g. +to only run a subset of tests. diff --git a/vendor/github.com/michaelklishin/rabbit-hole/ChangeLog.md b/vendor/github.com/michaelklishin/rabbit-hole/ChangeLog.md new file mode 100644 index 0000000000..b5252ffd79 --- /dev/null +++ b/vendor/github.com/michaelklishin/rabbit-hole/ChangeLog.md @@ -0,0 +1,32 @@ +## Changes Between 1.0.0 and 1.1.0 (unreleased) + +### More Complete Message Stats Information + +Message stats now include fields such as `deliver_get` and `redeliver`. + +GH issue: [#73](https://github.com/michaelklishin/rabbit-hole/pull/73). + +Contributed by Edward Wilde. + + +## 1.0 (first tagged release, Dec 25th, 2015) + +### TLS Support + +`rabbithole.NewTLSClient` is a new function which works +much like `NewClient` but additionally accepts a transport. + +Contributed by @[GrimTheReaper](https://github.com/GrimTheReaper). + +### Federation Support + +It is now possible to create federation links +over HTTP API. + +Contributed by [Ryan Grenz](https://github.com/grenzr-bskyb). + +### Core Operations Support + +Most common HTTP API operations (listing and management of +vhosts, users, permissions, queues, exchanges, and bindings) +are supported by the client. diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/LICENSE b/vendor/github.com/michaelklishin/rabbit-hole/LICENSE similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/LICENSE rename to vendor/github.com/michaelklishin/rabbit-hole/LICENSE diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/Makefile b/vendor/github.com/michaelklishin/rabbit-hole/Makefile similarity index 88% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/Makefile rename to vendor/github.com/michaelklishin/rabbit-hole/Makefile index 7ed31517b0..c3efcfb3e8 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/Makefile +++ b/vendor/github.com/michaelklishin/rabbit-hole/Makefile @@ -22,3 +22,5 @@ install-dependencies: go get github.com/onsi/ginkgo go get github.com/onsi/gomega go get github.com/streadway/amqp + # to get Ginkgo CLI + go install github.com/onsi/ginkgo/ginkgo diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/README.md b/vendor/github.com/michaelklishin/rabbit-hole/README.md similarity index 87% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/README.md rename to vendor/github.com/michaelklishin/rabbit-hole/README.md index b4aad1de65..230f179d07 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/README.md +++ b/vendor/github.com/michaelklishin/rabbit-hole/README.md @@ -1,24 +1,25 @@ # Rabbit Hole, a RabbitMQ HTTP API Client for Go -This library is a [RabbitMQ HTTP API](http://hg.rabbitmq.com/rabbitmq-management/raw-file/450b7ea22cfd/priv/www/api/index.html) client for the Go language. +This library is a [RabbitMQ HTTP API](https://raw.githack.com/rabbitmq/rabbitmq-management/rabbitmq_v3_6_0/priv/www/api/index.html) client for the Go language. ## Supported Go Versions -Rabbit Hole requires Go 1.1+. +Rabbit Hole requires Go 1.3+. ## Supported RabbitMQ Versions * RabbitMQ 3.x - * RabbitMQ 2.x All versions require [RabbitMQ Management UI plugin](http://www.rabbitmq.com/management.html) to be installed and enabled. ## Project Maturity -Rabbit Hole is a young project designed after a couple of other RabbitMQ HTTP API clients with stable APIs. -However, breaking API changes are not out of the question. +Rabbit Hole is a fairly mature library (started in October 2013) +designed after a couple of other RabbitMQ HTTP API clients with stable +APIs. Breaking API changes are not out of the question but not without +a reasonable version bump. It is largely (80-90%) feature complete and decently documented. @@ -274,20 +275,18 @@ rmqc.SetTransport(transport) ``` +## CI Status + +[![Build Status](https://travis-ci.org/michaelklishin/rabbit-hole.svg?branch=master)](https://travis-ci.org/michaelklishin/rabbit-hole) + + ## Contributing -1. Fork it -2. Create your feature branch (`git checkout -b my-new-feature`) -3. Commit your changes (`git commit -am 'Add some feature'`) -4. Push to the branch (`git push -u origin my-new-feature`) -5. Create new Pull Request +See [CONTRIBUTING.md](https://github.com/michaelklishin/rabbit-hole/blob/master/CONTRIBUTING.md) ## License & Copyright 2-clause BSD license. -(c) Michael S. Klishin, 2013-2014. - - -[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/michaelklishin/rabbit-hole/trend.png)](https://bitdeli.com/free "Bitdeli Badge") +(c) Michael S. Klishin, 2013-2016. diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/bindings.go b/vendor/github.com/michaelklishin/rabbit-hole/bindings.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/bindings.go rename to vendor/github.com/michaelklishin/rabbit-hole/bindings.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/channels.go b/vendor/github.com/michaelklishin/rabbit-hole/channels.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/channels.go rename to vendor/github.com/michaelklishin/rabbit-hole/channels.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/client.go b/vendor/github.com/michaelklishin/rabbit-hole/client.go similarity index 95% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/client.go rename to vendor/github.com/michaelklishin/rabbit-hole/client.go index 374b4e21b0..7c4f5678da 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/client.go +++ b/vendor/github.com/michaelklishin/rabbit-hole/client.go @@ -14,9 +14,9 @@ type Client struct { // Username to use. This RabbitMQ user must have the "management" tag. Username string // Password to use. - Password string - host string - transport *http.Transport + Password string + host string + transport *http.Transport } func NewClient(uri string, username string, password string) (me *Client, err error) { @@ -62,6 +62,8 @@ func newGETRequest(client *Client, path string) (*http.Request, error) { s := client.Endpoint + "/api/" + path req, err := http.NewRequest("GET", s, nil) + + req.Close = true req.SetBasicAuth(client.Username, client.Password) // set Opaque to preserve percent-encoded path. MK. req.URL.Opaque = "//" + client.host + "/api/" + path @@ -73,6 +75,8 @@ func newRequestWithBody(client *Client, method string, path string, body []byte) s := client.Endpoint + "/api/" + path req, err := http.NewRequest(method, s, bytes.NewReader(body)) + + req.Close = true req.SetBasicAuth(client.Username, client.Password) // set Opaque to preserve percent-encoded path. MK. req.URL.Opaque = "//" + client.host + "/api/" + path @@ -90,6 +94,7 @@ func executeRequest(client *Client, req *http.Request) (res *http.Response, err httpc = &http.Client{} } res, err = httpc.Do(req) + if err != nil { return nil, err } @@ -108,13 +113,12 @@ func executeAndParseRequest(client *Client, req *http.Request, rec interface{}) if err != nil { return err } + defer res.Body.Close() // always close body if isNotFound(res) { return errors.New("not found") } - defer res.Body.Close() - err = json.NewDecoder(res.Body).Decode(&rec) if err != nil { return err diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/common.go b/vendor/github.com/michaelklishin/rabbit-hole/common.go similarity index 56% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/common.go rename to vendor/github.com/michaelklishin/rabbit-hole/common.go index 5312269e7f..f633f0b5fa 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/common.go +++ b/vendor/github.com/michaelklishin/rabbit-hole/common.go @@ -40,6 +40,18 @@ type BrokerContext struct { // Basic published messages statistics type MessageStats struct { - Publish int `json:"publish"` - PublishDetails RateDetails `json:"publish_details"` + Publish int `json:"publish"` + PublishDetails RateDetails `json:"publish_details"` + Deliver int `json:"deliver"` + DeliverDetails RateDetails `json:"deliver_details"` + DeliverNoAck int `json:"deliver_noack"` + DeliverNoAckDetails RateDetails `json:"deliver_noack_details"` + DeliverGet int `json:"deliver_get"` + DeliverGetDetails RateDetails `json:"deliver_get_details"` + Redeliver int `json:"redeliver"` + RedeliverDetails RateDetails `json:"redeliver_details"` + Get int `json:"get"` + GetDetails RateDetails `json:"get_details"` + GetNoAck int `json:"get_no_ack"` + GetNoAckDetails RateDetails `json:"get_no_ack_details"` } diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/connections.go b/vendor/github.com/michaelklishin/rabbit-hole/connections.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/connections.go rename to vendor/github.com/michaelklishin/rabbit-hole/connections.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/doc.go b/vendor/github.com/michaelklishin/rabbit-hole/doc.go similarity index 96% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/doc.go rename to vendor/github.com/michaelklishin/rabbit-hole/doc.go index 75cfe6c209..af882d3d5a 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/doc.go +++ b/vendor/github.com/michaelklishin/rabbit-hole/doc.go @@ -25,7 +25,7 @@ Operations on Connections xs, err := rmqc.ListConnections() // => []ConnectionInfo, err - + conn, err := rmqc.GetConnection("127.0.0.1:50545 -> 127.0.0.1:5672") // => ConnectionInfo, err @@ -37,7 +37,7 @@ Operations on Channels xs, err := rmqc.ListChannels() // => []ChannelInfo, err - + ch, err := rmqc.GetChannel("127.0.0.1:50545 -> 127.0.0.1:5672 (1)") // => ChannelInfo, err @@ -45,19 +45,19 @@ Operations on Exchanges xs, err := rmqc.ListExchanges() // => []ExchangeInfo, err - + // list exchanges in a vhost xs, err := rmqc.ListExchangesIn("/") // => []ExchangeInfo, err - + // information about individual exchange x, err := rmqc.GetExchange("/", "amq.fanout") // => ExchangeInfo, err - + // declares an exchange resp, err := rmqc.DeclareExchange("/", "an.exchange", ExchangeSettings{Type: "fanout", Durable: false}) // => *http.Response, err - + // deletes individual exchange resp, err := rmqc.DeleteExchange("/", "an.exchange") // => *http.Response, err @@ -66,19 +66,19 @@ Operations on Queues xs, err := rmqc.ListQueues() // => []QueueInfo, err - + // list queues in a vhost xs, err := rmqc.ListQueuesIn("/") // => []QueueInfo, err - + // information about individual queue x, err := rmqc.GetQueue("/", "a.queue") // => QueueInfo, err - + // declares a queue resp, err := rmqc.DeclareQueue("/", "a.queue", QueueSettings{Durable: false}) // => *http.Response, err - + // deletes individual queue resp, err := rmqc.DeleteQueue("/", "a.queue") // => *http.Response, err @@ -119,15 +119,15 @@ Operations on Vhosts xs, err := rmqc.ListVhosts() // => []VhostInfo, err - + // information about individual vhost x, err := rmqc.GetVhost("/") // => VhostInfo, err - + // creates or updates individual vhost resp, err := rmqc.PutVhost("/", VhostSettings{Tracing: false}) // => *http.Response, err - + // deletes individual vhost resp, err := rmqc.DeleteVhost("/") // => *http.Response, err @@ -136,15 +136,15 @@ Managing Users xs, err := rmqc.ListUsers() // => []UserInfo, err - + // information about individual user x, err := rmqc.GetUser("my.user") // => UserInfo, err - + // creates or updates individual user resp, err := rmqc.PutUser("my.user", UserSettings{Password: "s3krE7", Tags: "management policymaker"}) // => *http.Response, err - + // deletes individual user resp, err := rmqc.DeleteUser("my.user") // => *http.Response, err @@ -153,19 +153,19 @@ Managing Permissions xs, err := rmqc.ListPermissions() // => []PermissionInfo, err - + // permissions of individual user x, err := rmqc.ListPermissionsOf("my.user") // => []PermissionInfo, err - + // permissions of individual user in vhost x, err := rmqc.GetPermissionsIn("/", "my.user") // => PermissionInfo, err - + // updates permissions of user in vhost resp, err := rmqc.UpdatePermissionsIn("/", "my.user", Permissions{Configure: ".*", Write: ".*", Read: ".*"}) // => *http.Response, err - + // revokes permissions in vhost resp, err := rmqc.ClearPermissionsIn("/", "my.user") // => *http.Response, err diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/exchanges.go b/vendor/github.com/michaelklishin/rabbit-hole/exchanges.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/exchanges.go rename to vendor/github.com/michaelklishin/rabbit-hole/exchanges.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/federation.go b/vendor/github.com/michaelklishin/rabbit-hole/federation.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/federation.go rename to vendor/github.com/michaelklishin/rabbit-hole/federation.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/misc.go b/vendor/github.com/michaelklishin/rabbit-hole/misc.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/misc.go rename to vendor/github.com/michaelklishin/rabbit-hole/misc.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/nodes.go b/vendor/github.com/michaelklishin/rabbit-hole/nodes.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/nodes.go rename to vendor/github.com/michaelklishin/rabbit-hole/nodes.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/permissions.go b/vendor/github.com/michaelklishin/rabbit-hole/permissions.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/permissions.go rename to vendor/github.com/michaelklishin/rabbit-hole/permissions.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/plugins.go b/vendor/github.com/michaelklishin/rabbit-hole/plugins.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/plugins.go rename to vendor/github.com/michaelklishin/rabbit-hole/plugins.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/policies.go b/vendor/github.com/michaelklishin/rabbit-hole/policies.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/policies.go rename to vendor/github.com/michaelklishin/rabbit-hole/policies.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/queues.go b/vendor/github.com/michaelklishin/rabbit-hole/queues.go similarity index 83% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/queues.go rename to vendor/github.com/michaelklishin/rabbit-hole/queues.go index 62bb1644d8..5abc512a4a 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/queues.go +++ b/vendor/github.com/michaelklishin/rabbit-hole/queues.go @@ -8,32 +8,32 @@ import ( // Information about backing queue (queue storage engine). type BackingQueueStatus struct { - Q1 int `json:"q1"` - Q2 int `json:"q2"` - Q3 int `json:"q3"` - Q4 int `json:"q4"` + Q1 int `json:"q1"` + Q2 int `json:"q2"` + Q3 int `json:"q3"` + Q4 int `json:"q4"` // Total queue length - Length int64 `json:"len"` + Length int64 `json:"len"` // Number of pending acks from consumers - PendingAcks int64 `json:"pending_acks"` + PendingAcks int64 `json:"pending_acks"` // Number of messages held in RAM - RAMMessageCount int64 `json:"ram_msg_count"` + RAMMessageCount int64 `json:"ram_msg_count"` // Number of outstanding acks held in RAM - RAMAckCount int64 `json:"ram_ack_count"` + RAMAckCount int64 `json:"ram_ack_count"` // Number of persistent messages in the store - PersistentCount int64 `json:"persistent_count"` + PersistentCount int64 `json:"persistent_count"` // Average ingress (inbound) rate, not including messages // that straight through to auto-acking consumers. - AverageIngressRate float64 `json:"avg_ingress_rate"` + AverageIngressRate float64 `json:"avg_ingress_rate"` // Average egress (outbound) rate, not including messages // that straight through to auto-acking consumers. - AverageEgressRate float64 `json:"avg_egress_rate"` + AverageEgressRate float64 `json:"avg_egress_rate"` // rate at which unacknowledged message records enter RAM, // e.g. because messages are delivered requiring acknowledgement AverageAckIngressRate float32 `json:"avg_ack_ingress_rate"` // rate at which unacknowledged message records leave RAM, // e.g. because acks arrive or unacked messages are paged out - AverageAckEgressRate float32 `json:"avg_ack_egress_rate"` + AverageAckEgressRate float32 `json:"avg_ack_egress_rate"` } type OwnerPidDetails struct { @@ -44,34 +44,41 @@ type OwnerPidDetails struct { type QueueInfo struct { // Queue name - Name string `json:"name"` + Name string `json:"name"` // Virtual host this queue belongs to - Vhost string `json:"vhost"` + Vhost string `json:"vhost"` // Is this queue durable? - Durable bool `json:"durable"` + Durable bool `json:"durable"` // Is this queue auto-delted? - AutoDelete bool `json:"auto_delete"` + AutoDelete bool `json:"auto_delete"` // Extra queue arguments - Arguments map[string]interface{} `json:"arguments"` + Arguments map[string]interface{} `json:"arguments"` // RabbitMQ node that hosts master for this queue - Node string `json:"node"` + Node string `json:"node"` // Queue status Status string `json:"status"` // Total amount of RAM used by this queue - Memory int64 `json:"memory"` + Memory int64 `json:"memory"` // How many consumers this queue has - Consumers int `json:"consumers"` + Consumers int `json:"consumers"` // If there is an exclusive consumer, its consumer tag ExclusiveConsumerTag string `json:"exclusive_consumer_tag"` // Policy applied to this queue, if any Policy string `json:"policy"` + // Total bytes of messages in this queues + MessagesBytes int64 `json:"message_bytes"` + MessagesBytesPersistent int64 `json:"message_bytes_persistent"` + MessagesBytesRAM int64 `json:"message_bytes_ram"` + // Total number of messages in this queue - Messages int `json:"messages"` - MessagesDetails RateDetails `json:"messages_details"` + Messages int `json:"messages"` + MessagesDetails RateDetails `json:"messages_details"` + MessagesPersistent int `json:"messages_persistent"` + MessagesRAM int `json:"messages_ram"` // Number of messages ready to be delivered MessagesReady int `json:"messages_ready"` diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/users.go b/vendor/github.com/michaelklishin/rabbit-hole/users.go similarity index 100% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/users.go rename to vendor/github.com/michaelklishin/rabbit-hole/users.go diff --git a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/vhosts.go b/vendor/github.com/michaelklishin/rabbit-hole/vhosts.go similarity index 95% rename from Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/vhosts.go rename to vendor/github.com/michaelklishin/rabbit-hole/vhosts.go index e052b9c09f..d0f84b5f82 100644 --- a/Godeps/_workspace/src/github.com/michaelklishin/rabbit-hole/vhosts.go +++ b/vendor/github.com/michaelklishin/rabbit-hole/vhosts.go @@ -51,9 +51,9 @@ import ( type VhostInfo struct { // Virtual host name - Name string `json:"name"` + Name string `json:"name"` // True if tracing is enabled for this virtual host - Tracing bool `json:"tracing"` + Tracing bool `json:"tracing"` // Total number of messages in queues of this virtual host Messages int `json:"messages"` @@ -68,7 +68,7 @@ type VhostInfo struct { MessagesUnacknowledgedDetails RateDetails `json:"messages_unacknowledged_details"` // Octets received - RecvOct uint64 `json:"recv_oct"` + RecvOct uint64 `json:"recv_oct"` // Octets sent SendOct uint64 `json:"send_oct"` RecvCount uint64 `json:"recv_cnt"` @@ -80,7 +80,7 @@ type VhostInfo struct { // Returns a list of virtual hosts. func (c *Client) ListVhosts() (rec []VhostInfo, err error) { - req, err := newGETRequest(c, "vhosts/") + req, err := newGETRequest(c, "vhosts") if err != nil { return []VhostInfo{}, err } diff --git a/vendor/github.com/mitchellh/go-homedir/homedir.go b/vendor/github.com/mitchellh/go-homedir/homedir.go index 086514ba5f..8996b02213 100644 --- a/vendor/github.com/mitchellh/go-homedir/homedir.go +++ b/vendor/github.com/mitchellh/go-homedir/homedir.go @@ -118,6 +118,11 @@ func dirUnix() (string, error) { } func dirWindows() (string, error) { + // First prefer the HOME environmental variable + if home := os.Getenv("HOME"); home != "" { + return home, nil + } + drive := os.Getenv("HOMEDRIVE") path := os.Getenv("HOMEPATH") home := drive + path diff --git a/vendor/golang.org/x/crypto/blowfish/cipher.go b/vendor/golang.org/x/crypto/blowfish/cipher.go index 542984aa8d..a73954f390 100644 --- a/vendor/golang.org/x/crypto/blowfish/cipher.go +++ b/vendor/golang.org/x/crypto/blowfish/cipher.go @@ -39,7 +39,7 @@ func NewCipher(key []byte) (*Cipher, error) { // NewSaltedCipher creates a returns a Cipher that folds a salt into its key // schedule. For most purposes, NewCipher, instead of NewSaltedCipher, is -// sufficient and desirable. For bcrypt compatiblity, the key can be over 56 +// sufficient and desirable. For bcrypt compatibility, the key can be over 56 // bytes. func NewSaltedCipher(key, salt []byte) (*Cipher, error) { if len(salt) == 0 { diff --git a/vendor/golang.org/x/crypto/ssh/agent/client.go b/vendor/golang.org/x/crypto/ssh/agent/client.go index 11d30945a1..6d1dca5ef7 100644 --- a/vendor/golang.org/x/crypto/ssh/agent/client.go +++ b/vendor/golang.org/x/crypto/ssh/agent/client.go @@ -580,25 +580,28 @@ func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string }) case *dsa.PrivateKey: req = ssh.Marshal(dsaCertMsg{ - Type: cert.Type(), - CertBytes: cert.Marshal(), - X: k.X, - Comments: comment, + Type: cert.Type(), + CertBytes: cert.Marshal(), + X: k.X, + Comments: comment, + Constraints: constraints, }) case *ecdsa.PrivateKey: req = ssh.Marshal(ecdsaCertMsg{ - Type: cert.Type(), - CertBytes: cert.Marshal(), - D: k.D, - Comments: comment, + Type: cert.Type(), + CertBytes: cert.Marshal(), + D: k.D, + Comments: comment, + Constraints: constraints, }) case ed25519.PrivateKey: req = ssh.Marshal(ed25519CertMsg{ - Type: cert.Type(), - CertBytes: cert.Marshal(), - Pub: []byte(k)[32:], - Priv: []byte(k), - Comments: comment, + Type: cert.Type(), + CertBytes: cert.Marshal(), + Pub: []byte(k)[32:], + Priv: []byte(k), + Comments: comment, + Constraints: constraints, }) default: return fmt.Errorf("agent: unsupported key type %T", s) diff --git a/vendor/vendor.json b/vendor/vendor.json index 167026a2d9..cc745889ee 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -27,184 +27,184 @@ "revisionTime": "2016-05-19T10:40:38Z" }, { - "checksumSHA1": "zKsZOyaTSC4MmdbKfiM6iUCjvGk=", + "checksumSHA1": "cnsyUke5GZ63byf6gvKTu3oYStU=", "path": "github.com/aws/aws-sdk-go/aws", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "AWg3FBA1NTPdIVZipaQf/rGx38o=", "path": "github.com/aws/aws-sdk-go/aws/awserr", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "dkfyy7aRNZ6BmUZ4ZdLIcMMXiPA=", "path": "github.com/aws/aws-sdk-go/aws/awsutil", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "RsYlRfQceaAgqjIrExwNsb/RBEM=", "path": "github.com/aws/aws-sdk-go/aws/client", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "ieAJ+Cvp/PKv1LpUEnUXpc3OI6E=", "path": "github.com/aws/aws-sdk-go/aws/client/metadata", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "gNWirlrTfSLbOe421hISBAhTqa4=", "path": "github.com/aws/aws-sdk-go/aws/corehandlers", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "EiauD48zRlXIFvAENgZ+PXSEnT0=", "path": "github.com/aws/aws-sdk-go/aws/credentials", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "KQiUK/zr3mqnAXD7x/X55/iNme0=", "path": "github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "t9z4goehHyiGgU85snZcFogywwk=", "path": "github.com/aws/aws-sdk-go/aws/defaults", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "U0SthWum+t9ACanK7SDJOg3dO6M=", "path": "github.com/aws/aws-sdk-go/aws/ec2metadata", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { - "checksumSHA1": "sPD1Ed00IPAslndR75MSwxVBlNg=", + "checksumSHA1": "1hUf2Q/nSEF1Ee4cnBBica+9C+E=", "path": "github.com/aws/aws-sdk-go/aws/request", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "46SVikiXo5xuy/CS6mM1XVTUU7w=", "path": "github.com/aws/aws-sdk-go/aws/session", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "sgft7A0lRCVD7QBogydg46lr3NM=", "path": "github.com/aws/aws-sdk-go/private/endpoints", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "wk7EyvDaHwb5qqoOP/4d3cV0708=", "path": "github.com/aws/aws-sdk-go/private/protocol", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "G1he3uSmd1h8ZRnKOIWuDrWp2zQ=", "path": "github.com/aws/aws-sdk-go/private/protocol/ec2query", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "gHqZ41fSrCEUftkImHKGW+cKxFk=", "path": "github.com/aws/aws-sdk-go/private/protocol/json/jsonutil", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "MPzz1x/qt6f2R/JW6aELbm/qT4k=", "path": "github.com/aws/aws-sdk-go/private/protocol/jsonrpc", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "nHHyS4+VgZOV7F3Xu87crArmbds=", "path": "github.com/aws/aws-sdk-go/private/protocol/query", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "5xzix1R8prUyWxgLnzUQoxTsfik=", "path": "github.com/aws/aws-sdk-go/private/protocol/query/queryutil", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "TW/7U+/8ormL7acf6z2rv2hDD+s=", "path": "github.com/aws/aws-sdk-go/private/protocol/rest", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "ttxyyPnlmMDqX+sY10BwbwwA+jo=", "path": "github.com/aws/aws-sdk-go/private/protocol/restxml", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "LsCIsjbzX2r3n/AhpNJvAC5ueNA=", "path": "github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "wZbHPxkyYsr5h6GW5OVh9qIMZR8=", "path": "github.com/aws/aws-sdk-go/private/signer/v4", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "Eo9yODN5U99BK0pMzoqnBm7PCrY=", "path": "github.com/aws/aws-sdk-go/private/waiter", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "tDZIdoVN4ECk3PrhKev2IxpnXJA=", "path": "github.com/aws/aws-sdk-go/service/dynamodb", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "CT/wROCklrL1EkTmd43QRZCfuNw=", "path": "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { - "checksumSHA1": "sf5+6DarxX5YbChCrJZUhsvSGMo=", + "checksumSHA1": "/liNSVM5mp72yUXz6ZKjiXnRTOI=", "path": "github.com/aws/aws-sdk-go/service/ec2", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "38ZhXbUh5DhfNvwIj98VWMT2i50=", "path": "github.com/aws/aws-sdk-go/service/iam", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "BA/gv0KordTClvOxXmhBZTnesqo=", "path": "github.com/aws/aws-sdk-go/service/s3", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "QOVvdzwlhH6tCVOPuRqUvFbxFMs=", "path": "github.com/aws/aws-sdk-go/service/sts", - "revision": "7878b9c08027abca987ff7e628e69f73d5a348b5", - "revisionTime": "2016-06-02T21:43:38Z" + "revision": "d2325e41fca90352e50602f08f7113348263bb5f", + "revisionTime": "2016-06-07T21:17:11Z" }, { "checksumSHA1": "dvd7Su+WNmHRP1+w1HezrPUCDsc=", @@ -221,38 +221,38 @@ { "checksumSHA1": "Fa/Hw0ByZgcIDU5iG+Jt0MdeYYg=", "path": "github.com/coreos/etcd/client", - "revision": "b3fee0abffb42424c1f833fcdd92101736bb2ce9", - "revisionTime": "2016-06-03T04:48:45Z" + "revision": "3e057129e2ad9deac4b8dffb65af6e6f980dcd58", + "revisionTime": "2016-06-08T05:25:57Z" }, { "checksumSHA1": "mKIXx1kDwmVmdIpZ3pJtRBuUKso=", "path": "github.com/coreos/etcd/pkg/pathutil", - "revision": "b3fee0abffb42424c1f833fcdd92101736bb2ce9", - "revisionTime": "2016-06-03T04:48:45Z" + "revision": "3e057129e2ad9deac4b8dffb65af6e6f980dcd58", + "revisionTime": "2016-06-08T05:25:57Z" }, { "checksumSHA1": "rMyIh9PsSvPs6Yd+YgKITQzQJx8=", "path": "github.com/coreos/etcd/pkg/tlsutil", - "revision": "b3fee0abffb42424c1f833fcdd92101736bb2ce9", - "revisionTime": "2016-06-03T04:48:45Z" + "revision": "3e057129e2ad9deac4b8dffb65af6e6f980dcd58", + "revisionTime": "2016-06-08T05:25:57Z" }, { "checksumSHA1": "+rHx+d1sRhZGCJtp6DovJhQkHZw=", "path": "github.com/coreos/etcd/pkg/transport", - "revision": "b3fee0abffb42424c1f833fcdd92101736bb2ce9", - "revisionTime": "2016-06-03T04:48:45Z" + "revision": "3e057129e2ad9deac4b8dffb65af6e6f980dcd58", + "revisionTime": "2016-06-08T05:25:57Z" }, { "checksumSHA1": "kGLbveUJwLvoqg9yeWAnY0BQXtA=", "path": "github.com/coreos/etcd/pkg/types", - "revision": "b3fee0abffb42424c1f833fcdd92101736bb2ce9", - "revisionTime": "2016-06-03T04:48:45Z" + "revision": "3e057129e2ad9deac4b8dffb65af6e6f980dcd58", + "revisionTime": "2016-06-08T05:25:57Z" }, { - "checksumSHA1": "4HOlPm1zZzFSCX7gZqQ4kxu0Gzc=", + "checksumSHA1": "mKQRWIjLivgiH7Bhf6Ry7EM1KKs=", "path": "github.com/denisenkom/go-mssqldb", - "revision": "2a223b1644106bc7ca456c12cde55a80185813ef", - "revisionTime": "2016-05-15T14:35:30Z" + "revision": "e291d7fd2204827b9964304c46ec21c330573faf", + "revisionTime": "2016-06-08T03:18:09Z" }, { "checksumSHA1": "33Jt/Cl5f+pO3kiFmYkkkF2JhyQ=", @@ -273,16 +273,16 @@ "revisionTime": "2016-06-01T09:31:17Z" }, { - "checksumSHA1": "G+5DzpCdfItQra0oIFk1APqaGyI=", + "checksumSHA1": "KF1gEVv2S4EisgvdnLXlT/r+x6Y=", "path": "github.com/fullsailor/pkcs7", - "revision": "2585af45975b11f1d7502bb6c01556c29efb54ce", - "revisionTime": "2016-04-14T16:13:37Z" + "revision": "9ab43480afa35dcb6df2c5b80e5e158f421c03c7", + "revisionTime": "2016-06-05T17:43:14Z" }, { - "checksumSHA1": "Ui9H0YkChVQ+0nIbA79qdgwvVfY=", + "checksumSHA1": "l2w6jertyAzSdcdKIXnHm02X8Jk=", "path": "github.com/ghodss/yaml", - "revision": "e8e0db9016175449df0e9c4b6e6995a9433a395c", - "revisionTime": "2016-05-03T19:07:39Z" + "revision": "aa0c862057666179de291b67d9f093d12b5a8473", + "revisionTime": "2016-06-04T00:29:25Z" }, { "checksumSHA1": "FfdxnQ4CZVJJvG4BC1fWavgperI=", @@ -291,10 +291,10 @@ "revisionTime": "2016-06-01T19:11:21Z" }, { - "checksumSHA1": "ka0nmgRfF36EbF2PztuMeYG7ysA=", + "checksumSHA1": "Wu6elvArlfFaTi1X77YRVjv8Xko=", "path": "github.com/go-ldap/ldap", - "revision": "0e7db8eb77695b5a952f0e5d78df9ab160050c73", - "revisionTime": "2016-04-15T03:57:59Z" + "revision": "1dc79ce72fa43e95ffeb4248bc1d3954c5db08d6", + "revisionTime": "2016-06-07T15:47:18Z" }, { "checksumSHA1": "E3ThDyBRCqfFAjY/jjzyGOyYS9w=", @@ -353,14 +353,14 @@ { "checksumSHA1": "glOabn8rkJvz7tjz/xfX4lmt070=", "path": "github.com/hashicorp/consul/api", - "revision": "ebf7ea1d759184c02a5bb5263a7c52d29838ffc3", - "revisionTime": "2016-06-01T20:35:34Z" + "revision": "14ec46b3cf8edf6fdd3f4bda8deacdfb6d4e9a73", + "revisionTime": "2016-06-08T05:31:58Z" }, { "checksumSHA1": "0DPAA2cTBjrCGgXaxXil0vILcFs=", "path": "github.com/hashicorp/consul/lib", - "revision": "ebf7ea1d759184c02a5bb5263a7c52d29838ffc3", - "revisionTime": "2016-06-01T20:35:34Z" + "revision": "14ec46b3cf8edf6fdd3f4bda8deacdfb6d4e9a73", + "revisionTime": "2016-06-08T05:31:58Z" }, { "checksumSHA1": "cdOCt0Yb+hdErz8NAQqayxPmRsY=", @@ -419,56 +419,56 @@ { "checksumSHA1": "5LrCq/ydlbL6pq1cdmuxiw7QV98=", "path": "github.com/hashicorp/hcl", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "WP5ODRo9+USuAsKYPu5RW3q8Epg=", "path": "github.com/hashicorp/hcl/hcl/ast", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "SVw0qm83Anf5T2GkYabn+f7Ibv0=", "path": "github.com/hashicorp/hcl/hcl/parser", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "WZM0q7Sya8PcGj607x1npgcEPa4=", "path": "github.com/hashicorp/hcl/hcl/scanner", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { - "checksumSHA1": "wh2mSXMC88JiAy8FIrTtL7OmY7Q=", + "checksumSHA1": "ETy6J7OZ7zjBNq0V0Lm8E/7Xafw=", "path": "github.com/hashicorp/hcl/hcl/strconv", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "VGNVyGYDGTTCTRqGH5R+CL0u6xw=", "path": "github.com/hashicorp/hcl/hcl/token", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "uEaK2zagnGctsUmjWt8ZYmK1Yvs=", "path": "github.com/hashicorp/hcl/json/parser", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "S1e0F9ZKSnqgOLfjDTYazRL28tA=", "path": "github.com/hashicorp/hcl/json/scanner", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "fNlXQCQEnb+B3k5UDL/r15xtSJY=", "path": "github.com/hashicorp/hcl/json/token", - "revision": "9a905a34e6280ce905da1a32344b25e81011197a", - "revisionTime": "2016-04-26T22:13:00Z" + "revision": "d7400db7143f8e869812e50a53acd6c8d92af3b8", + "revisionTime": "2016-06-07T00:19:40Z" }, { "checksumSHA1": "vt+P9D2yWDO3gdvdgCzwqunlhxU=", @@ -497,8 +497,14 @@ { "checksumSHA1": "E3Xcanc9ouQwL+CZGOUyA/+giLg=", "path": "github.com/hashicorp/serf/coordinate", - "revision": "b60a6d928fe726a588f79a1d500582507f9d79de", - "revisionTime": "2016-05-25T23:17:25Z" + "revision": "dce30f1c7806bf2d96478abb983c53af0e4c8fb2", + "revisionTime": "2016-06-07T21:27:01Z" + }, + { + "checksumSHA1": "IIwwZsObPGUTpSV8iWrcMLy3+3Y=", + "path": "github.com/hashicorp/uuid", + "revision": "ebb0a03e909c9c642a36d2527729104324c44fdb", + "revisionTime": "2016-03-11T17:04:51Z" }, { "checksumSHA1": "xvxetwF2G1XHScrmo8EM3yisjBc=", @@ -530,6 +536,12 @@ "revision": "56b76bdf51f7708750eac80fa38b952bb9f32639", "revisionTime": "2015-12-11T00:06:21Z" }, + { + "checksumSHA1": "Ugy4bNjWV4oxEs1TPXQlYAg5pxo=", + "path": "github.com/michaelklishin/rabbit-hole", + "revision": "9406f782bd447955eedd5d135d9736e43a7f47f4", + "revisionTime": "2016-06-02T10:07:13Z" + }, { "checksumSHA1": "yF39M9MGatDbq2d2oqlLy44jsRc=", "path": "github.com/mitchellh/cli", @@ -543,10 +555,10 @@ "revisionTime": "2016-01-28T17:02:16Z" }, { - "checksumSHA1": "Lnv1MZJu56aDzs5/EebdCuq3OFI=", + "checksumSHA1": "AXacfEchaUqT5RGmPmMXsOWRhv8=", "path": "github.com/mitchellh/go-homedir", - "revision": "981ab348d865cf048eb7d17e78ac7192632d8415", - "revisionTime": "2016-03-01T18:31:30Z" + "revision": "1111e456ffea841564ac0fa5f69c26ef44dafec9", + "revisionTime": "2016-06-06T03:01:22Z" }, { "checksumSHA1": "KCJhN9Dx329wAN/SeL4CxeypPyk=", @@ -581,116 +593,116 @@ { "checksumSHA1": "vE43s37+4CJ2CDU6TlOUOYE0K9c=", "path": "golang.org/x/crypto/bcrypt", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { - "checksumSHA1": "udD2DzUPFZbMVXP0VNADhef4zKk=", + "checksumSHA1": "JsJdKXhz87gWenMwBeejTOeNE7k=", "path": "golang.org/x/crypto/blowfish", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "TT1rac6kpQp2vz24m5yDGUNQ/QQ=", "path": "golang.org/x/crypto/cast5", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "kALxprn17Sk/x2InsoTApX6bo50=", "path": "golang.org/x/crypto/curve25519", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "wGb//LjBPNxYHqk+dcLo7BjPXK8=", "path": "golang.org/x/crypto/ed25519", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "LXFcVx8I587SnWmKycSDEq9yvK8=", "path": "golang.org/x/crypto/ed25519/internal/edwards25519", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "MCeXr2RNeiG1XG6V+er1OR0qyeo=", "path": "golang.org/x/crypto/md4", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "T0sFNhoMfuUyXVImEhkNAE+TB2E=", "path": "golang.org/x/crypto/openpgp", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "olOKkhrdkYQHZ0lf1orrFQPQrv4=", "path": "golang.org/x/crypto/openpgp/armor", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "eo/KtdjieJQXH7Qy+faXFcF70ME=", "path": "golang.org/x/crypto/openpgp/elgamal", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "rlxVSaGgqdAgwblsErxTxIfuGfg=", "path": "golang.org/x/crypto/openpgp/errors", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "IjQVXdetvKXlSW2yZHDd2m1TSoo=", "path": "golang.org/x/crypto/openpgp/packet", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "s2qT4UwvzBSkzXuiuMkowif1Olw=", "path": "golang.org/x/crypto/openpgp/s2k", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "3dxfePz1LkJB7x0nIiTI88o/fFY=", "path": "golang.org/x/crypto/ssh", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { - "checksumSHA1": "SEz1b89e679TV/nkIHlu49H5wTM=", + "checksumSHA1": "EcKMEjHXZnW85PGnmiVGLknf8HU=", "path": "golang.org/x/crypto/ssh/agent", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "N5fb5y92DFIP+wUhi1rSwPp9vyk=", "path": "golang.org/x/crypto/ssh/terminal", - "revision": "5bcd134fee4dd1475da17714aac19c0aa0142e2f", - "revisionTime": "2016-05-16T23:05:56Z" + "revision": "77f4136a99ffb5ecdbdd0226bd5cb146cf56bc0e", + "revisionTime": "2016-06-07T10:36:12Z" }, { "checksumSHA1": "ywm8niu75NXihtusbtxMK44qOU4=", "path": "golang.org/x/net/context", - "revision": "c4c3ea71919de159c9e246d7be66deb7f0a39a58", - "revisionTime": "2016-05-27T23:48:58Z" + "revision": "313cf39d4ac368181bce6960ac9be9e7cee67e68", + "revisionTime": "2016-06-07T20:04:34Z" }, { "checksumSHA1": "UtUkp2yqxAwGreQoHhrBR0Mttg4=", "path": "golang.org/x/oauth2", - "revision": "c406a4cc4ba462e5dc2f16225c5bd9488f9cbe10", - "revisionTime": "2016-05-20T18:48:49Z" + "revision": "71d9edd725fe4ce4c692fcb20765be558df45ad3", + "revisionTime": "2016-06-01T00:25:10Z" }, { "checksumSHA1": "W/GiDqzsagBnR7/yEvxatMhUDBs=", "path": "golang.org/x/oauth2/internal", - "revision": "c406a4cc4ba462e5dc2f16225c5bd9488f9cbe10", - "revisionTime": "2016-05-20T18:48:49Z" + "revision": "71d9edd725fe4ce4c692fcb20765be558df45ad3", + "revisionTime": "2016-06-01T00:25:10Z" }, { "checksumSHA1": "QcDlr1sWBDt6Dn/v7W/MRgccAi4=",