From 96fec7686e366c4749eb62a50695920e41297594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Ramos=20Cassella?= Date: Tue, 2 Jan 2024 12:55:25 -0300 Subject: [PATCH 1/2] CORE-18532: Explicit Crypto Retry Settings Instead of setting the maximum amount of retries within the code and ignore the values configured by the user, set the minimum and maximum allowed values in the configuration schema directly. --- .../schema/configuration/crypto/1.0/corda.crypto.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/config-schema/src/main/resources/net/corda/schema/configuration/crypto/1.0/corda.crypto.json b/data/config-schema/src/main/resources/net/corda/schema/configuration/crypto/1.0/corda.crypto.json index 62f006c0c6..e41ce93e3f 100644 --- a/data/config-schema/src/main/resources/net/corda/schema/configuration/crypto/1.0/corda.crypto.json +++ b/data/config-schema/src/main/resources/net/corda/schema/configuration/crypto/1.0/corda.crypto.json @@ -47,7 +47,9 @@ "properties": { "default": { "type": "integer", - "default": 3 + "default": 3, + "minimum": 0, + "maximum": 10 } } }, @@ -82,7 +84,9 @@ "maxAttempts": { "description": "Maximum number of attempts", "type": "integer", - "default": 3 + "default": 3, + "minimum": 0, + "maximum": 10 }, "attemptTimeoutMills": { "description": "Wait period in milliseconds between attempts, should be reasonably large as some operations may be long, e.g. RSA key generation by the SOFT HSM may take a few seconds", @@ -93,7 +97,7 @@ "additionalProperties": false }, "wrappingKeys": { - "description" : "Key derivation parameters for wrapping keys supplied in config", + "description": "Key derivation parameters for wrapping keys supplied in config", "type": "array", "items": { "type": "object", From 8604deaaf582b525071df60dcd92df22de6e7353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Jos=C3=A9=20Ramos=20Cassella?= Date: Tue, 2 Jan 2024 13:20:51 -0300 Subject: [PATCH 2/2] Trigger CI