From 2aa64c7e758739492d1fdd84421b649eb2e7149d Mon Sep 17 00:00:00 2001
From: "Alan T. DeKok" <aland@freeradius.org>
Date: Mon, 9 Oct 2023 09:00:36 -0400
Subject: [PATCH] more auto-conversion

perl -p -i -e "s/%{([a-zA-Z0-9._-]+):([a-zA-Z0-9.]+)}/%\$1('\$2')/g"  $(git grep -lE '%\{[a-z0-9.-]+:' src/tests/keywords/ src/tests/modules)
---
 src/tests/keywords/rand                    | 2 +-
 src/tests/modules/idn/idn.unlang           | 2 +-
 src/tests/modules/json/eval.unlang         | 2 +-
 src/tests/modules/pap/bin_random.unlang    | 2 +-
 src/tests/modules/redis/cluster_key.unlang | 6 +++---
 src/tests/modules/redis/cluster_reset.inc  | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/tests/keywords/rand b/src/tests/keywords/rand
index 760d3b385b..5d5441e8cc 100644
--- a/src/tests/keywords/rand
+++ b/src/tests/keywords/rand
@@ -16,7 +16,7 @@ if !(&Tmp-String-0 == "") {
 	test_fail
 }
 
-&Tmp-Integer-0 := %{rand:123}
+&Tmp-Integer-0 := %rand('123')
 
 if (!&Tmp-Integer-0) {
 	test_fail
diff --git a/src/tests/modules/idn/idn.unlang b/src/tests/modules/idn/idn.unlang
index 4fa52e5ccd..8ad0697798 100644
--- a/src/tests/modules/idn/idn.unlang
+++ b/src/tests/modules/idn/idn.unlang
@@ -2,7 +2,7 @@
 #  PRE: update if
 #
 
-&Tmp-String-0 := "%{idn:example.com}"
+&Tmp-String-0 := "%idn('example.com')"
 &Tmp-String-1 := "%{idn:èxâmpłé.com}"
 &Tmp-String-2 := "%{idn:пример.com}"
 &Tmp-String-3 := "%{idn:παράδειγμα.com}"
diff --git a/src/tests/modules/json/eval.unlang b/src/tests/modules/json/eval.unlang
index d0c06b8cf3..9ea0018e78 100644
--- a/src/tests/modules/json/eval.unlang
+++ b/src/tests/modules/json/eval.unlang
@@ -422,7 +422,7 @@ if !(&Tmp-Integer-0 == 2147483647) {
 {\
 	\"foo.bar\": \"baz\" \
 }"
-&Tmp-String-2 := "%{taint:foo.bar}"
+&Tmp-String-2 := "%taint('foo.bar')"
 
 map json &Tmp-String-0 {
 	&Tmp-String-1 := "$.%{Tmp-String-2}"
diff --git a/src/tests/modules/pap/bin_random.unlang b/src/tests/modules/pap/bin_random.unlang
index b03376793f..2d94b007be 100644
--- a/src/tests/modules/pap/bin_random.unlang
+++ b/src/tests/modules/pap/bin_random.unlang
@@ -1,5 +1,5 @@
 if (&User-Name == 'test') {
-	&User-Password := "%{randstr:bbbbbbbbbbbbbbbb}"
+	&User-Password := "%randstr('bbbbbbbbbbbbbbbb')"
 	&control.Password.Cleartext := "%{User-Password}"
 
 	pap.authorize
diff --git a/src/tests/modules/redis/cluster_key.unlang b/src/tests/modules/redis/cluster_key.unlang
index a053697ed8..f811644a7c 100644
--- a/src/tests/modules/redis/cluster_key.unlang
+++ b/src/tests/modules/redis/cluster_key.unlang
@@ -10,9 +10,9 @@ $INCLUDE cluster_reset.inc
 #  - 127.0.0.1:30005 - slave
 #  - 127.0.0.1:30003 - master [10923-16383]
 #  - 127.0.0.1:30006 - slave
-&control.Tmp-String-0 := "1-%{randstr:aaaaaaaa}"
-&control.Tmp-String-1 := "2-%{randstr:aaaaaaaa}"
-&control.Tmp-String-2 := "3-%{randstr:aaaaaaaa}"
+&control.Tmp-String-0 := "1-%randstr('aaaaaaaa')"
+&control.Tmp-String-1 := "2-%randstr('aaaaaaaa')"
+&control.Tmp-String-2 := "3-%randstr('aaaaaaaa')"
 
 #  Hashes to Redis cluster node master 1 (1)
 if ("%(redis:SET b "%{control.Tmp-String-0}")" == 'OK') {
diff --git a/src/tests/modules/redis/cluster_reset.inc b/src/tests/modules/redis/cluster_reset.inc
index 677c7a1912..1a38550073 100644
--- a/src/tests/modules/redis/cluster_reset.inc
+++ b/src/tests/modules/redis/cluster_reset.inc
@@ -28,9 +28,9 @@
 	&Tmp-Integer-0 = 21
 }
 
-&control.Tmp-String-0 := "1-%{randstr:aaaaaaaa}"
-&control.Tmp-String-1 := "2-%{randstr:aaaaaaaa}"
-&control.Tmp-String-2 := "3-%{randstr:aaaaaaaa}"
+&control.Tmp-String-0 := "1-%randstr('aaaaaaaa')"
+&control.Tmp-String-1 := "2-%randstr('aaaaaaaa')"
+&control.Tmp-String-2 := "3-%randstr('aaaaaaaa')"
 
 if ("$ENV{REDIS_CLUSTER_CONTROL}" == '') {
 	&control.Tmp-String-8 := 'scripts/ci/redis-setup.sh'
-- 
2.47.3