update vendor deps

Author: thisisaaronland

flags/oauth2.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"github.com/aaronland/go-http-crumb"
 	"github.com/aaronland/go-string/random"
-	"github.com/sfomuseum/go-flags"
+	"github.com/sfomuseum/go-flags/lookup"
 	"github.com/sfomuseum/go-http-oauth2"
 	goog_oauth2 "golang.org/x/oauth2"
 	"net/url"
@@ -45,35 +45,35 @@ func OAuth2OptionsWithFlagSet(ctx context.Context, fs *flag.FlagSet) (*oauth2.Op
 
 	oauth2_func := func() {
 
-		client_id, err := flags.StringVar(fs, "oauth2-client-id")
+		client_id, err := lookup.StringVar(fs, "oauth2-client-id")
 
 		if err != nil {
 			oauth2_err = err
 			return
 		}
 
-		client_secret, err := flags.StringVar(fs, "oauth2-client-secret")
+		client_secret, err := lookup.StringVar(fs, "oauth2-client-secret")
 
 		if err != nil {
 			oauth2_err = err
 			return
 		}
 
-		auth_url, err := flags.StringVar(fs, "oauth2-auth-url")
+		auth_url, err := lookup.StringVar(fs, "oauth2-auth-url")
 
 		if err != nil {
 			oauth2_err = err
 			return
 		}
 
-		token_url, err := flags.StringVar(fs, "oauth2-token-url")
+		token_url, err := lookup.StringVar(fs, "oauth2-token-url")
 
 		if err != nil {
 			oauth2_err = err
 			return
 		}
 
-		str_scopes, err := flags.StringVar(fs, "oauth2-scopes")
+		str_scopes, err := lookup.StringVar(fs, "oauth2-scopes")
 
 		if err != nil {
 			oauth2_err = err
@@ -82,14 +82,14 @@ func OAuth2OptionsWithFlagSet(ctx context.Context, fs *flag.FlagSet) (*oauth2.Op
 
 		scopes := strings.Split(str_scopes, ",")
 
-		path_auth, err := flags.StringVar(fs, "path-oauth2-auth")
+		path_auth, err := lookup.StringVar(fs, "path-oauth2-auth")
 
 		if err != nil {
 			oauth2_err = err
 			return
 		}
 
-		path_token, err := flags.StringVar(fs, "path-oauth2-token")
+		path_token, err := lookup.StringVar(fs, "path-oauth2-token")
 
 		if err != nil {
 			oauth2_err = err
@@ -107,7 +107,7 @@ func OAuth2OptionsWithFlagSet(ctx context.Context, fs *flag.FlagSet) (*oauth2.Op
 			RedirectURL: path_token,
 		}
 
-		cookie_uri, err := flags.StringVar(fs, "oauth2-cookie-uri")
+		cookie_uri, err := lookup.StringVar(fs, "oauth2-cookie-uri")
 
 		if err != nil {
 			oauth2_err = err

go.mod

@@ -4,10 +4,10 @@ go 1.12
 
 require (
 	github.com/aaronland/go-http-cookie v0.3.2
-	github.com/aaronland/go-http-crumb v0.1.0
+	github.com/aaronland/go-http-crumb v0.1.1
 	github.com/aaronland/go-http-sanitize v0.0.4
 	github.com/aaronland/go-string v0.1.2
 	github.com/awnumar/memguard v0.22.2
-	github.com/sfomuseum/go-flags v0.1.0
+	github.com/sfomuseum/go-flags v0.2.1
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 )

go.sum

@@ -17,13 +17,19 @@ github.com/aaronland/go-http-crumb v0.0.6 h1:R+hGU1SdkKxLqKIuabBwXpemo7VqFaCVYg4
 github.com/aaronland/go-http-crumb v0.0.6/go.mod h1:mf4QGr+5Mraf6ta1CwLJHSe31yWgDgmM8OxcLilnrpY=
 github.com/aaronland/go-http-crumb v0.1.0 h1:YfsCDZMZQWvkBvrre5TVrA1Kbkmxc3ZzbpDej/vCX8E=
 github.com/aaronland/go-http-crumb v0.1.0/go.mod h1:/9rG/lnTmpoVDr4gv2m9zCJjvgrscnntKmgY9l5PYEo=
+github.com/aaronland/go-http-crumb v0.1.1 h1:iwN8JdObGw8olgvXnGTIVM/vIozUk3TfelVX3CdiKjY=
+github.com/aaronland/go-http-crumb v0.1.1/go.mod h1:SSHOHwYW+5mTBjCE/A5kFwCjXA53cXZ2VAFXZSAcfgA=
 github.com/aaronland/go-http-rewrite v0.0.4 h1:lI8cDF/nINjuSPrYpwvlJLa1cC32h1nvmBwRRHs9sow=
 github.com/aaronland/go-http-rewrite v0.0.4/go.mod h1:g62jjXpsArD0lzJLs9bVLR9Locdt3f4OmqFkkJL2rQU=
+github.com/aaronland/go-http-rewrite v0.0.5 h1:QA1AE5IVDi76FeFBGlomyKlwMfcaIhBvLzFGNsO/2Co=
+github.com/aaronland/go-http-rewrite v0.0.5/go.mod h1:HdrFqPsolWHaLgDliK+HUuhuJaJM7YaN7q1fCMEqjYQ=
 github.com/aaronland/go-http-sanitize v0.0.1/go.mod h1:qUi4rzUPcpMntpUFnHK00yQI5vd/Q7x9MFYwX91/ygI=
 github.com/aaronland/go-http-sanitize v0.0.4 h1:oAYe5DbtbDS6x5Rygv5II6fDHzATGIAyY4/ZDZ63G2w=
 github.com/aaronland/go-http-sanitize v0.0.4/go.mod h1:qUi4rzUPcpMntpUFnHK00yQI5vd/Q7x9MFYwX91/ygI=
 github.com/aaronland/go-roster v0.0.1 h1:r1l4n1HfWvEtOXZvhfXX0Won9Xf6QJsigdUdzOtuy/M=
 github.com/aaronland/go-roster v0.0.1/go.mod h1:AcovpxlG1XxJxX2Fjqlm63fEIBhCjEIBV4lP87FZDmI=
+github.com/aaronland/go-roster v0.0.2 h1:2Fu7v4VQLRLRL/Zgr6R9S5JxsW75Ab/K88QtMVX532s=
+github.com/aaronland/go-roster v0.0.2/go.mod h1:AcovpxlG1XxJxX2Fjqlm63fEIBhCjEIBV4lP87FZDmI=
 github.com/aaronland/go-secretbox v0.1.0 h1:1M4LVD/qvdmZac+vjhjPt1SDobv++cASt8izGSrzN4U=
 github.com/aaronland/go-secretbox v0.1.0/go.mod h1:HdQrEPwc1KCsqMzmC6OCDFt31JnDhkTl3waaHTXYW3g=
 github.com/aaronland/go-secretbox v0.2.0 h1:0d/FN0+Mi9ldwV6OZpS4rn6JuHQDhXeFdz6YwoJUZAk=
@@ -46,6 +52,8 @@ github.com/sfomuseum/go-flags v0.0.2 h1:gdhf3A8oxHACAeFQpEHUplfLjkBCb6dILaftSSMD
 github.com/sfomuseum/go-flags v0.0.2/go.mod h1:54KCZIGmvZkIOrSCHSNMvgSTKH2gJRJyISH+AiI+55w=
 github.com/sfomuseum/go-flags v0.1.0 h1:iXE7KG28aMNuMnxqeQq1cmA12xCe/eX57bU9b370FGk=
 github.com/sfomuseum/go-flags v0.1.0/go.mod h1:54KCZIGmvZkIOrSCHSNMvgSTKH2gJRJyISH+AiI+55w=
+github.com/sfomuseum/go-flags v0.2.1 h1:rrn2xVEuUzxdhQ8CFaHMmNwJsE03bmOBNbvkVKSX7oM=
+github.com/sfomuseum/go-flags v0.2.1/go.mod h1:54KCZIGmvZkIOrSCHSNMvgSTKH2gJRJyISH+AiI+55w=
 github.com/whosonfirst/go-sanitize v0.1.0 h1:ygSqCnakwdzH/m8UEa15zXGDsoo5/JJeRkgmAjXZrBU=
 github.com/whosonfirst/go-sanitize v0.1.0/go.mod h1:p/emgbafMM0p5iVAz2XWwecYPl06Tw4Jos9rhTKIrt8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -63,6 +71,8 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowK
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476 h1:E7ct1C6/33eOdrGZKMoyntcEvs2dwZnDe30crG5vpYU=
+golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=