From fa6ef483b9ce7953c3da142883fd00be29370ca0 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Fri, 25 Jun 2021 15:17:33 -0700 Subject: [PATCH 01/16] chore: update cobra package Closes ENG-434. --- go.mod | 7 +- go.sum | 257 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7dbe5aca..de616433 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,10 @@ go 1.16 require ( github.com/AlecAivazis/survey/v2 v2.0.8 + github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect github.com/atotto/clipboard v0.1.2 + github.com/coreos/go-etcd v2.0.0+incompatible // indirect + github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/go-openapi/strfmt v0.19.3 // indirect github.com/google/uuid v1.1.1 github.com/hashicorp/go-version v1.2.1 @@ -13,8 +16,10 @@ require ( github.com/mattn/go-isatty v0.0.12 github.com/mattn/go-runewidth v0.0.5 // indirect github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e - github.com/spf13/cobra v0.0.5 + github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 // indirect + github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect + github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad go.mongodb.org/mongo-driver v1.1.2 // indirect golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e diff --git a/go.sum b/go.sum index f036f91e..d54b226b 100644 --- a/go.sum +++ b/go.sum @@ -1,23 +1,63 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AlecAivazis/survey/v2 v2.0.8 h1:zVjWKN+JIAfmrq6nGWG3DfLS8ypEBhxYy0p7FM+riFk= github.com/AlecAivazis/survey/v2 v2.0.8/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +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= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g= github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= 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= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA= @@ -26,53 +66,151 @@ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ= github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jedib0t/go-pretty v4.3.0+incompatible h1:CGs8AVhEKg/n9YbUenWmNStRW2PHJzaeDodcfvRAbIo= github.com/jedib0t/go-pretty v4.3.0+incompatible/go.mod h1:XemHduiw8R651AF9Pt4FwCTKeG3oo7hrHJAoznj9nag= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ= github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.5 h1:jrGtp51JOKTWgvLFzfG6OtZOJcK2sEnzc/U+zw7TtbA= github.com/mattn/go-runewidth v0.0.5/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e h1:VAzdS5Nw68fbf5RZ8RDVlUvPXNU6Z3jtPCK/qvm4FoQ= github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -80,28 +218,91 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad h1:aGgLtBPvZSG8l+Uo7Ko23p44iVOcrmZsZO2shJZHer8= github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 h1:8dUaAV7K4uHsF56JQWkprecIQKdPHtR9jCHF5nB8uzc= golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -111,14 +312,70 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= 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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/gookit/color.v1 v1.1.6 h1:5fB10p6AUFjhd2ayq9JgmJWr9WlTrguFdw3qlYtKNHk= gopkg.in/gookit/color.v1 v1.1.6/go.mod h1:IcEkFGaveVShJ+j8ew+jwe9epHyGpJ9IrptHmW3laVY= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d h1:LCPbGQ34PMrwad11aMZ+dbz5SAsq/0ySjRwQ8I9Qwd8= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From 23e1927fdde09f024c587044746d720564d84326 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Sat, 26 Jun 2021 00:57:42 -0700 Subject: [PATCH 02/16] chore: remove unused logic This command doesn't accept any args. --- pkg/cmd/environments.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/cmd/environments.go b/pkg/cmd/environments.go index 4b20a9b3..9a1f1d93 100644 --- a/pkg/cmd/environments.go +++ b/pkg/cmd/environments.go @@ -43,12 +43,7 @@ func environments(cmd *cobra.Command, args []string) { utils.RequireValue("token", localConfig.Token.Value) - project := localConfig.EnclaveProject.Value - if len(args) > 0 { - project = args[0] - } - - info, err := http.GetEnvironments(localConfig.APIHost.Value, utils.GetBool(localConfig.VerifyTLS.Value, true), localConfig.Token.Value, project) + info, err := http.GetEnvironments(localConfig.APIHost.Value, utils.GetBool(localConfig.VerifyTLS.Value, true), localConfig.Token.Value, localConfig.EnclaveProject.Value) if !err.IsNil() { utils.HandleError(err.Unwrap(), err.Message) } From ecd2beb3b1f470764eb0013444f43e16325dbf9a Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Sat, 26 Jun 2021 01:01:43 -0700 Subject: [PATCH 03/16] Add support for auto-completing command args --- pkg/cmd/activity.go | 19 +++++-- pkg/cmd/configs.go | 102 +++++++++++++++++++++++++++--------- pkg/cmd/configs_logs.go | 30 ++++++++--- pkg/cmd/configs_tokens.go | 32 +++++++---- pkg/cmd/configure.go | 33 ++++++++++++ pkg/cmd/environments.go | 21 ++++++-- pkg/cmd/projects.go | 39 +++++++++----- pkg/cmd/root.go | 5 ++ pkg/cmd/secrets.go | 21 ++++++-- pkg/controllers/activity.go | 37 +++++++++++++ pkg/controllers/configs.go | 91 ++++++++++++++++++++++++++++++++ pkg/controllers/projects.go | 37 +++++++++++++ pkg/controllers/secrets.go | 46 ++++++++++++++++ pkg/models/config.go | 12 +++++ 14 files changed, 461 insertions(+), 64 deletions(-) create mode 100644 pkg/controllers/activity.go create mode 100644 pkg/controllers/configs.go create mode 100644 pkg/controllers/projects.go create mode 100644 pkg/controllers/secrets.go diff --git a/pkg/cmd/activity.go b/pkg/cmd/activity.go index abb14887..1350fd0c 100644 --- a/pkg/cmd/activity.go +++ b/pkg/cmd/activity.go @@ -17,6 +17,7 @@ package cmd import ( "github.com/DopplerHQ/cli/pkg/configuration" + "github.com/DopplerHQ/cli/pkg/controllers" "github.com/DopplerHQ/cli/pkg/http" "github.com/DopplerHQ/cli/pkg/printer" "github.com/DopplerHQ/cli/pkg/utils" @@ -44,9 +45,10 @@ var activityCmd = &cobra.Command{ } var activityGetCmd = &cobra.Command{ - Use: "get [log_id]", - Short: "Get workplace activity log", - Args: cobra.MaximumNArgs(1), + Use: "get [log_id]", + Short: "Get workplace activity log", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: activityLogIDsValidArgs, Run: func(cmd *cobra.Command, args []string) { jsonFlag := utils.OutputJSON localConfig := configuration.LocalConfig(cmd) @@ -68,6 +70,17 @@ var activityGetCmd = &cobra.Command{ }, } +func activityLogIDsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + ids, err := controllers.GetActivityLogIDs(localConfig) + if err.IsNil() { + return ids, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + func init() { activityGetCmd.Flags().String("log", "", "activity log id") activityCmd.AddCommand(activityGetCmd) diff --git a/pkg/cmd/configs.go b/pkg/cmd/configs.go index a9af5552..750adb8a 100644 --- a/pkg/cmd/configs.go +++ b/pkg/cmd/configs.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/DopplerHQ/cli/pkg/configuration" + "github.com/DopplerHQ/cli/pkg/controllers" "github.com/DopplerHQ/cli/pkg/http" "github.com/DopplerHQ/cli/pkg/printer" "github.com/DopplerHQ/cli/pkg/utils" @@ -35,10 +36,11 @@ var configsCmd = &cobra.Command{ } var configsGetCmd = &cobra.Command{ - Use: "get [config]", - Short: "Get info for a config", - Args: cobra.MaximumNArgs(1), - Run: getConfigs, + Use: "get [config]", + Short: "Get info for a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configNamesValidArgs, + Run: getConfigs, } var configsCreateCmd = &cobra.Command{ @@ -49,38 +51,43 @@ var configsCreateCmd = &cobra.Command{ } var configsDeleteCmd = &cobra.Command{ - Use: "delete [config]", - Short: "Delete a config", - Args: cobra.MaximumNArgs(1), - Run: deleteConfigs, + Use: "delete [config]", + Short: "Delete a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configNamesValidArgs, + Run: deleteConfigs, } var configsUpdateCmd = &cobra.Command{ - Use: "update [config]", - Short: "Update a config", - Args: cobra.MaximumNArgs(1), - Run: updateConfigs, + Use: "update [config]", + Short: "Update a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configNamesValidArgs, + Run: updateConfigs, } var configsLockCmd = &cobra.Command{ - Use: "lock [config]", - Short: "Lock a config", - Args: cobra.MaximumNArgs(1), - Run: lockConfigs, + Use: "lock [config]", + Short: "Lock a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: unlockedConfigNamesValidArgs, + Run: lockConfigs, } var configsUnlockCmd = &cobra.Command{ - Use: "unlock [config]", - Short: "Unlock a config", - Args: cobra.MaximumNArgs(1), - Run: unlockConfigs, + Use: "unlock [config]", + Short: "Unlock a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: lockedConfigNamesValidArgs, + Run: unlockConfigs, } var configsCloneCmd = &cobra.Command{ - Use: "clone [config]", - Short: "Clone a config", - Args: cobra.MaximumNArgs(1), - Run: cloneConfigs, + Use: "clone [config]", + Short: "Clone a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configNamesValidArgs, + Run: cloneConfigs, } func configs(cmd *cobra.Command, args []string) { @@ -286,6 +293,53 @@ func cloneConfigs(cmd *cobra.Command, args []string) { } } +func configNamesValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + names, err := controllers.GetConfigNames(localConfig) + if err.IsNil() { + return names, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + +func lockedConfigNamesValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + configs, err := controllers.GetConfigs(localConfig) + if !err.IsNil() { + return nil, cobra.ShellCompDirectiveNoFileComp + } + + var names []string + for _, config := range configs { + if config.Locked { + names = append(names, config.Name) + } + } + return names, cobra.ShellCompDirectiveNoFileComp +} + +func unlockedConfigNamesValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + configs, err := controllers.GetConfigs(localConfig) + if !err.IsNil() { + return nil, cobra.ShellCompDirectiveNoFileComp + } + + var names []string + for _, config := range configs { + if !config.Locked { + names = append(names, config.Name) + } + } + return names, cobra.ShellCompDirectiveNoFileComp +} + func init() { configsCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") diff --git a/pkg/cmd/configs_logs.go b/pkg/cmd/configs_logs.go index 03565dbf..1c768297 100644 --- a/pkg/cmd/configs_logs.go +++ b/pkg/cmd/configs_logs.go @@ -17,6 +17,7 @@ package cmd import ( "github.com/DopplerHQ/cli/pkg/configuration" + "github.com/DopplerHQ/cli/pkg/controllers" "github.com/DopplerHQ/cli/pkg/http" "github.com/DopplerHQ/cli/pkg/printer" "github.com/DopplerHQ/cli/pkg/utils" @@ -31,17 +32,19 @@ var configsLogsCmd = &cobra.Command{ } var configsLogsGetCmd = &cobra.Command{ - Use: "get [log_id]", - Short: "Get config audit log", - Args: cobra.MaximumNArgs(1), - Run: getConfigsLogs, + Use: "get [log_id]", + Short: "Get config audit log", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configLogIDsValidArgs, + Run: getConfigsLogs, } var configsLogsRollbackCmd = &cobra.Command{ - Use: "rollback [log_id]", - Short: "Rollback a config change", - Args: cobra.MaximumNArgs(1), - Run: rollbackConfigsLogs, + Use: "rollback [log_id]", + Short: "Rollback a config change", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configLogIDsValidArgs, + Run: rollbackConfigsLogs, } func configsLogs(cmd *cobra.Command, args []string) { @@ -101,6 +104,17 @@ func rollbackConfigsLogs(cmd *cobra.Command, args []string) { } } +func configLogIDsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + ids, err := controllers.GetConfigLogIDs(localConfig) + if err.IsNil() { + return ids, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + func init() { configsLogsCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") configsLogsCmd.Flags().StringP("config", "c", "", "config (e.g. dev)") diff --git a/pkg/cmd/configs_tokens.go b/pkg/cmd/configs_tokens.go index f06a47b4..d23dbb27 100644 --- a/pkg/cmd/configs_tokens.go +++ b/pkg/cmd/configs_tokens.go @@ -19,6 +19,7 @@ import ( "errors" "github.com/DopplerHQ/cli/pkg/configuration" + "github.com/DopplerHQ/cli/pkg/controllers" "github.com/DopplerHQ/cli/pkg/http" "github.com/DopplerHQ/cli/pkg/printer" "github.com/DopplerHQ/cli/pkg/utils" @@ -33,10 +34,11 @@ var configsTokensCmd = &cobra.Command{ } var configsTokensGetCmd = &cobra.Command{ - Use: "get [slug]", - Short: "Get a config's service token", - Args: cobra.MaximumNArgs(1), - Run: getConfigsTokens, + Use: "get [slug]", + Short: "Get a config's service token", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configTokenSlugsValidArgs, + Run: getConfigsTokens, } var configsTokensCreateCmd = &cobra.Command{ @@ -47,11 +49,12 @@ var configsTokensCreateCmd = &cobra.Command{ } var configsTokensRevokeCmd = &cobra.Command{ - Use: "revoke [slug]", - Aliases: []string{"delete"}, - Short: "Revoke a service token from a config", - Args: cobra.MaximumNArgs(1), - Run: revokeConfigsTokens, + Use: "revoke [slug]", + Aliases: []string{"delete"}, + Short: "Revoke a service token from a config", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: configTokenSlugsValidArgs, + Run: revokeConfigsTokens, } func configsTokens(cmd *cobra.Command, args []string) { @@ -144,6 +147,17 @@ func revokeConfigsTokens(cmd *cobra.Command, args []string) { } } +func configTokenSlugsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + slugs, err := controllers.GetConfigTokenSlugs(localConfig) + if err.IsNil() { + return slugs, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + func init() { configsTokensCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") configsTokensCmd.Flags().StringP("config", "c", "", "config (e.g. dev)") diff --git a/pkg/cmd/configure.go b/pkg/cmd/configure.go index 8dc9f0ae..a20f286d 100644 --- a/pkg/cmd/configure.go +++ b/pkg/cmd/configure.go @@ -83,6 +83,7 @@ var configureGetCmd = &cobra.Command{ Ex: output the options "key" and "otherkey": doppler configure get key otherkey`, + ValidArgsFunction: currentConfigOptionsValidArgs, Args: func(cmd *cobra.Command, args []string) error { if len(args) == 0 { return errors.New("requires at least 1 arg(s), only received 0") @@ -119,6 +120,7 @@ var configureSetCmd = &cobra.Command{ Ex: set the options "key" and "otherkey": doppler configure set key=123 otherkey=456`, + ValidArgsFunction: configOptionsValidArgs, Args: func(cmd *cobra.Command, args []string) error { if len(args) == 0 { return errors.New("requires at least 1 arg(s), only received 0") @@ -178,6 +180,7 @@ var configureUnsetCmd = &cobra.Command{ Ex: unset the options "key" and "otherkey": doppler configure unset key otherkey`, + ValidArgsFunction: currentConfigOptionsValidArgs, Args: func(cmd *cobra.Command, args []string) error { if len(args) == 0 { return errors.New("requires at least 1 arg(s), only received 0") @@ -227,6 +230,36 @@ var configureResetCmd = &cobra.Command{ }, } +// currentConfigOptionsValidArgs the options currently in use in the current scope +func configOptionsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + var names []string + for _, option := range models.AllConfigOptions() { + friendlyName := configuration.TranslateConfigOption(option) + names = append(names, friendlyName) + } + return names, cobra.ShellCompDirectiveNoFileComp +} + +// currentConfigOptionsValidArgs the options currently in use in the current scope +func currentConfigOptionsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + config := configuration.Get(configuration.Scope) + configMap := models.ScopedOptionsStringMap(&config) + + var validArgs []string + for _, option := range models.AllConfigOptions() { + value := configMap[option] + if value != "" { + friendlyName := configuration.TranslateConfigOption(option) + validArgs = append(validArgs, friendlyName) + } + } + return validArgs, cobra.ShellCompDirectiveNoFileComp +} + func init() { configureCmd.AddCommand(configureDebugCmd) diff --git a/pkg/cmd/environments.go b/pkg/cmd/environments.go index 9a1f1d93..fe3166ac 100644 --- a/pkg/cmd/environments.go +++ b/pkg/cmd/environments.go @@ -17,6 +17,7 @@ package cmd import ( "github.com/DopplerHQ/cli/pkg/configuration" + "github.com/DopplerHQ/cli/pkg/controllers" "github.com/DopplerHQ/cli/pkg/http" "github.com/DopplerHQ/cli/pkg/printer" "github.com/DopplerHQ/cli/pkg/utils" @@ -31,10 +32,11 @@ var environmentsCmd = &cobra.Command{ } var environmentsGetCmd = &cobra.Command{ - Use: "get [environment_id]", - Short: "Get info for an environment", - Args: cobra.ExactArgs(1), - Run: getEnvironments, + Use: "get [environment_id]", + Short: "Get info for an environment", + Args: cobra.ExactArgs(1), + ValidArgsFunction: configEnvironmentIDsValidArgs, + Run: getEnvironments, } func environments(cmd *cobra.Command, args []string) { @@ -67,6 +69,17 @@ func getEnvironments(cmd *cobra.Command, args []string) { printer.EnvironmentInfo(info, jsonFlag) } +func configEnvironmentIDsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + ids, err := controllers.GetEnvironmentIDs(localConfig) + if err.IsNil() { + return ids, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + func init() { environmentsGetCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") environmentsCmd.AddCommand(environmentsGetCmd) diff --git a/pkg/cmd/projects.go b/pkg/cmd/projects.go index dedc6a1e..24234770 100644 --- a/pkg/cmd/projects.go +++ b/pkg/cmd/projects.go @@ -19,6 +19,7 @@ import ( "fmt" "github.com/DopplerHQ/cli/pkg/configuration" + "github.com/DopplerHQ/cli/pkg/controllers" "github.com/DopplerHQ/cli/pkg/http" "github.com/DopplerHQ/cli/pkg/models" "github.com/DopplerHQ/cli/pkg/printer" @@ -34,10 +35,11 @@ var projectsCmd = &cobra.Command{ } var projectsGetCmd = &cobra.Command{ - Use: "get [project_id]", - Short: "Get info for a project", - Args: cobra.MaximumNArgs(1), - Run: getProjects, + Use: "get [project_id]", + Short: "Get info for a project", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: projectIDsValidArgs, + Run: getProjects, } var projectsCreateCmd = &cobra.Command{ @@ -48,17 +50,19 @@ var projectsCreateCmd = &cobra.Command{ } var projectsDeleteCmd = &cobra.Command{ - Use: "delete [project_id]", - Short: "Delete a project", - Args: cobra.MaximumNArgs(1), - Run: deleteProjects, + Use: "delete [project_id]", + Short: "Delete a project", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: projectIDsValidArgs, + Run: deleteProjects, } var projectsUpdateCmd = &cobra.Command{ - Use: "update [project_id]", - Short: "Update a project", - Args: cobra.MaximumNArgs(1), - Run: updateProjects, + Use: "update [project_id]", + Short: "Update a project", + Args: cobra.MaximumNArgs(1), + ValidArgsFunction: projectIDsValidArgs, + Run: updateProjects, } func projects(cmd *cobra.Command, args []string) { @@ -181,6 +185,17 @@ func updateProjects(cmd *cobra.Command, args []string) { } } +func projectIDsValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + ids, err := controllers.GetProjectIDs(localConfig) + if err.IsNil() { + return ids, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + func init() { projectsGetCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") projectsCmd.AddCommand(projectsGetCmd) diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go index b1191dd0..af67da4a 100644 --- a/pkg/cmd/root.go +++ b/pkg/cmd/root.go @@ -113,6 +113,11 @@ func checkVersion(command string) { configuration.SetVersionCheck(versionCheck) } +// persistentValidArgsFunction Cobra parses flags after executing ValidArgsFunction, so we must manually initialize flags +func persistentValidArgsFunction(cmd *cobra.Command) { + loadFlags(cmd) +} + func loadFlags(cmd *cobra.Command) { var err error scope := cmd.Flag("scope").Value.String() diff --git a/pkg/cmd/secrets.go b/pkg/cmd/secrets.go index b12a6a0b..d29a8d77 100644 --- a/pkg/cmd/secrets.go +++ b/pkg/cmd/secrets.go @@ -54,8 +54,9 @@ var secretsGetCmd = &cobra.Command{ Ex: output the secrets "API_KEY" and "CRYPTO_KEY": doppler secrets get API_KEY CRYPTO_KEY`, - Args: cobra.MinimumNArgs(1), - Run: getSecrets, + Args: cobra.MinimumNArgs(1), + ValidArgsFunction: secretNamesValidArgs, + Run: getSecrets, } var secretsSetCmd = &cobra.Command{ @@ -90,8 +91,9 @@ var secretsDeleteCmd = &cobra.Command{ Ex: delete the secrets "API_KEY" and "CRYPTO_KEY": doppler secrets delete API_KEY CRYPTO_KEY`, - Args: cobra.MinimumNArgs(1), - Run: deleteSecrets, + Args: cobra.MinimumNArgs(1), + Run: deleteSecrets, + ValidArgsFunction: secretNamesValidArgs, } var validFormatList = strings.Join(models.SecretFormats, ", ") @@ -490,6 +492,17 @@ func substituteSecrets(cmd *cobra.Command, args []string) { } } +func secretNamesValidArgs(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { + persistentValidArgsFunction(cmd) + + localConfig := configuration.LocalConfig(cmd) + names, err := controllers.GetSecretNames(localConfig) + if err.IsNil() { + return names, cobra.ShellCompDirectiveNoFileComp + } + return nil, cobra.ShellCompDirectiveNoFileComp +} + func init() { secretsCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") secretsCmd.Flags().StringP("config", "c", "", "config (e.g. dev)") diff --git a/pkg/controllers/activity.go b/pkg/controllers/activity.go new file mode 100644 index 00000000..0258e3fd --- /dev/null +++ b/pkg/controllers/activity.go @@ -0,0 +1,37 @@ +/* +Copyright © 2021 Doppler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package controllers + +import ( + "github.com/DopplerHQ/cli/pkg/http" + "github.com/DopplerHQ/cli/pkg/models" + "github.com/DopplerHQ/cli/pkg/utils" +) + +func GetActivityLogIDs(config models.ScopedOptions) ([]string, Error) { + utils.RequireValue("token", config.Token.Value) + + logs, err := http.GetActivityLogs(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + var ids []string + for _, log := range logs { + ids = append(ids, log.ID) + } + return ids, Error{} +} diff --git a/pkg/controllers/configs.go b/pkg/controllers/configs.go new file mode 100644 index 00000000..d0416696 --- /dev/null +++ b/pkg/controllers/configs.go @@ -0,0 +1,91 @@ +/* +Copyright © 2021 Doppler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package controllers + +import ( + "github.com/DopplerHQ/cli/pkg/http" + "github.com/DopplerHQ/cli/pkg/models" + "github.com/DopplerHQ/cli/pkg/utils" +) + +func GetConfigs(config models.ScopedOptions) ([]models.ConfigInfo, Error) { + utils.RequireValue("token", config.Token.Value) + + configs, err := http.GetConfigs(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value, config.EnclaveProject.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + return configs, Error{} +} + +func GetConfigNames(config models.ScopedOptions) ([]string, Error) { + configs, err := GetConfigs(config) + if !err.IsNil() { + return nil, err + } + + var names []string + for _, config := range configs { + names = append(names, config.Name) + } + return names, Error{} +} + +func GetConfigLogIDs(config models.ScopedOptions) ([]string, Error) { + utils.RequireValue("token", config.Token.Value) + + logs, err := http.GetConfigLogs(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value, config.EnclaveProject.Value, config.EnclaveConfig.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + var names []string + for _, log := range logs { + names = append(names, log.ID) + } + return names, Error{} +} + +func GetConfigTokenSlugs(config models.ScopedOptions) ([]string, Error) { + utils.RequireValue("token", config.Token.Value) + + tokens, err := http.GetConfigServiceTokens(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value, config.EnclaveProject.Value, config.EnclaveConfig.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + var slugs []string + for _, token := range tokens { + slugs = append(slugs, token.Slug) + } + return slugs, Error{} +} + +func GetEnvironmentIDs(config models.ScopedOptions) ([]string, Error) { + utils.RequireValue("token", config.Token.Value) + + environments, err := http.GetEnvironments(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value, config.EnclaveProject.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + var ids []string + for _, environment := range environments { + ids = append(ids, environment.ID) + } + return ids, Error{} +} diff --git a/pkg/controllers/projects.go b/pkg/controllers/projects.go new file mode 100644 index 00000000..9a575149 --- /dev/null +++ b/pkg/controllers/projects.go @@ -0,0 +1,37 @@ +/* +Copyright © 2021 Doppler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package controllers + +import ( + "github.com/DopplerHQ/cli/pkg/http" + "github.com/DopplerHQ/cli/pkg/models" + "github.com/DopplerHQ/cli/pkg/utils" +) + +func GetProjectIDs(config models.ScopedOptions) ([]string, Error) { + utils.RequireValue("token", config.Token.Value) + + info, err := http.GetProjects(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + var ids []string + for _, project := range info { + ids = append(ids, project.ID) + } + return ids, Error{} +} diff --git a/pkg/controllers/secrets.go b/pkg/controllers/secrets.go new file mode 100644 index 00000000..786833c2 --- /dev/null +++ b/pkg/controllers/secrets.go @@ -0,0 +1,46 @@ +/* +Copyright © 2021 Doppler + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +package controllers + +import ( + "sort" + + "github.com/DopplerHQ/cli/pkg/http" + "github.com/DopplerHQ/cli/pkg/models" + "github.com/DopplerHQ/cli/pkg/utils" +) + +func GetSecretNames(config models.ScopedOptions) ([]string, Error) { + utils.RequireValue("token", config.Token.Value) + + response, err := http.GetSecrets(config.APIHost.Value, utils.GetBool(config.VerifyTLS.Value, true), config.Token.Value, config.EnclaveProject.Value, config.EnclaveConfig.Value) + if !err.IsNil() { + return nil, Error{Err: err.Unwrap(), Message: err.Message} + } + + secrets, parseErr := models.ParseSecrets(response) + if parseErr != nil { + return nil, Error{Err: parseErr, Message: "Unable to parse API response"} + } + + var secretsNames []string + for name := range secrets { + secretsNames = append(secretsNames, name) + } + sort.Strings(secretsNames) + + return secretsNames, Error{} +} diff --git a/pkg/models/config.go b/pkg/models/config.go index 3d2568bb..dd0de6b9 100644 --- a/pkg/models/config.go +++ b/pkg/models/config.go @@ -124,6 +124,18 @@ func ScopedPairs(conf *ScopedOptions) map[string]*ScopedOption { } } +// ScopedOptions get the options for the given scoped config +func ScopedOptionsStringMap(conf *ScopedOptions) map[string]string { + return map[string]string{ + ConfigToken.String(): conf.Token.Value, + ConfigAPIHost.String(): conf.APIHost.Value, + ConfigDashboardHost.String(): conf.DashboardHost.Value, + ConfigVerifyTLS.String(): conf.VerifyTLS.Value, + ConfigEnclaveProject.String(): conf.EnclaveProject.Value, + ConfigEnclaveConfig.String(): conf.EnclaveConfig.Value, + } +} + // EnvPairs get the scoped config pairs for each environment variable func EnvPairs(conf *ScopedOptions) map[string]*ScopedOption { return map[string]*ScopedOption{ From 7328228ddf46a333f56089e18a6c1af7d9ca280c Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Sat, 26 Jun 2021 01:16:06 -0700 Subject: [PATCH 04/16] Only show CLI update prompt when running in terminal If not running in a terminal, the prompt can't be responded to and may hang indefinitely. --- pkg/cmd/root.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go index af67da4a..fbbcd05f 100644 --- a/pkg/cmd/root.go +++ b/pkg/cmd/root.go @@ -26,6 +26,7 @@ import ( "github.com/DopplerHQ/cli/pkg/printer" "github.com/DopplerHQ/cli/pkg/utils" "github.com/DopplerHQ/cli/pkg/version" + "github.com/mattn/go-isatty" "github.com/spf13/cobra" "gopkg.in/gookit/color.v1" ) @@ -54,10 +55,13 @@ var rootCmd = &cobra.Command{ plain := utils.GetBoolFlagIfChanged(cmd, "plain", false) canPrompt := !utils.GetBoolFlagIfChanged(cmd, "no-prompt", false) + // tty is required to accept user input, otherwise the update can't be accepted/declined + isTTY := isatty.IsTerminal(os.Stdout.Fd()) + // only run version check if we can print the results // --plain doesn't normally affect logging output, but due to legacy reasons it does here // also don't want to display updates if user doesn't want to be prompted (--no-prompt) - if utils.CanLogInfo() && !plain && canPrompt { + if isTTY && utils.CanLogInfo() && !plain && canPrompt { checkVersion(cmd.CommandPath()) } }, From 2b076628dfc08e3486ee1d60599d91edce57d229 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Sat, 26 Jun 2021 13:09:27 -0700 Subject: [PATCH 05/16] chore: rename config option structs for clarity --- pkg/cmd/configure.go | 2 +- pkg/cmd/setup.go | 2 +- pkg/configuration/config.go | 6 +++--- pkg/models/config.go | 16 +++++++++------- pkg/printer/config.go | 4 ++-- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkg/cmd/configure.go b/pkg/cmd/configure.go index a20f286d..7ce7121a 100644 --- a/pkg/cmd/configure.go +++ b/pkg/cmd/configure.go @@ -109,7 +109,7 @@ doppler configure get key otherkey`, translatedArgs = append(translatedArgs, configuration.TranslateFriendlyOption(arg)) } - printer.ScopedConfigValues(conf, translatedArgs, models.ScopedPairs(&conf), jsonFlag, plain, copy) + printer.ScopedConfigValues(conf, translatedArgs, models.ScopedOptionsMap(&conf), jsonFlag, plain, copy) }, } diff --git a/pkg/cmd/setup.go b/pkg/cmd/setup.go index d4c315bf..671ddfd1 100644 --- a/pkg/cmd/setup.go +++ b/pkg/cmd/setup.go @@ -162,7 +162,7 @@ func setup(cmd *cobra.Command, args []string) { if saveToken { valuesToPrint = append(valuesToPrint, utils.RedactAuthToken(models.ConfigToken.String())) } - printer.ScopedConfigValues(conf, valuesToPrint, models.ScopedPairs(&conf), utils.OutputJSON, false, false) + printer.ScopedConfigValues(conf, valuesToPrint, models.ScopedOptionsMap(&conf), utils.OutputJSON, false, false) } } diff --git a/pkg/configuration/config.go b/pkg/configuration/config.go index 899ebb41..2ce67dec 100644 --- a/pkg/configuration/config.go +++ b/pkg/configuration/config.go @@ -139,8 +139,8 @@ func Get(scope string) models.ScopedOptions { continue } - pairs := models.Pairs(conf) - scopedPairs := models.ScopedPairs(&scopedConfig) + pairs := models.OptionsMap(conf) + scopedPairs := models.ScopedOptionsMap(&scopedConfig) for name, pair := range pairs { if pair != "" { scopedPair := scopedPairs[name] @@ -173,7 +173,7 @@ func LocalConfig(cmd *cobra.Command) models.ScopedOptions { // environment variables if CanReadEnv { - pairs := models.EnvPairs(&localConfig) + pairs := models.EnvOptions(&localConfig) envVars := []string{} for envVar := range pairs { envVars = append(envVars, envVar) diff --git a/pkg/models/config.go b/pkg/models/config.go index dd0de6b9..08d9425d 100644 --- a/pkg/models/config.go +++ b/pkg/models/config.go @@ -15,7 +15,9 @@ limitations under the License. */ package models -import "time" +import ( + "time" +) // ConfigFile structure of the config file type ConfigFile struct { @@ -100,8 +102,8 @@ func AllConfigOptions() []string { return allConfigOptions } -// Pairs get the pairs for the given config -func Pairs(conf FileScopedOptions) map[string]string { +// OptionsMap get the options for the given config +func OptionsMap(conf FileScopedOptions) map[string]string { return map[string]string{ ConfigToken.String(): conf.Token, ConfigAPIHost.String(): conf.APIHost, @@ -112,8 +114,8 @@ func Pairs(conf FileScopedOptions) map[string]string { } } -// ScopedPairs get the pairs for the given scoped config -func ScopedPairs(conf *ScopedOptions) map[string]*ScopedOption { +// ScopedOptionsMap get the options for the given scoped config +func ScopedOptionsMap(conf *ScopedOptions) map[string]*ScopedOption { return map[string]*ScopedOption{ ConfigToken.String(): &conf.Token, ConfigAPIHost.String(): &conf.APIHost, @@ -136,8 +138,8 @@ func ScopedOptionsStringMap(conf *ScopedOptions) map[string]string { } } -// EnvPairs get the scoped config pairs for each environment variable -func EnvPairs(conf *ScopedOptions) map[string]*ScopedOption { +// EnvOptions get the scoped config options for each environment variable +func EnvOptions(conf *ScopedOptions) map[string]*ScopedOption { return map[string]*ScopedOption{ "DOPPLER_TOKEN": &conf.Token, "DOPPLER_API_HOST": &conf.APIHost, diff --git a/pkg/printer/config.go b/pkg/printer/config.go index 271151a6..267668b1 100644 --- a/pkg/printer/config.go +++ b/pkg/printer/config.go @@ -32,7 +32,7 @@ func ScopedConfig(conf models.ScopedOptions, jsonFlag bool) { // ScopedConfigSource print scoped config with source func ScopedConfigSource(conf models.ScopedOptions, jsonFlag bool, source bool, obfuscateToken bool) { - pairs := models.ScopedPairs(&conf) + pairs := models.ScopedOptionsMap(&conf) if jsonFlag { confMap := map[string]map[string]string{} @@ -140,7 +140,7 @@ func Configs(configs map[string]models.FileScopedOptions, jsonFlag bool) { var rows [][]string for scope, conf := range configs { - pairs := models.Pairs(conf) + pairs := models.OptionsMap(conf) for name, value := range pairs { if value != "" { From 6cc71e0e9b90b025418503815f2cb05e456fd72a Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 14:15:18 -0700 Subject: [PATCH 06/16] Require confirmation before renaming config --- pkg/cmd/configs.go | 10 ++++++++++ pkg/cmd/enclave_configs.go | 1 + 2 files changed, 11 insertions(+) diff --git a/pkg/cmd/configs.go b/pkg/cmd/configs.go index 750adb8a..cc1f080a 100644 --- a/pkg/cmd/configs.go +++ b/pkg/cmd/configs.go @@ -194,6 +194,7 @@ func deleteConfigs(cmd *cobra.Command, args []string) { func updateConfigs(cmd *cobra.Command, args []string) { jsonFlag := utils.OutputJSON name := cmd.Flag("name").Value.String() + yes := utils.GetBoolFlag(cmd, "yes") localConfig := configuration.LocalConfig(cmd) utils.RequireValue("token", localConfig.Token.Value) @@ -204,6 +205,14 @@ func updateConfigs(cmd *cobra.Command, args []string) { config = args[0] } + if !yes { + utils.LogWarning("Renaming this config may break your current deploys.") + if !utils.ConfirmationPrompt("Continue?", false) { + utils.Log("Aborting") + return + } + } + info, err := http.UpdateConfig(localConfig.APIHost.Value, utils.GetBool(localConfig.VerifyTLS.Value, true), localConfig.Token.Value, localConfig.EnclaveProject.Value, config, name) if !err.IsNil() { utils.HandleError(err.Unwrap(), err.Message) @@ -358,6 +367,7 @@ func init() { if err := configsUpdateCmd.MarkFlagRequired("name"); err != nil { utils.HandleError(err) } + configsUpdateCmd.Flags().BoolP("yes", "y", false, "proceed without confirmation") configsCmd.AddCommand(configsUpdateCmd) configsDeleteCmd.Flags().StringP("project", "p", "", "project (e.g. backend)") diff --git a/pkg/cmd/enclave_configs.go b/pkg/cmd/enclave_configs.go index a525ebd4..fa2b1249 100644 --- a/pkg/cmd/enclave_configs.go +++ b/pkg/cmd/enclave_configs.go @@ -108,6 +108,7 @@ func init() { if err := enclaveConfigsUpdateCmd.MarkFlagRequired("name"); err != nil { utils.HandleError(err) } + enclaveConfigsUpdateCmd.Flags().BoolP("yes", "y", false, "proceed without confirmation") enclaveConfigsCmd.AddCommand(enclaveConfigsUpdateCmd) enclaveConfigsDeleteCmd.Flags().StringP("project", "p", "", "enclave project (e.g. backend)") From a92d9bfbe4346c68609bb2680b31225446632111 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 14:16:26 -0700 Subject: [PATCH 07/16] chore: don't require specifying description when updating project This flag was incorrectly marked as required on our legacy `enclave projects update` command. --- pkg/cmd/enclave_projects.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/cmd/enclave_projects.go b/pkg/cmd/enclave_projects.go index f16e4d16..5f6351e9 100644 --- a/pkg/cmd/enclave_projects.go +++ b/pkg/cmd/enclave_projects.go @@ -84,13 +84,10 @@ func init() { enclaveProjectsUpdateCmd.Flags().StringP("project", "p", "", "enclave project (e.g. backend)") enclaveProjectsUpdateCmd.Flags().String("name", "", "project name") - enclaveProjectsUpdateCmd.Flags().String("description", "", "project description") if err := enclaveProjectsUpdateCmd.MarkFlagRequired("name"); err != nil { utils.HandleError(err) } - if err := enclaveProjectsUpdateCmd.MarkFlagRequired("description"); err != nil { - utils.HandleError(err) - } + enclaveProjectsUpdateCmd.Flags().String("description", "", "project description") enclaveProjectsCmd.AddCommand(enclaveProjectsUpdateCmd) enclaveCmd.AddCommand(enclaveProjectsCmd) From 1d6e4b57eb417d6051bf3dd0338a6b3e08aa383e Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 15:26:54 -0700 Subject: [PATCH 08/16] Add completion support for fish shell --- .goreleaser.yml | 3 +++ pkg/cmd/completion.go | 6 +++++- scripts/completions.sh | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 2089ffd9..3440c637 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -120,6 +120,7 @@ brews: bin.install "doppler" bash_completion.install "completions/doppler.bash" => "doppler" zsh_completion.install "completions/doppler.zsh" => "_doppler" + fish_completion.install "completions/doppler.fish" test: | system "#{bin}/doppler --version" @@ -152,6 +153,8 @@ nfpms: dst: /etc/bash_completion.d/doppler - src: ./completions/doppler.zsh dst: /usr/local/share/zsh/site-functions/_doppler + - src: ./completions/doppler.fish + dst: /usr/share/fish/completions/doppler.fish blobs: - diff --git a/pkg/cmd/completion.go b/pkg/cmd/completion.go index b4fcf887..df1d4b9b 100644 --- a/pkg/cmd/completion.go +++ b/pkg/cmd/completion.go @@ -29,7 +29,7 @@ import ( var completionCmd = &cobra.Command{ Use: "completion", Short: "Print shell completion script", - ValidArgs: []string{"bash", "zsh"}, + ValidArgs: []string{"bash", "zsh", "fish"}, Args: cobra.MaximumNArgs(1), Run: func(cmd *cobra.Command, args []string) { shell := getShell(args) @@ -42,6 +42,10 @@ var completionCmd = &cobra.Command{ if err := cmd.Root().GenZshCompletion(os.Stdout); err != nil { utils.HandleError(err, "Unable to generate zsh completions.") } + } else if strings.HasSuffix(shell, "/fish") { + if err := cmd.Root().GenFishCompletion(os.Stdout, true); err != nil { + utils.HandleError(err, "Unable to generate fish completions.") + } } else { utils.HandleError(fmt.Errorf("Your shell is not supported")) } diff --git a/scripts/completions.sh b/scripts/completions.sh index bfd2b920..827c7721 100755 --- a/scripts/completions.sh +++ b/scripts/completions.sh @@ -4,6 +4,6 @@ set -e rm -rf completions mkdir completions -for sh in bash zsh; do +for sh in bash zsh fish; do go run main.go completion "$sh" > "completions/doppler.$sh" done From 1f05ddcac8164d6e5828dfdbe645e3c5673d423b Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:29:23 -0700 Subject: [PATCH 09/16] chore: update survey library --- go.mod | 10 +++++++--- go.sum | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index de616433..a7f265c8 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/DopplerHQ/cli go 1.16 require ( - github.com/AlecAivazis/survey/v2 v2.0.8 + github.com/AlecAivazis/survey/v2 v2.2.13 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect github.com/atotto/clipboard v0.1.2 github.com/coreos/go-etcd v2.0.0+incompatible // indirect @@ -12,9 +12,10 @@ require ( github.com/google/uuid v1.1.1 github.com/hashicorp/go-version v1.2.1 github.com/jedib0t/go-pretty v4.3.0+incompatible - github.com/mattn/go-colorable v0.1.4 // indirect - github.com/mattn/go-isatty v0.0.12 + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.13 github.com/mattn/go-runewidth v0.0.5 // indirect + github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 // indirect @@ -23,6 +24,9 @@ require ( github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad go.mongodb.org/mongo-driver v1.1.2 // indirect golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e + golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect + golang.org/x/text v0.3.6 // indirect gopkg.in/gookit/color.v1 v1.1.6 gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d ) diff --git a/go.sum b/go.sum index d54b226b..a6bfab3c 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,8 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AlecAivazis/survey/v2 v2.0.8 h1:zVjWKN+JIAfmrq6nGWG3DfLS8ypEBhxYy0p7FM+riFk= github.com/AlecAivazis/survey/v2 v2.0.8/go.mod h1:9FJRdMdDm8rnT+zHVbvQT2RTSTLq0Ttd6q3Vl2fahjk= +github.com/AlecAivazis/survey/v2 v2.2.13 h1:7s6Msv/M4omLvZ0PfItdmr/VqPEgsLLuxj5NvREsQu8= +github.com/AlecAivazis/survey/v2 v2.2.13/go.mod h1:TH2kPCDU3Kqq7pLbnCWwZXDBjnhZtmsCle5EiYDJ2fg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= @@ -144,15 +146,21 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA= +github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.5 h1:jrGtp51JOKTWgvLFzfG6OtZOJcK2sEnzc/U+zw7TtbA= github.com/mattn/go-runewidth v0.0.5/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= +github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -305,17 +313,25 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From ed6bb88bd834ddbb081a37d52e07c6b39957b132 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:33:37 -0700 Subject: [PATCH 10/16] chore: update clipboard library --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a7f265c8..7e005d75 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/AlecAivazis/survey/v2 v2.2.13 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect - github.com/atotto/clipboard v0.1.2 + github.com/atotto/clipboard v0.1.4 github.com/coreos/go-etcd v2.0.0+incompatible // indirect github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/go-openapi/strfmt v0.19.3 // indirect diff --git a/go.sum b/go.sum index a6bfab3c..e47cee3d 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/atotto/clipboard v0.1.2 h1:YZCtFu5Ie8qX2VmVTBnrqLSiU9XOWwqNRmdT3gIQzbY= github.com/atotto/clipboard v0.1.2/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= +github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= +github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= From 793df79cc83b618ae8c8881b794fa054ac131015 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:34:46 -0700 Subject: [PATCH 11/16] chore: update uuid library --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7e005d75..d8816749 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/coreos/go-etcd v2.0.0+incompatible // indirect github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/go-openapi/strfmt v0.19.3 // indirect - github.com/google/uuid v1.1.1 + github.com/google/uuid v1.2.0 github.com/hashicorp/go-version v1.2.1 github.com/jedib0t/go-pretty v4.3.0+incompatible github.com/mattn/go-colorable v0.1.8 // indirect diff --git a/go.sum b/go.sum index e47cee3d..70c1104d 100644 --- a/go.sum +++ b/go.sum @@ -91,6 +91,8 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= +github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= From 8332acaf460f8d69ce59cc347dd1fd49ecfb625b Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:35:29 -0700 Subject: [PATCH 12/16] chore: update go-version library --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d8816749..5fc1555b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/go-openapi/strfmt v0.19.3 // indirect github.com/google/uuid v1.2.0 - github.com/hashicorp/go-version v1.2.1 + github.com/hashicorp/go-version v1.3.0 github.com/jedib0t/go-pretty v4.3.0+incompatible github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-isatty v0.0.13 diff --git a/go.sum b/go.sum index 70c1104d..7c3ea3ce 100644 --- a/go.sum +++ b/go.sum @@ -114,6 +114,8 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= +github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= From b50aee2efb9c16f47c84fa35ae1dbdceebd8297b Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:36:14 -0700 Subject: [PATCH 13/16] chore: update open-golang library --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5fc1555b..24095176 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/mattn/go-isatty v0.0.13 github.com/mattn/go-runewidth v0.0.5 // indirect github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect - github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e + github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 github.com/spf13/cobra v1.1.3 github.com/spf13/pflag v1.0.5 // indirect github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect diff --git a/go.sum b/go.sum index 7c3ea3ce..330ccd7d 100644 --- a/go.sum +++ b/go.sum @@ -207,6 +207,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e h1:VAzdS5Nw68fbf5RZ8RDVlUvPXNU6Z3jtPCK/qvm4FoQ= github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= +github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= From 70bfdd5b4231880362dae649875e704a68fe7711 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:36:48 -0700 Subject: [PATCH 14/16] chore: update go-keyring library --- go.mod | 3 ++- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 24095176..b613f2d6 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/coreos/go-etcd v2.0.0+incompatible // indirect github.com/cpuguy83/go-md2man v1.0.10 // indirect github.com/go-openapi/strfmt v0.19.3 // indirect + github.com/godbus/dbus/v5 v5.0.4 // indirect github.com/google/uuid v1.2.0 github.com/hashicorp/go-version v1.3.0 github.com/jedib0t/go-pretty v4.3.0+incompatible @@ -21,7 +22,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect - github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad + github.com/zalando/go-keyring v0.1.1 go.mongodb.org/mongo-driver v1.1.2 // indirect golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect diff --git a/go.sum b/go.sum index 330ccd7d..8268dfe9 100644 --- a/go.sum +++ b/go.sum @@ -70,6 +70,8 @@ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME= github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -243,6 +245,8 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad h1:aGgLtBPvZSG8l+Uo7Ko23p44iVOcrmZsZO2shJZHer8= github.com/zalando/go-keyring v0.1.1-0.20210112083600-4d37811583ad/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= +github.com/zalando/go-keyring v0.1.1 h1:w2V9lcx/Uj4l+dzAf1m9s+DJ1O8ROkEHnynonHjTcYE= +github.com/zalando/go-keyring v0.1.1/go.mod h1:OIC+OZ28XbmwFxU/Rp9V7eKzZjamBJwRzC8UFJH9+L8= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA= From c8219afc06eefdb5a20fceec6362436ebf36a152 Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 18:38:13 -0700 Subject: [PATCH 15/16] chore: update yaml library --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b613f2d6..e5004343 100644 --- a/go.mod +++ b/go.mod @@ -29,5 +29,5 @@ require ( golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect golang.org/x/text v0.3.6 // indirect gopkg.in/gookit/color.v1 v1.1.6 - gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) diff --git a/go.sum b/go.sum index 8268dfe9..ab4f490a 100644 --- a/go.sum +++ b/go.sum @@ -402,6 +402,8 @@ gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d h1:LCPbGQ34PMrwad11aMZ+dbz5SAsq/0ySjRwQ8I9Qwd8= gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From fa6ac5b6007a5b30ec9213fe3803d9a7482ac88a Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Mon, 28 Jun 2021 14:20:27 -0700 Subject: [PATCH 16/16] Require confirmation before renaming project --- pkg/cmd/enclave_projects.go | 1 + pkg/cmd/projects.go | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/pkg/cmd/enclave_projects.go b/pkg/cmd/enclave_projects.go index 5f6351e9..c348ad0b 100644 --- a/pkg/cmd/enclave_projects.go +++ b/pkg/cmd/enclave_projects.go @@ -88,6 +88,7 @@ func init() { utils.HandleError(err) } enclaveProjectsUpdateCmd.Flags().String("description", "", "project description") + enclaveProjectsUpdateCmd.Flags().BoolP("yes", "y", false, "proceed without confirmation") enclaveProjectsCmd.AddCommand(enclaveProjectsUpdateCmd) enclaveCmd.AddCommand(enclaveProjectsCmd) diff --git a/pkg/cmd/projects.go b/pkg/cmd/projects.go index 24234770..1f731766 100644 --- a/pkg/cmd/projects.go +++ b/pkg/cmd/projects.go @@ -159,6 +159,7 @@ func updateProjects(cmd *cobra.Command, args []string) { jsonFlag := utils.OutputJSON name := cmd.Flag("name").Value.String() description := cmd.Flag("description").Value.String() + yes := utils.GetBoolFlag(cmd, "yes") localConfig := configuration.LocalConfig(cmd) utils.RequireValue("token", localConfig.Token.Value) @@ -169,6 +170,14 @@ func updateProjects(cmd *cobra.Command, args []string) { project = args[0] } + if !yes { + utils.LogWarning("Renaming this project may break your current deploys.") + if !utils.ConfirmationPrompt("Continue?", false) { + utils.Log("Aborting") + return + } + } + var info models.ProjectInfo var httpErr http.Error if cmd.Flags().Changed("description") { @@ -214,6 +223,7 @@ func init() { if err := projectsUpdateCmd.MarkFlagRequired("name"); err != nil { utils.HandleError(err) } + projectsUpdateCmd.Flags().BoolP("yes", "y", false, "proceed without confirmation") projectsCmd.AddCommand(projectsUpdateCmd) rootCmd.AddCommand(projectsCmd)