Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5337 from vvoland/5327-27.x 

[27.x backport] plugins: don't panic on Close if PluginServer nil
This commit is contained in:
Sebastiaan van Stijn 2024-08-09 20:03:37 +02:00 committed by GitHub
parent 096e42b366 984ef9072c
commit f62c68eedd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cli-plugins/socket/socket.go
View File

@ -95,6 +95,9 @@ func (pl *PluginServer) Addr() net.Addr {
// //
// The error value is that of the underlying [net.Listner.Close] call. // The error value is that of the underlying [net.Listner.Close] call.
func (pl *PluginServer) Close() error { func (pl *PluginServer) Close() error {
if pl == nil {
return nil
}
logrus.Trace("Closing plugin server") logrus.Trace("Closing plugin server")
// Close connections first to ensure the connections get io.EOF instead // Close connections first to ensure the connections get io.EOF instead
// of a connection reset. // of a connection reset.

12
cli-plugins/socket/socket_test.go
View File

@ -117,6 +117,18 @@ func TestPluginServer(t *testing.T) {
assert.NilError(t, err, "failed to dial returned server") assert.NilError(t, err, "failed to dial returned server")
checkDirNoNewPluginServer(t) checkDirNoNewPluginServer(t)
}) })
t.Run("does not panic on Close if server is nil", func(t *testing.T) {
var srv *PluginServer
defer func() {
if r := recover(); r != nil {
t.Errorf("panicked on Close")
}
}()
err := srv.Close()
assert.NilError(t, err)
})
} }
func checkDirNoNewPluginServer(t *testing.T) { func checkDirNoNewPluginServer(t *testing.T) {