1. docker
  2. Commit 40908c5fcdf72e94cdfca78974413f31aa9f8529
Browse code

libnetwork/drivers: inline capabilities options

Remove the intermediate variable, and move the option closer
to where it's used, as in some cases we created the variable,
but could return with an error before it was used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2023/06/30 21:36:01
Showing 11 changed files
libnetwork/drivers/bridge/bridge.go
History View file @ 40908c5
... ... 
@@ -174,12 +174,10 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error {
174 174 
 	if err := d.configure(config); err != nil {
175 175 
 		return err
176 176 
 	}
177 
-
178 
-	c := driverapi.Capability{
177 
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
179 178 
 		DataScope:         datastore.LocalScope,
180 179 
 		ConnectivityScope: datastore.LocalScope,
181 
-	}
182 
-	return r.RegisterDriver(networkType, d, c)
180 
+	})
183 181 
 }
184 182
185 183 
 // Validate performs a static validation on the network configuration parameters.
libnetwork/drivers/bridge/brmanager/brmanager.go
History View file @ 40908c5
... ... 
@@ -20,11 +20,10 @@ func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
20 20
21 21 
 // Register registers a new instance of the bridge manager driver with r.
22 22 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
23 
-	c := driverapi.Capability{
23 
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
24 24 
 		DataScope:         datastore.LocalScope,
25 25 
 		ConnectivityScope: datastore.LocalScope,
26 
-	}
27 
-	return r.RegisterDriver(networkType, &driver{}, c)
26 
+	})
28 27 
 }
29 28
30 29 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/host/host.go
History View file @ 40908c5
... ... 
@@ -24,11 +24,10 @@ func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
24 24 
 }
25 25
26 26 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
27 
-	c := driverapi.Capability{
27 
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
28 28 
 		DataScope:         datastore.LocalScope,
29 29 
 		ConnectivityScope: datastore.LocalScope,
30 
-	}
31 
-	return r.RegisterDriver(networkType, &driver{}, c)
30 
+	})
32 31 
 }
33 32
34 33 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/ipvlan/ipvlan.go
History View file @ 40908c5
... ... 
@@ -64,18 +64,16 @@ type network struct {
64 64
65 65 
 // Register initializes and registers the libnetwork ipvlan driver.
66 66 
 func Register(r driverapi.Registerer, config map[string]interface{}) error {
67 
-	c := driverapi.Capability{
68 
-		DataScope:         datastore.LocalScope,
69 
-		ConnectivityScope: datastore.GlobalScope,
70 
-	}
71 67 
 	d := &driver{
72 68 
 		networks: networkTable{},
73 69 
 	}
74 70 
 	if err := d.initStore(config); err != nil {
75 71 
 		return err
76 72 
 	}
77 
-
78 
-	return r.RegisterDriver(driverName, d, c)
73 
+	return r.RegisterDriver(driverName, d, driverapi.Capability{
74 
+		DataScope:         datastore.LocalScope,
75 
+		ConnectivityScope: datastore.GlobalScope,
76 
+	})
79 77 
 }
80 78
81 79 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/ipvlan/ivmanager/ivmanager.go
History View file @ 40908c5
... ... 
@@ -20,11 +20,10 @@ func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
20 20
21 21 
 // Register registers a new instance of the ipvlan manager driver.
22 22 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
23 
-	c := driverapi.Capability{
23 
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
24 24 
 		DataScope:         datastore.LocalScope,
25 25 
 		ConnectivityScope: datastore.GlobalScope,
26 
-	}
27 
-	return r.RegisterDriver(networkType, &driver{}, c)
26 
+	})
28 27 
 }
29 28
30 29 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/macvlan/macvlan.go
History View file @ 40908c5
... ... 
@@ -58,18 +58,16 @@ type network struct {
58 58
59 59 
 // Register initializes and registers the libnetwork macvlan driver
60 60 
 func Register(r driverapi.Registerer, config map[string]interface{}) error {
61 
-	c := driverapi.Capability{
62 
-		DataScope:         datastore.LocalScope,
63 
-		ConnectivityScope: datastore.GlobalScope,
64 
-	}
65 61 
 	d := &driver{
66 62 
 		networks: networkTable{},
67 63 
 	}
68 64 
 	if err := d.initStore(config); err != nil {
69 65 
 		return err
70 66 
 	}
71 
-
72 
-	return r.RegisterDriver(driverName, d, c)
67 
+	return r.RegisterDriver(driverName, d, driverapi.Capability{
68 
+		DataScope:         datastore.LocalScope,
69 
+		ConnectivityScope: datastore.GlobalScope,
70 
+	})
73 71 
 }
74 72
75 73 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/macvlan/mvmanager/mvmanager.go
History View file @ 40908c5
... ... 
@@ -20,11 +20,10 @@ func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
20 20
21 21 
 // Register registers a new instance of the macvlan manager driver.
22 22 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
23 
-	c := driverapi.Capability{
23 
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
24 24 
 		DataScope:         datastore.LocalScope,
25 25 
 		ConnectivityScope: datastore.GlobalScope,
26 
-	}
27 
-	return r.RegisterDriver(networkType, &driver{}, c)
26 
+	})
28 27 
 }
29 28
30 29 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/null/null.go
History View file @ 40908c5
... ... 
@@ -18,10 +18,9 @@ type driver struct {
18 18
19 19 
 // Register registers a new instance of the null driver.
20 20 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
21 
-	c := driverapi.Capability{
21 
+	return r.RegisterDriver(networkType, &driver{}, driverapi.Capability{
22 22 
 		DataScope: datastore.LocalScope,
23 
-	}
24 
-	return r.RegisterDriver(networkType, &driver{}, c)
23 
+	})
25 24 
 }
26 25
27 26 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/overlay/overlay.go
History View file @ 40908c5
... ... 
@@ -39,10 +39,6 @@ type driver struct {
39 39
40 40 
 // Register registers a new instance of the overlay driver.
41 41 
 func Register(r driverapi.Registerer, config map[string]interface{}) error {
42 
-	c := driverapi.Capability{
43 
-		DataScope:         datastore.GlobalScope,
44 
-		ConnectivityScope: datastore.GlobalScope,
45 
-	}
46 42 
 	d := &driver{
47 43 
 		networks: networkTable{},
48 44 
 		peerDb: peerNetworkMap{
... ... 
@@ -51,8 +47,10 @@ func Register(r driverapi.Registerer, config map[string]interface{}) error {
51 51 
 		secMap: &encrMap{nodes: map[string][]*spi{}},
52 52 
 		config: config,
53 53 
 	}
54 
-
55 
-	return r.RegisterDriver(networkType, d, c)
54 
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
55 
+		DataScope:         datastore.GlobalScope,
56 
+		ConnectivityScope: datastore.GlobalScope,
57 
+	})
56 58 
 }
57 59
58 60 
 func (d *driver) configure() error {
libnetwork/drivers/overlay/ovmanager/ovmanager.go
History View file @ 40908c5
... ... 
@@ -54,11 +54,6 @@ func Init(dc driverapi.DriverCallback, _ map[string]interface{}) error {
54 54 
 // Register registers a new instance of the overlay driver.
55 55 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
56 56 
 	var err error
57 
-	c := driverapi.Capability{
58 
-		DataScope:         datastore.GlobalScope,
59 
-		ConnectivityScope: datastore.GlobalScope,
60 
-	}
61 
-
62 57 
 	d := &driver{
63 58 
 		networks: networkTable{},
64 59 
 	}
... ... 
@@ -68,7 +63,10 @@ func Register(r driverapi.Registerer, _ map[string]interface{}) error {
68 68 
 		return fmt.Errorf("failed to initialize vxlan id manager: %v", err)
69 69 
 	}
70 70
71 
-	return r.RegisterDriver(networkType, d, c)
71 
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
72 
+		DataScope:         datastore.GlobalScope,
73 
+		ConnectivityScope: datastore.GlobalScope,
74 
+	})
72 75 
 }
73 76
74 77 
 func (d *driver) NetworkAllocate(id string, option map[string]string, ipV4Data, ipV6Data []driverapi.IPAMData) (map[string]string, error) {
libnetwork/drivers/windows/overlay/overlay_windows.go
History View file @ 40908c5
... ... 
@@ -27,18 +27,16 @@ type driver struct {
27 27
28 28 
 // Register registers a new instance of the overlay driver.
29 29 
 func Register(r driverapi.Registerer, _ map[string]interface{}) error {
30 
-	c := driverapi.Capability{
31 
-		DataScope:         datastore.GlobalScope,
32 
-		ConnectivityScope: datastore.GlobalScope,
33 
-	}
34 
-
35 30 
 	d := &driver{
36 31 
 		networks: networkTable{},
37 32 
 	}
38 33
39 34 
 	d.restoreHNSNetworks()
40 35
41 
-	return r.RegisterDriver(networkType, d, c)
36 
+	return r.RegisterDriver(networkType, d, driverapi.Capability{
37 
+		DataScope:         datastore.GlobalScope,
38 
+		ConnectivityScope: datastore.GlobalScope,
39 
+	})
42 40 
 }
43 41
44 42 
 func (d *driver) restoreHNSNetworks() error {