@@ -22,8 +22,7 @@ import (
2222 "path/filepath"
2323 "runtime"
2424
25- . "github.com/onsi/ginkgo"
26- . "github.com/onsi/ginkgo/extensions/table"
25+ . "github.com/onsi/ginkgo/v2"
2726 . "github.com/onsi/gomega"
2827 "github.com/spf13/afero"
2928 "github.com/spf13/cobra"
@@ -63,7 +62,7 @@ var _ = Describe("Discover external plugins", func() {
6362 pluginFileName = "externalPlugin.sh"
6463 pluginFilePath = filepath .Join (pluginPath , "externalPlugin" , "v1" , pluginFileName )
6564
66- err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0700 )
65+ err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0o700 )
6766 Expect (err ).To (BeNil ())
6867
6968 f , err = fs .FS .Create (pluginFilePath )
@@ -125,7 +124,6 @@ var _ = Describe("Discover external plugins", func() {
125124
126125 Expect (ps [0 ].Name ()).To (Equal ("externalPlugin" ))
127126 Expect (ps [1 ].Name ()).To (Equal ("myotherexternalPlugin" ))
128-
129127 })
130128
131129 Context ("that are invalid" , func () {
@@ -136,14 +134,13 @@ var _ = Describe("Discover external plugins", func() {
136134
137135 pluginPath , err = getPluginsRoot (runtime .GOOS )
138136 Expect (err ).To (BeNil ())
139-
140137 })
141138
142139 It ("should error if the plugin found is not an executable" , func () {
143140 pluginFileName = "externalPlugin.sh"
144141 pluginFilePath = filepath .Join (pluginPath , "externalPlugin" , "v1" , pluginFileName )
145142
146- err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0700 )
143+ err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0o700 )
147144 Expect (err ).To (BeNil ())
148145
149146 f , err := fs .FS .Create (pluginFilePath )
@@ -154,21 +151,20 @@ var _ = Describe("Discover external plugins", func() {
154151 Expect (err ).To (BeNil ())
155152
156153 // set the plugin file permissions to read-only
157- err = fs .FS .Chmod (pluginFilePath , 0444 )
154+ err = fs .FS .Chmod (pluginFilePath , 0o444 )
158155 Expect (err ).To (Not (HaveOccurred ()))
159156
160157 ps , err := DiscoverExternalPlugins (fs .FS )
161158 Expect (err ).NotTo (BeNil ())
162159 Expect (err .Error ()).To (ContainSubstring ("not an executable" ))
163160 Expect (len (ps )).To (Equal (0 ))
164-
165161 })
166162
167163 It ("should error if the plugin found has an invalid plugin name" , func () {
168164 pluginFileName = ".sh"
169165 pluginFilePath = filepath .Join (pluginPath , "externalPlugin" , "v1" , pluginFileName )
170166
171- err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0700 )
167+ err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0o700 )
172168 Expect (err ).To (BeNil ())
173169
174170 f , err = fs .FS .Create (pluginFilePath )
@@ -179,7 +175,6 @@ var _ = Describe("Discover external plugins", func() {
179175 Expect (err ).NotTo (BeNil ())
180176 Expect (err .Error ()).To (ContainSubstring ("Invalid plugin name found" ))
181177 Expect (len (ps )).To (Equal (0 ))
182-
183178 })
184179 })
185180
@@ -191,14 +186,13 @@ var _ = Describe("Discover external plugins", func() {
191186
192187 pluginPath , err = getPluginsRoot (runtime .GOOS )
193188 Expect (err ).To (BeNil ())
194-
195189 })
196190
197191 It ("should skip adding the external plugin and not return any errors" , func () {
198192 pluginFileName = "random.sh"
199193 pluginFilePath = filepath .Join (pluginPath , "externalPlugin" , "v1" , pluginFileName )
200194
201- err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0700 )
195+ err = fs .FS .MkdirAll (filepath .Dir (pluginFilePath ), 0o700 )
202196 Expect (err ).To (BeNil ())
203197
204198 f , err = fs .FS .Create (pluginFilePath )
@@ -211,11 +205,10 @@ var _ = Describe("Discover external plugins", func() {
211205 ps , err := DiscoverExternalPlugins (fs .FS )
212206 Expect (err ).To (BeNil ())
213207 Expect (len (ps )).To (Equal (0 ))
214-
215208 })
216209
217210 It ("should fail if pluginsroot is empty" , func () {
218- var errPluginsRoot = errors .New ("could not retrieve plugins root" )
211+ errPluginsRoot : =errors .New ("could not retrieve plugins root" )
219212 retrievePluginsRoot = func (host string ) (string , error ) {
220213 return "" , errPluginsRoot
221214 }
@@ -224,7 +217,6 @@ var _ = Describe("Discover external plugins", func() {
224217 Expect (err ).NotTo (BeNil ())
225218
226219 Expect (err ).To (Equal (errPluginsRoot ))
227-
228220 })
229221
230222 It ("should fail for any other host that is not supported" , func () {
@@ -280,7 +272,6 @@ var _ = Describe("Discover external plugins", func() {
280272 Expect (pluginsroot ).To (Equal ("" ))
281273 Expect (err .Error ()).To (ContainSubstring ("error retrieving home dir" ))
282274 })
283-
284275 })
285276 })
286277
@@ -323,7 +314,6 @@ var _ = Describe("Discover external plugins", func() {
323314})
324315
325316var _ = Describe ("CLI options" , func () {
326-
327317 const (
328318 pluginName = "plugin"
329319 pluginVersion = "v1"
@@ -549,5 +539,4 @@ var _ = Describe("CLI options", func() {
549539 Expect (c .completionCommand ).To (BeTrue ())
550540 })
551541 })
552-
553542})
0 commit comments