From a46b814d3e53c1a9e36b7bc60913e232182dcaf9 Mon Sep 17 00:00:00 2001
From: Anna Paskova <anna.paskova@r3.com>
Date: Wed, 24 Jan 2024 15:07:33 +0000
Subject: [PATCH] CORE-18617: Add new parent key alias and created timestamp
 into the key rotation status (#1459)

Changes:
- update unmanaged key rotation status schema to also contain new parent key alias and created timestamp so we can print it out on key rotation status request
---
 .../wire/ops/key.status/UnmanagedKeyStatus.avsc   | 15 ++++++++++++++-
 gradle.properties                                 |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/key.status/UnmanagedKeyStatus.avsc b/data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/key.status/UnmanagedKeyStatus.avsc
index 1ab2c51a1c..2459c84b91 100644
--- a/data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/key.status/UnmanagedKeyStatus.avsc
+++ b/data/avro-schema/src/main/resources/avro/net/corda/data/crypto/wire/ops/key.status/UnmanagedKeyStatus.avsc
@@ -5,10 +5,15 @@
   "doc": "Defines the key status and key rotation status data.",
   "fields": [
     {
-      "name": "rootKeyAlias",
+      "name": "oldParentKeyAlias",
       "type": "string",
       "doc": "Alias of an unmanaged key that we are rotating away from."
     },
+    {
+      "name": "newParentKeyAlias",
+      "type": ["null", "string"],
+      "doc": "The wrapping key alias that should be used for material currently wrapped with old key."
+    },
     {
       "name": "total",
       "type": "int",
@@ -18,6 +23,14 @@
       "name": "rotatedKeys",
       "type": ["null", "int"],
       "doc": "Number of keys for tenantId that has been rotated. Null in case of key status."
+    },
+    {
+      "name": "createdTimestamp",
+      "type": {
+        "type": "long",
+        "logicalType": "timestamp-millis"
+      },
+      "doc": "The date and time the key rotation request was created."
     }
   ]
 }
diff --git a/gradle.properties b/gradle.properties
index 7ea39e04e4..dd3aa4e538 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ cordaProductVersion = 5.2.0
 # NOTE: update this each time this module contains a breaking change
 ## NOTE: currently this is a top level revision, so all API versions will line up, but this could be moved to
 ##   a per module property in which case module versions can change independently.
-cordaApiRevision = 31
+cordaApiRevision = 32
 
 # Main
 kotlin.stdlib.default.dependency = false