Merge remote-tracking branch 'origin/topic/awelzel/avoid-node-interfa…

…ce-deprecation' * origin/topic/awelzel/avoid-node-interface-deprecation: install: Ignore Cluster$interface deprecation
zeek · Nov 7, 2023 · 0c4a9fa · 0c4a9fa
2 parents 81e8c48 + 1c65c6e
commit 0c4a9fa
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,11 @@
+2.5.0-39 | 2023-11-07 19:37:51 +0100
+
+  * install: Ignore Cluster$interface deprecation (Arne Welzel, Corelight)
+
+    The idea is that until v7.1, zeekctl continues to populate the interface
+    in cluster-layout.zeek just as before, but accesses by users will cause
+    deprecation warnings.
+
 2.5.0-37 | 2023-08-07 09:32:38 -0700
 
   * Use the right CMake variable for python executable (Tim Wojtulewicz, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0-37
+2.5.0-39
diff --git a/ZeekControl/install.py b/ZeekControl/install.py
@@ -185,6 +185,7 @@ def use_port(self, node):
 
         ostr = "# Automatically generated. Do not edit.\n"
         ostr += "redef Cluster::manager_is_logger = %s;\n" % manager_is_logger
+        ostr += "@pragma push ignore-deprecations\n"
         ostr += "redef Cluster::nodes = {\n"
 
         # Control definition.  For now just reuse the manager information.
@@ -211,6 +212,7 @@ def use_port(self, node):
             ostr += '\t["time-machine"] = [$node_type=Cluster::TIME_MACHINE, $ip=%s, $p=%s],\n' % (config.Config.timemachinehost, config.Config.timemachineport)
 
         ostr += "};\n"
+        ostr += "@pragma pop ignore-deprecations\n"
 
     try:
         with open(filename, "w") as out:

diff --git a/doc/main.rst b/doc/main.rst
@@ -3,7 +3,7 @@
 .. Note: This file includes further autogenerated ones.
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 2.5.0-37
+.. |version| replace:: 2.5.0-39
 
 ===========
 ZeekControl

diff --git a/testing/Baseline/command.install-layout-files/logger b/testing/Baseline/command.install-layout-files/logger
@@ -1,6 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 # Automatically generated. Do not edit.
 redef Cluster::manager_is_logger = F;
+@pragma push ignore-deprecations
 redef Cluster::nodes = {
 	["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=27760/tcp],
 	["logger"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=27761/tcp],
@@ -9,3 +10,4 @@ redef Cluster::nodes = {
 	["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27764/tcp, $interface="eth0", $manager="manager"],
 	["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27765/tcp, $interface="eth1", $manager="manager"],
 };
+@pragma pop ignore-deprecations
diff --git a/testing/Baseline/command.install-layout-files/no-logger b/testing/Baseline/command.install-layout-files/no-logger
@@ -1,10 +1,12 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 # Automatically generated. Do not edit.
 redef Cluster::manager_is_logger = T;
+@pragma push ignore-deprecations
 redef Cluster::nodes = {
 	["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=27760/tcp],
 	["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=27761/tcp],
 	["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=27762/tcp, $manager="manager"],
 	["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27763/tcp, $interface="eth0", $manager="manager"],
 	["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27764/tcp, $interface="eth1", $manager="manager"],
 };
+@pragma pop ignore-deprecations
diff --git a/testing/Baseline/command.install-layout-files/two-loggers b/testing/Baseline/command.install-layout-files/two-loggers
@@ -1,6 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 # Automatically generated. Do not edit.
 redef Cluster::manager_is_logger = F;
+@pragma push ignore-deprecations
 redef Cluster::nodes = {
 	["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=27760/tcp],
 	["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=27761/tcp],
@@ -10,3 +11,4 @@ redef Cluster::nodes = {
 	["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27765/tcp, $interface="eth0", $manager="manager"],
 	["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=27766/tcp, $interface="eth1", $manager="manager"],
 };
+@pragma pop ignore-deprecations
diff --git a/testing/Baseline/command.install-zeekport/no-logger b/testing/Baseline/command.install-zeekport/no-logger
@@ -1,10 +1,12 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 # Automatically generated. Do not edit.
 redef Cluster::manager_is_logger = T;
+@pragma push ignore-deprecations
 redef Cluster::nodes = {
 	["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=41234/tcp],
 	["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=41235/tcp],
 	["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=41236/tcp, $manager="manager"],
 	["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41237/tcp, $interface="eth0", $manager="manager"],
 	["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41238/tcp, $interface="eth1", $manager="manager"],
 };
+@pragma pop ignore-deprecations
diff --git a/testing/Baseline/command.install-zeekport/two-loggers b/testing/Baseline/command.install-zeekport/two-loggers
@@ -1,6 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 # Automatically generated. Do not edit.
 redef Cluster::manager_is_logger = F;
+@pragma push ignore-deprecations
 redef Cluster::nodes = {
 	["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=41234/tcp],
 	["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=41235/tcp],
@@ -10,3 +11,4 @@ redef Cluster::nodes = {
 	["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41239/tcp, $interface="eth0", $manager="manager"],
 	["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41240/tcp, $interface="eth1", $manager="manager"],
 };
+@pragma pop ignore-deprecations
diff --git a/testing/Baseline/command.install-zeekport/two-proxies b/testing/Baseline/command.install-zeekport/two-proxies
@@ -1,6 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 # Automatically generated. Do not edit.
 redef Cluster::manager_is_logger = F;
+@pragma push ignore-deprecations
 redef Cluster::nodes = {
 	["control"] = [$node_type=Cluster::CONTROL, $ip=127.0.0.1, $p=41234/tcp],
 	["logger"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=41235/tcp],
@@ -10,3 +11,4 @@ redef Cluster::nodes = {
 	["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41239/tcp, $interface="eth0", $manager="manager"],
 	["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=41240/tcp, $interface="eth1", $manager="manager"],
 };
+@pragma pop ignore-deprecations