From d12638d114b08df4d5bf3663e9a6689968643cdb Mon Sep 17 00:00:00 2001 From: Amol Deodhar Date: Thu, 19 Sep 2024 08:56:10 -0400 Subject: [PATCH] fix tests --- go.mod | 9 -- go.sum | 96 ------------------ internal/driver/controllerserver.go | 4 +- internal/driver/luks.go | 2 +- internal/driver/metadata.go | 4 +- internal/driver/nodeserver_helpers.go | 12 +-- .../driver/nodeserver_luks_encryption_test.go | 97 ++++++++++++------- 7 files changed, 70 insertions(+), 154 deletions(-) diff --git a/go.mod b/go.mod index f58cbddc..9ee05893 100644 --- a/go.mod +++ b/go.mod @@ -4,14 +4,12 @@ go 1.22.5 require ( github.com/container-storage-interface/spec v1.10.0 - github.com/dell/csi-baremetal v1.7.0 github.com/go-logr/logr v1.4.1 github.com/google/uuid v1.6.0 github.com/ianschenck/envflag v0.0.0-20140720210342-9111d830d133 github.com/linode/go-metadata v0.2.0 github.com/linode/linodego v1.40.0 github.com/martinjungblut/go-cryptsetup v0.0.0-20220520180014-fd0874fd07a6 - github.com/sirupsen/logrus v1.9.3 go.uber.org/automaxprocs v1.5.3 go.uber.org/mock v0.4.0 golang.org/x/net v0.29.0 @@ -25,15 +23,8 @@ require ( ) require ( - github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/go-resty/resty/v2 v2.13.1 // indirect - github.com/golang/protobuf v1.5.4 // indirect github.com/moby/sys/mountinfo v0.6.2 // indirect - github.com/prometheus/client_golang v1.18.0 // indirect - github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.46.0 // indirect - github.com/prometheus/procfs v0.13.0 // indirect golang.org/x/text v0.18.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect gopkg.in/ini.v1 v1.66.6 // indirect diff --git a/go.sum b/go.sum index 2f069e9a..6f56f25b 100644 --- a/go.sum +++ b/go.sum @@ -1,94 +1,31 @@ -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/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= -github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/container-storage-interface/spec v1.10.0 h1:YkzWPV39x+ZMTa6Ax2czJLLwpryrQ+dPesB34mrRMXA= github.com/container-storage-interface/spec v1.10.0/go.mod h1:DtUvaQszPml1YJfIK7c00mlv6/g4wNMLanLgiUbKFRI= -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/dell/csi-baremetal v1.7.0 h1:o5nOfCoSZCQJtPxSyr30BrJ+rDX299cSB0ikQ28xN+A= -github.com/dell/csi-baremetal v1.7.0/go.mod h1:Oip5RkRsUySOQJnRFcqGzsNreIq4DmG1dYuLC+eYYSU= -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/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/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= -github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -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.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-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz03g= github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -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.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -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/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/ianschenck/envflag v0.0.0-20140720210342-9111d830d133 h1:h6FO/Da7rdYqJbRYMW9f+SMBWnJVguWh+0ERefW8zp8= github.com/ianschenck/envflag v0.0.0-20140720210342-9111d830d133/go.mod h1:pyYc5lldRtL0l5YitYVv1dLKuC0qhMfAfiR7BLsN2pA= -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/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= -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.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/linode/go-metadata v0.2.0 h1:hlWzkYLa80ikA0NmFX2hcwhcnWFol8F3UIvJnOgdKw4= github.com/linode/go-metadata v0.2.0/go.mod h1:XraDbSwms0+CtA7/Qh7agkSvGDc6H0s782kpX9MdMu0= github.com/linode/linodego v1.40.0 h1:7ESY0PwK94hoggoCtIroT1Xk6b1flrFBNZ6KwqbTqlI= github.com/linode/linodego v1.40.0/go.mod h1:NsUw4l8QrLdIofRg1NYFBbW5ZERnmbZykVBszPZLORM= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/martinjungblut/go-cryptsetup v0.0.0-20220520180014-fd0874fd07a6 h1:YDjLk3wsL5ZLhLC4TIwIvT2NkSCAdAV6pzzZaRfj4jk= github.com/martinjungblut/go-cryptsetup v0.0.0-20220520180014-fd0874fd07a6/go.mod h1:gZoZ0+POlM1ge/VUxWpMmZVNPzzMJ7l436CgkQ5+qzU= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= -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.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= -github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= -github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= -github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= -github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o= -github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= -github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= -github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= @@ -100,8 +37,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -122,7 +57,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -136,8 +70,6 @@ golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -154,49 +86,21 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= -gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d h1:JU0iKnSg02Gmb5ZdV8nYsKEKsP6o/FGVWTrw4i1DA9A= google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo= google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= -gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -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.29.0 h1:0VuspFG7Hj+SxyF/Z/2T0uFbI5gb5LRgEyUVE3Q4lV0= -k8s.io/apiextensions-apiserver v0.29.0/go.mod h1:TKmpy3bTS0mr9pylH0nOt/QzQRrW7/h7yLdRForMZwc= 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/component-base v0.29.0 h1:T7rjd5wvLnPBV1vC4zWd/iWRbV8Mdxs+nGaoaFzGw3s= -k8s.io/component-base v0.29.0/go.mod h1:sADonFTQ9Zc9yFLghpDpmNXEdHyQmFIGbiuZbqAXQ1M= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -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.30.3 h1:8Z3wSW5+GSvGNtlDhtoZrBCKLMIf5z/9tf8pie+G06s= k8s.io/mount-utils v0.30.3/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo= 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.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0= -sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s= -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.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.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/internal/driver/controllerserver.go b/internal/driver/controllerserver.go index 9ebaa14c..22c56946 100644 --- a/internal/driver/controllerserver.go +++ b/internal/driver/controllerserver.go @@ -497,7 +497,6 @@ func (cs *ControllerServer) ValidateVolumeCapabilities(ctx context.Context, req return &csi.ValidateVolumeCapabilitiesResponse{}, errInternal("get volume: %v", err) } - resp := &csi.ValidateVolumeCapabilitiesResponse{} if validVolumeCapabilities(volumeCapabilities) { resp.Confirmed = &csi.ValidateVolumeCapabilitiesResponse_Confirmed{VolumeCapabilities: volumeCapabilities} @@ -532,7 +531,6 @@ func (cs *ControllerServer) ListVolumes(ctx context.Context, req *csi.ListVolume nextToken = strconv.Itoa(listOpts.Page + 1) } - // List all volumes log.V(4).Info("Listing volumes", "list_opts", listOpts) volumes, err := cs.client.ListVolumes(ctx, listOpts) @@ -606,7 +604,7 @@ func (cs *ControllerServer) ControllerGetCapabilities(ctx context.Context, req * func (cs *ControllerServer) ControllerExpandVolume(ctx context.Context, req *csi.ControllerExpandVolumeRequest) (*csi.ControllerExpandVolumeResponse, error) { log, ctx, done := logger.GetLogger(ctx).WithMethod("ControllerExpandVolume") defer done() - + log.V(2).Info("Processing request", "req", req) volumeID, statusErr := linodevolumes.VolumeIdAsInt("ControllerExpandVolume", req) diff --git a/internal/driver/luks.go b/internal/driver/luks.go index 82a2bd20..988cf0b1 100644 --- a/internal/driver/luks.go +++ b/internal/driver/luks.go @@ -187,7 +187,7 @@ func (e *Encryption) luksOpen(ctx context.Context, luksCtx LuksContext, source s log.V(4).Info("Loading luks device", "device", newLuksDevice.Identifier, "VolumeName", luksCtx.VolumeName) err = newLuksDevice.Device.Load(cryptsetup.LUKS2{SectorSize: 512}) if err != nil { - return "", fmt.Errorf("Loading %s luks device %s: %w", newLuksDevice.Identifier, luksCtx.VolumeName, luksCtx.EncryptionKey, err) + return "", fmt.Errorf("Loading %s luks device %s volumekey %s: %w", newLuksDevice.Identifier, luksCtx.VolumeName, luksCtx.EncryptionKey, err) } // Activate the device using the encryption key diff --git a/internal/driver/metadata.go b/internal/driver/metadata.go index e8dfd938..06e46018 100644 --- a/internal/driver/metadata.go +++ b/internal/driver/metadata.go @@ -45,7 +45,7 @@ func GetMetadata(ctx context.Context) (Metadata, error) { return Metadata{}, fmt.Errorf("get instance data: %w", err) } - log.V(4).Info("Successfully retrieved metadata", + log.V(4).Info("Successfully retrieved metadata", "instanceID", data.ID, "instanceLabel", data.Label, "region", data.Region, @@ -140,7 +140,7 @@ func GetMetadataFromAPI(ctx context.Context, client *linodego.Client) (Metadata, Memory: memory, } - log.V(4).Info("Successfully retrieved metadata", + log.V(4).Info("Successfully retrieved metadata", "instanceID", metadata.ID, "instanceLabel", metadata.Label, "region", metadata.Region, diff --git a/internal/driver/nodeserver_helpers.go b/internal/driver/nodeserver_helpers.go index 77325c89..cc4b9dcb 100644 --- a/internal/driver/nodeserver_helpers.go +++ b/internal/driver/nodeserver_helpers.go @@ -22,8 +22,6 @@ import ( "strings" "github.com/container-storage-interface/spec/lib/go/csi" - "github.com/dell/csi-baremetal/pkg/base/linuxutils/lsblk" - "github.com/sirupsen/logrus" linodevolumes "github.com/linode/linode-blockstorage-csi-driver/pkg/linode-volumes" "github.com/linode/linode-blockstorage-csi-driver/pkg/logger" @@ -337,11 +335,11 @@ func (ns *NodeServer) formatLUKSVolume(ctx context.Context, devicePath string, l log.V(4).Info("Entering formatLUKSVolume", "devicePath", devicePath, "luksContext", luksContext) // Verify if the device is already formatted - lsblkExecutor := lsblk.NewLSBLK(logrus.New()) - devices, _ := lsblkExecutor.GetBlockDevices(devicePath) - for number, device := range devices { - log.V(4).Info("device", "device number", number, "device", device) - } + // lsblkExecutor := lsblk.NewLSBLK(logrus.New()) + // devices, _ := lsblkExecutor.GetBlockDevices(devicePath) + // for number, device := range devices { + // log.V(4).Info("device", "device number", number, "device", device) + // } // Validate the LUKS context. if err = luksContext.validate(); err != nil { diff --git a/internal/driver/nodeserver_luks_encryption_test.go b/internal/driver/nodeserver_luks_encryption_test.go index 3d9aff04..8b123795 100644 --- a/internal/driver/nodeserver_luks_encryption_test.go +++ b/internal/driver/nodeserver_luks_encryption_test.go @@ -51,16 +51,17 @@ func TestNodeServer_mountVolume_luks(t *testing.T) { c.EXPECT().CombinedOutput().Return([]byte("TYPE=ext4"), nil).AnyTimes() m.EXPECT().Command(gomock.Any(), gomock.Any(), gomock.Any()).Return(c) c.EXPECT().CombinedOutput().Return([]byte("TYPE=ext4"), nil).AnyTimes() + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(exec.CodeExitError{Code: 2, Err: fmt.Errorf("test")}) }, expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().Init(gomock.Any()).Return(md, nil).AnyTimes() }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Dump().Return(1).AnyTimes() m.EXPECT().Format(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() m.EXPECT().KeyslotAddByVolumeKey(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() m.EXPECT().Free().Return(true).AnyTimes() - m.EXPECT().Load(gomock.Any()).Return(nil).AnyTimes() m.EXPECT().ActivateByPassphrase("test", gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() }, expectFsCalls: func(m *mocks.MockFileSystem) { @@ -87,16 +88,21 @@ func TestNodeServer_mountVolume_luks(t *testing.T) { }, expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { // Mount_linux: Format disk - m.EXPECT().Command(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(c) + m.EXPECT().Command(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(c).AnyTimes() c.EXPECT().CombinedOutput().Return([]byte("TYPE=ext4"), nil).AnyTimes() - m.EXPECT().Command(gomock.Any(), gomock.Any(), gomock.Any()).Return(c) + m.EXPECT().Command(gomock.Any(), gomock.Any(), gomock.Any()).Return(c).AnyTimes() c.EXPECT().CombinedOutput().Return([]byte("TYPE=ext4"), nil).AnyTimes() + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(nil).AnyTimes() }, expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().Init(gomock.Any()).Return(md, nil).AnyTimes() }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Dump().Return(0).AnyTimes() + m.EXPECT().Free().Return(true).AnyTimes() + m.EXPECT().Load(gomock.Any()).Return(nil).AnyTimes() + m.EXPECT().ActivateByPassphrase(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() }, expectFsCalls: func(m *mocks.MockFileSystem) { m.EXPECT().IsNotExist(gomock.Any()).Return(true).AnyTimes() @@ -120,6 +126,12 @@ func TestNodeServer_mountVolume_luks(t *testing.T) { expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().Init(gomock.Any()).Return(nil, fmt.Errorf("luks initializing failed")).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(exec.CodeExitError{Code: 2, Err: fmt.Errorf("test")}) + }, wantErr: true, }, { @@ -138,8 +150,13 @@ func TestNodeServer_mountVolume_luks(t *testing.T) { expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().Init(gomock.Any()).Return(md, nil).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(exec.CodeExitError{Code: 2, Err: fmt.Errorf("test")}) + }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Dump().Return(1).AnyTimes() m.EXPECT().Format(gomock.Any(), gomock.Any()).Return(fmt.Errorf("luks formatting failed")).AnyTimes() m.EXPECT().Free().Return(true).AnyTimes() }, @@ -158,39 +175,19 @@ func TestNodeServer_mountVolume_luks(t *testing.T) { }, Secrets: map[string]string{LuksKeyAttribute: "test"}, }, - expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { - mc.EXPECT().Init(gomock.Any()).Return(md, nil).AnyTimes() - }, - expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Dump().Return(1).AnyTimes() - m.EXPECT().Format(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() - m.EXPECT().KeyslotAddByVolumeKey(gomock.Any(), gomock.Any(), gomock.Any()).Return(fmt.Errorf("luks adding keyslot failed")).AnyTimes() - m.EXPECT().Free().Return(true).AnyTimes() - }, - wantErr: true, - }, - { - name: "Error - unable to load LUKS volume", - devicePath: "/tmp/test", - req: &csi.NodeStageVolumeRequest{ - VolumeId: "test", - VolumeContext: map[string]string{ - LuksEncryptedAttribute: "true", - LuksCipherAttribute: "aes-xts-plain64", - LuksKeySizeAttribute: "512", - PublishInfoVolumeName: "test", - }, - Secrets: map[string]string{LuksKeyAttribute: "test"}, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(exec.CodeExitError{Code: 2, Err: fmt.Errorf("test")}) }, expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().Init(gomock.Any()).Return(md, nil).AnyTimes() }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Dump().Return(1).AnyTimes() m.EXPECT().Format(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() - m.EXPECT().KeyslotAddByVolumeKey(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() + m.EXPECT().KeyslotAddByVolumeKey(gomock.Any(), gomock.Any(), gomock.Any()).Return(fmt.Errorf("luks adding keyslot failed")).AnyTimes() m.EXPECT().Free().Return(true).AnyTimes() - m.EXPECT().Load(gomock.Any()).Return(fmt.Errorf("luks loading failed")).AnyTimes() }, wantErr: true, }, @@ -210,12 +207,16 @@ func TestNodeServer_mountVolume_luks(t *testing.T) { expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().Init(gomock.Any()).Return(md, nil).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(exec.CodeExitError{Code: 2, Err: fmt.Errorf("test")}) + }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Dump().Return(1).AnyTimes() m.EXPECT().Format(gomock.Any(), gomock.Any()).Return(nil).AnyTimes() m.EXPECT().KeyslotAddByVolumeKey(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes() m.EXPECT().Free().Return(true).AnyTimes() - m.EXPECT().Load(gomock.Any()).Return(nil).AnyTimes() m.EXPECT().ActivateByPassphrase("test", gomock.Any(), gomock.Any(), gomock.Any()).Return(fmt.Errorf("luks activating failed")).AnyTimes() }, wantErr: true, @@ -269,6 +270,7 @@ func TestNodeServer_closeLuksMountSource(t *testing.T) { name string expectCryptDeviceCalls func(m *mocks.MockDevice) expectCryptSetUpCalls func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) + expectExecCalls func(m *mocks.MockExecutor, c *mocks.MockCommand) volumeID string wantErr bool }{ @@ -277,6 +279,12 @@ func TestNodeServer_closeLuksMountSource(t *testing.T) { expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().InitByName(gomock.Any()).Return(md, nil).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(nil).AnyTimes() + }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { m.EXPECT().Free().Return(true).AnyTimes() m.EXPECT().Deactivate(gomock.Any()).Return(nil).AnyTimes() @@ -293,6 +301,12 @@ func TestNodeServer_closeLuksMountSource(t *testing.T) { m.EXPECT().Free().Return(true).AnyTimes() m.EXPECT().Deactivate(gomock.Any()).Return(nil).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(nil).AnyTimes() + }, volumeID: "3232-pvc1234", wantErr: false, }, @@ -301,6 +315,12 @@ func TestNodeServer_closeLuksMountSource(t *testing.T) { expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().InitByName(gomock.Any()).Return(nil, fmt.Errorf("luks initializing failed")).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(nil).AnyTimes() + }, wantErr: true, }, { @@ -308,8 +328,13 @@ func TestNodeServer_closeLuksMountSource(t *testing.T) { expectCryptSetUpCalls: func(mc *mocks.MockCryptSetupClient, md *mocks.MockDevice) { mc.EXPECT().InitByName(gomock.Any()).Return(md, nil).AnyTimes() }, + expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { + // Mount_linux: Format disk + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() + m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() + c.EXPECT().Run().Return(nil).AnyTimes() + }, expectCryptDeviceCalls: func(m *mocks.MockDevice) { - m.EXPECT().Free().Return(true).AnyTimes() m.EXPECT().Deactivate(gomock.Any()).Return(fmt.Errorf("failed to deactivate")).AnyTimes() }, volumeID: "3232-pvc1234", @@ -365,7 +390,7 @@ func TestNodeServer_formatLUKSVolume(t *testing.T) { name: "Error - Encryption enabled. Volume not formatted. We will proceed with luks formatting and fail to validate.", expectFsCalls: func(m *mocks.MockFileSystem) {}, expectExecCalls: func(m *mocks.MockExecutor, c *mocks.MockCommand) { - m.EXPECT().LookPath(gomock.Any()).Return("/bin/test", nil).AnyTimes() + m.EXPECT().LookPath(gomock.Any()).Return("/bin/blkid", nil).AnyTimes() m.EXPECT().Command(gomock.Any(), gomock.Any()).Return(c).AnyTimes() c.EXPECT().Run().Return(exec.CodeExitError{Code: 2, Err: fmt.Errorf("test")}).AnyTimes() },