From f7bbe81761bae1fba3a1e60b9d10534e454e926e Mon Sep 17 00:00:00 2001 From: Scott Ganyo Date: Wed, 24 Feb 2021 16:19:33 -0800 Subject: [PATCH] update deps and cleanup --- cmd/provision/provision.go | 2 +- cmd/token/token_test.go | 1 - go.mod | 4 ++-- go.sum | 19 +++++++------------ 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/cmd/provision/provision.go b/cmd/provision/provision.go index 37ae6a7..f5d18af 100644 --- a/cmd/provision/provision.go +++ b/cmd/provision/provision.go @@ -396,7 +396,7 @@ func (p *provision) policySecretsFromPropertyset() (keyID string, privateKey *rs err = fmt.Errorf("key not found in remote-service propertyset") return } - privateKey, err = server.LoadPrivateKey([]byte(strings.ReplaceAll(pkStr, `\n`, "\n")), "") + privateKey, err = server.LoadPrivateKey([]byte(strings.ReplaceAll(pkStr, `\n`, "\n"))) if err != nil { return } diff --git a/cmd/token/token_test.go b/cmd/token/token_test.go index 7d241b9..46200f9 100644 --- a/cmd/token/token_test.go +++ b/cmd/token/token_test.go @@ -486,7 +486,6 @@ func generateConfig(t *testing.T) []byte { config.Tenant.RemoteServiceAPI = "https://RUNTIME/remote-service" config.Tenant.OrgName = "hi" config.Tenant.EnvName = "test" - config.Analytics.FluentdEndpoint = "apigee-udca-hi-test-1q2w3e4r.apigee:20001" if err := yamlEncoder.Encode(config); err != nil { t.Fatal(err) } diff --git a/go.mod b/go.mod index a5f39c1..7bb1bf9 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ go 1.16 // replace github.com/apigee/apigee-remote-service-envoy => ../apigee-remote-service-envoy require ( - github.com/apigee/apigee-remote-service-envoy v1.4.2-0.20210211002633-4361e2d75e9b - github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210204182927-a734c0a4bd72 + github.com/apigee/apigee-remote-service-envoy v1.4.2-0.20210225001659-710688224f39 + github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210224224933-6a2cf53cd4b7 github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d github.com/lestrrat-go/jwx v1.0.5 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 13a8724..b73919c 100644 --- a/go.sum +++ b/go.sum @@ -48,11 +48,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apigee/apigee-remote-service-envoy v1.4.2-0.20210211002633-4361e2d75e9b h1:5JgCkXGg482PpGZR3ob+loLdcJA4VStP8s5aj0r1eGE= -github.com/apigee/apigee-remote-service-envoy v1.4.2-0.20210211002633-4361e2d75e9b/go.mod h1:GwCBdgIZ5w4GIDDdyDlm+r0KLtWmVU/NnsEOXJXM84g= -github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210127172319-6ac528b724ab/go.mod h1:v8JlgWxYdj2CtCbV3qMWdjyVxtHjnbDnFZl6v1XCWEY= -github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210204182927-a734c0a4bd72 h1:nVAWXQLdxnJC8N2BpQ6lGhyHmQdM4VyBKQZDgZJ35aU= -github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210204182927-a734c0a4bd72/go.mod h1:v8JlgWxYdj2CtCbV3qMWdjyVxtHjnbDnFZl6v1XCWEY= +github.com/apigee/apigee-remote-service-envoy v1.4.2-0.20210225001659-710688224f39 h1:vPek3xbmZG+VlnSec9rPs3S+yVyuvq+cExYoijdc9cE= +github.com/apigee/apigee-remote-service-envoy v1.4.2-0.20210225001659-710688224f39/go.mod h1:lkqFBhLnqCfQoyldWx65ZYMYxLL8z2p1+zItMfo9CNg= +github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210224224933-6a2cf53cd4b7 h1:nY2KSa0UAOUz0K/555C/cbvQS0RcNKIsUWgGknifsmo= +github.com/apigee/apigee-remote-service-golib v1.4.1-0.20210224224933-6a2cf53cd4b7/go.mod h1:+XDfxt6zRx2+BRZQdiD9iTLwYAIP8Z3OQ+yz7G0D1W0= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -96,7 +95,6 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -256,11 +254,11 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lestrrat-go/iter v0.0.0-20200422075355-fc1769541911 h1:FvnrqecqX4zT0wOIbYK1gNgTm0677INEWiFY8UEYggY= github.com/lestrrat-go/iter v0.0.0-20200422075355-fc1769541911/go.mod h1:zIdgO1mRKhn8l9vrZJZz9TUMMFbQbLeTsbqPDrJ/OJc= github.com/lestrrat-go/jwx v1.0.5 h1:8bVUGXXkR3+YQNwuFof3lLxSJMLtrscHJfGI6ZIBRD0= @@ -298,8 +296,6 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -726,9 +722,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=