From 276270ce0962a81542130321a90bae924c834472 Mon Sep 17 00:00:00 2001
From: Michael Tibben <michael.tibben@99designs.com>
Date: Tue, 7 Mar 2023 20:32:57 +1100
Subject: [PATCH] Bump kingpin dep

---
 cli/add.go       | 2 +-
 cli/add_test.go  | 2 +-
 cli/clear.go     | 2 +-
 cli/exec.go      | 2 +-
 cli/exec_test.go | 2 +-
 cli/export.go    | 2 +-
 cli/global.go    | 2 +-
 cli/list.go      | 2 +-
 cli/list_test.go | 2 +-
 cli/login.go     | 2 +-
 cli/proxy.go     | 2 +-
 cli/remove.go    | 2 +-
 cli/rotate.go    | 2 +-
 go.mod           | 4 ++--
 go.sum           | 9 ++++-----
 main.go          | 2 +-
 16 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/cli/add.go b/cli/add.go
index 2104239e4..cf585edcb 100644
--- a/cli/add.go
+++ b/cli/add.go
@@ -8,7 +8,7 @@ import (
 	"github.com/99designs/aws-vault/v7/prompt"
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/aws/aws-sdk-go-v2/aws"
 )
 
diff --git a/cli/add_test.go b/cli/add_test.go
index 10d56dc7a..73098022d 100644
--- a/cli/add_test.go
+++ b/cli/add_test.go
@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 func ExampleAddCommand() {
diff --git a/cli/clear.go b/cli/clear.go
index ebc531778..c62988fb7 100644
--- a/cli/clear.go
+++ b/cli/clear.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 type ClearCommandInput struct {
diff --git a/cli/exec.go b/cli/exec.go
index 8e5d7847a..47f7f4c54 100644
--- a/cli/exec.go
+++ b/cli/exec.go
@@ -17,7 +17,7 @@ import (
 	"github.com/99designs/aws-vault/v7/server"
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/aws/aws-sdk-go-v2/aws"
 )
 
diff --git a/cli/exec_test.go b/cli/exec_test.go
index 02d624f7c..c2d259185 100644
--- a/cli/exec_test.go
+++ b/cli/exec_test.go
@@ -1,7 +1,7 @@
 package cli
 
 import (
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 
 	"github.com/99designs/keyring"
 )
diff --git a/cli/export.go b/cli/export.go
index a20b7e3c9..109b3958f 100644
--- a/cli/export.go
+++ b/cli/export.go
@@ -11,7 +11,7 @@ import (
 	"github.com/99designs/aws-vault/v7/iso8601"
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	ini "gopkg.in/ini.v1"
 )
diff --git a/cli/global.go b/cli/global.go
index 4255cfc27..21eb311c9 100644
--- a/cli/global.go
+++ b/cli/global.go
@@ -9,7 +9,7 @@ import (
 	"github.com/99designs/aws-vault/v7/prompt"
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 	isatty "github.com/mattn/go-isatty"
 	"golang.org/x/term"
 )
diff --git a/cli/list.go b/cli/list.go
index 49338892c..330bb09e2 100644
--- a/cli/list.go
+++ b/cli/list.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 type ListCommandInput struct {
diff --git a/cli/list_test.go b/cli/list_test.go
index ec6d872c9..161757ec5 100644
--- a/cli/list_test.go
+++ b/cli/list_test.go
@@ -1,7 +1,7 @@
 package cli
 
 import (
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 
 	"github.com/99designs/keyring"
 )
diff --git a/cli/login.go b/cli/login.go
index 2a34d51eb..1977b4366 100644
--- a/cli/login.go
+++ b/cli/login.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
diff --git a/cli/proxy.go b/cli/proxy.go
index d444630e2..b6a35a1a6 100644
--- a/cli/proxy.go
+++ b/cli/proxy.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 
 	"github.com/99designs/aws-vault/v7/server"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 func ConfigureProxyCommand(app *kingpin.Application, a *AwsVault) {
diff --git a/cli/remove.go b/cli/remove.go
index 8a9046a3f..d9d7f47f0 100644
--- a/cli/remove.go
+++ b/cli/remove.go
@@ -7,7 +7,7 @@ import (
 	"github.com/99designs/aws-vault/v7/prompt"
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 type RemoveCommandInput struct {
diff --git a/cli/rotate.go b/cli/rotate.go
index 852036516..372e1f1f9 100644
--- a/cli/rotate.go
+++ b/cli/rotate.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/99designs/aws-vault/v7/vault"
 	"github.com/99designs/keyring"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/iam"
 )
diff --git a/go.mod b/go.mod
index 3e065c354..5b38040ca 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/99designs/keyring v1.2.2
-	github.com/alecthomas/kingpin v0.0.0-20200323085623-b6657d9477a6
+	github.com/alecthomas/kingpin/v2 v2.3.1
 	github.com/aws/aws-sdk-go-v2 v1.17.5
 	github.com/aws/aws-sdk-go-v2/config v1.18.15
 	github.com/aws/aws-sdk-go-v2/credentials v1.13.15
@@ -21,7 +21,6 @@ require (
 
 require (
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.23 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.29 // indirect
@@ -34,5 +33,6 @@ require (
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
+	github.com/xhit/go-str2duration v1.2.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
 )
diff --git a/go.sum b/go.sum
index d149aefc9..d9bb35592 100644
--- a/go.sum
+++ b/go.sum
@@ -2,11 +2,8 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
 github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=
 github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk=
-github.com/alecthomas/kingpin v0.0.0-20200323085623-b6657d9477a6 h1:0fwkEPHxb5V+KZZLxWmOknl4oHWo60+TnhmKOi4BIkU=
-github.com/alecthomas/kingpin v0.0.0-20200323085623-b6657d9477a6/go.mod h1:b6br6/pDFSfMkBgC96TbpOji05q5pa+v5rIlS0Y6XtI=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/kingpin/v2 v2.3.1 h1:ANLJcKmQm4nIaog7xdr/id6FM6zm5hHnfZrvtKPxqGg=
+github.com/alecthomas/kingpin/v2 v2.3.1/go.mod h1:oYL5vtsvEHZGHxU7DMp32Dvx+qL+ptGn6lWaot2vCNE=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
@@ -71,6 +68,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/xhit/go-str2duration v1.2.0 h1:BcV5u025cITWxEQKGWr1URRzrcXtu7uk8+luz3Yuhwc=
+github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4=
 golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
diff --git a/main.go b/main.go
index aac09b7ab..397fcf04d 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/99designs/aws-vault/v7/cli"
-	"github.com/alecthomas/kingpin"
+	"github.com/alecthomas/kingpin/v2"
 )
 
 // Version is provided at compile time