diff --git a/Makefile b/Makefile index f072d2d8..4ae9af05 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ PACKAGE := github.com/derailed/$(NAME) GIT := $(shell git rev-parse --short HEAD) SOURCE_DATE_EPOCH ?= $(shell date +%s) DATE := $(shell date -u -d @${SOURCE_DATE_EPOCH} +%FT%T%Z) -VERSION ?= v0.23.10 +VERSION ?= v0.24.0 IMG_NAME := derailed/k9s IMAGE := ${IMG_NAME}:${VERSION} diff --git a/change_logs/release_v0.24.0.md b/change_logs/release_v0.24.0.md new file mode 100644 index 00000000..57f3122a --- /dev/null +++ b/change_logs/release_v0.24.0.md @@ -0,0 +1,44 @@ + + +# Release v0.24.0 + +## Notes + +Thank you to all that contributed with flushing out issues and enhancements for K9s! I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev and see if we're happier with some of the fixes! If you've filed an issue please help me verify and close. Your support, kindness and awesome suggestions to make K9s better are as ever very much noted and appreciated! + +If you feel K9s is helping your Kubernetes journey, please consider joining our [sponsorhip program](https://github.com/sponsors/derailed) and/or make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer) + +On Slack? Please join us [K9slackers](https://join.slack.com/t/k9sers/shared_invite/enQtOTA5MDEyNzI5MTU0LWQ1ZGI3MzliYzZhZWEyNzYxYzA3NjE0YTk1YmFmNzViZjIyNzhkZGI0MmJjYzhlNjdlMGJhYzE2ZGU1NjkyNTM) + +--- + +## ♫ Sounds Behind The Release ♭ + +* [Mother Protect - Niki & The Dove](https://www.youtube.com/watch?v=P5W2hjwBsFk) +* [Dark Star - POLIÇA](https://www.youtube.com/watch?v=2pD3hJc-8xg) + +## A Word From Our Sponsors... + +First and foremost, I would like to extend a `Big Thank You` to the following generous K9s friends for joining our sponsorship program and supporting this project! +Your sponsorships efforts are vital to keep this project alive and evolving. So please do give back! + +* [Lopeg](https://github.com/lopeg) +* [Gerhard Lazu](https://github.com/gerhard) + +--- + +## Resolved Issues/Features + +* [Issue #953](https://github.com/derailed/k9s/issues/953) Pdb with percentages show as "0". +* [Issue #947](https://github.com/derailed/k9s/issues/947) Selection is applied for nonexistant items. +* [Issue #944](https://github.com/derailed/k9s/issues/944) Can not launch ksniff. +* [Issue #940](https://github.com/derailed/k9s/issues/940) Indeterminate search results when filtering with numbers. +* [Issue #914](https://github.com/derailed/k9s/issues/914) Unable to edit resources with colliding singular names. + +## Resolved PRs + +* [PR #941](https://github.com/derailed/k9s/pull/941) Add Monokai skin. My new favorite skin! Big Thanks to [Mike SigsWorth](https://github.com/mikesigs)!! + +--- + + © 2020 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0) diff --git a/cmd/root.go b/cmd/root.go index e9a9323c..e01f5688 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -196,7 +196,7 @@ func initK9sFlags() { k9sFlags.Command, "command", "c", config.DefaultCommand, - "Specify the default command to view when the application launches", + "Overrides the default resource to load when the application launches", ) rootCmd.Flags().BoolVar( k9sFlags.ReadOnly, diff --git a/go.mod b/go.mod index 3c2927ba..e0b08c8d 100644 --- a/go.mod +++ b/go.mod @@ -3,16 +3,17 @@ module github.com/derailed/k9s go 1.15 require ( + github.com/Azure/go-autorest v14.0.0+incompatible // indirect github.com/atotto/clipboard v0.1.2 github.com/cenkalti/backoff v2.2.1+incompatible github.com/cenkalti/backoff/v4 v4.1.0 - github.com/derailed/popeye v0.8.10 - github.com/derailed/tview v0.4.6 + github.com/derailed/popeye v0.9.0 + github.com/derailed/tview v0.4.7 github.com/drone/envsubst v1.0.2 // indirect - github.com/fatih/color v1.9.0 + github.com/fatih/color v1.10.0 github.com/fsnotify/fsnotify v1.4.9 github.com/fvbommel/sortorder v1.0.2 - github.com/gdamore/tcell v1.4.0 + github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 github.com/ghodss/yaml v1.0.0 github.com/golang/protobuf v1.4.2 // indirect github.com/kylelemons/godebug v1.1.0 // indirect @@ -21,11 +22,11 @@ require ( github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c github.com/openfaas/faas-provider v0.15.0 github.com/petergtz/pegomock v2.7.0+incompatible - github.com/rakyll/hey v0.1.3 - github.com/rs/zerolog v1.18.0 + github.com/rakyll/hey v0.1.4 + github.com/rs/zerolog v1.20.0 github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sahilm/fuzzy v0.1.0 - github.com/spf13/cobra v1.0.0 + github.com/spf13/cobra v1.1.1 github.com/stretchr/testify v1.6.1 golang.org/x/net v0.0.0-20200519113804-d87ec0cfa476 // indirect golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 // indirect @@ -43,5 +44,5 @@ require ( k8s.io/metrics v0.18.8 rsc.io/letsencrypt v0.0.3 // indirect sigs.k8s.io/yaml v1.2.0 - vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 + vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect ) diff --git a/go.sum b/go.sum index 078a5a1b..f51ace4a 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,17 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= 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 h1:AVXDdKsrtX33oR9fbCMu/+c1o8Ofjq6Ku/MInaLVg5Y= +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/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= @@ -29,6 +40,7 @@ github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VY github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= 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/DATA-DOG/go-sqlmock v1.3.3 h1:CWUqKXe0s8A2z6qCgkP4Kru7wC11YoAnoupUKFDnH08= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= @@ -65,7 +77,9 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= +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-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= @@ -84,6 +98,7 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= @@ -125,6 +140,7 @@ github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kw github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible h1:jFneRYjIvLMLhDLCzuTuU4rSJUjRplcJQ7pD7MnhC04= 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-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -151,8 +167,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xb github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= github.com/derailed/popeye v0.8.10 h1:V0767TmO+nOlzszU2zQIDwNzEg6Iw36RqciYL6/LvtA= github.com/derailed/popeye v0.8.10/go.mod h1:yjWFWX32SD1eaS5uXuPZJQQgJTUr/DkV81939yJoFzM= -github.com/derailed/tview v0.4.6 h1:xCk6C0+/YQb9BWtn7n7Vp6JwJKKjq+zoRMc3XnoOOFM= -github.com/derailed/tview v0.4.6/go.mod h1:GJ3k/TIzEE+sj1L09/usk6HrkjsdadSsb03eHgPbcII= +github.com/derailed/popeye v0.9.0 h1:0zP4BAzo94RUjrUkzgF962v0zL9B3xyopd7kU7tMxuc= +github.com/derailed/popeye v0.9.0/go.mod h1:g3hudQlbEEChCA7U44fA+utTM9xQpD4pINUMQaiq5Gs= +github.com/derailed/tview v0.4.7 h1:XBu2gW/PInLXOrWtm/B7V78T2+LMdt8DWquRT8L08F8= +github.com/derailed/tview v0.4.7/go.mod h1:FrWq4XTQjisx2NIl9n3j6OD6NL03HxUYeVvZwSy1JYE= github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -201,28 +219,31 @@ github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZM github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/fvbommel/sortorder v1.0.2 h1:mV4o8B2hKboCdkJm+a7uX/SIpZob4JzUpc5GGnM45eo= github.com/fvbommel/sortorder v1.0.2/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell v1.1.2 h1:Afe8cU6SECC06UmvaJ55Jr3Eh0tz/ywLjqWYqjGZp3s= github.com/gdamore/tcell v1.1.2/go.mod h1:h3kq4HO9l2On+V9ed8w8ewqQEmGCSSHOgQ+2h8uzurE= -github.com/gdamore/tcell v1.3.0 h1:r35w0JBADPZCVQijYebl6YMWWtHRqVEGt7kL2eBADRM= -github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= -github.com/gdamore/tcell v1.4.0 h1:vUnHwJRvcPQa3tzi+0QI4U9JINXYJlOz9yiaiPQ2wMU= -github.com/gdamore/tcell v1.4.0/go.mod h1:vxEiSDZdW3L+Uhjii9c3375IlDmR05bzxY404ZVSMo0= +github.com/gdamore/tcell/v2 v2.0.0 h1:GRWG8aLfWAlekj9Q6W29bVvkHENc6hp79XOqG4AWDOs= +github.com/gdamore/tcell/v2 v2.0.0/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA= +github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591 h1:0WWUDZ1oxq7NxVyGo8M3KI5jbkiwNAdZFFzAdC68up4= +github.com/gdamore/tcell/v2 v2.0.1-0.20201017141208-acf90d56d591/go.mod h1:vSVL/GV5mCSlPC6thFP5kfOFdM9MGZcalipmpTxTgQA= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= @@ -305,6 +326,7 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9 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 v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= 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= @@ -336,10 +358,13 @@ github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI= github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= @@ -354,6 +379,7 @@ github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I= github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= @@ -363,14 +389,29 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de 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/grpc-ecosystem/grpc-gateway v1.9.5/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 v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= 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 v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= 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.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 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU= 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/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= @@ -441,16 +482,14 @@ github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -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.4/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.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +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.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.5/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= @@ -460,13 +499,19 @@ github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/ github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +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/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= 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/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= +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/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f h1:2+myh5ml7lgEU/51gbeLHfKGNfgEQQIWrlbdaOsidbQ= github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= @@ -515,6 +560,7 @@ github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c h1:9RGaDpUySgRsc github.com/openfaas/faas-cli v0.0.0-20200124160744-30b7cec9634c/go.mod h1:u/KO+e43wkagC0lqM1eaqNEWEBdg08Q1ugP/idj39MM= github.com/openfaas/faas-provider v0.15.0 h1:3x5ma90FL7AqP4NOD6f03AY24y3xBeVF6xGLUx6Xrlc= github.com/openfaas/faas-provider v0.15.0/go.mod h1:8Fagi2UeMfL+gZAqZWSMQg86i+w1+hBOKtwKRP5sLFI= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -558,8 +604,8 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rakyll/hey v0.1.3 h1:OxaaU+3P16QGT4tccjFgZ51havtIZTgTshnUc62JPBE= -github.com/rakyll/hey v0.1.3/go.mod h1:nAOTOo+L52KB9SZq/M6J18kxjto4yVtXQDjU2HgjUPI= +github.com/rakyll/hey v0.1.4 h1:hhc8GIqHN4+rPFZvkM9lkCQGi7da0sINM83xxpFkbPA= +github.com/rakyll/hey v0.1.4/go.mod h1:nAOTOo+L52KB9SZq/M6J18kxjto4yVtXQDjU2HgjUPI= github.com/rivo/tview v0.0.0-20191018115645-bacbf5155bc1/go.mod h1:+rKjP5+h9HMwWRpAfhIkkQ9KE3m3Nz5rwn7YtUpwgqk= github.com/rivo/uniseg v0.0.0-20190513083848-b9f5b9457d44/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY= @@ -573,16 +619,20 @@ github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.18.0 h1:CbAm3kP2Tptby1i9sYy2MGRg0uxIN9cyDb59Ys7W8z8= github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/rs/zerolog v1.20.0 h1:38k9hgtUBdxFwE34yS8rTHmHBa4eN16E4DJlv177LNs= +github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3 h1:xkBtI5JktwbW/vf4vopBbhYsRFTGfQWHYXzC0/qYwxI= github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod h1:rtQlpHw+eR6UrqaS3kX1VYeaCxzCVdimDS7g5Ln4pPc= github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= 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/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI= github.com/sahilm/fuzzy v0.1.0/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= @@ -592,6 +642,7 @@ github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +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= @@ -607,6 +658,8 @@ github.com/spf13/cobra v0.0.6 h1:breEStsVwemnKh2/s6gMvSdMEkwW0sK8vGStnlVBMCs= github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= +github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -616,6 +669,7 @@ 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.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +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/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= @@ -626,6 +680,7 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -672,11 +727,14 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= 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-20190211182817-74369b46fc67/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-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/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-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -687,17 +745,32 @@ golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 h1:bXoxMPcSLOq08zI3/c5dEBT6lE4eh+jOh886GHrn6V8= golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= 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-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181017193950-04a2e542c03f/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= @@ -705,6 +778,7 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/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-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -733,28 +807,33 @@ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5h 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-20180909124046-d0be0721c37e/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-20190209173611-3b5209105503/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-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/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-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82 h1:ywK/j/KkyTHcdyYSZNXGjMwgmDSfjglYZ3vStQ/gSCU= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -775,23 +854,38 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/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-20190524140312-2c0ae7006135/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-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190617190820-da514acc4774/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-20190828213141-aed303cbaa74/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-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/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= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= 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 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c= 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/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= @@ -799,14 +893,19 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA 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 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE= 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/genproto v0.0.0-20200515170657-fc4c6c6a6587 h1:1Ym+vvUpq1ZHvxzn34gENJX8U4aKO+vhy2P/2+Xl6qQ= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= 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.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= @@ -839,6 +938,7 @@ gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw= gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= @@ -855,13 +955,13 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -helm.sh/helm v1.2.1 h1:Jrn7kKQqQ/hnFWZEX+9pMFvYqFexkzrBnGqYBmIph7c= -helm.sh/helm v2.17.0+incompatible h1:cSe3FaQOpRWLDXvTObQNj0P7WI98IG5yloU6tQVls2k= helm.sh/helm/v3 v3.2.0 h1:V12EGAmr2DJ/fWrPo2fPdXWSIXvlXm51vGkQIXMeymE= helm.sh/helm/v3 v3.2.0/go.mod h1:ZaXz/vzktgwjyGGFbUWtIQkscfE7WYoRGP2szqAFHR0= 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.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.18.0 h1:lwYk8Vt7rsVTwjRU6pzEsa9YNhThbmbocQlKvNBB4EQ= k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8= @@ -920,6 +1020,7 @@ k8s.io/metrics v0.18.8 h1:Obf262GVd2Uy+WbPkOXNiZroI5mT8zYoKK3Y/8KF7Yc= k8s.io/metrics v0.18.8/go.mod h1:j7JzZdiyhLP2BsJm/Fzjs+j5Lb1Y7TySjhPWqBPwRXA= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/letsencrypt v0.0.3 h1:H7xDfhkaFFSYEJlKeq38RwX2jYcnTeHuDQyT+mMNMwM= rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= diff --git a/internal/client/gvr.go b/internal/client/gvr.go index 761e20c9..306c8191 100644 --- a/internal/client/gvr.go +++ b/internal/client/gvr.go @@ -56,6 +56,11 @@ func FromGVAndR(gv, r string) GVR { return NewGVR(path.Join(gv, r)) } +// FQN returns a fully qualified resource name. +func (g GVR) FQN(n string) string { + return path.Join(g.AsResourceName(), n) +} + // AsResourceName returns a resource . separated descriptor in the shape of kind.version.group. func (g GVR) AsResourceName() string { return g.r + "." + g.v + "." + g.g diff --git a/internal/config/bench.go b/internal/config/bench.go index f3e0a149..ba3a0cfc 100644 --- a/internal/config/bench.go +++ b/internal/config/bench.go @@ -7,10 +7,8 @@ import ( "gopkg.in/yaml.v2" ) -var ( - // K9sBench the name of the benchmarks config file. - K9sBench = "bench" -) +// K9sBench the name of the benchmarks config file. +var K9sBench = "bench" type ( // Bench tracks K9s styling options. diff --git a/internal/config/styles.go b/internal/config/styles.go index 3e842056..2baf599a 100644 --- a/internal/config/styles.go +++ b/internal/config/styles.go @@ -5,7 +5,7 @@ import ( "path/filepath" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "gopkg.in/yaml.v2" ) diff --git a/internal/config/styles_test.go b/internal/config/styles_test.go index a7b9c946..b7e9cf06 100644 --- a/internal/config/styles_test.go +++ b/internal/config/styles_test.go @@ -1,11 +1,12 @@ package config_test import ( + "fmt" "testing" "github.com/derailed/k9s/internal/config" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" ) @@ -13,13 +14,14 @@ func TestColor(t *testing.T) { uu := map[string]tcell.Color{ "blah": tcell.ColorDefault, "blue": tcell.ColorBlue, - "#ffffff": tcell.NewHexColor(33554431), - "#ff0000": tcell.NewHexColor(33488896), + "#ffffff": tcell.NewHexColor(16777215), + "#ff0000": tcell.NewHexColor(16711680), } for k := range uu { c, u := k, uu[k] t.Run(k, func(t *testing.T) { + fmt.Printf("%#v\n", config.NewColor(c).Color().Hex()) assert.Equal(t, u, config.NewColor(c).Color()) }) } diff --git a/internal/dao/alias.go b/internal/dao/alias.go index 045a4615..fcbcfaea 100644 --- a/internal/dao/alias.go +++ b/internal/dao/alias.go @@ -84,18 +84,18 @@ func (a *Alias) load() error { if err != nil { return err } - if _, ok := a.Alias[meta.Kind]; ok || IsK9sMeta(meta) { + if IsK9sMeta(meta) { continue } - gvrs := gvr.String() - a.Define(gvrs, strings.ToLower(meta.Kind), meta.Name) + gvrStr := gvr.String() + a.Define(gvrStr, strings.ToLower(meta.Kind), meta.Name) if meta.SingularName != "" { - a.Define(gvrs, meta.SingularName) + a.Define(gvrStr, meta.SingularName) } if meta.ShortNames != nil { - a.Define(gvrs, meta.ShortNames...) + a.Define(gvrStr, meta.ShortNames...) } - a.Define(gvrs, gvrs) + a.Define(gvrStr, gvrStr) } return nil diff --git a/internal/model/stack_test.go b/internal/model/stack_test.go index 6d21ddac..51a6deeb 100644 --- a/internal/model/stack_test.go +++ b/internal/model/stack_test.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" ) diff --git a/internal/render/alias_test.go b/internal/render/alias_test.go index 2b6d2dc6..59b50991 100644 --- a/internal/render/alias_test.go +++ b/internal/render/alias_test.go @@ -5,7 +5,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" ) @@ -33,7 +33,7 @@ func TestAliasColorer(t *testing.T) { "updateAll": { ns: client.AllNamespaces, re: render.RowEvent{Kind: render.EventUpdate, Row: r}, - e: tcell.ColorBlack, + e: tcell.ColorDefault, }, } diff --git a/internal/render/benchmark.go b/internal/render/benchmark.go index ae82684e..d8648372 100644 --- a/internal/render/benchmark.go +++ b/internal/render/benchmark.go @@ -11,7 +11,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/color.go b/internal/render/color.go index dcd2c537..fc808060 100644 --- a/internal/render/color.go +++ b/internal/render/color.go @@ -1,7 +1,7 @@ package render import ( - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) var ( diff --git a/internal/render/color_test.go b/internal/render/color_test.go index 92e947e0..6414a022 100644 --- a/internal/render/color_test.go +++ b/internal/render/color_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/derailed/k9s/internal/render" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" ) diff --git a/internal/render/container.go b/internal/render/container.go index a254bb2f..80ff5f9e 100644 --- a/internal/render/container.go +++ b/internal/render/container.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/render/context.go b/internal/render/context.go index 0cd84732..c6ecef22 100644 --- a/internal/render/context.go +++ b/internal/render/context.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/internal/render/dir.go b/internal/render/dir.go index e3aac63f..12a3e941 100644 --- a/internal/render/dir.go +++ b/internal/render/dir.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/ev.go b/internal/render/ev.go index 5c119b06..3455c050 100644 --- a/internal/render/ev.go +++ b/internal/render/ev.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/render/helm.go b/internal/render/helm.go index c41e6f03..67402cf5 100644 --- a/internal/render/helm.go +++ b/internal/render/helm.go @@ -5,7 +5,7 @@ import ( "strconv" "github.com/derailed/k9s/internal/client" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "helm.sh/helm/v3/pkg/release" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/render/ns.go b/internal/render/ns.go index e7e2c076..35c083b6 100644 --- a/internal/render/ns.go +++ b/internal/render/ns.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/derailed/k9s/internal/client" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/render/ns_test.go b/internal/render/ns_test.go index 17c23fdc..21d51ef4 100644 --- a/internal/render/ns_test.go +++ b/internal/render/ns_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/derailed/k9s/internal/render" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" ) diff --git a/internal/render/ofaas.go b/internal/render/ofaas.go index 21668e14..c9d5d120 100644 --- a/internal/render/ofaas.go +++ b/internal/render/ofaas.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ofaas "github.com/openfaas/faas-provider/types" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/render/pdb.go b/internal/render/pdb.go index 399c2bc8..4f3c4d0a 100644 --- a/internal/render/pdb.go +++ b/internal/render/pdb.go @@ -83,5 +83,8 @@ func numbToStr(n *intstr.IntOrString) string { if n == nil { return NAValue } - return strconv.Itoa(int(n.IntVal)) + if n.Type == intstr.Int { + return strconv.Itoa(int(n.IntVal)) + } + return n.StrVal } diff --git a/internal/render/pod.go b/internal/render/pod.go index 7546ba88..45721bb8 100644 --- a/internal/render/pod.go +++ b/internal/render/pod.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/internal/render/pod_test.go b/internal/render/pod_test.go index d32ff59c..430ea3a0 100644 --- a/internal/render/pod_test.go +++ b/internal/render/pod_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/derailed/k9s/internal/render" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" res "k8s.io/apimachinery/pkg/api/resource" diff --git a/internal/render/policy.go b/internal/render/policy.go index e2baaaec..8004dda0 100644 --- a/internal/render/policy.go +++ b/internal/render/policy.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/derailed/k9s/internal/client" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/popeye.go b/internal/render/popeye.go index 38357396..4b6a80b6 100644 --- a/internal/render/popeye.go +++ b/internal/render/popeye.go @@ -2,14 +2,15 @@ package render import ( "fmt" - "github.com/derailed/k9s/internal/client" "math" "strconv" "strings" + "github.com/derailed/k9s/internal/client" + "github.com/derailed/popeye/pkg/config" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/portforward.go b/internal/render/portforward.go index c05185cc..75a331c1 100644 --- a/internal/render/portforward.go +++ b/internal/render/portforward.go @@ -5,7 +5,7 @@ import ( "strings" "github.com/derailed/k9s/internal/client" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/pv.go b/internal/render/pv.go index a21f66a7..0f0ce121 100644 --- a/internal/render/pv.go +++ b/internal/render/pv.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/derailed/k9s/internal/client" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/render/rbac.go b/internal/render/rbac.go index 895d3c59..6b1a39d2 100644 --- a/internal/render/rbac.go +++ b/internal/render/rbac.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/reference.go b/internal/render/reference.go index f9d78dab..82608bba 100644 --- a/internal/render/reference.go +++ b/internal/render/reference.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/derailed/k9s/internal/client" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/screen_dump.go b/internal/render/screen_dump.go index 4af11b77..e08fa0b4 100644 --- a/internal/render/screen_dump.go +++ b/internal/render/screen_dump.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/render/subject.go b/internal/render/subject.go index 6f36f7fb..9e69234a 100644 --- a/internal/render/subject.go +++ b/internal/render/subject.go @@ -3,7 +3,7 @@ package render import ( "fmt" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" ) diff --git a/internal/tchart/component.go b/internal/tchart/component.go index 89219f5c..171fb2a8 100644 --- a/internal/tchart/component.go +++ b/internal/tchart/component.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const ( diff --git a/internal/tchart/component_test.go b/internal/tchart/component_test.go index 88156f5c..fde5fd67 100644 --- a/internal/tchart/component_test.go +++ b/internal/tchart/component_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/derailed/k9s/internal/tchart" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" ) diff --git a/internal/tchart/gauge.go b/internal/tchart/gauge.go index 07fcb81a..e8f4eb6b 100644 --- a/internal/tchart/gauge.go +++ b/internal/tchart/gauge.go @@ -5,7 +5,7 @@ import ( "image" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const ( diff --git a/internal/tchart/sparkline.go b/internal/tchart/sparkline.go index 36d5ac0b..3874ab4f 100644 --- a/internal/tchart/sparkline.go +++ b/internal/tchart/sparkline.go @@ -6,7 +6,7 @@ import ( "math" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) var sparks = []rune{'▁', '▂', '▃', '▄', '▅', '▆', '▇', '█'} diff --git a/internal/ui/action.go b/internal/ui/action.go index 0491ee30..8d92ef8c 100644 --- a/internal/ui/action.go +++ b/internal/ui/action.go @@ -4,7 +4,7 @@ import ( "sort" "github.com/derailed/k9s/internal/model" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/ui/app.go b/internal/ui/app.go index aa688944..bf91e98c 100644 --- a/internal/ui/app.go +++ b/internal/ui/app.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/model" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/ui/config_test.go b/internal/ui/config_test.go index a2d94fcd..cd7c18de 100644 --- a/internal/ui/config_test.go +++ b/internal/ui/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" ) diff --git a/internal/ui/crumbs_test.go b/internal/ui/crumbs_test.go index c1527b89..64d4e3c4 100644 --- a/internal/ui/crumbs_test.go +++ b/internal/ui/crumbs_test.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" ) diff --git a/internal/ui/dialog/confirm.go b/internal/ui/dialog/confirm.go index 6e8a6310..e1e88d77 100644 --- a/internal/ui/dialog/confirm.go +++ b/internal/ui/dialog/confirm.go @@ -42,7 +42,6 @@ func ShowConfirm(styles config.Dialog, pages *ui.Pages, title, msg string, ack c modal := tview.NewModalForm("<"+title+">", f) modal.SetText(msg) modal.SetTextColor(styles.FgColor.Color()) - modal.SetBackgroundColor(styles.BgColor.Color()) modal.SetDoneFunc(func(int, string) { dismissConfirm(pages) cancel() diff --git a/internal/ui/flash.go b/internal/ui/flash.go index 82abf53b..d21ddcfa 100644 --- a/internal/ui/flash.go +++ b/internal/ui/flash.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/model" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/ui/indicator.go b/internal/ui/indicator.go index 36b9081e..0b04b987 100644 --- a/internal/ui/indicator.go +++ b/internal/ui/indicator.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/render" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // StatusIndicator represents a status indicator when main header is collapsed. diff --git a/internal/ui/key.go b/internal/ui/key.go index feeecd31..45084cbd 100644 --- a/internal/ui/key.go +++ b/internal/ui/key.go @@ -1,6 +1,6 @@ package ui -import "github.com/gdamore/tcell" +import "github.com/gdamore/tcell/v2" func init() { initKeys() diff --git a/internal/ui/prompt.go b/internal/ui/prompt.go index 7449f491..8c963be4 100644 --- a/internal/ui/prompt.go +++ b/internal/ui/prompt.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/model" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const ( diff --git a/internal/ui/select_table.go b/internal/ui/select_table.go index 1226c4b2..e0371782 100644 --- a/internal/ui/select_table.go +++ b/internal/ui/select_table.go @@ -2,7 +2,7 @@ package ui import ( "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // SelectTable represents a table with selections. @@ -115,7 +115,7 @@ func (s *SelectTable) selectionChanged(r, c int) { return } cell := s.GetCell(r, c) - s.SetSelectedStyle(s.fgColor, cell.Color, tcell.AttrBold) + s.SetSelectedStyle(tcell.StyleDefault.Foreground(s.fgColor).Background(cell.Color).Attributes(tcell.AttrBold)) } // ClearMarks delete all marked items. @@ -146,11 +146,7 @@ func (s *SelectTable) ToggleMark() { if cell == nil { return } - s.SetSelectedStyle( - cell.BackgroundColor, - cell.Color, - tcell.AttrBold, - ) + s.SetSelectedStyle(tcell.StyleDefault.Foreground(cell.BackgroundColor).Background(cell.Color).Attributes(tcell.AttrBold)) } // SpanMark toggles marked row @@ -206,11 +202,7 @@ func (s *SelectTable) markRange(prev, curr int) { if cell == nil { break } - s.SetSelectedStyle( - cell.BackgroundColor, - cell.Color, - tcell.AttrBold, - ) + s.SetSelectedStyle(tcell.StyleDefault.Foreground(cell.BackgroundColor).Background(cell.Color).Attributes(tcell.AttrBold)) } } diff --git a/internal/ui/table.go b/internal/ui/table.go index 2a60946a..e0f95860 100644 --- a/internal/ui/table.go +++ b/internal/ui/table.go @@ -12,7 +12,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/render" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) @@ -92,11 +92,7 @@ func (t *Table) StylesChanged(s *config.Styles) { t.SetBackgroundColor(s.Table().BgColor.Color()) t.SetBorderColor(s.Table().FgColor.Color()) t.SetBorderFocusColor(s.Frame().Border.FocusColor.Color()) - t.SetSelectedStyle( - t.styles.Table().CursorFgColor.Color(), - t.styles.Table().CursorBgColor.Color(), - tcell.AttrBold, - ) + t.SetSelectedStyle(tcell.StyleDefault.Foreground(t.styles.Table().CursorFgColor.Color()).Background(t.styles.Table().CursorBgColor.Color()).Attributes(tcell.AttrBold)) t.fgColor = s.Table().CursorFgColor.Color() t.Refresh() } diff --git a/internal/ui/table_helper.go b/internal/ui/table_helper.go index f19468b8..dcfda695 100644 --- a/internal/ui/table_helper.go +++ b/internal/ui/table_helper.go @@ -161,8 +161,17 @@ func rxFilter(q string, inverse bool, data render.TableData) (render.TableData, RowEvents: make(render.RowEvents, 0, len(data.RowEvents)), Namespace: data.Namespace, } + ageIndex := -1 + if data.Header.HasAge() { + ageIndex = data.Header.IndexOf("AGE", true) + } + const spacer = " " for _, re := range data.RowEvents { - fields := strings.Join(re.Row.Fields, " ") + ff := re.Row.Fields + if ageIndex > 0 { + ff = append(ff[0:ageIndex], ff[ageIndex+1:]...) + } + fields := strings.Join(ff, spacer) if (inverse && !rx.MatchString(fields)) || ((!inverse) && rx.MatchString(fields)) { filtered.RowEvents = append(filtered.RowEvents, re) diff --git a/internal/ui/tree.go b/internal/ui/tree.go index 84bad3cb..0db54579 100644 --- a/internal/ui/tree.go +++ b/internal/ui/tree.go @@ -5,7 +5,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // KeyListenerFunc listens to key presses. diff --git a/internal/view/actions.go b/internal/view/actions.go index 0771cabd..4b588877 100644 --- a/internal/view/actions.go +++ b/internal/view/actions.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/ui/dialog" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/alias.go b/internal/view/alias.go index 8cb13886..d6301797 100644 --- a/internal/view/alias.go +++ b/internal/view/alias.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const aliasTitle = "Aliases" @@ -25,7 +25,7 @@ func NewAlias(gvr client.GVR) ResourceViewer { } a.GetTable().SetColorerFn(render.Alias{}.ColorerFunc()) a.GetTable().SetBorderFocusColor(tcell.ColorAliceBlue) - a.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorAliceBlue, tcell.AttrNone) + a.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorAliceBlue).Attributes(tcell.AttrNone)) a.AddBindKeysFn(a.bindKeys) a.SetContextFn(a.aliasContext) diff --git a/internal/view/alias_test.go b/internal/view/alias_test.go index 3e25cd1f..3e77e889 100644 --- a/internal/view/alias_test.go +++ b/internal/view/alias_test.go @@ -12,7 +12,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/view" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/view/app.go b/internal/view/app.go index cbcd4262..8220287f 100644 --- a/internal/view/app.go +++ b/internal/view/app.go @@ -20,7 +20,7 @@ import ( "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/watch" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/view/benchmark.go b/internal/view/benchmark.go index 744d2184..892cdb23 100644 --- a/internal/view/benchmark.go +++ b/internal/view/benchmark.go @@ -12,7 +12,7 @@ import ( "github.com/derailed/k9s/internal/perf" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Benchmark represents a service benchmark results view. @@ -26,7 +26,7 @@ func NewBenchmark(gvr client.GVR) ResourceViewer { ResourceViewer: NewBrowser(gvr), } b.GetTable().SetBorderFocusColor(tcell.ColorSeaGreen) - b.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorSeaGreen, tcell.AttrNone) + b.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorSeaGreen).Attributes(tcell.AttrNone)) b.GetTable().SetColorerFn(render.Benchmark{}.ColorerFunc()) b.GetTable().SetSortCol(ageCol, true) b.SetContextFn(b.benchContext) diff --git a/internal/view/browser.go b/internal/view/browser.go index 74fe7e58..daeeebda 100644 --- a/internal/view/browser.go +++ b/internal/view/browser.go @@ -17,7 +17,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/ui/dialog" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -349,11 +349,11 @@ func (b *Browser) editCmd(evt *tcell.EventKey) *tcell.EventKey { { args := make([]string, 0, 10) args = append(args, "edit") - args = append(args, b.meta.SingularName) + args = append(args, b.GVR().FQN(n)) if ns != client.AllNamespaces { args = append(args, "-n", ns) } - if !runK(b.app, shellOpts{clear: true, args: append(args, n)}) { + if !runK(b.app, shellOpts{clear: true, args: args}) { b.app.Flash().Err(errors.New("Edit exec failed")) } } @@ -488,17 +488,19 @@ func (b *Browser) simpleDelete(selections []string, msg string) { } else { b.app.Flash().Infof("Delete resource %s %s", b.GVR(), selections[0]) } + log.Debug().Msgf("SELS %v", selections) for _, sel := range selections { nuker, ok := b.accessor.(dao.Nuker) if !ok { b.app.Flash().Errf("Invalid nuker %T", b.accessor) - return + continue } if err := nuker.Delete(sel, true, true); err != nil { b.app.Flash().Errf("Delete failed with `%s", err) } else { - b.GetTable().DeleteMark(sel) + b.app.factory.DeleteForwarder(sel) } + b.GetTable().DeleteMark(sel) } b.refresh() }, func() {}) @@ -516,10 +518,9 @@ func (b *Browser) resourceDelete(selections []string, msg string) { if err := b.GetModel().Delete(b.defaultContext(), sel, cascade, force); err != nil { b.app.Flash().Errf("Delete failed with `%s", err) } else { - b.app.Flash().Infof("%s `%s deleted successfully", b.GVR(), sel) b.app.factory.DeleteForwarder(sel) - b.GetTable().DeleteMark(sel) } + b.GetTable().DeleteMark(sel) } b.refresh() }, func() {}) diff --git a/internal/view/cluster_info.go b/internal/view/cluster_info.go index 2aa4b478..6dffc10e 100644 --- a/internal/view/cluster_info.go +++ b/internal/view/cluster_info.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/cm.go b/internal/view/cm.go index 7afb64c0..7540b026 100644 --- a/internal/view/cm.go +++ b/internal/view/cm.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // ConfigMap represents a configmap viewer. diff --git a/internal/view/container.go b/internal/view/container.go index 7725949c..f432ab2f 100644 --- a/internal/view/container.go +++ b/internal/view/container.go @@ -10,7 +10,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" ) diff --git a/internal/view/context.go b/internal/view/context.go index e0d6ff70..a438a25f 100644 --- a/internal/view/context.go +++ b/internal/view/context.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/cow.go b/internal/view/cow.go index e864717f..0fa06c5d 100644 --- a/internal/view/cow.go +++ b/internal/view/cow.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Cow represents a bomb viewer diff --git a/internal/view/cronjob.go b/internal/view/cronjob.go index a19d338a..94bdf668 100644 --- a/internal/view/cronjob.go +++ b/internal/view/cronjob.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" batchv1beta1 "k8s.io/api/batch/v1beta1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/internal/view/details.go b/internal/view/details.go index 3aa0b02d..d515ddd5 100644 --- a/internal/view/details.go +++ b/internal/view/details.go @@ -10,7 +10,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/sahilm/fuzzy" ) diff --git a/internal/view/dir.go b/internal/view/dir.go index e4c5f2fb..13c35d8b 100644 --- a/internal/view/dir.go +++ b/internal/view/dir.go @@ -14,7 +14,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/ui/dialog" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const ( @@ -39,7 +39,7 @@ func NewDir(path string) ResourceViewer { path: path, } d.GetTable().SetBorderFocusColor(tcell.ColorAliceBlue) - d.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorAliceBlue, tcell.AttrNone) + d.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorAliceBlue).Attributes(tcell.AttrNone)) d.AddBindKeysFn(d.bindKeys) d.SetContextFn(d.dirContext) d.GetTable().SetColorerFn(render.Dir{}.ColorerFunc()) diff --git a/internal/view/event.go b/internal/view/event.go index 147a6a4f..0c531599 100644 --- a/internal/view/event.go +++ b/internal/view/event.go @@ -4,7 +4,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Event represents a command alias view. diff --git a/internal/view/exec.go b/internal/view/exec.go index dff4ccb9..158c7dee 100644 --- a/internal/view/exec.go +++ b/internal/view/exec.go @@ -105,7 +105,7 @@ func execute(opts shellOpts) error { }() log.Debug().Msgf("Running command> %s %s", opts.binary, strings.Join(opts.args, " ")) - cmd := exec.CommandContext(ctx, opts.binary, opts.args...) + cmd := exec.Command(opts.binary, opts.args...) var err error if opts.background { diff --git a/internal/view/group.go b/internal/view/group.go index b0304995..ed89ebba 100644 --- a/internal/view/group.go +++ b/internal/view/group.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Group presents a RBAC group viewer. diff --git a/internal/view/helm.go b/internal/view/helm.go index 5a0f7d4c..c7a88581 100644 --- a/internal/view/helm.go +++ b/internal/view/helm.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Helm represents a helm chart view. @@ -21,7 +21,7 @@ func NewHelm(gvr client.GVR) ResourceViewer { } c.GetTable().SetColorerFn(render.Helm{}.ColorerFunc()) c.GetTable().SetBorderFocusColor(tcell.ColorMediumSpringGreen) - c.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorMediumSpringGreen, tcell.AttrNone) + c.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorMediumSpringGreen).Attributes(tcell.AttrNone)) c.AddBindKeysFn(c.bindKeys) c.SetContextFn(c.chartContext) diff --git a/internal/view/help.go b/internal/view/help.go index 460dfd62..7389abfa 100644 --- a/internal/view/help.go +++ b/internal/view/help.go @@ -14,7 +14,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const ( diff --git a/internal/view/helpers.go b/internal/view/helpers.go index 15cf0470..fcd5c7c1 100644 --- a/internal/view/helpers.go +++ b/internal/view/helpers.go @@ -13,7 +13,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/helpers_test.go b/internal/view/helpers_test.go index ce9e426a..c1323b70 100644 --- a/internal/view/helpers_test.go +++ b/internal/view/helpers_test.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/render" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/internal/view/image_extender.go b/internal/view/image_extender.go index e6bcee6c..9acf8d09 100644 --- a/internal/view/image_extender.go +++ b/internal/view/image_extender.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/view/live_view.go b/internal/view/live_view.go index 6ae53862..aad97544 100644 --- a/internal/view/live_view.go +++ b/internal/view/live_view.go @@ -12,7 +12,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" "github.com/sahilm/fuzzy" ) diff --git a/internal/view/log.go b/internal/view/log.go index eef8f0a0..04c4f0bf 100644 --- a/internal/view/log.go +++ b/internal/view/log.go @@ -20,7 +20,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/logger.go b/internal/view/logger.go index 972b50bb..65e10fd3 100644 --- a/internal/view/logger.go +++ b/internal/view/logger.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Logger represents a generic log viewer. diff --git a/internal/view/logs_extender.go b/internal/view/logs_extender.go index 9efdf4bb..24107120 100644 --- a/internal/view/logs_extender.go +++ b/internal/view/logs_extender.go @@ -3,7 +3,7 @@ package view import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // LogsExtender adds log actions to a given viewer. diff --git a/internal/view/node.go b/internal/view/node.go index f27cd2ef..f1cbfc28 100644 --- a/internal/view/node.go +++ b/internal/view/node.go @@ -11,7 +11,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/ui/dialog" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/view/ns.go b/internal/view/ns.go index e9d158e8..f623c864 100644 --- a/internal/view/ns.go +++ b/internal/view/ns.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/pf.go b/internal/view/pf.go index e7cd4e36..5b7556cf 100644 --- a/internal/view/pf.go +++ b/internal/view/pf.go @@ -13,7 +13,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) @@ -32,7 +32,7 @@ func NewPortForward(gvr client.GVR) ResourceViewer { ResourceViewer: NewBrowser(gvr), } p.GetTable().SetBorderFocusColor(tcell.ColorDodgerBlue) - p.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorDodgerBlue, tcell.AttrNone) + p.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorDodgerBlue).Attributes(tcell.AttrNone)) p.GetTable().SetColorerFn(render.PortForward{}.ColorerFunc()) p.GetTable().SetSortCol(ageCol, true) p.SetContextFn(p.portForwardContext) diff --git a/internal/view/pf_extender.go b/internal/view/pf_extender.go index d4a40713..170a38c5 100644 --- a/internal/view/pf_extender.go +++ b/internal/view/pf_extender.go @@ -10,7 +10,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/watch" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/internal/view/picker.go b/internal/view/picker.go index 8f37295f..3fe8f5c1 100644 --- a/internal/view/picker.go +++ b/internal/view/picker.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Picker represents a container picker. diff --git a/internal/view/pod.go b/internal/view/pod.go index bd20c2b9..cc994505 100644 --- a/internal/view/pod.go +++ b/internal/view/pod.go @@ -12,7 +12,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/fatih/color" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -134,8 +134,8 @@ func (p *Pod) portForwardContext(ctx context.Context) context.Context { } func (p *Pod) killCmd(evt *tcell.EventKey) *tcell.EventKey { - sels := p.GetTable().GetSelectedItems() - if len(sels) == 0 { + selections := p.GetTable().GetSelectedItems() + if len(selections) == 0 { return evt } @@ -149,14 +149,20 @@ func (p *Pod) killCmd(evt *tcell.EventKey) *tcell.EventKey { p.App().Flash().Err(fmt.Errorf("expecting a nuker for %q", p.GVR())) return nil } + if len(selections) > 1 { + p.App().Flash().Infof("Delete %d marked %s", len(selections), p.GVR()) + } else { + p.App().Flash().Infof("Delete resource %s %s", p.GVR(), selections[0]) + } p.GetTable().ShowDeleted() - for _, res := range sels { - p.App().Flash().Infof("Delete resource %s -- %s", p.GVR(), res) - if err := nuker.Delete(res, true, true); err != nil { + log.Debug().Msgf("SELS %v", selections) + for _, path := range selections { + if err := nuker.Delete(path, true, true); err != nil { p.App().Flash().Errf("Delete failed with %s", err) } else { - p.App().factory.DeleteForwarder(res) + p.App().factory.DeleteForwarder(path) } + p.GetTable().DeleteMark(path) } p.Refresh() diff --git a/internal/view/policy.go b/internal/view/policy.go index 5c455137..006f3c23 100644 --- a/internal/view/policy.go +++ b/internal/view/policy.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) const ( diff --git a/internal/view/popeye.go b/internal/view/popeye.go index 3f0dc9de..d54676c2 100644 --- a/internal/view/popeye.go +++ b/internal/view/popeye.go @@ -10,7 +10,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Popeye represents a sanitizer view. @@ -25,7 +25,7 @@ func NewPopeye(gvr client.GVR) ResourceViewer { } p.GetTable().SetColorerFn(render.Popeye{}.ColorerFunc()) p.GetTable().SetBorderFocusColor(tcell.ColorMediumSpringGreen) - p.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorMediumSpringGreen, tcell.AttrNone) + p.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorMediumSpringGreen).Attributes(tcell.AttrNone)) p.GetTable().SetSortCol("SCORE%", true) p.GetTable().SetDecorateFn(p.decorateRows) p.AddBindKeysFn(p.bindKeys) diff --git a/internal/view/pulse.go b/internal/view/pulse.go index ac8c1ecb..106a7bbe 100644 --- a/internal/view/pulse.go +++ b/internal/view/pulse.go @@ -15,7 +15,7 @@ import ( "github.com/derailed/k9s/internal/tchart" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Grapheable represents a graphic component. diff --git a/internal/view/pvc.go b/internal/view/pvc.go index 06dda203..eddf4a8c 100644 --- a/internal/view/pvc.go +++ b/internal/view/pvc.go @@ -4,7 +4,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // PersistentVolumeClaim represents a PVC custom viewer. diff --git a/internal/view/rbac.go b/internal/view/rbac.go index edaa5866..cda73cc9 100644 --- a/internal/view/rbac.go +++ b/internal/view/rbac.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Rbac presents an RBAC policy viewer. diff --git a/internal/view/reference.go b/internal/view/reference.go index 3d49f133..322f9060 100644 --- a/internal/view/reference.go +++ b/internal/view/reference.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // Reference represents resource references. @@ -21,7 +21,7 @@ func NewReference(gvr client.GVR) ResourceViewer { } r.GetTable().SetColorerFn(render.Reference{}.ColorerFunc()) r.GetTable().SetBorderFocusColor(tcell.ColorMediumSpringGreen) - r.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorMediumSpringGreen, tcell.AttrNone) + r.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorMediumSpringGreen).Attributes(tcell.AttrNone)) r.AddBindKeysFn(r.bindKeys) return &r diff --git a/internal/view/restart_extender.go b/internal/view/restart_extender.go index b0742dad..d76c9be5 100644 --- a/internal/view/restart_extender.go +++ b/internal/view/restart_extender.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/ui/dialog" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // RestartExtender represents a restartable resource. diff --git a/internal/view/rs.go b/internal/view/rs.go index 455b6c35..f410cb88 100644 --- a/internal/view/rs.go +++ b/internal/view/rs.go @@ -8,7 +8,7 @@ import ( "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // ReplicaSet presents a replicaset viewer. diff --git a/internal/view/sa.go b/internal/view/sa.go index 144d95b4..f9778a39 100644 --- a/internal/view/sa.go +++ b/internal/view/sa.go @@ -6,7 +6,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // ServiceAccount represents a serviceaccount viewer. diff --git a/internal/view/sanitizer.go b/internal/view/sanitizer.go index e76a62b9..a4822435 100644 --- a/internal/view/sanitizer.go +++ b/internal/view/sanitizer.go @@ -12,7 +12,7 @@ import ( "github.com/derailed/k9s/internal/ui" "github.com/derailed/k9s/internal/xray" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/view/scale_extender.go b/internal/view/scale_extender.go index 2f17e0b0..e6a788a6 100644 --- a/internal/view/scale_extender.go +++ b/internal/view/scale_extender.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/dao" "github.com/derailed/k9s/internal/ui" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/screen_dump.go b/internal/view/screen_dump.go index bff03b6d..d73b8c81 100644 --- a/internal/view/screen_dump.go +++ b/internal/view/screen_dump.go @@ -10,7 +10,7 @@ import ( "github.com/derailed/k9s/internal/config" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) @@ -25,7 +25,7 @@ func NewScreenDump(gvr client.GVR) ResourceViewer { ResourceViewer: NewBrowser(gvr), } s.GetTable().SetBorderFocusColor(tcell.ColorSteelBlue) - s.GetTable().SetSelectedStyle(tcell.ColorWhite, tcell.ColorRoyalBlue, tcell.AttrNone) + s.GetTable().SetSelectedStyle(tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorRoyalBlue).Attributes(tcell.AttrNone)) s.GetTable().SetColorerFn(render.ScreenDump{}.ColorerFunc()) s.GetTable().SetSortCol(ageCol, true) s.GetTable().SelectRow(1, true) diff --git a/internal/view/secret.go b/internal/view/secret.go index 0b989b44..0d490432 100644 --- a/internal/view/secret.go +++ b/internal/view/secret.go @@ -5,7 +5,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/labels" diff --git a/internal/view/svc.go b/internal/view/svc.go index 9dbe6b9a..ede8903a 100644 --- a/internal/view/svc.go +++ b/internal/view/svc.go @@ -13,7 +13,7 @@ import ( "github.com/derailed/k9s/internal/perf" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/internal/view/table.go b/internal/view/table.go index 2f87bd7e..c20923a5 100644 --- a/internal/view/table.go +++ b/internal/view/table.go @@ -9,7 +9,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/model" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" ) diff --git a/internal/view/user.go b/internal/view/user.go index 4c6a488a..71b2b986 100644 --- a/internal/view/user.go +++ b/internal/view/user.go @@ -7,7 +7,7 @@ import ( "github.com/derailed/k9s/internal/client" "github.com/derailed/k9s/internal/render" "github.com/derailed/k9s/internal/ui" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" ) // User presents a user viewer. diff --git a/internal/view/xray.go b/internal/view/xray.go index 27b460f5..2dc5019e 100644 --- a/internal/view/xray.go +++ b/internal/view/xray.go @@ -17,7 +17,7 @@ import ( "github.com/derailed/k9s/internal/ui/dialog" "github.com/derailed/k9s/internal/xray" "github.com/derailed/tview" - "github.com/gdamore/tcell" + "github.com/gdamore/tcell/v2" "github.com/rs/zerolog/log" "github.com/sahilm/fuzzy" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"