From 22b0b8b750d894fb1ce90ec9dda765862b2b6433 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Fri, 21 Oct 2016 15:56:09 +0200 Subject: [PATCH] Fix mapstructure issue with anonymous slice Signed-off-by: Emile Vauge --- glide.lock | 6 +++--- glide.yaml | 4 +++- types/types.go | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/glide.lock b/glide.lock index bb904e3ec..bec1206d5 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 61a63d2dd37e5a9bf32c83fa520f54458c3fe6b520f89b9615d8b26f5d3f317f -updated: 2016-10-24T15:09:49.3944218+02:00 +hash: 45d9abd00276bba5aaeb92cd5f2464e404bba3cf90f37aa538d4866041626327 +updated: 2016-10-26T14:26:07.740582437+02:00 imports: - name: github.com/abbot/go-http-auth version: cb4372376e1e00e9f6ab9ec142e029302c9e7140 @@ -225,7 +225,7 @@ imports: - name: github.com/miekg/dns version: 5d001d020961ae1c184f9f8152fdc73810481677 - name: github.com/mitchellh/mapstructure - version: ca63d7c062ee3c9f34db231e352b60012b4fd0c1 + version: f3009df150dadf309fdee4a54ed65c124afad715 - name: github.com/moul/http2curl version: b1479103caacaa39319f75e7f57fc545287fca0d - name: github.com/NYTimes/gziphandler diff --git a/glide.yaml b/glide.yaml index 9358b2efe..1436021bc 100644 --- a/glide.yaml +++ b/glide.yaml @@ -102,7 +102,9 @@ import: - package: github.com/docker/leadership - package: github.com/satori/go.uuid version: ^1.1.0 +- package: github.com/mitchellh/mapstructure + version: f3009df150dadf309fdee4a54ed65c124afad715 - package: github.com/coreos/go-systemd version: v12 subpackages: - - daemon + - daemon \ No newline at end of file diff --git a/types/types.go b/types/types.go index 76fa96bd4..a8db1a6e3 100644 --- a/types/types.go +++ b/types/types.go @@ -216,12 +216,12 @@ type Users []string // Basic HTTP basic authentication type Basic struct { - Users + Users `mapstructure:","` } // Digest HTTP authentication type Digest struct { - Users + Users `mapstructure:","` } // CanonicalDomain returns a lower case domain with trim space