From 8070f1596682f1504f5bba3ffd1fe28ba5d8d5c5 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Thu, 10 Aug 2023 12:34:24 +0200
Subject: [PATCH] libnetwork/drivers/bridge: rename some linux-only files

This makes it easier to spot if code is only used on Linux. Note that "all of"
the bridge driver is Linux-only.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 libnetwork/drivers/bridge/{bridge.go => bridge_linux.go}        | 2 --
 .../drivers/bridge/{bridge_test.go => bridge_linux_test.go}     | 2 --
 libnetwork/drivers/bridge/{interface.go => interface_linux.go}  | 2 --
 .../bridge/{interface_test.go => interface_linux_test.go}       | 2 --
 .../drivers/bridge/{network_test.go => network_linux_test.go}   | 2 --
 .../drivers/bridge/{port_mapping.go => port_mapping_linux.go}   | 2 --
 .../bridge/{port_mapping_test.go => port_mapping_linux_test.go} | 2 --
 .../drivers/bridge/{setup_device.go => setup_device_linux.go}   | 2 --
 .../bridge/{setup_device_test.go => setup_device_linux_test.go} | 2 --
 .../bridge/{setup_ip_tables.go => setup_ip_tables_linux.go}     | 2 --
 .../{setup_ip_tables_test.go => setup_ip_tables_linux_test.go}  | 2 --
 .../drivers/bridge/{setup_ipv4.go => setup_ipv4_linux.go}       | 2 --
 .../bridge/{setup_ipv4_test.go => setup_ipv4_linux_test.go}     | 2 --
 .../drivers/bridge/{setup_ipv6.go => setup_ipv6_linux.go}       | 2 --
 .../bridge/{setup_ipv6_test.go => setup_ipv6_linux_test.go}     | 2 --
 .../drivers/bridge/{setup_verify.go => setup_verify_linux.go}   | 2 --
 .../bridge/{setup_verify_test.go => setup_verify_linux_test.go} | 2 --
 17 files changed, 34 deletions(-)
 rename libnetwork/drivers/bridge/{bridge.go => bridge_linux.go} (99%)
 rename libnetwork/drivers/bridge/{bridge_test.go => bridge_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{interface.go => interface_linux.go} (99%)
 rename libnetwork/drivers/bridge/{interface_test.go => interface_linux_test.go} (98%)
 rename libnetwork/drivers/bridge/{network_test.go => network_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{port_mapping.go => port_mapping_linux.go} (99%)
 rename libnetwork/drivers/bridge/{port_mapping_test.go => port_mapping_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{setup_device.go => setup_device_linux.go} (99%)
 rename libnetwork/drivers/bridge/{setup_device_test.go => setup_device_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{setup_ip_tables.go => setup_ip_tables_linux.go} (99%)
 rename libnetwork/drivers/bridge/{setup_ip_tables_test.go => setup_ip_tables_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{setup_ipv4.go => setup_ipv4_linux.go} (99%)
 rename libnetwork/drivers/bridge/{setup_ipv4_test.go => setup_ipv4_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{setup_ipv6.go => setup_ipv6_linux.go} (99%)
 rename libnetwork/drivers/bridge/{setup_ipv6_test.go => setup_ipv6_linux_test.go} (99%)
 rename libnetwork/drivers/bridge/{setup_verify.go => setup_verify_linux.go} (99%)
 rename libnetwork/drivers/bridge/{setup_verify_test.go => setup_verify_linux_test.go} (99%)

diff --git a/libnetwork/drivers/bridge/bridge.go b/libnetwork/drivers/bridge/bridge_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/bridge.go
rename to libnetwork/drivers/bridge/bridge_linux.go
index 60fb3929e5..94aaae4f94 100644
--- a/libnetwork/drivers/bridge/bridge.go
+++ b/libnetwork/drivers/bridge/bridge_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/bridge_test.go b/libnetwork/drivers/bridge/bridge_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/bridge_test.go
rename to libnetwork/drivers/bridge/bridge_linux_test.go
index 525a22d3a8..6277ee1ab7 100644
--- a/libnetwork/drivers/bridge/bridge_test.go
+++ b/libnetwork/drivers/bridge/bridge_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/interface.go b/libnetwork/drivers/bridge/interface_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/interface.go
rename to libnetwork/drivers/bridge/interface_linux.go
index 4f78d81381..55637ee07b 100644
--- a/libnetwork/drivers/bridge/interface.go
+++ b/libnetwork/drivers/bridge/interface_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/interface_test.go b/libnetwork/drivers/bridge/interface_linux_test.go
similarity index 98%
rename from libnetwork/drivers/bridge/interface_test.go
rename to libnetwork/drivers/bridge/interface_linux_test.go
index e3fa53c9c8..d7859131d0 100644
--- a/libnetwork/drivers/bridge/interface_test.go
+++ b/libnetwork/drivers/bridge/interface_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/network_test.go b/libnetwork/drivers/bridge/network_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/network_test.go
rename to libnetwork/drivers/bridge/network_linux_test.go
index a4ff4de20b..710676fd03 100644
--- a/libnetwork/drivers/bridge/network_test.go
+++ b/libnetwork/drivers/bridge/network_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/port_mapping.go b/libnetwork/drivers/bridge/port_mapping_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/port_mapping.go
rename to libnetwork/drivers/bridge/port_mapping_linux.go
index d1ef05ab67..6d4dd40713 100644
--- a/libnetwork/drivers/bridge/port_mapping.go
+++ b/libnetwork/drivers/bridge/port_mapping_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/port_mapping_test.go b/libnetwork/drivers/bridge/port_mapping_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/port_mapping_test.go
rename to libnetwork/drivers/bridge/port_mapping_linux_test.go
index 9e82bbe5a3..a342d2e978 100644
--- a/libnetwork/drivers/bridge/port_mapping_test.go
+++ b/libnetwork/drivers/bridge/port_mapping_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_device.go b/libnetwork/drivers/bridge/setup_device_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_device.go
rename to libnetwork/drivers/bridge/setup_device_linux.go
index 2066df2a4c..1f499bc14e 100644
--- a/libnetwork/drivers/bridge/setup_device.go
+++ b/libnetwork/drivers/bridge/setup_device_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_device_test.go b/libnetwork/drivers/bridge/setup_device_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_device_test.go
rename to libnetwork/drivers/bridge/setup_device_linux_test.go
index 35832d0a88..a7868a00ea 100644
--- a/libnetwork/drivers/bridge/setup_device_test.go
+++ b/libnetwork/drivers/bridge/setup_device_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_ip_tables.go b/libnetwork/drivers/bridge/setup_ip_tables_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_ip_tables.go
rename to libnetwork/drivers/bridge/setup_ip_tables_linux.go
index 21c35f3d5d..5f4f6c7ab2 100644
--- a/libnetwork/drivers/bridge/setup_ip_tables.go
+++ b/libnetwork/drivers/bridge/setup_ip_tables_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_ip_tables_test.go b/libnetwork/drivers/bridge/setup_ip_tables_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_ip_tables_test.go
rename to libnetwork/drivers/bridge/setup_ip_tables_linux_test.go
index 2d8ceeae8e..8d46a73b45 100644
--- a/libnetwork/drivers/bridge/setup_ip_tables_test.go
+++ b/libnetwork/drivers/bridge/setup_ip_tables_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_ipv4.go b/libnetwork/drivers/bridge/setup_ipv4_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_ipv4.go
rename to libnetwork/drivers/bridge/setup_ipv4_linux.go
index ef8ee724c4..6ffc5f7231 100644
--- a/libnetwork/drivers/bridge/setup_ipv4.go
+++ b/libnetwork/drivers/bridge/setup_ipv4_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_ipv4_test.go b/libnetwork/drivers/bridge/setup_ipv4_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_ipv4_test.go
rename to libnetwork/drivers/bridge/setup_ipv4_linux_test.go
index 92b8e41b21..6b191b3745 100644
--- a/libnetwork/drivers/bridge/setup_ipv4_test.go
+++ b/libnetwork/drivers/bridge/setup_ipv4_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_ipv6.go b/libnetwork/drivers/bridge/setup_ipv6_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_ipv6.go
rename to libnetwork/drivers/bridge/setup_ipv6_linux.go
index ba42e9dfb9..092dfeb477 100644
--- a/libnetwork/drivers/bridge/setup_ipv6.go
+++ b/libnetwork/drivers/bridge/setup_ipv6_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_ipv6_test.go b/libnetwork/drivers/bridge/setup_ipv6_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_ipv6_test.go
rename to libnetwork/drivers/bridge/setup_ipv6_linux_test.go
index ed358cb744..5ad9e13820 100644
--- a/libnetwork/drivers/bridge/setup_ipv6_test.go
+++ b/libnetwork/drivers/bridge/setup_ipv6_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_verify.go b/libnetwork/drivers/bridge/setup_verify_linux.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_verify.go
rename to libnetwork/drivers/bridge/setup_verify_linux.go
index ad40cf6567..12bf4c7c42 100644
--- a/libnetwork/drivers/bridge/setup_verify.go
+++ b/libnetwork/drivers/bridge/setup_verify_linux.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (
diff --git a/libnetwork/drivers/bridge/setup_verify_test.go b/libnetwork/drivers/bridge/setup_verify_linux_test.go
similarity index 99%
rename from libnetwork/drivers/bridge/setup_verify_test.go
rename to libnetwork/drivers/bridge/setup_verify_linux_test.go
index 602dd89c5c..f6850ba202 100644
--- a/libnetwork/drivers/bridge/setup_verify_test.go
+++ b/libnetwork/drivers/bridge/setup_verify_linux_test.go
@@ -1,5 +1,3 @@
-//go:build linux
-
 package bridge
 
 import (