ES-1992: migrate to corda runtime plugin #122

anton-subbotin · 2024-02-27T13:33:40Z

https://r3-cev.atlassian.net/browse/ES-1992

Not for merge!

The goal is to migrate this code to a different repository; PR raised only to allow reviews of the changes.

github-actions

PR title failed to match regex -> ^((CORDA|EG|ENT|INFRA|CORE|ES)-\d+)(.*)

All good!

anton-subbotin · 2024-02-27T15:51:23Z

build.gradle

+        cordaRuntimePluginWorkspaceDir = "workspace"
+        composeFilePath = "config/combined-worker-kafka-compose.yaml"
+        // Alternatively, you can use a Database-only combined worker:
+        // composeFilePath = "config/combined-worker-compose.yaml"


Do we need to provide an example of no-kafka deployment?

anton-subbotin · 2024-02-27T15:53:02Z

gradle.properties

-# Specify the version of the CSDE gradle plugin to use
-csdePluginVersion=1.2.0-beta-+
+# Specify the version of the Corda runtime Gradle plugin to use
+cordaGradlePluginVersion=5.2.0.0-RC02


This and other versions will need to be updated after 5.2 release

anton-subbotin · 2024-02-27T15:55:42Z

config/combined-worker-kafka-compose.yaml

+      - kafka
+      - kafka-create-topics
+    environment:
+      JAVA_TOOL_OPTIONS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005


This piece is missing in the examples provided in the plugin's readme.
This is necessary to enable debugger connection on port 5005 - to provide the string in the JAVA_TOOL_OPTIONS variable.
For some reason, if we specify it as one of the args in the command list, it doesn't seem to be applied by JVM (as it does when started on a local JVM outside container), and debug connection fails.

anton-subbotin · 2024-02-27T16:15:22Z

README.md

@@ -1,25 +1,22 @@
-# CSDE-cordapp-template-kotlin
+# release-V5 cordapp-template-kotlin


previously this was the name of the repository; now it is a specific branch name where the code would live, and the target repo name

anton-subbotin · 2024-02-27T16:38:09Z

...acts/src/main/kotlin/com/r3/developers/cordapptemplate/utxoexample/contracts/ChatContract.kt

@@ -1,6 +1,6 @@
-package com.r3.developers.csdetemplate.utxoexample.contracts
+package com.r3.developers.cordapptemplate.utxoexample.contracts


rename package - change csdetemplate to cordapptemplate; I'm open for suggestions of a better name

Works for me

anton-subbotin · 2024-02-27T16:40:51Z

build.gradle

+        cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"
+
+        // Alternatively, you can use a Database-only combined worker:
+        // composeFilePath = "config/combined-worker-compose.yaml"


We have an example of a Database-only compose file in the plugin's readme; the link to the readme was added to this repo's README.

The question is - do we still want to provide a no-kafka example here in the template repo, including this comment and the compose yaml file in the config?

We should steer people to the Kafka enabled version, as it's quicker. We then offer the db only version to those who need it.

I think it's fine to just have the Kafka version here. The non-Kafka version remains documented with the Gradle plugin.

anton-subbotin · 2024-02-27T16:41:44Z

build.gradle

@@ -110,7 +103,7 @@ allprojects {
 publishing {
    publications {
            maven(MavenPublication) {
-                artifactId "corda-CSDE-kotlin-sample"
+                artifactId "corda-dev-template-kotlin-sample"


I'm not sure if this is being used anywhere; publishing is disabled in the pipeline

I can't really see why it would ever be published.

tlawson3

LGTM

tlawson3 · 2024-02-27T16:52:54Z

build.gradle

+        cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"
+
+        // Alternatively, you can use a Database-only combined worker:
+        // composeFilePath = "config/combined-worker-compose.yaml"


We should steer people to the Kafka enabled version, as it's quicker. We then offer the db only version to those who need it.

tlawson3 · 2024-02-27T16:53:51Z

...acts/src/main/kotlin/com/r3/developers/cordapptemplate/utxoexample/contracts/ChatContract.kt

@@ -1,6 +1,6 @@
-package com.r3.developers.csdetemplate.utxoexample.contracts
+package com.r3.developers.cordapptemplate.utxoexample.contracts


Works for me

davidcurrie · 2024-02-27T20:39:07Z

build.gradle

+        cordaCliBinDir = "${System.getProperty("user.home")}/.corda/cli"
+
+        // Alternatively, you can use a Database-only combined worker:
+        // composeFilePath = "config/combined-worker-compose.yaml"


I think it's fine to just have the Kafka version here. The non-Kafka version remains documented with the Gradle plugin.

davidcurrie · 2024-02-27T20:40:15Z

build.gradle

@@ -110,7 +103,7 @@ allprojects {
 publishing {
    publications {
            maven(MavenPublication) {
-                artifactId "corda-CSDE-kotlin-sample"
+                artifactId "corda-dev-template-kotlin-sample"


I can't really see why it would ever be published.

davidcurrie · 2024-02-27T20:43:06Z

config/combined-worker-compose.yaml

@@ -0,0 +1,32 @@
+version: '2'


Let's just have the Kafka version...

davidcurrie · 2024-02-27T20:46:33Z

config/combined-worker-kafka-compose.yaml

@@ -0,0 +1,72 @@
+version: '2'


I've got some ideas for improvements we can make with this file but they can wait for another day.

davidcurrie · 2024-02-27T20:47:09Z

...acts/src/main/kotlin/com/r3/developers/cordapptemplate/utxoexample/contracts/ChatContract.kt

@@ -1,6 +1,6 @@
-package com.r3.developers.csdetemplate.utxoexample.contracts
+package com.r3.developers.cordapptemplate.utxoexample.contracts


anton-subbotin added 8 commits January 26, 2024 17:10

Apply gradle changes

65457dc

Run SNAPSHOT from mavenLocal

a92f663

Cleanup gradle config

d085180

Use 5.0.1.0 versions of combined worker and notary

fdc2284

Test with docker compose file

a93e52f

Use 5.2 versions across

cc51ed1

Fix JDWP config in compose files

0716005

Get rid of CSDE across the code and docs

9b36681

anton-subbotin changed the title ~~Asubbotin/es 1992/migrate to corda runtime plugin~~ ES-1992: migrate to corda runtime plugin Feb 27, 2024

github-actions bot previously requested changes Feb 27, 2024

View reviewed changes

Add more plugin config properties

909a209

anton-subbotin commented Feb 27, 2024

View reviewed changes

anton-subbotin added 2 commits February 27, 2024 16:27

Remove commented code, add prerequisites in readme

6b91e3c

Restructure config properties

55ecbbd

anton-subbotin commented Feb 27, 2024

View reviewed changes

tlawson3 reviewed Feb 27, 2024

View reviewed changes

davidcurrie reviewed Feb 27, 2024

View reviewed changes

Use only kafka compose file

c861d12

anton-subbotin closed this Mar 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ES-1992: migrate to corda runtime plugin #122

ES-1992: migrate to corda runtime plugin #122

anton-subbotin commented Feb 27, 2024 •

edited

Loading

github-actions bot left a comment

anton-subbotin Feb 27, 2024

anton-subbotin Feb 27, 2024

anton-subbotin Feb 27, 2024 •

edited

Loading

anton-subbotin Feb 27, 2024

anton-subbotin Feb 27, 2024

tlawson3 Feb 27, 2024

davidcurrie Feb 27, 2024

anton-subbotin Feb 27, 2024 •

edited

Loading

tlawson3 Feb 27, 2024

davidcurrie Feb 27, 2024

anton-subbotin Feb 27, 2024

davidcurrie Feb 27, 2024

tlawson3 left a comment

tlawson3 Feb 27, 2024

tlawson3 Feb 27, 2024

davidcurrie Feb 27, 2024

davidcurrie Feb 27, 2024

davidcurrie Feb 27, 2024

davidcurrie Feb 27, 2024

davidcurrie Feb 27, 2024

		@@ -1,25 +1,22 @@
		# CSDE-cordapp-template-kotlin
		# release-V5 cordapp-template-kotlin

		@@ -1,6 +1,6 @@
		package com.r3.developers.csdetemplate.utxoexample.contracts
		package com.r3.developers.cordapptemplate.utxoexample.contracts

ES-1992: migrate to corda runtime plugin #122

ES-1992: migrate to corda runtime plugin #122

Conversation

anton-subbotin commented Feb 27, 2024 • edited Loading

github-actions bot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anton-subbotin Feb 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anton-subbotin Feb 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tlawson3 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anton-subbotin commented Feb 27, 2024 •

edited

Loading

anton-subbotin Feb 27, 2024 •

edited

Loading

anton-subbotin Feb 27, 2024 •

edited

Loading