From e9439b5f99e1ca0e904bb6b2632bcc7cc9e9f671 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Fri, 29 Mar 2019 15:42:10 -0500
Subject: [PATCH] update vendor

---
 vendor/github.com/hashicorp/consul/api/acl.go | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/vendor/github.com/hashicorp/consul/api/acl.go b/vendor/github.com/hashicorp/consul/api/acl.go
index 53a052363e29..667d21548227 100644
--- a/vendor/github.com/hashicorp/consul/api/acl.go
+++ b/vendor/github.com/hashicorp/consul/api/acl.go
@@ -22,15 +22,17 @@ type ACLTokenPolicyLink struct {
 
 // ACLToken represents an ACL Token
 type ACLToken struct {
-	CreateIndex uint64
-	ModifyIndex uint64
-	AccessorID  string
-	SecretID    string
-	Description string
-	Policies    []*ACLTokenPolicyLink
-	Local       bool
-	CreateTime  time.Time `json:",omitempty"`
-	Hash        []byte    `json:",omitempty"`
+	CreateIndex    uint64
+	ModifyIndex    uint64
+	AccessorID     string
+	SecretID       string
+	Description    string
+	Policies       []*ACLTokenPolicyLink
+	Local          bool
+	ExpirationTTL  time.Duration `json:",omitempty"`
+	ExpirationTime time.Time     `json:",omitempty"`
+	CreateTime     time.Time     `json:",omitempty"`
+	Hash           []byte        `json:",omitempty"`
 
 	// DEPRECATED (ACL-Legacy-Compat)
 	// Rules will only be present for legacy tokens returned via the new APIs
@@ -38,15 +40,16 @@ type ACLToken struct {
 }
 
 type ACLTokenListEntry struct {
-	CreateIndex uint64
-	ModifyIndex uint64
-	AccessorID  string
-	Description string
-	Policies    []*ACLTokenPolicyLink
-	Local       bool
-	CreateTime  time.Time
-	Hash        []byte
-	Legacy      bool
+	CreateIndex    uint64
+	ModifyIndex    uint64
+	AccessorID     string
+	Description    string
+	Policies       []*ACLTokenPolicyLink
+	Local          bool
+	ExpirationTime time.Time `json:",omitempty"`
+	CreateTime     time.Time
+	Hash           []byte
+	Legacy         bool
 }
 
 // ACLEntry is used to represent a legacy ACL token