From 516c2c43392907493f4157ea7d6d2149b725688b Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 12 Jan 2024 21:53:17 +0100
Subject: wireguard: T5924: harden migration script logic 22-to-23

The original commit 2c1c36135 ("wireguard: T5413: Blocked adding the peer with
the router's public key") did not honor the fact that there might be no
private-key CLI node defined for a WireGuard interface. If this is the case,
private-key defaults to "default". This fact needs to be handled in the
migration script.
---
 src/migration-scripts/interfaces/22-to-23 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/migration-scripts/interfaces/22-to-23 b/src/migration-scripts/interfaces/22-to-23
index c3c4ea366..a66bd303b 100755
--- a/src/migration-scripts/interfaces/22-to-23
+++ b/src/migration-scripts/interfaces/22-to-23
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2024 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -33,9 +33,11 @@ if __name__ == '__main__':
     if not config.exists(base):
         # Nothing to do
         sys.exit(0)
+
     for interface in config.list_nodes(base):
-        private_key_name = config.return_value(
-            base + [interface, 'private-key'])
+        private_key_name = 'default'
+        if config.exists(base + [interface, 'private-key']):
+            private_key_name = config.return_value(base + [interface, 'private-key'])
         private_key_path = f'/config/auth/wireguard/{private_key_name}/private.key'
         with open(private_key_path, 'r') as file:
             private_key = file.read().rstrip()
-- 
cgit v1.2.3


From 375dc0c9b5da7f51a1b7e89a965affab8266ba04 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Fri, 12 Jan 2024 21:57:51 +0100
Subject: GitHub: add pull request labaler

---
 .github/labeler.yml                       | 12 ++++++++++++
 .github/workflows/pull-request-labels.yml | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/pull-request-labels.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..e0b9ee430
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,12 @@
+equuleus:
+  - any:
+    - base-branch: 'equuleus'
+current:
+  - any:
+    - base-branch: 'current'
+crux:
+  - any:
+    - base-branch: 'crux'
+sagitta:
+  - any:
+    - base-branch: 'sagitta'
diff --git a/.github/workflows/pull-request-labels.yml b/.github/workflows/pull-request-labels.yml
new file mode 100644
index 000000000..778daae30
--- /dev/null
+++ b/.github/workflows/pull-request-labels.yml
@@ -0,0 +1,20 @@
+---
+name: Add pull request labels
+
+on:
+  pull_request_target:
+    branches:
+      - current
+      - crux
+      - equuleus
+      - sagitta
+
+jobs:
+  add-pr-label:
+    name: Add PR Labels
+    runs-on: ubuntu-20.04
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: actions/labeler@v5.0.0-alpha.1
-- 
cgit v1.2.3