0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46101 from thaJeztah/libnetwork_remote_concrete_type

Browse source 
libnetwork/remote: newDriver(): return concrete type
This commit is contained in:
Sebastiaan van Stijn 2023-07-28 17:14:52 +02:00 • committed by GitHub
commit 70e620f791
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/drivers/remote/driver.go
View file

@ -25,7 +25,7 @@ type maybeError interface {
GetError() string
}
func newDriver(name string, client *plugins.Client) driverapi.Driver {
func newDriver(name string, client *plugins.Client) *driver {
return &driver{networkType: name, endpoint: client}
}
@ -35,7 +35,7 @@ func Register(r driverapi.Registerer, pg plugingetter.PluginGetter) error {
newPluginHandler := func(name string, client *plugins.Client) {
// negotiate driver capability with client
d := newDriver(name, client)
c, err := d.(*driver).getCapabilities()
c, err := d.getCapabilities()
if err != nil {
log.G(context.TODO()).Errorf("error getting capability for %s due to %v", name, err)
return

8
libnetwork/drivers/remote/driver_test.go
View file

@ -239,7 +239,7 @@ func TestGetEmptyCapabilities(t *testing.T) {
t.Fatal("Driver type does not match that given")
}
_, err = d.(*driver).getCapabilities()
_, err = d.getCapabilities()
if err == nil {
t.Fatal("There should be error reported when get empty capability")
}
@ -273,7 +273,7 @@ func TestGetExtraCapabilities(t *testing.T) {
t.Fatal("Driver type does not match that given")
}
c, err := d.(*driver).getCapabilities()
c, err := d.getCapabilities()
if err != nil {
t.Fatal(err)
} else if c.DataScope != datastore.LocalScope {
@ -309,7 +309,7 @@ func TestGetInvalidCapabilities(t *testing.T) {
t.Fatal("Driver type does not match that given")
}
_, err = d.(*driver).getCapabilities()
_, err = d.getCapabilities()
if err == nil {
t.Fatal("There should be error reported when get invalid capability")
}
@ -427,7 +427,7 @@ func TestRemoteDriver(t *testing.T) {
t.Fatal("Driver type does not match that given")
}
c, err := d.(*driver).getCapabilities()
c, err := d.getCapabilities()
if err != nil {
t.Fatal(err)
} else if c.DataScope != datastore.GlobalScope {