From 0f6ab2320666e8b6b7ada741d20310297845298e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= <lazzer@gmail.com>
Date: Wed, 21 Jan 2026 17:07:10 +0100
Subject: [PATCH] confd: Fix migration script

When migrate to 1.7 the keystore was not correctly
migrated.
---
 .../1.7/20-keystore-cleartext-key-rename.sh        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh b/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh
index fec54bc5..b55b42d7 100755
--- a/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh
+++ b/src/confd/share/migrate/1.7/20-keystore-cleartext-key-rename.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Rename cleartext-symmetric-key to symmetric-key
+# Rename cleartext-key to symmetric-key
 
 file=$1
 temp=${file}.tmp
@@ -7,12 +7,12 @@ temp=${file}.tmp
 jq '
 if .["ietf-keystore:keystore"]?."symmetric-keys"?."symmetric-key" then
   .["ietf-keystore:keystore"]."symmetric-keys"."symmetric-key" |= map(
-    if ."key-type"?."cleartext-key" then
-      # Rename cleartext-key to cleartext-symmetric-key
-      ."key-type"."cleartext-key" as $key_value |
-      ."key-type" |= (del(."cleartext-key") | . + {
-        "symmetric-key": $key_value
-      })
+    if ."infix-keystore:cleartext-key" then
+      # Rename cleartext-key to symmetric-key
+      ."infix-keystore:cleartext-key" as $key_value |
+      del(."infix-keystore:cleartext-key") | . + {
+        "infix-keystore:symmetric-key": $key_value
+      }
     else
       .
     end