Merge branch 'release/os/5.2' into driessamyn/poc/version-catalogue

corda · Dec 8, 2023 · 4c9e8a6 · 4c9e8a6
2 parents e452891 + 6fbc6c2
commit 4c9e8a6
Show file tree

Hide file tree

Showing 8 changed files with 166 additions and 40 deletions.
diff --git a/...ma/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc b/...ma/src/main/resources/avro/net/corda/data/virtualnode/VirtualNodeAsynchronousRequest.avsc
@@ -21,8 +21,9 @@
       "name": "request",
       "doc": "The operation specific request.",
       "type": [
-        "net.corda.data.virtualnode.VirtualNodeUpgradeRequest",
-        "net.corda.data.virtualnode.VirtualNodeCreateRequest"
+        "net.corda.data.virtualnode.VirtualNodeCreateRequest",
+        "net.corda.data.virtualnode.VirtualNodeDbConnectionUpdateRequest",
+        "net.corda.data.virtualnode.VirtualNodeUpgradeRequest"
       ]
     }
   ]

diff --git a/.../main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateRequest.avsc b/.../main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateRequest.avsc
@@ -0,0 +1,46 @@
+{
+  "type": "record",
+  "name": "VirtualNodeDbConnectionUpdateRequest",
+  "namespace": "net.corda.data.virtualnode",
+  "fields": [
+    {
+      "name": "holdingId",
+      "type": "net.corda.data.identity.HoldingIdentity"
+    },
+    {
+      "name": "vaultDdlConnection",
+      "type": ["null", "string"],
+      "doc": "Connection details for virtual node Vault DB to be used for DDL operations. If null is passed for both vault connections, cluster DB will be used."
+    },
+    {
+      "name": "vaultDmlConnection",
+      "type": ["null", "string"],
+      "doc": "Connection details for virtual node Vault DB to be used for DML operations. If null is passed for both vault connections, cluster DB will be used."
+    },
+    {
+      "name": "cryptoDdlConnection",
+      "type": ["null", "string"],
+      "doc": "Connection details for virtual node Crypto DB to be used for DDL operations. If null is passed for both crypto connections, cluster DB will be used."
+    },
+    {
+      "name": "cryptoDmlConnection",
+      "type": ["null", "string"],
+      "doc": "Connection details for virtual node Crypto DB to be used for DML operations. If null is passed for both crypto connections, cluster DB will be used."
+    },
+    {
+      "name": "uniquenessDdlConnection",
+      "type": ["null", "string"],
+      "doc": "Connection details for virtual node Uniqueness DB to be used for DDL operations. If null is passed for both uniqueness connections, cluster DB will be used."
+    },
+    {
+      "name": "uniquenessDmlConnection",
+      "type": ["null", "string"],
+      "doc": "Connection details for virtual node Uniqueness DB to be used for DML operations. If null is passed for both uniqueness connections, cluster DB will be used."
+    },
+    {
+      "name": "updateActor",
+      "type": "string",
+      "doc": "ID of RPC user that requested the virtual node creation."
+    }
+  ]
+}
diff --git a/...main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateResponse.avsc b/...main/resources/avro/net/corda/data/virtualnode/VirtualNodeDbConnectionUpdateResponse.avsc
@@ -0,0 +1,98 @@
+{
+  "type": "record",
+  "name": "VirtualNodeDbConnectionUpdateResponse",
+  "namespace": "net.corda.data.virtualnode",
+  "fields": [
+    {
+      "name": "holdingIdentity",
+      "type": [
+        "null",
+        "net.corda.data.identity.HoldingIdentity"
+      ]
+    },
+    {
+      "name": "holdingIdentifierHash",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "The short 12-character hash of the holding identity."
+    },
+    {
+      "name": "vaultDdlConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of virtual node Vault DB connection for DDL operations. Null value means that DB is managed externally."
+    },
+    {
+      "name": "vaultDmlConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of virtual node Vault DB connection for DML operations."
+    },
+    {
+      "name": "cryptoDdlConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of virtual node Crypto DB connection for DDL operations. Null value means that DB is managed externally."
+    },
+    {
+      "name": "cryptoDmlConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of virtual node Crypto DB connection for DML operations."
+    },
+    {
+      "name": "uniquenessDdlConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of virtual node Uniqueness DB connection for DDL operations. Null value means that DB is managed externally."
+    },
+    {
+      "name": "uniquenessDmlConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of virtual node Uniqueness DB connection for DML operations."
+    },
+    {
+      "name": "hsmConnectionId",
+      "type": [
+        "null",
+        "string"
+      ],
+      "doc": "ID of HSM connection. Null value means that HSM is not used."
+    },
+    {
+      "name": "flowP2pOperationalStatus",
+      "type": "VirtualNodeOperationalState",
+      "doc": "The current flow p2p operational status of virtual node"
+    },
+    {
+      "name": "flowStartOperationalStatus",
+      "type": "VirtualNodeOperationalState",
+      "doc": "The current flow start operational status of virtual node"
+    },
+    {
+      "name": "flowOperationalStatus",
+      "type": "VirtualNodeOperationalState",
+      "doc": "The current flow operational status of virtual node"
+    },
+    {
+      "name": "vaultDbOperationalStatus",
+      "type": "VirtualNodeOperationalState",
+      "doc": "The current vault db operational status of virtual node"
+    }
+  ]
+}
diff --git a/.../config-schema/src/main/resources/net/corda/schema/configuration/rbac/1.0/corda.rbac.json b/.../config-schema/src/main/resources/net/corda/schema/configuration/rbac/1.0/corda.rbac.json
@@ -10,22 +10,24 @@
       "description": "Settings for passwords.",
       "type": "object",
       "default": {},
-      "userPasswordChangeExpiry": {
-        "description": "The amount of time (days) before the password must be updated again after user password change.",
-        "type": "integer",
-        "minimum": 30,
-        "default": 90
-      },
-      "adminPasswordChangeExpiry": {
-        "description": "The amount of time (days) before the password must be updated again after admin password change",
-        "type": "integer",
-        "minimum": 1,
-        "default": 7
-      },
-      "passwordExpiryWarningWindow": {
-        "description": "The time (days) before a password expires in which we begin to offer warnings about upcoming expiry.",
-        "type": "integer",
-        "default": 30
+      "properties": {
+        "userPasswordChangeExpiry": {
+          "description": "The amount of time (days) before the password must be updated again after user password change.",
+          "type": "integer",
+          "minimum": 30,
+          "default": 90
+        },
+        "adminPasswordChangeExpiry": {
+          "description": "The amount of time (days) before the password must be updated again after admin password change",
+          "type": "integer",
+          "minimum": 1,
+          "default": 7
+        },
+        "passwordExpiryWarningWindow": {
+          "description": "The time (days) before a password expires in which we begin to offer warnings about upcoming expiry.",
+          "type": "integer",
+          "default": 30
+        }
       }
     }
   }

diff --git a/data/topic-schema/src/main/java/net/corda/schema/Schemas.java b/data/topic-schema/src/main/java/net/corda/schema/Schemas.java
@@ -224,16 +224,6 @@ private Rest() {
         public static final String REST_PERM_ENTITY_TOPIC = "rest.permissions.permission";
     }
 
-    /**
-     * Uniqueness checker schema.
-     */
-    public static final class UniquenessChecker {
-        private UniquenessChecker() {
-        }
-
-        public static final String UNIQUENESS_CHECK_TOPIC = "uniqueness.check";
-    }
-
     /**
      * Virtual node schema.
      */

diff --git a/data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml b/data/topic-schema/src/main/resources/net/corda/schema/Flow.yaml
@@ -5,11 +5,8 @@ topics:
       - flow
     producers:
       - db
-      - crypto
       - flow
       - flowMapper
-      - persistence
-      - uniqueness
       - tokenSelection
     config:
   FlowEventDLQTopic:

diff --git a/data/topic-schema/src/main/resources/net/corda/schema/UniquenessChecker.yaml b/data/topic-schema/src/main/resources/net/corda/schema/UniquenessChecker.yaml
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,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 = 10
+cordaApiRevision = 11
 
 # Main
 kotlinVersion = 1.8.21