From d1161578970bb7cf4967082aca2218020a0bf4b5 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 24 Dec 2024 14:15:26 +0900 Subject: [PATCH 01/14] feat: add hook package for prestop Signed-off-by: hlts2 --- go.mod | 34 +-- go.sum | 466 ++++-------------------------------- pkg/driver/hooks/hooks.go | 66 +++++ pkg/driver/hooks/prestop.go | 165 +++++++++++++ 4 files changed, 288 insertions(+), 443 deletions(-) create mode 100644 pkg/driver/hooks/hooks.go create mode 100644 pkg/driver/hooks/prestop.go diff --git a/go.mod b/go.mod index 47ad825..c81f7e1 100644 --- a/go.mod +++ b/go.mod @@ -9,33 +9,33 @@ require ( github.com/golang/protobuf v1.5.4 github.com/joho/godotenv v1.4.0 github.com/kubernetes-csi/csi-test/v4 v4.4.0 - github.com/onsi/gomega v1.27.4 + github.com/onsi/gomega v1.29.0 github.com/rs/zerolog v1.20.0 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 golang.org/x/sync v0.1.0 golang.org/x/sys v0.18.0 google.golang.org/grpc v1.56.3 - k8s.io/api v0.27.1 - k8s.io/apimachinery v0.27.1 - k8s.io/client-go v0.24.2 + k8s.io/api v0.29.0 + k8s.io/apimachinery v0.29.0 + k8s.io/client-go v0.29.0 k8s.io/mount-utils v0.24.3 sigs.k8s.io/controller-runtime v0.12.3 ) require ( github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.8.0 // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.1 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/gnostic v0.5.7-v3refs // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/gofuzz v1.1.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -51,10 +51,10 @@ require ( github.com/spf13/pflag v1.0.5 // indirect golang.org/x/mod v0.16.0 // indirect golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect + golang.org/x/oauth2 v0.10.0 // indirect golang.org/x/term v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/protobuf v1.33.0 // indirect @@ -62,10 +62,10 @@ require ( gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect - k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect + k8s.io/klog/v2 v2.110.1 // indirect + k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect + k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index f72d8c5..d04aaaf 100644 --- a/go.sum +++ b/go.sum @@ -1,57 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= -github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= -github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= 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/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -65,7 +16,6 @@ github.com/civo/civogo v0.3.67 h1:R6MepF20Od7KQdcEKpr3GD8zKy1Jly0SuBDubZkEU2s= github.com/civo/civogo v0.3.67/go.mod h1:S/iYmGvQOraxdRtcXeq/2mVX01/ia2qfpQUp2SsTLKA= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -78,75 +28,45 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= -github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= -github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/jsonreference v0.20.1 h1:FBLnyygC4/IZZr893oiomc9XaghoveYTrLC1F86HID8= -github.com/go-openapi/jsonreference v0.20.1/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/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/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -156,132 +76,84 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= -github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -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/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -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/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kubernetes-csi/csi-test/v4 v4.4.0 h1:r0mnAwDURI24Vw3a/LyA/ga11yD5ZGuU7+REO35Na9s= github.com/kubernetes-csi/csi-test/v4 v4.4.0/go.mod h1:t1RzseMZJKy313nezI/d7TolbbiKpUZM3SXQvXxOX0w= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= -github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= -github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= +github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -297,7 +169,6 @@ github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= @@ -306,32 +177,20 @@ github.com/rs/zerolog v1.20.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= 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/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -340,45 +199,14 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= 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/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -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/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -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/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -389,192 +217,75 @@ golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8= +golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-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-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-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -583,98 +294,24 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -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/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= @@ -694,18 +331,14 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -714,54 +347,35 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= -k8s.io/api v0.27.1 h1:Z6zUGQ1Vd10tJ+gHcNNNgkV5emCyW+v2XTmn+CLjSd0= -k8s.io/api v0.27.1/go.mod h1:z5g/BpAiD+f6AArpqNjkY+cji8ueZDU/WV1jcj5Jk4E= +k8s.io/api v0.29.0 h1:NiCdQMY1QOp1H8lfRyeEf8eOwV6+0xA6XEE44ohDX2A= +k8s.io/api v0.29.0/go.mod h1:sdVmXoz2Bo/cb77Pxi71IPTSErEW32xa4aXwKH7gfBA= k8s.io/apiextensions-apiserver v0.24.2 h1:/4NEQHKlEz1MlaK/wHT5KMKC9UKYz6NZz6JE6ov4G6k= k8s.io/apiextensions-apiserver v0.24.2/go.mod h1:e5t2GMFVngUEHUd0wuCJzw8YDwZoqZfJiGOW6mm2hLQ= -k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apimachinery v0.27.1 h1:EGuZiLI95UQQcClhanryclaQE6xjg1Bts6/L3cD7zyc= -k8s.io/apimachinery v0.27.1/go.mod h1:5ikh59fK3AJ287GUvpUsryoMFtH9zj/ARfWCo3AyXTM= -k8s.io/client-go v0.24.2 h1:CoXFSf8if+bLEbinDqN9ePIDGzcLtqhfd6jpfnwGOFA= -k8s.io/client-go v0.24.2/go.mod h1:zg4Xaoo+umDsfCWr4fCnmLEtQXyCNXCvJuSsglNcV30= -k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/apimachinery v0.29.0 h1:+ACVktwyicPz0oc6MTMLwa2Pw3ouLAfAon1wPLtG48o= +k8s.io/apimachinery v0.29.0/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis= +k8s.io/client-go v0.29.0 h1:KmlDtFcrdUzOYrBhXHgKw5ycWzc3ryPX5mQe0SkG3y8= +k8s.io/client-go v0.29.0/go.mod h1:yLkXH4HKMAywcrD82KMSmfYg2DlE8mepPR4JGSo5n38= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a h1:gmovKNur38vgoWfGtP5QOGNOA7ki4n6qNYoFAgMlNvg= -k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY= +k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= +k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= +k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/mount-utils v0.24.3 h1:o16GMv2uk3MzGgbgSYT49lNPHMgpmVbwJu9VPO47KgI= k8s.io/mount-utils v0.24.3/go.mod h1:XrSqB3a2e8sq+aU+rlbcBtQ3EgcuDk5RP9ZsGxjoDrI= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230209194617-a36077c30491 h1:r0BAOLElQnnFhE/ApUsg3iHdVYYPBjNSSOMowRZxxsY= -k8s.io/utils v0.0.0-20230209194617-a36077c30491/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio= sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/pkg/driver/hooks/hooks.go b/pkg/driver/hooks/hooks.go new file mode 100644 index 0000000..ff35300 --- /dev/null +++ b/pkg/driver/hooks/hooks.go @@ -0,0 +1,66 @@ +package hooks + +import ( + "context" + "errors" + "fmt" + + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/rest" + "k8s.io/client-go/tools/clientcmd" +) + +type Hook interface { + PreStop(ctx context.Context) error + // PostStop, ... +} + +type hook struct { + client kubernetes.Interface + nodeName string + clientCfgPath string +} + +func NewHook(opts ...Option) (Hook, error) { + h := &hook{} + for _, opt := range append(defaultOpts, opts...) { + opt(h) + } + + if h.nodeName == "" { + return nil, errors.New("node name not found") + } + if err := h.setupKubernetesClient(); err != nil { + return nil, fmt.Errorf("failed to setup kubernetes API client: %w", err) + } + return h, nil +} + +// setupKubernetesClient creates Kubernetes client based on the kubeconfig path. +// If kubeconfig path is not empty, the client will be created using that path. +// Otherwise, if the kubeconfig path is empty, the client will be created using the in-clustetr config. +func (h *hook) setupKubernetesClient() (err error) { + if h.clientCfgPath != "" && h.client == nil { + cfg, err := clientcmd.BuildConfigFromFlags("", h.clientCfgPath) + if err != nil { + return fmt.Errorf("failed to build kubeconfig from path %q: %w", h.clientCfgPath, err) + } + h.client, err = kubernetes.NewForConfig(cfg) + if err != nil { + return fmt.Errorf("failed to create kubernetes API client: %w", err) + } + return nil + } + + if h.client == nil { + cfg, err := rest.InClusterConfig() + if err != nil { + return fmt.Errorf("failed to load in-cluster kubeconfig: %w", err) + } + h.client, err = kubernetes.NewForConfig(cfg) + if err != nil { + return fmt.Errorf("failed to create kubernetes API client: %w", err) + } + } + return nil +} diff --git a/pkg/driver/hooks/prestop.go b/pkg/driver/hooks/prestop.go new file mode 100644 index 0000000..ed723ab --- /dev/null +++ b/pkg/driver/hooks/prestop.go @@ -0,0 +1,165 @@ +package hooks + +import ( + "context" + "errors" + "fmt" + "sync" + + "github.com/rs/zerolog/log" + v1 "k8s.io/api/core/v1" + storagev1 "k8s.io/api/storage/v1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/informers" + "k8s.io/client-go/tools/cache" +) + +var drainTaints = map[string]struct{}{ + v1.TaintNodeUnschedulable: {}, // Kubernetes common eviction taint (kubectl drain) +} + +func (h *hook) PreStop(ctx context.Context) error { + node, err := h.client.CoreV1().Nodes().Get(ctx, h.nodeName, metav1.GetOptions{}) + if err != nil { + if k8serrors.IsNotFound(err) { + return fmt.Errorf("node %q not found: %w", h.nodeName, err) + } + return err + } + if !isNodeDrained(node) { + log.Info(). + Str("node_name", h.nodeName). + Msg("Node is not being drained, skipping VolumeAttachments cleanup check") + return nil + } + + log.Info(). + Str("node_name", h.nodeName). + Msg("Node is being drained, starting waiting for VolumeAttachments cleanup") + + if err := h.waitForVolumeAttachmentsCleanup(ctx); err != nil { + log.Error(). + Err(err). + Str("node_name", h.nodeName). + Msg("Failed to wait for VolumeAttachments cleanup") + return err + } + + log.Info(). + Str("node_name", h.nodeName). + Msg("Finished waiting for VolumeAttachments cleanup") + + return nil +} + +func isNodeDrained(node *v1.Node) bool { + for _, traint := range node.Spec.Taints { + if _, ok := drainTaints[traint.Key]; ok { + return true + } + } + return false +} + +func (h *hook) waitForVolumeAttachmentsCleanup(ctx context.Context) error { + factory := informers.NewSharedInformerFactory(h.client, 0) + informer := factory.Storage().V1().VolumeAttachments().Informer() + informerCh := make(chan struct{}) + + // Since the event is called asynchronously, there is a risk of duplicate closures, so we are using sync.Once just to be safe. + var once sync.Once + stopInformerFn := func() { + once.Do(func() { + close(informerCh) + }) + } + defer stopInformerFn() + + _, err := informer.AddEventHandler(cache.ResourceEventHandlerFuncs{ + DeleteFunc: func(obj interface{}) { + log.Warn().Msg("Received an object in DeleteFunc") + if err := h.volumeAttachmentEventHandler(ctx, obj); err != nil { + log.Error(). + Str("node_name", h.nodeName). + Err(err). + Msg("An error occurred while handling the VolumeAttachment event in DeleteFunc") + return + } + stopInformerFn() + }, + UpdateFunc: func(_, obj interface{}) { + log.Warn().Msg("Received an object in UpdateFunc") + if err := h.volumeAttachmentEventHandler(ctx, obj); err != nil { + log.Error(). + Str("node_name", h.nodeName). + Err(err). + Msg("An error occurred while handling the VolumeAttachment event in UpdateFunc") + return + } + stopInformerFn() + }, + }) + if err != nil { + return fmt.Errorf("failed to create event handler for VolumeAttachment: %w", err) + } + go informer.Run(informerCh) + + ok, err := h.checkVolumeAttachmentsExist(ctx) + if err == nil { + return nil + } else if !ok { + log.Error(). + Str("node_name", h.nodeName). + Err(err). + Msg("Failed to check the existence of VolumeAttachments") + return fmt.Errorf("failed to check the existence of VolumeAttachments: %w", err) + } + + log.Error(). + Str("node_name", h.nodeName). + Err(err). + Msg("An error occurred while checking the existence of VolumeAttachments, waiting for VolumeAttachments to be deleted") + + select { + case <-informerCh: + case <-ctx.Done(): + log.Error(). + Err(ctx.Err()). + Msg("Stopped waiting for VolumeAttachments, therefore some resources might still remain") + } + return nil +} + +func (h *hook) volumeAttachmentEventHandler(ctx context.Context, obj interface{}) error { + va, ok := obj.(*storagev1.VolumeAttachment) + if !ok { + return errors.New("received an object that is not a VolumeAttachment") + } + if va.Spec.NodeName == h.nodeName { + if _, err := h.checkVolumeAttachmentsExist(ctx); err != nil { + return err + } + } + return nil +} + +func (h *hook) checkVolumeAttachmentsExist(ctx context.Context) (bool, error) { + attachments, err := h.client.StorageV1().VolumeAttachments().List(ctx, metav1.ListOptions{}) + if err != nil { + log.Error(). + Err(err). + Msg("Failed to get VolumeAttachment resources") + return false, err + } + for _, at := range attachments.Items { + if at.Spec.NodeName == h.nodeName { + log.Info(). + Str("name", at.ObjectMeta.Name). + Str("node_name", h.nodeName). + Msg("VolumeAttachment resource has not been deleted yet") + return true, fmt.Errorf("VolumeAttachment resource %q has not been deleted yet", at.ObjectMeta.Name) + } + } + return false, nil +} From 9c521a4145bb5b931619bb4ee7c16b184773de40 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 24 Dec 2024 14:18:41 +0900 Subject: [PATCH 02/14] feat: add hook options Signed-off-by: hlts2 --- pkg/driver/hooks/options.go | 39 +++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkg/driver/hooks/options.go diff --git a/pkg/driver/hooks/options.go b/pkg/driver/hooks/options.go new file mode 100644 index 0000000..7c4077b --- /dev/null +++ b/pkg/driver/hooks/options.go @@ -0,0 +1,39 @@ +package hooks + +import ( + "os" + + "k8s.io/client-go/kubernetes" +) + +type Option func(*hook) + +var defaultOpts = []Option{ + WithNodeName(os.Getenv("KUBE_NODE_NAME")), +} + +// WithKubernetesClient returns Option to set Kubernetes API client. +func WithKubernetesClient(client kubernetes.Interface) Option { + return func(h *hook) { + if client != nil { + h.client = client + } + } +} + +func WithKubernetesClientConfigPath(path string) Option { + return func(h *hook) { + if path != "" { + h.clientCfgPath = path + } + } +} + +// WithNodeName returns Option to set node node name. +func WithNodeName(name string) Option { + return func(h *hook) { + if name != "" { + h.nodeName = name + } + } +} From 92dc3a7f9e19ed0a80d57f822bff41e31b2d8b00 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 24 Dec 2024 14:30:17 +0900 Subject: [PATCH 03/14] feat: add comment for public method and function Signed-off-by: hlts2 --- pkg/driver/hooks/hooks.go | 5 +++-- pkg/driver/hooks/options.go | 4 +++- pkg/driver/hooks/prestop.go | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkg/driver/hooks/hooks.go b/pkg/driver/hooks/hooks.go index ff35300..a80b901 100644 --- a/pkg/driver/hooks/hooks.go +++ b/pkg/driver/hooks/hooks.go @@ -10,9 +10,10 @@ import ( "k8s.io/client-go/tools/clientcmd" ) +// Hook defines the lifecycle methods for a hook, such as PreStop, PostStart, and PostStop. +// Implementations of this interface can define actions to be performed at different lifecycle stages. type Hook interface { PreStop(ctx context.Context) error - // PostStop, ... } type hook struct { @@ -21,12 +22,12 @@ type hook struct { clientCfgPath string } +// NewHook creates a new Hook with the provided options. It returns an error if setup fails. func NewHook(opts ...Option) (Hook, error) { h := &hook{} for _, opt := range append(defaultOpts, opts...) { opt(h) } - if h.nodeName == "" { return nil, errors.New("node name not found") } diff --git a/pkg/driver/hooks/options.go b/pkg/driver/hooks/options.go index 7c4077b..f79ac0e 100644 --- a/pkg/driver/hooks/options.go +++ b/pkg/driver/hooks/options.go @@ -6,6 +6,7 @@ import ( "k8s.io/client-go/kubernetes" ) +// Option represents a configuration function that modifies hook object. type Option func(*hook) var defaultOpts = []Option{ @@ -21,6 +22,7 @@ func WithKubernetesClient(client kubernetes.Interface) Option { } } +// WithKubernetesClient returns Option to set Kubernetes config path. func WithKubernetesClientConfigPath(path string) Option { return func(h *hook) { if path != "" { @@ -29,7 +31,7 @@ func WithKubernetesClientConfigPath(path string) Option { } } -// WithNodeName returns Option to set node node name. +// WithNodeName returns Option to set node name. func WithNodeName(name string) Option { return func(h *hook) { if name != "" { diff --git a/pkg/driver/hooks/prestop.go b/pkg/driver/hooks/prestop.go index ed723ab..d7ec12a 100644 --- a/pkg/driver/hooks/prestop.go +++ b/pkg/driver/hooks/prestop.go @@ -19,6 +19,11 @@ var drainTaints = map[string]struct{}{ v1.TaintNodeUnschedulable: {}, // Kubernetes common eviction taint (kubectl drain) } +// PreStop handles the PreStop lifecycle event. It retrieves the node information +// from the Kubernetes API and checks if the node is being drained. If the node is not +// being drained, it skips the VolumeAttachment cleanup check. If the node is being drained, +// it waits for the cleanup of VolumeAttachments. If any errors occur during this process, +// they are logged and returned. func (h *hook) PreStop(ctx context.Context) error { node, err := h.client.CoreV1().Nodes().Get(ctx, h.nodeName, metav1.GetOptions{}) if err != nil { @@ -49,7 +54,6 @@ func (h *hook) PreStop(ctx context.Context) error { log.Info(). Str("node_name", h.nodeName). Msg("Finished waiting for VolumeAttachments cleanup") - return nil } From affc6f02c56efb3d40853c214f341a4a186a5d43 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 24 Dec 2024 15:24:06 +0900 Subject: [PATCH 04/14] fix: tweak Signed-off-by: hlts2 --- pkg/driver/hooks/prestop.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/driver/hooks/prestop.go b/pkg/driver/hooks/prestop.go index d7ec12a..687de85 100644 --- a/pkg/driver/hooks/prestop.go +++ b/pkg/driver/hooks/prestop.go @@ -54,6 +54,7 @@ func (h *hook) PreStop(ctx context.Context) error { log.Info(). Str("node_name", h.nodeName). Msg("Finished waiting for VolumeAttachments cleanup") + return nil } From 2499499a0106467185e807dece75eaf0a23d58df Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 24 Dec 2024 22:19:43 +0900 Subject: [PATCH 05/14] fix: build error Signed-off-by: hlts2 --- e2e/preexiting_volume_test.go | 2 +- e2e/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/preexiting_volume_test.go b/e2e/preexiting_volume_test.go index a515ed1..54c228d 100644 --- a/e2e/preexiting_volume_test.go +++ b/e2e/preexiting_volume_test.go @@ -83,7 +83,7 @@ func Test_ExistingCivoVolume(t *testing.T) { Spec: corev1.PersistentVolumeClaimSpec{ AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, VolumeName: pv.Name, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ "storage": resource.MustParse("10Gi"), }, diff --git a/e2e/utils.go b/e2e/utils.go index b9904c4..e80830b 100644 --- a/e2e/utils.go +++ b/e2e/utils.go @@ -17,7 +17,7 @@ func pvcSpec() *corev1.PersistentVolumeClaim { Spec: corev1.PersistentVolumeClaimSpec{ StorageClassName: &storageClassName, AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce}, - Resources: corev1.ResourceRequirements{ + Resources: corev1.VolumeResourceRequirements{ Requests: corev1.ResourceList{ "storage": resource.MustParse("10Gi"), }, From 24e9a38f668e5c618fa10a7a0e1c0cade1341394 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 24 Dec 2024 22:57:44 +0900 Subject: [PATCH 06/14] fix: rename package name Signed-off-by: hlts2 --- pkg/driver/{hooks/hooks.go => hook/hook.go} | 2 +- pkg/driver/{hooks => hook}/options.go | 2 +- pkg/driver/{hooks => hook}/prestop.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkg/driver/{hooks/hooks.go => hook/hook.go} (99%) rename pkg/driver/{hooks => hook}/options.go (98%) rename pkg/driver/{hooks => hook}/prestop.go (99%) diff --git a/pkg/driver/hooks/hooks.go b/pkg/driver/hook/hook.go similarity index 99% rename from pkg/driver/hooks/hooks.go rename to pkg/driver/hook/hook.go index a80b901..5b2d489 100644 --- a/pkg/driver/hooks/hooks.go +++ b/pkg/driver/hook/hook.go @@ -1,4 +1,4 @@ -package hooks +package hook import ( "context" diff --git a/pkg/driver/hooks/options.go b/pkg/driver/hook/options.go similarity index 98% rename from pkg/driver/hooks/options.go rename to pkg/driver/hook/options.go index f79ac0e..0a35ea3 100644 --- a/pkg/driver/hooks/options.go +++ b/pkg/driver/hook/options.go @@ -1,4 +1,4 @@ -package hooks +package hook import ( "os" diff --git a/pkg/driver/hooks/prestop.go b/pkg/driver/hook/prestop.go similarity index 99% rename from pkg/driver/hooks/prestop.go rename to pkg/driver/hook/prestop.go index 687de85..f4dbeec 100644 --- a/pkg/driver/hooks/prestop.go +++ b/pkg/driver/hook/prestop.go @@ -1,4 +1,4 @@ -package hooks +package hook import ( "context" From e2943818f13a4ea3437eb642c987e6e3a8bf4693 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Wed, 25 Dec 2024 16:25:18 +0900 Subject: [PATCH 07/14] fix: bugfix for node termination event Signed-off-by: hlts2 --- pkg/driver/hook/prestop.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/driver/hook/prestop.go b/pkg/driver/hook/prestop.go index f4dbeec..b6d79c9 100644 --- a/pkg/driver/hook/prestop.go +++ b/pkg/driver/hook/prestop.go @@ -27,12 +27,17 @@ var drainTaints = map[string]struct{}{ func (h *hook) PreStop(ctx context.Context) error { node, err := h.client.CoreV1().Nodes().Get(ctx, h.nodeName, metav1.GetOptions{}) if err != nil { - if k8serrors.IsNotFound(err) { - return fmt.Errorf("node %q not found: %w", h.nodeName, err) + if !k8serrors.IsNotFound(err) { + return err } - return err + log.Info(). + Str("node_name", h.nodeName). + Msg("Node does not found, assuming the termination event, the node might be in the process of being removed") } + + isDrained := true if !isNodeDrained(node) { + isDrained = false log.Info(). Str("node_name", h.nodeName). Msg("Node is not being drained, skipping VolumeAttachments cleanup check") @@ -41,7 +46,8 @@ func (h *hook) PreStop(ctx context.Context) error { log.Info(). Str("node_name", h.nodeName). - Msg("Node is being drained, starting waiting for VolumeAttachments cleanup") + Bool("is_drained", isDrained). + Msg("Node is being drained or removed, starting the wait for VolumeAttachments cleanup") if err := h.waitForVolumeAttachmentsCleanup(ctx); err != nil { log.Error(). From bec285296570868e763ab27ee8067302d3edfd60 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Wed, 25 Dec 2024 16:41:01 +0900 Subject: [PATCH 08/14] fix: bugfix condition check Signed-off-by: hlts2 --- pkg/driver/hook/prestop.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/driver/hook/prestop.go b/pkg/driver/hook/prestop.go index b6d79c9..2638bee 100644 --- a/pkg/driver/hook/prestop.go +++ b/pkg/driver/hook/prestop.go @@ -33,11 +33,7 @@ func (h *hook) PreStop(ctx context.Context) error { log.Info(). Str("node_name", h.nodeName). Msg("Node does not found, assuming the termination event, the node might be in the process of being removed") - } - - isDrained := true - if !isNodeDrained(node) { - isDrained = false + } else if !isNodeDrained(node) { log.Info(). Str("node_name", h.nodeName). Msg("Node is not being drained, skipping VolumeAttachments cleanup check") @@ -46,7 +42,6 @@ func (h *hook) PreStop(ctx context.Context) error { log.Info(). Str("node_name", h.nodeName). - Bool("is_drained", isDrained). Msg("Node is being drained or removed, starting the wait for VolumeAttachments cleanup") if err := h.waitForVolumeAttachmentsCleanup(ctx); err != nil { From 948f7903adcdfba4e233b796d698a78cb4815a37 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 7 Jan 2025 16:41:45 +0900 Subject: [PATCH 09/14] feat: add process log Signed-off-by: hlts2 --- pkg/driver/hook/prestop.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/driver/hook/prestop.go b/pkg/driver/hook/prestop.go index 2638bee..3daf304 100644 --- a/pkg/driver/hook/prestop.go +++ b/pkg/driver/hook/prestop.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "sync" + "time" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" @@ -127,8 +128,14 @@ func (h *hook) waitForVolumeAttachmentsCleanup(ctx context.Context) error { Err(err). Msg("An error occurred while checking the existence of VolumeAttachments, waiting for VolumeAttachments to be deleted") + tick := time.NewTicker(time.Second) + defer tick.Stop() + select { case <-informerCh: + case <-tick.C: + log.Info(). + Msg("Waiting for VolumeAttachments to be deleted") case <-ctx.Done(): log.Error(). Err(ctx.Err()). From 8698faa7ca2ee01c274b424d868db624566f0b25 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 7 Jan 2025 18:49:10 +0900 Subject: [PATCH 10/14] fix: bugfix of channel handling Signed-off-by: hlts2 --- pkg/driver/hook/prestop.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkg/driver/hook/prestop.go b/pkg/driver/hook/prestop.go index 3daf304..b8f3d8d 100644 --- a/pkg/driver/hook/prestop.go +++ b/pkg/driver/hook/prestop.go @@ -131,17 +131,20 @@ func (h *hook) waitForVolumeAttachmentsCleanup(ctx context.Context) error { tick := time.NewTicker(time.Second) defer tick.Stop() - select { - case <-informerCh: - case <-tick.C: - log.Info(). - Msg("Waiting for VolumeAttachments to be deleted") - case <-ctx.Done(): - log.Error(). - Err(ctx.Err()). - Msg("Stopped waiting for VolumeAttachments, therefore some resources might still remain") + for { + select { + case <-informerCh: + return nil + case <-tick.C: + log.Info(). + Msg("Waiting for VolumeAttachments to be deleted") + case <-ctx.Done(): + log.Error(). + Err(ctx.Err()). + Msg("Stopped waiting for VolumeAttachments, therefore some resources might still remain") + return nil + } } - return nil } func (h *hook) volumeAttachmentEventHandler(ctx context.Context, obj interface{}) error { From fbbcc1395f8e7867d98f094c325354d649e30ae4 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Tue, 14 Jan 2025 17:42:24 +0900 Subject: [PATCH 11/14] feat: add test case for preStop hook package Signed-off-by: hlts2 --- pkg/driver/hook/options_test.go | 122 +++++++ pkg/driver/hook/prestop_test.go | 593 ++++++++++++++++++++++++++++++++ 2 files changed, 715 insertions(+) create mode 100644 pkg/driver/hook/options_test.go create mode 100644 pkg/driver/hook/prestop_test.go diff --git a/pkg/driver/hook/options_test.go b/pkg/driver/hook/options_test.go new file mode 100644 index 0000000..90ce8c4 --- /dev/null +++ b/pkg/driver/hook/options_test.go @@ -0,0 +1,122 @@ +package hook + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "k8s.io/client-go/kubernetes" +) + +func TestWithKubernetesClient(t *testing.T) { + type test struct { + name string + client kubernetes.Interface + beforeFunc func(*hook) + wantClient kubernetes.Interface + } + + tests := []test{ + { + name: "Succeeds to apply option", + client: &kubernetes.Clientset{}, + wantClient: &kubernetes.Clientset{}, + }, + { + name: "Does nothing when client is nil", + beforeFunc: func(h *hook) { + h.client = &kubernetes.Clientset{} + }, + wantClient: &kubernetes.Clientset{}, + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h := &hook{} + + if test.beforeFunc != nil { + test.beforeFunc(h) + } + + WithKubernetesClient(test.client)(h) + + assert.Equal(tt, test.wantClient, h.client) + }) + } +} + +func TestWithKubernetesClientConfigPath(t *testing.T) { + type test struct { + name string + path string + beforeFunc func(*hook) + wantPath string + } + + tests := []test{ + { + name: "Succeeds to apply option", + path: "kubeconfig.yaml", + wantPath: "kubeconfig.yaml", + }, + { + name: "Do nothing when path is empty", + beforeFunc: func(h *hook) { + h.clientCfgPath = "kubeconfig.yaml" + }, + wantPath: "kubeconfig.yaml", + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h := &hook{} + + if test.beforeFunc != nil { + test.beforeFunc(h) + } + + WithKubernetesClientConfigPath(test.path)(h) + + assert.Equal(tt, test.wantPath, h.clientCfgPath) + }) + } +} + +func TestWithNodeName(t *testing.T) { + type test struct { + name string + nodeName string + beforeFunc func(*hook) + wantNodeName string + } + + tests := []test{ + { + name: "Succeeds to apply option", + nodeName: "node-01", + wantNodeName: "node-01", + }, + { + name: "Do nothing when Node name is empty", + beforeFunc: func(h *hook) { + h.nodeName = "node-01" + }, + wantNodeName: "node-01", + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h := &hook{} + + if test.beforeFunc != nil { + test.beforeFunc(h) + } + + WithNodeName(test.nodeName)(h) + + assert.Equal(tt, test.wantNodeName, h.nodeName) + }) + } +} diff --git a/pkg/driver/hook/prestop_test.go b/pkg/driver/hook/prestop_test.go new file mode 100644 index 0000000..d2be141 --- /dev/null +++ b/pkg/driver/hook/prestop_test.go @@ -0,0 +1,593 @@ +package hook + +import ( + "context" + "errors" + "testing" + + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" + storagev1 "k8s.io/api/storage/v1" + k8serrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/client-go/kubernetes" + "k8s.io/client-go/kubernetes/fake" + k8stesting "k8s.io/client-go/testing" +) + +func TestPreStop(t *testing.T) { + type args struct { + ctx context.Context + opts []Option + } + type test struct { + name string + args args + wantErr bool + } + + tests := []test{ + { + name: "Returns nil when node exists but is not drained", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + node := &v1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: "node-01", + }, + Spec: v1.NodeSpec{}, + } + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, node, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns nil when drained node exists but no volume attachments are found", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + node := &v1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: "node-01", + }, + Spec: v1.NodeSpec{ + Taints: []v1.Taint{ + { + Key: v1.TaintNodeUnschedulable, + }, + }, + }, + } + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, node, nil + }) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{}, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns nil when node is not found (possibly being deleted), and no volume attachments are found", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, k8serrors.NewNotFound(schema.GroupResource{ + Group: "", + Resource: "nodes", + }, "node-01") + }) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{}, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns error when node cannot be retrieved due to an internal error", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + return client + }()), + }, + }, + wantErr: true, + }, + { + name: "Returns error when volume attachments cannot be listed due to an internal error", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + node := &v1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: "node-01", + }, + Spec: v1.NodeSpec{ + Taints: []v1.Taint{ + { + Key: v1.TaintNodeUnschedulable, + }, + }, + }, + } + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, node, nil + }) + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + return client + }()), + }, + }, + wantErr: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h, err := NewHook(test.args.opts...) + if err != nil { + tt.Fatal(err) + } + + err = h.PreStop(test.args.ctx) + if test.wantErr { + assert.NotNil(tt, err) + } else { + assert.Nil(tt, err) + } + }) + } +} + +func TestIsNodeDrained(t *testing.T) { + type test struct { + name string + node *v1.Node + want bool + } + + tests := []test{ + { + name: "Returns true when node is drained due to TaintNodeUnreachable", + node: &v1.Node{ + Spec: v1.NodeSpec{ + Taints: []v1.Taint{ + { + Key: v1.TaintNodeUnschedulable, + }, + }, + }, + }, + want: true, + }, + { + name: "Returns false when node is not drained because of TaintNodeNotReady", + node: &v1.Node{ + Spec: v1.NodeSpec{ + Taints: []v1.Taint{ + { + Key: v1.TaintNodeNotReady, + }, + }, + }, + }, + want: false, + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + got := isNodeDrained(test.node) + + assert.Equal(tt, test.want, got) + }) + } +} + +func TestWaitForVolumeAttachmentsCleanup(t *testing.T) { + type args struct { + ctx context.Context + opts []Option + } + type test struct { + name string + args args + wantErr bool + } + + tests := []test{ + { + name: "Returns nil when volume attachment exists for a different node", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns nil when the context is canceled", + args: args{ + ctx: func() context.Context { + ctx, cancel := context.WithCancel(context.Background()) + cancel() + return ctx + }(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns error when listing volume attachments fails in checkVolumeAttachmentsExist method", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + return client + }()), + }, + }, + wantErr: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h, err := NewHook(test.args.opts...) + if err != nil { + tt.Fatal(err) + } + + err = h.(*hook).waitForVolumeAttachmentsCleanup(test.args.ctx) + if test.wantErr { + assert.NotNil(tt, err) + } else { + assert.Nil(tt, err) + } + }) + } +} + +func TestVolumeAttachmentEventHandler(t *testing.T) { + type args struct { + ctx context.Context + obj interface{} + opts []Option + } + type test struct { + name string + args args + wantErr bool + } + + tests := []test{ + { + name: "Returns nil when volume attachment exists for a different node", + args: args{ + ctx: context.Background(), + obj: &storagev1.VolumeAttachment{ + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns nil when input object is VolumeAttachment but resource is not found (already deleted)", + args: args{ + ctx: context.Background(), + obj: &storagev1.VolumeAttachment{ + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + return client + }()), + }, + }, + }, + { + name: "Returns error when volume attachment exists for the specified node", + args: args{ + ctx: context.Background(), + obj: &storagev1.VolumeAttachment{ + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + wantErr: true, + }, + { + name: "Returns error when invalid object is provided", + args: args{ + ctx: context.Background(), + obj: "invalid-object", + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + return client + }()), + }, + }, + wantErr: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h, err := NewHook(test.args.opts...) + if err != nil { + tt.Fatal(err) + } + + err = h.(*hook).volumeAttachmentEventHandler(test.args.ctx, test.args.obj) + if test.wantErr { + assert.NotNil(tt, err) + } else { + assert.Nil(tt, err) + } + }) + } +} + +func TestCheckVolumeAttachmentsExist(t *testing.T) { + type args struct { + ctx context.Context + opts []Option + } + type test struct { + name string + args args + want bool + wantErr bool + } + + tests := []test{ + { + name: "Returns false when no volume attachments exist for the specified node", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + return client + }()), + }, + }, + }, + { + name: "Returns false when volume attachment exists for a different node", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + }, + { + name: "Returns false and error when listing volume attachments fails", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + return client + }()), + }, + }, + wantErr: true, + }, + { + name: "Returns true and error when volume attachment exists for the specified node", + args: args{ + ctx: context.Background(), + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(func() kubernetes.Interface { + client := fake.NewSimpleClientset() + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + return client + }()), + }, + }, + want: true, + wantErr: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(tt *testing.T) { + h, err := NewHook(test.args.opts...) + if err != nil { + tt.Fatal(err) + } + + got, err := h.(*hook).checkVolumeAttachmentsExist(test.args.ctx) + if test.wantErr { + assert.NotNil(tt, err) + } else { + assert.Nil(tt, err) + } + assert.Equal(tt, test.want, got) + }) + } +} From 48c41b446aa1e663b5a21dab1f1b9e84c90f39b4 Mon Sep 17 00:00:00 2001 From: hlts2 Date: Wed, 15 Jan 2025 15:33:05 +0900 Subject: [PATCH 12/14] fix: add test case for informer event Signed-off-by: hlts2 --- pkg/driver/hook/prestop.go | 13 +- pkg/driver/hook/prestop_test.go | 661 ++++++++++++++++++++------------ 2 files changed, 415 insertions(+), 259 deletions(-) diff --git a/pkg/driver/hook/prestop.go b/pkg/driver/hook/prestop.go index b8f3d8d..6ba041e 100644 --- a/pkg/driver/hook/prestop.go +++ b/pkg/driver/hook/prestop.go @@ -86,25 +86,23 @@ func (h *hook) waitForVolumeAttachmentsCleanup(ctx context.Context) error { _, err := informer.AddEventHandler(cache.ResourceEventHandlerFuncs{ DeleteFunc: func(obj interface{}) { log.Warn().Msg("Received an object in DeleteFunc") - if err := h.volumeAttachmentEventHandler(ctx, obj); err != nil { + if err := h.volumeAttachmentEventHandler(ctx, obj, stopInformerFn); err != nil { log.Error(). Str("node_name", h.nodeName). Err(err). Msg("An error occurred while handling the VolumeAttachment event in DeleteFunc") return } - stopInformerFn() }, UpdateFunc: func(_, obj interface{}) { log.Warn().Msg("Received an object in UpdateFunc") - if err := h.volumeAttachmentEventHandler(ctx, obj); err != nil { + if err := h.volumeAttachmentEventHandler(ctx, obj, stopInformerFn); err != nil { log.Error(). Str("node_name", h.nodeName). Err(err). Msg("An error occurred while handling the VolumeAttachment event in UpdateFunc") return } - stopInformerFn() }, }) if err != nil { @@ -134,6 +132,8 @@ func (h *hook) waitForVolumeAttachmentsCleanup(ctx context.Context) error { for { select { case <-informerCh: + log.Info(). + Msg("Stopped informer to check event of VolumeAttachment resource") return nil case <-tick.C: log.Info(). @@ -141,13 +141,13 @@ func (h *hook) waitForVolumeAttachmentsCleanup(ctx context.Context) error { case <-ctx.Done(): log.Error(). Err(ctx.Err()). - Msg("Stopped waiting for VolumeAttachments, therefore some resources might still remain") + Msg("Stopped waiting for VolumeAttachments cleanup, therefore some resources might still remain") return nil } } } -func (h *hook) volumeAttachmentEventHandler(ctx context.Context, obj interface{}) error { +func (h *hook) volumeAttachmentEventHandler(ctx context.Context, obj interface{}, stopEventFn func()) error { va, ok := obj.(*storagev1.VolumeAttachment) if !ok { return errors.New("received an object that is not a VolumeAttachment") @@ -156,6 +156,7 @@ func (h *hook) volumeAttachmentEventHandler(ctx context.Context, obj interface{} if _, err := h.checkVolumeAttachmentsExist(ctx); err != nil { return err } + stopEventFn() } return nil } diff --git a/pkg/driver/hook/prestop_test.go b/pkg/driver/hook/prestop_test.go index d2be141..2c97db3 100644 --- a/pkg/driver/hook/prestop_test.go +++ b/pkg/driver/hook/prestop_test.go @@ -3,7 +3,9 @@ package hook import ( "context" "errors" + "sync/atomic" "testing" + "time" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" @@ -12,7 +14,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" k8stesting "k8s.io/client-go/testing" ) @@ -23,9 +24,10 @@ func TestPreStop(t *testing.T) { opts []Option } type test struct { - name string - args args - wantErr bool + name string + args args + beforeFunc func(*hook) + wantErr bool } tests := []test{ @@ -35,21 +37,22 @@ func TestPreStop(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - node := &v1.Node{ - ObjectMeta: metav1.ObjectMeta{ - Name: "node-01", - }, - Spec: v1.NodeSpec{}, - } - client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, node, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + node := &v1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: "node-01", + }, + Spec: v1.NodeSpec{}, + } + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, node, nil + }) + }, }, { name: "Returns nil when drained node exists but no volume attachments are found", @@ -57,33 +60,34 @@ func TestPreStop(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - node := &v1.Node{ - ObjectMeta: metav1.ObjectMeta{ - Name: "node-01", - }, - Spec: v1.NodeSpec{ - Taints: []v1.Taint{ - { - Key: v1.TaintNodeUnschedulable, - }, - }, + WithKubernetesClient(fake.NewSimpleClientset()), + }, + }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + node := &v1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: "node-01", + }, + Spec: v1.NodeSpec{ + Taints: []v1.Taint{ + { + Key: v1.TaintNodeUnschedulable, }, - } - client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, node, nil - }) + }, + }, + } + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, node, nil + }) - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{}, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), - }, + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{}, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) }, }, { @@ -92,25 +96,26 @@ func TestPreStop(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, nil, k8serrors.NewNotFound(schema.GroupResource{ - Group: "", - Resource: "nodes", - }, "node-01") - }) - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{}, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, k8serrors.NewNotFound(schema.GroupResource{ + Group: "", + Resource: "nodes", + }, "node-01") + }) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{}, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, }, { name: "Returns error when node cannot be retrieved due to an internal error", @@ -118,15 +123,15 @@ func TestPreStop(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, nil, errors.New("error") - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + }, wantErr: true, }, { @@ -135,30 +140,31 @@ func TestPreStop(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - node := &v1.Node{ - ObjectMeta: metav1.ObjectMeta{ - Name: "node-01", - }, - Spec: v1.NodeSpec{ - Taints: []v1.Taint{ - { - Key: v1.TaintNodeUnschedulable, - }, - }, - }, - } - client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, node, nil - }) - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, nil, errors.New("error") - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + node := &v1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: "node-01", + }, + Spec: v1.NodeSpec{ + Taints: []v1.Taint{ + { + Key: v1.TaintNodeUnschedulable, + }, + }, + }, + } + client.Fake.PrependReactor("get", "nodes", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, node, nil + }) + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + }, wantErr: true, }, } @@ -170,7 +176,15 @@ func TestPreStop(t *testing.T) { tt.Fatal(err) } - err = h.PreStop(test.args.ctx) + ctx, cancel := context.WithCancel(test.args.ctx) + defer cancel() + + hook := h.(*hook) + if test.beforeFunc != nil { + test.beforeFunc(hook) + } + + err = h.PreStop(ctx) if test.wantErr { assert.NotNil(tt, err) } else { @@ -231,9 +245,10 @@ func TestWaitForVolumeAttachmentsCleanup(t *testing.T) { opts []Option } type test struct { - name string - args args - wantErr bool + name string + args args + beforeFunc func(*hook) + wantErr bool } tests := []test{ @@ -243,28 +258,28 @@ func TestWaitForVolumeAttachmentsCleanup(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{ - { - ObjectMeta: metav1.ObjectMeta{ - Name: "test-volume-attachment-01", - }, - Spec: storagev1.VolumeAttachmentSpec{ - NodeName: "node-02", - }, - }, - }, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, }, { name: "Returns nil when the context is canceled", @@ -276,44 +291,161 @@ func TestWaitForVolumeAttachmentsCleanup(t *testing.T) { }(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{ - { - ObjectMeta: metav1.ObjectMeta{ - Name: "test-volume-attachment-01", - }, - Spec: storagev1.VolumeAttachmentSpec{ - NodeName: "node-01", - }, - }, - }, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, }, + func() test { + ctx := context.Background() + volumeattachment := &storagev1.VolumeAttachment{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + Status: storagev1.VolumeAttachmentStatus{ + Attached: true, + }, + } + var volumeAttachmentDeleted int64 + + return test{ + name: "Returns nil after volume attachment is cleaned up", + args: args{ + ctx: ctx, + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(fake.NewSimpleClientset()), + }, + }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + client.StorageV1().VolumeAttachments().Create(ctx, volumeattachment, metav1.CreateOptions{}) + + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + if atomic.LoadInt64(&volumeAttachmentDeleted) == 1 { + return true, &storagev1.VolumeAttachmentList{}, nil + } + return true, &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{*volumeattachment}, + }, nil + }) + + // To trigger the event after registering it to the informer. + go func() { + time.Sleep(time.Second) + + newObj := volumeattachment.DeepCopy() + newObj.Status.Attached = false + h.client.StorageV1().VolumeAttachments().Update(ctx, newObj, metav1.UpdateOptions{}) + time.Sleep(100 * time.Millisecond) + + // Since calling delete triggers the event handler, we change the value of volumeAttachmentDeleted before that. This allows us to dynamically modify the value. + atomic.StoreInt64(&volumeAttachmentDeleted, 1) + h.client.StorageV1().VolumeAttachments().Delete(ctx, newObj.GetName(), metav1.DeleteOptions{}) + time.Sleep(100 * time.Millisecond) + }() + }, + } + }(), + + func() test { + ctx := context.Background() + volumeattachments := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-02", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + var volumeAttachmentDeleted int64 + + return test{ + name: "Returns nil after successful deletion of multiple volume attachments", + args: args{ + ctx: ctx, + opts: []Option{ + WithNodeName("node-01"), + WithKubernetesClient(fake.NewSimpleClientset()), + }, + }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + for _, item := range volumeattachments.Items { + client.StorageV1().VolumeAttachments().Create(ctx, &item, metav1.CreateOptions{}) + } + + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + if atomic.LoadInt64(&volumeAttachmentDeleted) == 1 { + return true, &storagev1.VolumeAttachmentList{}, nil + } + return true, volumeattachments, nil + }) + + // To trigger the event after registering it to the informer. + go func() { + time.Sleep(time.Second) + + client.StorageV1().VolumeAttachments().Delete(ctx, "test-volume-attachment-01", metav1.DeleteOptions{}) + time.Sleep(100 * time.Millisecond) + + // Since calling delete triggers the event handler, we change the value of volumeAttachmentDeleted before that. This allows us to dynamically modify the value. + atomic.StoreInt64(&volumeAttachmentDeleted, 1) + client.StorageV1().VolumeAttachments().Delete(ctx, "test-volume-attachment-02", metav1.DeleteOptions{}) + time.Sleep(100 * time.Millisecond) + }() + }, + } + }(), { name: "Returns error when listing volume attachments fails in checkVolumeAttachmentsExist method", args: args{ ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, nil, errors.New("error") - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + }, wantErr: true, }, } @@ -325,7 +457,15 @@ func TestWaitForVolumeAttachmentsCleanup(t *testing.T) { tt.Fatal(err) } - err = h.(*hook).waitForVolumeAttachmentsCleanup(test.args.ctx) + ctx, cancel := context.WithCancel(test.args.ctx) + defer cancel() + + hook := h.(*hook) + if test.beforeFunc != nil { + test.beforeFunc(hook) + } + + err = hook.waitForVolumeAttachmentsCleanup(ctx) if test.wantErr { assert.NotNil(tt, err) } else { @@ -337,14 +477,16 @@ func TestWaitForVolumeAttachmentsCleanup(t *testing.T) { func TestVolumeAttachmentEventHandler(t *testing.T) { type args struct { - ctx context.Context - obj interface{} - opts []Option + ctx context.Context + obj interface{} + stopEventFn func() + opts []Option } type test struct { - name string - args args - wantErr bool + name string + args args + beforeFunc func(*hook) + wantErr bool } tests := []test{ @@ -357,30 +499,31 @@ func TestVolumeAttachmentEventHandler(t *testing.T) { NodeName: "node-02", }, }, + stopEventFn: func() {}, opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{ - { - ObjectMeta: metav1.ObjectMeta{ - Name: "test-volume-attachment-01", - }, - Spec: storagev1.VolumeAttachmentSpec{ - NodeName: "node-02", - }, - }, - }, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, }, { name: "Returns nil when input object is VolumeAttachment but resource is not found (already deleted)", @@ -391,12 +534,10 @@ func TestVolumeAttachmentEventHandler(t *testing.T) { NodeName: "node-01", }, }, + stopEventFn: func() {}, opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, }, @@ -409,43 +550,42 @@ func TestVolumeAttachmentEventHandler(t *testing.T) { NodeName: "node-01", }, }, + stopEventFn: func() {}, opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{ - { - ObjectMeta: metav1.ObjectMeta{ - Name: "test-volume-attachment-01", - }, - Spec: storagev1.VolumeAttachmentSpec{ - NodeName: "node-01", - }, - }, - }, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, wantErr: true, }, { name: "Returns error when invalid object is provided", args: args{ - ctx: context.Background(), - obj: "invalid-object", + ctx: context.Background(), + obj: "invalid-object", + stopEventFn: func() {}, opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, wantErr: true, @@ -459,7 +599,15 @@ func TestVolumeAttachmentEventHandler(t *testing.T) { tt.Fatal(err) } - err = h.(*hook).volumeAttachmentEventHandler(test.args.ctx, test.args.obj) + ctx, cancel := context.WithCancel(test.args.ctx) + defer cancel() + + hook := h.(*hook) + if test.beforeFunc != nil { + test.beforeFunc(hook) + } + + err = hook.volumeAttachmentEventHandler(ctx, test.args.obj, test.args.stopEventFn) if test.wantErr { assert.NotNil(tt, err) } else { @@ -475,10 +623,11 @@ func TestCheckVolumeAttachmentsExist(t *testing.T) { opts []Option } type test struct { - name string - args args - want bool - wantErr bool + name string + args args + beforeFunc func(*hook) + want bool + wantErr bool } tests := []test{ @@ -488,10 +637,7 @@ func TestCheckVolumeAttachmentsExist(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, }, @@ -501,28 +647,28 @@ func TestCheckVolumeAttachmentsExist(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{ - { - ObjectMeta: metav1.ObjectMeta{ - Name: "test-volume-attachment-01", - }, - Spec: storagev1.VolumeAttachmentSpec{ - NodeName: "node-02", - }, - }, - }, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-02", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, }, { name: "Returns false and error when listing volume attachments fails", @@ -530,15 +676,16 @@ func TestCheckVolumeAttachmentsExist(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, nil, errors.New("error") - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, nil, errors.New("error") + }) + }, wantErr: true, }, { @@ -547,28 +694,28 @@ func TestCheckVolumeAttachmentsExist(t *testing.T) { ctx: context.Background(), opts: []Option{ WithNodeName("node-01"), - WithKubernetesClient(func() kubernetes.Interface { - client := fake.NewSimpleClientset() - - list := &storagev1.VolumeAttachmentList{ - Items: []storagev1.VolumeAttachment{ - { - ObjectMeta: metav1.ObjectMeta{ - Name: "test-volume-attachment-01", - }, - Spec: storagev1.VolumeAttachmentSpec{ - NodeName: "node-01", - }, - }, - }, - } - client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { - return true, list, nil - }) - return client - }()), + WithKubernetesClient(fake.NewSimpleClientset()), }, }, + beforeFunc: func(h *hook) { + client := h.client.(*fake.Clientset) + + list := &storagev1.VolumeAttachmentList{ + Items: []storagev1.VolumeAttachment{ + { + ObjectMeta: metav1.ObjectMeta{ + Name: "test-volume-attachment-01", + }, + Spec: storagev1.VolumeAttachmentSpec{ + NodeName: "node-01", + }, + }, + }, + } + client.Fake.PrependReactor("list", "volumeattachments", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) { + return true, list, nil + }) + }, want: true, wantErr: true, }, @@ -581,7 +728,15 @@ func TestCheckVolumeAttachmentsExist(t *testing.T) { tt.Fatal(err) } - got, err := h.(*hook).checkVolumeAttachmentsExist(test.args.ctx) + ctx, cancel := context.WithCancel(test.args.ctx) + defer cancel() + + hook := h.(*hook) + if test.beforeFunc != nil { + test.beforeFunc(hook) + } + + got, err := hook.checkVolumeAttachmentsExist(ctx) if test.wantErr { assert.NotNil(tt, err) } else { From f0f9ed409d38f3d56b9565a19a5caf34c7b791f2 Mon Sep 17 00:00:00 2001 From: Hiroto Funakoshi Date: Wed, 15 Jan 2025 15:56:01 +0900 Subject: [PATCH 13/14] Update pkg/driver/hook/hook.go --- pkg/driver/hook/hook.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/driver/hook/hook.go b/pkg/driver/hook/hook.go index 5b2d489..729dd4d 100644 --- a/pkg/driver/hook/hook.go +++ b/pkg/driver/hook/hook.go @@ -10,7 +10,7 @@ import ( "k8s.io/client-go/tools/clientcmd" ) -// Hook defines the lifecycle methods for a hook, such as PreStop, PostStart, and PostStop. +// Hook defines the lifecycle methods for a hook, such as PreStop, PostStart ..etc. // Implementations of this interface can define actions to be performed at different lifecycle stages. type Hook interface { PreStop(ctx context.Context) error From de1a4ff66a03e8e0baf1d92c2c384eb51521b11e Mon Sep 17 00:00:00 2001 From: Hiroto Funakoshi Date: Wed, 15 Jan 2025 15:56:53 +0900 Subject: [PATCH 14/14] Update pkg/driver/hook/hook.go --- pkg/driver/hook/hook.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/driver/hook/hook.go b/pkg/driver/hook/hook.go index 729dd4d..c703da7 100644 --- a/pkg/driver/hook/hook.go +++ b/pkg/driver/hook/hook.go @@ -10,7 +10,7 @@ import ( "k8s.io/client-go/tools/clientcmd" ) -// Hook defines the lifecycle methods for a hook, such as PreStop, PostStart ..etc. +// Hook defines the lifecycle methods for a hook, such as PreStop, PostStart, etc. // Implementations of this interface can define actions to be performed at different lifecycle stages. type Hook interface { PreStop(ctx context.Context) error