From 2367c7d31b30f8d3be41f8ac4f505ddffb97ce70 Mon Sep 17 00:00:00 2001
From: Richard Laager <rlaager@wiktel.com>
Date: Fri, 26 May 2023 23:17:24 -0500
Subject: [PATCH] bird2: Remove stray whitespace when no MD5

When no MD5 password is set, there should not be extra whitespace.
---
 data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf           | 3 ---
 data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf           | 2 --
 .../views/api/v4/router/collector/bird2/neighbors.foil.php  | 6 +++---
 .../views/api/v4/router/server/bird2/neighbors.foil.php     | 5 +++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf b/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf
index 1961ad89c..3a28162c4 100644
--- a/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf
+++ b/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv4.conf
@@ -443,7 +443,6 @@ protocol bgp pb_as42_vli3_ipv4 {
         import where f_import_as42();
         export none;
     };
-
     password "mcWsqMdzGwTKt67g";
 }
 
@@ -583,7 +582,6 @@ protocol bgp pb_as112_vli4_ipv4 {
         import where f_import_as112();
         export none;
     };
-
     password "w83fmGpRDtaKomQo";
 }
 
@@ -729,7 +727,6 @@ protocol bgp pb_as1213_vli1_ipv4 {
         import where f_import_as1213();
         export none;
     };
-
     password "N7rX2SdfbRsyBLTm";
 }
 
diff --git a/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf b/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf
index 5f1b083e7..2760ff3c5 100644
--- a/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf
+++ b/data/ci/known-good/ci-apiv4-b2-rc1-lan1-ipv6.conf
@@ -347,7 +347,6 @@ protocol bgp pb_as1213_vli1_ipv6 {
         import where f_import_as1213();
         export none;
     };
-
     password "N7rX2SdfbRsyBLTm";
 }
 
@@ -488,7 +487,6 @@ protocol bgp pb_as25441_vli6_ipv6 {
         import where f_import_as25441();
         export none;
     };
-
     password "X8Ks9QnbER9cyzU3";
 }
 
diff --git a/resources/views/api/v4/router/collector/bird2/neighbors.foil.php b/resources/views/api/v4/router/collector/bird2/neighbors.foil.php
index 02ff4968b..551103028 100644
--- a/resources/views/api/v4/router/collector/bird2/neighbors.foil.php
+++ b/resources/views/api/v4/router/collector/bird2/neighbors.foil.php
@@ -239,9 +239,9 @@ function f_import_as<?= $int['autsys'] ?>()
         import where f_import_as<?= $int['autsys'] ?>();
         export none;
     };
-
-    <?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>
-
+<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
+    password "<?= $int['bgpmd5secret'] ?>";
+<?php endif; ?>
 }
 
 <?php endforeach; ?>
diff --git a/resources/views/api/v4/router/server/bird2/neighbors.foil.php b/resources/views/api/v4/router/server/bird2/neighbors.foil.php
index 92fad682a..b40604689 100644
--- a/resources/views/api/v4/router/server/bird2/neighbors.foil.php
+++ b/resources/views/api/v4/router/server/bird2/neighbors.foil.php
@@ -281,8 +281,9 @@
             table t_<?= $int['fvliid'] ?>_as<?= $int['autsys'] ?>;
             export filter f_export_as<?= $int['autsys'] ?>;
         };
-        <?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>password "<?= $int['bgpmd5secret'] ?>";<?php endif; ?>
-
+<?php if( $int['bgpmd5secret'] && !$t->router->skip_md5 ): ?>
+        password "<?= $int['bgpmd5secret'] ?>";
+<?php endif; ?>
 }
 
 <?php endforeach; ?>