From 0937bed0f22a52b1f52a0e708c0f4aa9d8826ad2 Mon Sep 17 00:00:00 2001 From: Ben Millar <44114751+ben-millar@users.noreply.github.com> Date: Tue, 21 Feb 2023 09:59:44 +0000 Subject: [PATCH] CORE-8034 Renamed 'application/rpc-worker' module to 'application/rest-worker', updated helm charts accordingly (#3110) * CORE-8034 Renamed 'application/rpc-worker' module to 'application/rest-worker', updated helm charts accordingly * Modified Jenkins file to point at feature branch of corda-shared-build-pipeline-steps * Updated shared-pipeline version in E2E compatability check, renamed processors/rpc dir to processors/rest * Returning corda api version to 5.0.0.651-beta+ following green build --------- Co-authored-by: Peter McKinney --- .ci/e2eTests/Jenkinsfile | 2 +- .ci/e2eTests/corda.yaml | 6 +- .ci/e2eTests/prereqs.yaml | 2 +- .ci/versionCompatibility/Jenkinsfile | 2 +- Jenkinsfile | 2 +- .../workers/combined/CombinedWorker.kt | 4 +- .../workers/release/flow-worker/README.md | 2 +- .../{rpc-worker => rest-worker}/build.gradle | 14 ++-- .../src/e2eTest/README.md | 0 .../workers/rest}/CheckClusterRolesE2eTest.kt | 6 +- .../workers/rest}/CreatePermissionE2eTest.kt | 6 +- .../workers/rest}/CreateRoleE2eTest.kt | 8 +-- .../workers/rest}/CreateUserE2eTest.kt | 6 +- .../workers/rest}/FlowExecutorE2eTest.kt | 16 ++--- .../rest}/LimitedUserAuthorizationE2eTest.kt | 10 +-- .../rest}/MultiClusterDynamicNetworkTest.kt | 26 +++---- .../PermissionSummaryConcurrentE2eTest.kt | 10 +-- .../workers/rest}/PermissionSummaryE2eTest.kt | 10 +-- .../rest}/RbacE2eClientRequestHelper.kt | 4 +- .../workers/rest}/SessionCertificateTest.kt | 26 +++---- .../rest}/SingleClusterDynamicNetworkTest.kt | 18 ++--- .../workers/rest}/StaticNetworkTest.kt | 16 ++--- .../rest}/UserRoleAssociationE2eTest.kt | 6 +- .../applications/workers/rest}/cli/CliTask.kt | 2 +- .../workers/rest}/cli/CliTaskResult.kt | 2 +- .../http/EndpointAvailabilityCondition.kt | 4 +- .../http/SkipWhenRestEndpointUnavailable.kt | 2 +- .../workers/rest}/http/TestToolkit.kt | 8 +-- .../workers/rest}/http/TestToolkitImpl.kt | 8 +-- .../workers/rest}/http/TestToolkitProperty.kt | 2 +- .../workers/rest}/kafka/KafkaTestToolKit.kt | 4 +- .../workers/rest}/utils/AdminPasswordUtil.kt | 2 +- .../rest}/utils/CertificateTestUtils.kt | 2 +- .../workers/rest}/utils/ClusterTestUtils.kt | 2 +- .../workers/rest}/utils/E2eCluster.kt | 6 +- .../workers/rest}/utils/E2eClusterConfig.kt | 20 +++--- .../workers/rest}/utils/E2eClusterMember.kt | 2 +- .../rest}/utils/MembershipTestUtils.kt | 2 +- .../workers/rest}/utils/P2PTestUtils.kt | 4 +- .../src/e2eTest/resources/RunNetworkTests.md | 24 +++---- .../src/e2eTest/resources/RunP2PTest.md | 0 .../src/e2eTest/resources/certificate.pem | 0 .../src/e2eTest/resources/connect.e2e.sh | 2 +- .../resources/create.multi.clusters.sh | 0 .../src/e2eTest/resources/install.aws.sh | 2 +- .../src/e2eTest/resources/install.minikube.sh | 2 +- .../applications/workers/rest}/RestWorker.kt | 2 +- .../workers/workers-smoketest/build.gradle | 4 +- .../workers/smoketest/ClusterBootstrapTest.kt | 2 +- charts/corda/templates/rbac-job.yaml | 6 +- .../{rpc-worker.yaml => rest-worker.yaml} | 24 +++---- charts/corda/values.schema.json | 20 +++--- charts/corda/values.yaml | 70 +++++++++---------- .../db/impl/validation/ValidationFunctions.kt | 4 +- .../cache/PermissionManagementCacheService.kt | 16 ++--- ...PermissionManagementServiceEventHandler.kt | 4 +- ...missionStorageWriterServiceEventHandler.kt | 4 +- debug.yaml | 2 +- gradle.properties | 2 +- .../impl/PermissionStorageReaderImpl.kt | 30 ++++---- .../impl/PermissionStorageReaderImplTest.kt | 48 ++++++------- .../{rpc => rest}/FakeSecurityManager.kt | 0 .../{rpc => rest}/OpenApiCompatibilityTest.kt | 0 .../processors/{rpc => rest}/TestUtils.kt | 0 .../{rpc => rest}/diff/OpenApiDiff.kt | 0 settings.gradle | 2 +- .../corda/e2etest/utilities/ClusterInfo.kt | 6 +- .../e2etest/utilities/ConfigTestUtils.kt | 2 +- .../e2etest/utilities/MembershipUtils.kt | 4 +- testing/flow-worker-demo/README.md | 4 +- .../corda/cli/plugins/topicconfig/Create.kt | 2 +- 71 files changed, 281 insertions(+), 281 deletions(-) rename applications/workers/release/{rpc-worker => rest-worker}/build.gradle (93%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/README.md (100%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/CheckClusterRolesE2eTest.kt (95%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/CreatePermissionE2eTest.kt (94%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/CreateRoleE2eTest.kt (96%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/CreateUserE2eTest.kt (93%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/FlowExecutorE2eTest.kt (74%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/LimitedUserAuthorizationE2eTest.kt (93%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/MultiClusterDynamicNetworkTest.kt (79%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/PermissionSummaryConcurrentE2eTest.kt (91%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/PermissionSummaryE2eTest.kt (96%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/RbacE2eClientRequestHelper.kt (98%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/SessionCertificateTest.kt (77%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/SingleClusterDynamicNetworkTest.kt (78%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/StaticNetworkTest.kt (79%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/UserRoleAssociationE2eTest.kt (97%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/cli/CliTask.kt (97%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/cli/CliTaskResult.kt (63%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/http/EndpointAvailabilityCondition.kt (95%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/http/SkipWhenRestEndpointUnavailable.kt (81%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/http/TestToolkit.kt (66%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/http/TestToolkitImpl.kt (80%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/http/TestToolkitProperty.kt (95%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/kafka/KafkaTestToolKit.kt (98%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/AdminPasswordUtil.kt (74%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/CertificateTestUtils.kt (98%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/ClusterTestUtils.kt (99%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/E2eCluster.kt (90%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/E2eClusterConfig.kt (70%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/E2eClusterMember.kt (90%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/MembershipTestUtils.kt (99%) rename applications/workers/release/{rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc => rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest}/utils/P2PTestUtils.kt (97%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/RunNetworkTests.md (77%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/RunP2PTest.md (100%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/certificate.pem (100%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/connect.e2e.sh (90%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/create.multi.clusters.sh (100%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/install.aws.sh (92%) rename applications/workers/release/{rpc-worker => rest-worker}/src/e2eTest/resources/install.minikube.sh (94%) rename applications/workers/release/{rpc-worker/src/main/kotlin/net/corda/applications/workers/rpc => rest-worker/src/main/kotlin/net/corda/applications/workers/rest}/RestWorker.kt (98%) rename charts/corda/templates/{rpc-worker.yaml => rest-worker.yaml} (77%) rename processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/{rpc => rest}/FakeSecurityManager.kt (100%) rename processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/{rpc => rest}/OpenApiCompatibilityTest.kt (100%) rename processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/{rpc => rest}/TestUtils.kt (100%) rename processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/{rpc => rest}/diff/OpenApiDiff.kt (100%) diff --git a/.ci/e2eTests/Jenkinsfile b/.ci/e2eTests/Jenkinsfile index 22c5123b6cb..a2740e6c83f 100644 --- a/.ci/e2eTests/Jenkinsfile +++ b/.ci/e2eTests/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.0') _ +@Library('corda-shared-build-pipeline-steps@5.0.1') _ endToEndPipeline( assembleAndCompile: false, diff --git a/.ci/e2eTests/corda.yaml b/.ci/e2eTests/corda.yaml index 408832e2955..607d2860268 100644 --- a/.ci/e2eTests/corda.yaml +++ b/.ci/e2eTests/corda.yaml @@ -95,13 +95,13 @@ workers: secretKeyRef: name: "kafka-credentials" key: "p2pLinkManager" - rpc: + rest: kafka: sasl: username: - value: "rpc" + value: "rest" password: valueFrom: secretKeyRef: name: "kafka-credentials" - key: "rpc" + key: "rest" diff --git a/.ci/e2eTests/prereqs.yaml b/.ci/e2eTests/prereqs.yaml index 23e1229ea80..4cae9790117 100644 --- a/.ci/e2eTests/prereqs.yaml +++ b/.ci/e2eTests/prereqs.yaml @@ -10,4 +10,4 @@ kafka: - "membership" - "p2pGateway" - "p2pLinkManager" - - "rpc" + - "rest" diff --git a/.ci/versionCompatibility/Jenkinsfile b/.ci/versionCompatibility/Jenkinsfile index c0ac495003d..aeaeaab3b79 100644 --- a/.ci/versionCompatibility/Jenkinsfile +++ b/.ci/versionCompatibility/Jenkinsfile @@ -1,3 +1,3 @@ -@Library('corda-shared-build-pipeline-steps@5.0') _ +@Library('corda-shared-build-pipeline-steps@5.0.1') _ cordaCompatibilityCheckPipeline() \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index cc4521548a2..02a887fc3da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('corda-shared-build-pipeline-steps@5.0') _ +@Library('corda-shared-build-pipeline-steps@5.0.1') _ cordaPipeline( dailyBuildCron: 'H H/6 * * *', diff --git a/applications/workers/release/combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt b/applications/workers/release/combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt index 201e2db6416..7055ef6d036 100644 --- a/applications/workers/release/combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt +++ b/applications/workers/release/combined-worker/src/main/kotlin/net/corda/applications/workers/combined/CombinedWorker.kt @@ -182,8 +182,8 @@ private class CombinedWorkerParams { @Option(names = ["-d", "--database-params"], description = ["Database parameters for the worker."]) var databaseParams = emptyMap() - @Option(names = ["-r", "--rpc-params"], description = ["RPC parameters for the worker."]) - var rpcParams = emptyMap() + @Option(names = ["-r", "--rest-params"], description = ["REST parameters for the worker."]) + var restParams = emptyMap() @Option(names = ["--hsm-id"], description = ["HSM ID which is handled by this worker instance."]) var hsmId = "" diff --git a/applications/workers/release/flow-worker/README.md b/applications/workers/release/flow-worker/README.md index 456c5178ad5..a85c87ddd3f 100644 --- a/applications/workers/release/flow-worker/README.md +++ b/applications/workers/release/flow-worker/README.md @@ -66,7 +66,7 @@ helm upgrade --install corda -n corda ` --values values.yaml ` --wait -kubectl port-forward --namespace corda deployment/corda-rpc-worker 8888 +kubectl port-forward --namespace corda deployment/corda-rest-worker 8888 ``` ### Uploading the CBP and creating the Virtual Node diff --git a/applications/workers/release/rpc-worker/build.gradle b/applications/workers/release/rest-worker/build.gradle similarity index 93% rename from applications/workers/release/rpc-worker/build.gradle rename to applications/workers/release/rest-worker/build.gradle index 7f41c8d5637..8c812807179 100644 --- a/applications/workers/release/rpc-worker/build.gradle +++ b/applications/workers/release/rest-worker/build.gradle @@ -4,7 +4,7 @@ plugins { id 'corda.docker-app' } -description 'RPC Worker' +description 'REST Worker' sourceSets { e2eTest { @@ -106,13 +106,13 @@ tasks.named('e2eTest') { } ["A", "B", "C"].each {cluster -> - if(System.getenv("E2E_CLUSTER_${cluster}_RPC_HOST") == null) { - environment "E2E_CLUSTER_${cluster}_RPC_HOST", - project.getProperties().getOrDefault("e2eCluster${cluster}RpcHost","localhost") + if(System.getenv("E2E_CLUSTER_${cluster}_REST_HOST") == null) { + environment "E2E_CLUSTER_${cluster}_REST_HOST", + project.getProperties().getOrDefault("e2eCluster${cluster}RestHost","localhost") } - if(System.getenv("E2E_CLUSTER_${cluster}_RPC_PORT") == null) { - environment "E2E_CLUSTER_${cluster}_RPC_PORT", - project.getProperties().getOrDefault("e2eCluster${cluster}RpcPort","8888") + if(System.getenv("E2E_CLUSTER_${cluster}_REST_PORT") == null) { + environment "E2E_CLUSTER_${cluster}_REST_PORT", + project.getProperties().getOrDefault("e2eCluster${cluster}RestPort","8888") } if(System.getenv("E2E_CLUSTER_${cluster}_P2P_HOST") == null) { environment "E2E_CLUSTER_${cluster}_P2P_HOST", diff --git a/applications/workers/release/rpc-worker/src/e2eTest/README.md b/applications/workers/release/rest-worker/src/e2eTest/README.md similarity index 100% rename from applications/workers/release/rpc-worker/src/e2eTest/README.md rename to applications/workers/release/rest-worker/src/e2eTest/README.md diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CheckClusterRolesE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CheckClusterRolesE2eTest.kt similarity index 95% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CheckClusterRolesE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CheckClusterRolesE2eTest.kt index ac8ba9b529e..a17f202387b 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CheckClusterRolesE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CheckClusterRolesE2eTest.kt @@ -1,7 +1,7 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable -import net.corda.applications.workers.rpc.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.http.TestToolkitProperty import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionResponseType import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreatePermissionE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreatePermissionE2eTest.kt similarity index 94% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreatePermissionE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreatePermissionE2eTest.kt index 0cdda095df5..a2675034946 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreatePermissionE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreatePermissionE2eTest.kt @@ -1,7 +1,7 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable import net.corda.httprpc.client.exceptions.MissingRequestedResourceException import net.corda.httprpc.response.ResponseEntity import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreateRoleE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreateRoleE2eTest.kt similarity index 96% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreateRoleE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreateRoleE2eTest.kt index 4224a9b952f..b93274e86f8 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreateRoleE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreateRoleE2eTest.kt @@ -1,8 +1,8 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser import net.corda.httprpc.client.exceptions.MissingRequestedResourceException import net.corda.httprpc.client.exceptions.RequestErrorException import net.corda.httprpc.exception.ResourceAlreadyExistsException diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreateUserE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreateUserE2eTest.kt similarity index 93% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreateUserE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreateUserE2eTest.kt index 1257e9d251b..87d633fd36c 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/CreateUserE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/CreateUserE2eTest.kt @@ -1,7 +1,7 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable import net.corda.httprpc.client.exceptions.MissingRequestedResourceException import net.corda.libs.permissions.endpoints.v1.user.UserEndpoint import net.corda.libs.permissions.endpoints.v1.user.types.CreateUserType diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/FlowExecutorE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/FlowExecutorE2eTest.kt similarity index 74% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/FlowExecutorE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/FlowExecutorE2eTest.kt index 6083557e859..891c5d1592d 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/FlowExecutorE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/FlowExecutorE2eTest.kt @@ -1,12 +1,12 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.cli.CliTask -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.TestToolkitProperty.Companion.DEFAULT_HTTP_HOST -import net.corda.applications.workers.rpc.http.TestToolkitProperty.Companion.DEFAULT_HTTP_PORT -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser +import net.corda.applications.workers.rest.cli.CliTask +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.TestToolkitProperty.Companion.DEFAULT_HTTP_HOST +import net.corda.applications.workers.rest.http.TestToolkitProperty.Companion.DEFAULT_HTTP_PORT +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser import net.corda.libs.permissions.endpoints.v1.role.RoleEndpoint import net.corda.test.util.eventually import net.corda.v5.base.util.seconds diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/LimitedUserAuthorizationE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/LimitedUserAuthorizationE2eTest.kt similarity index 93% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/LimitedUserAuthorizationE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/LimitedUserAuthorizationE2eTest.kt index 64b3723cfcd..483987426ba 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/LimitedUserAuthorizationE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/LimitedUserAuthorizationE2eTest.kt @@ -1,11 +1,11 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest import java.time.Instant import java.time.temporal.ChronoUnit.DAYS -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser import net.corda.httprpc.client.exceptions.PermissionException import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType import org.assertj.core.api.Assertions diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/MultiClusterDynamicNetworkTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/MultiClusterDynamicNetworkTest.kt similarity index 79% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/MultiClusterDynamicNetworkTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/MultiClusterDynamicNetworkTest.kt index d40847c3210..bc22f98b5cf 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/MultiClusterDynamicNetworkTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/MultiClusterDynamicNetworkTest.kt @@ -1,17 +1,17 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.utils.E2eClusterAConfig -import net.corda.applications.workers.rpc.utils.E2eClusterBConfig -import net.corda.applications.workers.rpc.utils.E2eClusterCConfig -import net.corda.applications.workers.rpc.utils.E2eClusterFactory -import net.corda.applications.workers.rpc.utils.E2eClusterMember -import net.corda.applications.workers.rpc.utils.allowClientCertificates -import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList -import net.corda.applications.workers.rpc.utils.setSslConfiguration -import net.corda.applications.workers.rpc.utils.generateGroupPolicy -import net.corda.applications.workers.rpc.utils.getGroupId -import net.corda.applications.workers.rpc.utils.onboardMembers -import net.corda.applications.workers.rpc.utils.onboardMgm +import net.corda.applications.workers.rest.utils.E2eClusterAConfig +import net.corda.applications.workers.rest.utils.E2eClusterBConfig +import net.corda.applications.workers.rest.utils.E2eClusterCConfig +import net.corda.applications.workers.rest.utils.E2eClusterFactory +import net.corda.applications.workers.rest.utils.E2eClusterMember +import net.corda.applications.workers.rest.utils.allowClientCertificates +import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList +import net.corda.applications.workers.rest.utils.setSslConfiguration +import net.corda.applications.workers.rest.utils.generateGroupPolicy +import net.corda.applications.workers.rest.utils.getGroupId +import net.corda.applications.workers.rest.utils.onboardMembers +import net.corda.applications.workers.rest.utils.onboardMgm import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Disabled diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/PermissionSummaryConcurrentE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/PermissionSummaryConcurrentE2eTest.kt similarity index 91% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/PermissionSummaryConcurrentE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/PermissionSummaryConcurrentE2eTest.kt index 90b1f9be102..5a330252767 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/PermissionSummaryConcurrentE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/PermissionSummaryConcurrentE2eTest.kt @@ -1,12 +1,12 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest import java.time.Instant import java.time.temporal.ChronoUnit.DAYS import java.util.concurrent.Executors -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType import net.corda.test.util.eventually diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/PermissionSummaryE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/PermissionSummaryE2eTest.kt similarity index 96% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/PermissionSummaryE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/PermissionSummaryE2eTest.kt index d5a5102ebd6..b3c449994c0 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/PermissionSummaryE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/PermissionSummaryE2eTest.kt @@ -1,11 +1,11 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest import java.time.Instant import java.time.temporal.ChronoUnit.DAYS -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser import net.corda.libs.permissions.endpoints.v1.permission.types.PermissionType import net.corda.test.util.eventually import org.assertj.core.api.Assertions.assertThat diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/RbacE2eClientRequestHelper.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/RbacE2eClientRequestHelper.kt similarity index 98% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/RbacE2eClientRequestHelper.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/RbacE2eClientRequestHelper.kt index a2ea034dbf1..40431a860c1 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/RbacE2eClientRequestHelper.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/RbacE2eClientRequestHelper.kt @@ -1,7 +1,7 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest import java.time.Instant -import net.corda.applications.workers.rpc.http.TestToolkit +import net.corda.applications.workers.rest.http.TestToolkit import net.corda.libs.permissions.endpoints.v1.permission.PermissionEndpoint import net.corda.libs.permissions.endpoints.v1.permission.types.BulkCreatePermissionsRequestType import net.corda.libs.permissions.endpoints.v1.permission.types.CreatePermissionType diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/SessionCertificateTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/SessionCertificateTest.kt similarity index 77% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/SessionCertificateTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/SessionCertificateTest.kt index 6861ff073ec..1a1800f6818 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/SessionCertificateTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/SessionCertificateTest.kt @@ -1,17 +1,17 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.utils.E2eClusterAConfig -import net.corda.applications.workers.rpc.utils.E2eClusterBConfig -import net.corda.applications.workers.rpc.utils.E2eClusterCConfig -import net.corda.applications.workers.rpc.utils.E2eClusterFactory -import net.corda.applications.workers.rpc.utils.E2eClusterMember -import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList -import net.corda.applications.workers.rpc.utils.setSslConfiguration -import net.corda.applications.workers.rpc.utils.disableLinkManagerCLRChecks -import net.corda.applications.workers.rpc.utils.generateGroupPolicy -import net.corda.applications.workers.rpc.utils.getGroupId -import net.corda.applications.workers.rpc.utils.onboardMembers -import net.corda.applications.workers.rpc.utils.onboardMgm +import net.corda.applications.workers.rest.utils.E2eClusterAConfig +import net.corda.applications.workers.rest.utils.E2eClusterBConfig +import net.corda.applications.workers.rest.utils.E2eClusterCConfig +import net.corda.applications.workers.rest.utils.E2eClusterFactory +import net.corda.applications.workers.rest.utils.E2eClusterMember +import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList +import net.corda.applications.workers.rest.utils.setSslConfiguration +import net.corda.applications.workers.rest.utils.disableLinkManagerCLRChecks +import net.corda.applications.workers.rest.utils.generateGroupPolicy +import net.corda.applications.workers.rest.utils.getGroupId +import net.corda.applications.workers.rest.utils.onboardMembers +import net.corda.applications.workers.rest.utils.onboardMgm import org.assertj.core.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/SingleClusterDynamicNetworkTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/SingleClusterDynamicNetworkTest.kt similarity index 78% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/SingleClusterDynamicNetworkTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/SingleClusterDynamicNetworkTest.kt index 59b4473b148..fb18909e694 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/SingleClusterDynamicNetworkTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/SingleClusterDynamicNetworkTest.kt @@ -1,13 +1,13 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.utils.E2eClusterFactory -import net.corda.applications.workers.rpc.utils.E2eClusterMember -import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList -import net.corda.applications.workers.rpc.utils.assertP2pConnectivity -import net.corda.applications.workers.rpc.utils.generateGroupPolicy -import net.corda.applications.workers.rpc.utils.getGroupId -import net.corda.applications.workers.rpc.utils.onboardMembers -import net.corda.applications.workers.rpc.utils.onboardMgm +import net.corda.applications.workers.rest.utils.E2eClusterFactory +import net.corda.applications.workers.rest.utils.E2eClusterMember +import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList +import net.corda.applications.workers.rest.utils.assertP2pConnectivity +import net.corda.applications.workers.rest.utils.generateGroupPolicy +import net.corda.applications.workers.rest.utils.getGroupId +import net.corda.applications.workers.rest.utils.onboardMembers +import net.corda.applications.workers.rest.utils.onboardMgm import net.corda.data.identity.HoldingIdentity import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/StaticNetworkTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/StaticNetworkTest.kt similarity index 79% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/StaticNetworkTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/StaticNetworkTest.kt index 715e7f48426..5b7a7750dc4 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/StaticNetworkTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/StaticNetworkTest.kt @@ -1,12 +1,12 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest -import net.corda.applications.workers.rpc.utils.E2eClusterFactory -import net.corda.applications.workers.rpc.utils.E2eClusterMember -import net.corda.applications.workers.rpc.utils.assertAllMembersAreInMemberList -import net.corda.applications.workers.rpc.utils.assertP2pConnectivity -import net.corda.applications.workers.rpc.utils.createStaticMemberGroupPolicyJson -import net.corda.applications.workers.rpc.utils.getCa -import net.corda.applications.workers.rpc.utils.onboardStaticMembers +import net.corda.applications.workers.rest.utils.E2eClusterFactory +import net.corda.applications.workers.rest.utils.E2eClusterMember +import net.corda.applications.workers.rest.utils.assertAllMembersAreInMemberList +import net.corda.applications.workers.rest.utils.assertP2pConnectivity +import net.corda.applications.workers.rest.utils.createStaticMemberGroupPolicyJson +import net.corda.applications.workers.rest.utils.getCa +import net.corda.applications.workers.rest.utils.onboardStaticMembers import net.corda.data.identity.HoldingIdentity import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/UserRoleAssociationE2eTest.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/UserRoleAssociationE2eTest.kt similarity index 97% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/UserRoleAssociationE2eTest.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/UserRoleAssociationE2eTest.kt index 9e30f63a443..3e3c62e0a47 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/UserRoleAssociationE2eTest.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/UserRoleAssociationE2eTest.kt @@ -1,9 +1,9 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest import java.time.Instant import java.time.temporal.ChronoUnit.DAYS -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.http.SkipWhenRestEndpointUnavailable +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.http.SkipWhenRestEndpointUnavailable import net.corda.httprpc.client.exceptions.MissingRequestedResourceException import net.corda.httprpc.client.exceptions.RequestErrorException import net.corda.httprpc.exception.ResourceAlreadyExistsException diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/cli/CliTask.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/cli/CliTask.kt similarity index 97% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/cli/CliTask.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/cli/CliTask.kt index 451faa581cf..5db7159dd6d 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/cli/CliTask.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/cli/CliTask.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.cli +package net.corda.applications.workers.rest.cli import org.slf4j.LoggerFactory import java.io.BufferedReader diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/cli/CliTaskResult.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/cli/CliTaskResult.kt similarity index 63% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/cli/CliTaskResult.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/cli/CliTaskResult.kt index f220bf46503..3745e16b9bf 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/cli/CliTaskResult.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/cli/CliTaskResult.kt @@ -1,3 +1,3 @@ -package net.corda.applications.workers.rpc.cli +package net.corda.applications.workers.rest.cli data class CliTaskResult(val exitCode: Int, val stdOut: String, val stdErr: String) diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/EndpointAvailabilityCondition.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/EndpointAvailabilityCondition.kt similarity index 95% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/EndpointAvailabilityCondition.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/EndpointAvailabilityCondition.kt index 62826e04b07..7957052d088 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/EndpointAvailabilityCondition.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/EndpointAvailabilityCondition.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.http +package net.corda.applications.workers.rest.http import net.corda.libs.permissions.endpoints.v1.user.UserEndpoint import org.junit.jupiter.api.extension.ConditionEvaluationResult @@ -54,7 +54,7 @@ internal class EndpointAvailabilityCondition : ExecutionCondition { } /** - * Checks to see if HTTP RPC endpoint is reachable + * Checks to see if REST endpoint is reachable * * @return true if reachable, false if not */ diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/SkipWhenRestEndpointUnavailable.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/SkipWhenRestEndpointUnavailable.kt similarity index 81% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/SkipWhenRestEndpointUnavailable.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/SkipWhenRestEndpointUnavailable.kt index ff588f81ce0..a698e35429e 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/SkipWhenRestEndpointUnavailable.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/SkipWhenRestEndpointUnavailable.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.http +package net.corda.applications.workers.rest.http import org.junit.jupiter.api.extension.ExtendWith diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkit.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkit.kt similarity index 66% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkit.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkit.kt index dd71d15ee1f..39ee755e10c 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkit.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkit.kt @@ -1,7 +1,7 @@ -package net.corda.applications.workers.rpc.http +package net.corda.applications.workers.rest.http -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminPassword -import net.corda.applications.workers.rpc.utils.AdminPasswordUtil.adminUser +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminPassword +import net.corda.applications.workers.rest.utils.AdminPasswordUtil.adminUser import net.corda.httprpc.RestResource import net.corda.httprpc.client.RestClient @@ -19,7 +19,7 @@ interface TestToolkit { * Creates the [RestClient] for a given [RestResource] class. */ fun httpClientFor( - rpcOpsClass: Class, + restResourceClass: Class, userName: String = adminUser, password: String = adminPassword ): RestClient diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkitImpl.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkitImpl.kt similarity index 80% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkitImpl.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkitImpl.kt index 6fd66dbf2d6..161879e3e97 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkitImpl.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkitImpl.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.http +package net.corda.applications.workers.rest.http import net.corda.httprpc.RestResource import net.corda.httprpc.client.RestClient @@ -13,7 +13,7 @@ class TestToolkitImpl(private val testCaseClass: Class, private val baseAdd if (testCaseClass.simpleName != "Companion") { testCaseClass.simpleName } else { - // Converts "net.corda.applications.rpc.LimitedUserAuthorizationE2eTest$Companion" + // Converts "net.corda.applications.rest.LimitedUserAuthorizationE2eTest$Companion" // Into: LimitedUserAuthorizationE2eTest testCaseClass.name .substringBeforeLast('$') @@ -32,9 +32,9 @@ class TestToolkitImpl(private val testCaseClass: Class, private val baseAdd override val uniqueName: String get() = "$uniqueNamePrefix-${counter.incrementAndGet()}-${System.currentTimeMillis()}" - override fun httpClientFor(rpcOpsClass: Class, userName: String, password: String): RestClient { + override fun httpClientFor(restResourceClass: Class, userName: String, password: String): RestClient { return RestClient( - baseAddress, rpcOpsClass, RestClientConfig() + baseAddress, restResourceClass, RestClientConfig() .enableSSL(true) .minimumServerProtocolVersion(1) .username(userName) diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkitProperty.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkitProperty.kt similarity index 95% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkitProperty.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkitProperty.kt index 4b0565e1700..e57af8d5417 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/http/TestToolkitProperty.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/http/TestToolkitProperty.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.http +package net.corda.applications.workers.rest.http import kotlin.properties.ReadOnlyProperty import kotlin.reflect.KProperty diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/kafka/KafkaTestToolKit.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/kafka/KafkaTestToolKit.kt similarity index 98% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/kafka/KafkaTestToolKit.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/kafka/KafkaTestToolKit.kt index 695ddb6b730..8bf582f1883 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/kafka/KafkaTestToolKit.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/kafka/KafkaTestToolKit.kt @@ -1,10 +1,10 @@ -package net.corda.applications.workers.rpc.kafka +package net.corda.applications.workers.rest.kafka import com.typesafe.config.ConfigFactory import com.typesafe.config.ConfigValueFactory import java.util.concurrent.TimeUnit import kotlin.random.Random -import net.corda.applications.workers.rpc.http.TestToolkit +import net.corda.applications.workers.rest.http.TestToolkit import net.corda.chunking.impl.ChunkBuilderServiceImpl import net.corda.cipher.suite.impl.CipherSchemeMetadataImpl import net.corda.cipher.suite.impl.PlatformDigestServiceImpl diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/AdminPasswordUtil.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/AdminPasswordUtil.kt similarity index 74% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/AdminPasswordUtil.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/AdminPasswordUtil.kt index 29374b37a60..211491acdf1 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/AdminPasswordUtil.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/AdminPasswordUtil.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils object AdminPasswordUtil { const val adminUser = "admin" diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/CertificateTestUtils.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/CertificateTestUtils.kt similarity index 98% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/CertificateTestUtils.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/CertificateTestUtils.kt index cf58c446a4b..d800f8238f0 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/CertificateTestUtils.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/CertificateTestUtils.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils import net.corda.crypto.cipher.suite.schemes.RSA_TEMPLATE import net.corda.crypto.test.certificates.generation.CertificateAuthorityFactory diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/ClusterTestUtils.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/ClusterTestUtils.kt similarity index 99% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/ClusterTestUtils.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/ClusterTestUtils.kt index 60bd3b126bb..72325fdc589 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/ClusterTestUtils.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/ClusterTestUtils.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils import com.fasterxml.jackson.databind.ObjectMapper import net.corda.cli.plugins.packaging.CreateCpiV2 diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eCluster.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eCluster.kt similarity index 90% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eCluster.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eCluster.kt index fbf55291ed4..376286c2b7d 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eCluster.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eCluster.kt @@ -1,7 +1,7 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils -import net.corda.applications.workers.rpc.http.TestToolkitProperty -import net.corda.applications.workers.rpc.kafka.KafkaTestToolKit +import net.corda.applications.workers.rest.http.TestToolkitProperty +import net.corda.applications.workers.rest.kafka.KafkaTestToolKit import net.corda.httprpc.RestResource import net.corda.httprpc.client.RestClient diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eClusterConfig.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eClusterConfig.kt similarity index 70% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eClusterConfig.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eClusterConfig.kt index 6963efaff0d..55fb8a59e87 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eClusterConfig.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eClusterConfig.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils abstract class E2eClusterConfig { abstract val restHostPropertyName: String @@ -22,25 +22,25 @@ abstract class E2eClusterConfig { } internal object E2eClusterAConfig : E2eClusterConfig() { - override val restHostPropertyName = "E2E_CLUSTER_A_RPC_HOST" - override val restPortPropertyName = "E2E_CLUSTER_A_RPC_PORT" - override val restPasswordPropertyName = "E2E_CLUSTER_A_RPC_PASSWORD" + override val restHostPropertyName = "E2E_CLUSTER_A_REST_HOST" + override val restPortPropertyName = "E2E_CLUSTER_A_REST_PORT" + override val restPasswordPropertyName = "E2E_CLUSTER_A_REST_PASSWORD" override val p2pHostPropertyName = "E2E_CLUSTER_A_P2P_HOST" override val p2pPortPropertyName = "E2E_CLUSTER_A_P2P_PORT" } internal object E2eClusterBConfig : E2eClusterConfig() { - override val restHostPropertyName = "E2E_CLUSTER_B_RPC_HOST" - override val restPortPropertyName = "E2E_CLUSTER_B_RPC_PORT" - override val restPasswordPropertyName = "E2E_CLUSTER_B_RPC_PASSWORD" + override val restHostPropertyName = "E2E_CLUSTER_B_REST_HOST" + override val restPortPropertyName = "E2E_CLUSTER_B_REST_PORT" + override val restPasswordPropertyName = "E2E_CLUSTER_B_REST_PASSWORD" override val p2pHostPropertyName = "E2E_CLUSTER_B_P2P_HOST" override val p2pPortPropertyName = "E2E_CLUSTER_B_P2P_PORT" } internal object E2eClusterCConfig : E2eClusterConfig() { - override val restHostPropertyName = "E2E_CLUSTER_C_RPC_HOST" - override val restPortPropertyName = "E2E_CLUSTER_C_RPC_PORT" - override val restPasswordPropertyName = "E2E_CLUSTER_C_RPC_PASSWORD" + override val restHostPropertyName = "E2E_CLUSTER_C_REST_HOST" + override val restPortPropertyName = "E2E_CLUSTER_C_REST_PORT" + override val restPasswordPropertyName = "E2E_CLUSTER_C_REST_PASSWORD" override val p2pHostPropertyName = "E2E_CLUSTER_C_P2P_HOST" override val p2pPortPropertyName = "E2E_CLUSTER_C_P2P_PORT" } \ No newline at end of file diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eClusterMember.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eClusterMember.kt similarity index 90% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eClusterMember.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eClusterMember.kt index 75357dfe78f..ab5bdf5afc9 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/E2eClusterMember.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/E2eClusterMember.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils import net.corda.v5.base.types.MemberX500Name import org.assertj.core.api.Assertions.fail diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/MembershipTestUtils.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/MembershipTestUtils.kt similarity index 99% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/MembershipTestUtils.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/MembershipTestUtils.kt index e29274f7a22..9e2611f7d35 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/MembershipTestUtils.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/MembershipTestUtils.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils import com.fasterxml.jackson.databind.ObjectMapper import net.corda.crypto.test.certificates.generation.CertificateAuthority diff --git a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/P2PTestUtils.kt b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/P2PTestUtils.kt similarity index 97% rename from applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/P2PTestUtils.kt rename to applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/P2PTestUtils.kt index af6f94cf251..c29a26c0820 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/kotlin/net/corda/applications/workers/rpc/utils/P2PTestUtils.kt +++ b/applications/workers/release/rest-worker/src/e2eTest/kotlin/net/corda/applications/workers/rest/utils/P2PTestUtils.kt @@ -1,6 +1,6 @@ -package net.corda.applications.workers.rpc.utils +package net.corda.applications.workers.rest.utils -import net.corda.applications.workers.rpc.kafka.KafkaTestToolKit +import net.corda.applications.workers.rest.kafka.KafkaTestToolKit import net.corda.data.identity.HoldingIdentity import net.corda.messaging.api.records.Record import net.corda.data.p2p.app.AppMessage diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/RunNetworkTests.md b/applications/workers/release/rest-worker/src/e2eTest/resources/RunNetworkTests.md similarity index 77% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/RunNetworkTests.md rename to applications/workers/release/rest-worker/src/e2eTest/resources/RunNetworkTests.md index b8906618ccd..442457396a1 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/resources/RunNetworkTests.md +++ b/applications/workers/release/rest-worker/src/e2eTest/resources/RunNetworkTests.md @@ -3,12 +3,12 @@ Before running the tests for the membership groups, you will need to configure t Below is an example of properties which can be set in the projects `build.properties` ``` properties -e2eClusterARpcHost = corda-rpc-worker.ccrean-cluster-a -e2eClusterARpcPort = 443 -e2eClusterBRpcHost = corda-rpc-worker.ccrean-cluster-b -e2eClusterBRpcPort = 443 -e2eClusterCRpcHost = corda-rpc-worker.ccrean-cluster-mgm -e2eClusterCRpcPort = 443 +e2eClusterARestHost = corda-rest-worker.ccrean-cluster-a +e2eClusterARestPort = 443 +e2eClusterBRestHost = corda-rest-worker.ccrean-cluster-b +e2eClusterBRestPort = 443 +e2eClusterCRestHost = corda-rest-worker.ccrean-cluster-mgm +e2eClusterCRestPort = 443 e2eClusterAP2pHost = corda-p2p-gateway-worker.ccrean-cluster-a e2eClusterAP2pPort = 8080 @@ -20,12 +20,12 @@ e2eClusterCP2pPort = 8080 Or if you wish to set these as system properties you can set them as ```bash -export E2E_CLUSTER_A_RPC_HOST=corda-rpc-worker.ccrean-cluster-a -export E2E_CLUSTER_A_RPC_PORT=443 -export E2E_CLUSTER_B_RPC_HOST=corda-rpc-worker.ccrean-cluster-b -export E2E_CLUSTER_B_RPC_PORT=443 -export E2E_CLUSTER_C_RPC_HOST=corda-rpc-worker.ccrean-cluster-mgm -export E2E_CLUSTER_C_RPC_PORT=443 +export E2E_CLUSTER_A_REST_HOST=corda-rest-worker.ccrean-cluster-a +export E2E_CLUSTER_A_REST_PORT=443 +export E2E_CLUSTER_B_REST_HOST=corda-rest-worker.ccrean-cluster-b +export E2E_CLUSTER_B_REST_PORT=443 +export E2E_CLUSTER_C_REST_HOST=corda-rest-worker.ccrean-cluster-mgm +export E2E_CLUSTER_C_REST_PORT=443 export E2E_CLUSTER_A_P2P_HOST=corda-p2p-gateway-worker.ccrean-cluster-a export E2E_CLUSTER_A_P2P_PORT=8080 diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/RunP2PTest.md b/applications/workers/release/rest-worker/src/e2eTest/resources/RunP2PTest.md similarity index 100% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/RunP2PTest.md rename to applications/workers/release/rest-worker/src/e2eTest/resources/RunP2PTest.md diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/certificate.pem b/applications/workers/release/rest-worker/src/e2eTest/resources/certificate.pem similarity index 100% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/certificate.pem rename to applications/workers/release/rest-worker/src/e2eTest/resources/certificate.pem diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/connect.e2e.sh b/applications/workers/release/rest-worker/src/e2eTest/resources/connect.e2e.sh similarity index 90% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/connect.e2e.sh rename to applications/workers/release/rest-worker/src/e2eTest/resources/connect.e2e.sh index ea91c3101c3..df07812ddd0 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/resources/connect.e2e.sh +++ b/applications/workers/release/rest-worker/src/e2eTest/resources/connect.e2e.sh @@ -21,7 +21,7 @@ printf "KafkaClient {\n org.apache.kafka.common.security.scram.ScramLoginModule telepresence connect -kubectl port-forward --namespace $NAMESPACE deployment/corda-rpc-worker 8888 > /tmp/cluster/forward.8888.txt & +kubectl port-forward --namespace $NAMESPACE deployment/corda-rest-worker 8888 > /tmp/cluster/forward.8888.txt & echo "To run the tests set environment variables to:" echo " CORDA_KAFKA_SSL_TRUSTSTORE_LOCATION=/tmp/cluster/ca.crt" diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/create.multi.clusters.sh b/applications/workers/release/rest-worker/src/e2eTest/resources/create.multi.clusters.sh similarity index 100% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/create.multi.clusters.sh rename to applications/workers/release/rest-worker/src/e2eTest/resources/create.multi.clusters.sh diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/install.aws.sh b/applications/workers/release/rest-worker/src/e2eTest/resources/install.aws.sh similarity index 92% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/install.aws.sh rename to applications/workers/release/rest-worker/src/e2eTest/resources/install.aws.sh index 5c309544665..e909c4f6466 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/resources/install.aws.sh +++ b/applications/workers/release/rest-worker/src/e2eTest/resources/install.aws.sh @@ -37,7 +37,7 @@ kubectl get secret -n $NAMESPACE prereqs-kafka-0-tls -o go-template='{{ index .d telepresence connect -kubectl port-forward --namespace $NAMESPACE deployment/corda-rpc-worker 8888 > /tmp/cluster/forward.8888.txt & +kubectl port-forward --namespace $NAMESPACE deployment/corda-rest-worker 8888 > /tmp/cluster/forward.8888.txt & echo "To run the tests set environment variables to:" echo " CORDA_KAFKA_SSL_TRUSTSTORE_LOCATION=/tmp/cluster/ca.crt" diff --git a/applications/workers/release/rpc-worker/src/e2eTest/resources/install.minikube.sh b/applications/workers/release/rest-worker/src/e2eTest/resources/install.minikube.sh similarity index 94% rename from applications/workers/release/rpc-worker/src/e2eTest/resources/install.minikube.sh rename to applications/workers/release/rest-worker/src/e2eTest/resources/install.minikube.sh index affc2df4225..bd4beef0ac1 100644 --- a/applications/workers/release/rpc-worker/src/e2eTest/resources/install.minikube.sh +++ b/applications/workers/release/rest-worker/src/e2eTest/resources/install.minikube.sh @@ -42,7 +42,7 @@ helm upgrade --install corda -n corda \ -kubectl port-forward --namespace corda deployment/corda-rpc-worker 8888 > /tmp/cluster/forward.8888.txt & +kubectl port-forward --namespace corda deployment/corda-rest-worker 8888 > /tmp/cluster/forward.8888.txt & kubectl port-forward --namespace corda services/prereqs-kafka-headless 9092 > /tmp/cluster/forward.9092.txt & kubectl get secret -n corda prereqs-kafka-0-tls -o go-template='{{ index .data "ca.crt" }}' | base64 --decode > /tmp/cluster/ca.crt diff --git a/applications/workers/release/rpc-worker/src/main/kotlin/net/corda/applications/workers/rpc/RestWorker.kt b/applications/workers/release/rest-worker/src/main/kotlin/net/corda/applications/workers/rest/RestWorker.kt similarity index 98% rename from applications/workers/release/rpc-worker/src/main/kotlin/net/corda/applications/workers/rpc/RestWorker.kt rename to applications/workers/release/rest-worker/src/main/kotlin/net/corda/applications/workers/rest/RestWorker.kt index 51d78c16d2d..95fe0ae81eb 100644 --- a/applications/workers/release/rpc-worker/src/main/kotlin/net/corda/applications/workers/rpc/RestWorker.kt +++ b/applications/workers/release/rest-worker/src/main/kotlin/net/corda/applications/workers/rest/RestWorker.kt @@ -1,4 +1,4 @@ -package net.corda.applications.workers.rpc +package net.corda.applications.workers.rest import net.corda.applications.workers.workercommon.ApplicationBanner import net.corda.applications.workers.workercommon.DefaultWorkerParams diff --git a/applications/workers/workers-smoketest/build.gradle b/applications/workers/workers-smoketest/build.gradle index 98985647ec7..5192be8d873 100644 --- a/applications/workers/workers-smoketest/build.gradle +++ b/applications/workers/workers-smoketest/build.gradle @@ -144,8 +144,8 @@ tasks.register('smokeTest', Test) { // E.g. during Jenkins pipeline setup. systemProperty "cryptoWorkerHealthHttp", project.getProperties().getOrDefault("cryptoWorkerHealthHttp",combinedWorker ? null : "http://localhost:7001/") - systemProperty "rpcWorkerHealthHttp", - project.getProperties().getOrDefault("rpcWorkerHealthHttp",combinedWorker ? null : "http://localhost:7002/") + systemProperty "restWorkerHealthHttp", + project.getProperties().getOrDefault("restWorkerHealthHttp",combinedWorker ? null : "http://localhost:7002/") systemProperty "flowWorkerHealthHttp", project.getProperties().getOrDefault("flowWorkerHealthHttp",combinedWorker ? null : "http://localhost:7003/") systemProperty "dbWorkerHealthHttp", diff --git a/applications/workers/workers-smoketest/src/smokeTest/kotlin/net/corda/applications/workers/smoketest/ClusterBootstrapTest.kt b/applications/workers/workers-smoketest/src/smokeTest/kotlin/net/corda/applications/workers/smoketest/ClusterBootstrapTest.kt index 9189bf19718..72d5c18c1ad 100644 --- a/applications/workers/workers-smoketest/src/smokeTest/kotlin/net/corda/applications/workers/smoketest/ClusterBootstrapTest.kt +++ b/applications/workers/workers-smoketest/src/smokeTest/kotlin/net/corda/applications/workers/smoketest/ClusterBootstrapTest.kt @@ -31,7 +31,7 @@ class ClusterBootstrapTest { // "crypto-worker" to System.getProperty("cryptoWorkerHealthHttp"), "db-worker" to System.getProperty("dbWorkerHealthHttp"), "flow-worker" to System.getProperty("flowWorkerHealthHttp"), - "rpc-worker" to System.getProperty("rpcWorkerHealthHttp"), + "rest-worker" to System.getProperty("restWorkerHealthHttp"), ) private val client = HttpClient.newBuilder().build() diff --git a/charts/corda/templates/rbac-job.yaml b/charts/corda/templates/rbac-job.yaml index f3084929f12..42e7d865280 100644 --- a/charts/corda/templates/rbac-job.yaml +++ b/charts/corda/templates/rbac-job.yaml @@ -27,7 +27,7 @@ spec: {{- include "corda.containerSecurityContext" . | nindent 10 }} args: ['initial-rbac', 'user-admin', '--yield', '300', '--user', "$(INITIAL_ADMIN_USER_USERNAME)", '--password', "$(INITIAL_ADMIN_USER_PASSWORD)", - '--target', "https://{{ include "corda.fullname" . }}-rpc-worker:443"] + '--target', "https://{{ include "corda.fullname" . }}-rest-worker:443"] volumeMounts: {{ include "corda.log4jVolumeMount" . | nindent 12 }} env: @@ -40,7 +40,7 @@ spec: {{- include "corda.containerSecurityContext" . | nindent 10 }} args: ['initial-rbac', 'vnode-creator', '--yield', '300', '--user', "$(INITIAL_ADMIN_USER_USERNAME)", '--password', "$(INITIAL_ADMIN_USER_PASSWORD)", - '--target', "https://{{ include "corda.fullname" . }}-rpc-worker:443"] + '--target', "https://{{ include "corda.fullname" . }}-rest-worker:443"] volumeMounts: {{ include "corda.log4jVolumeMount" . | nindent 12 }} env: @@ -53,7 +53,7 @@ spec: {{- include "corda.containerSecurityContext" . | nindent 10 }} args: ['initial-rbac', 'corda-developer', '--yield', '300', '--user', "$(INITIAL_ADMIN_USER_USERNAME)", '--password', "$(INITIAL_ADMIN_USER_PASSWORD)", - '--target', "https://{{ include "corda.fullname" . }}-rpc-worker:443"] + '--target', "https://{{ include "corda.fullname" . }}-rest-worker:443"] volumeMounts: {{ include "corda.log4jVolumeMount" . | nindent 12 }} env: diff --git a/charts/corda/templates/rpc-worker.yaml b/charts/corda/templates/rest-worker.yaml similarity index 77% rename from charts/corda/templates/rpc-worker.yaml rename to charts/corda/templates/rest-worker.yaml index 7aa8d4bdac4..58e6d941bef 100644 --- a/charts/corda/templates/rpc-worker.yaml +++ b/charts/corda/templates/rest-worker.yaml @@ -1,22 +1,22 @@ -{{- $_ := set . "worker" "rpc" }} +{{- $_ := set . "worker" "rest" }} apiVersion: v1 kind: Service metadata: name: {{ include "corda.workerName" . | quote }} labels: {{- include "corda.workerLabels" . | nindent 4 }} - {{- if .Values.workers.rpc.service.annotations }} + {{- if .Values.workers.rest.service.annotations }} annotations: - {{- range $key, $value := .Values.workers.rpc.service.annotations }} + {{- range $key, $value := .Values.workers.rest.service.annotations }} {{ $key }}: {{ $value | quote }} {{- end }} {{- end}} spec: - type: {{ .Values.workers.rpc.service.type }} - {{- if .Values.workers.rpc.service.externalTrafficPolicy }} - externalTrafficPolicy: {{ .Values.workers.rpc.service.externalTrafficPolicy }} - {{- else if .Values.workers.rpc.service.loadBalancerSourceRanges }} - loadBalancerSourceRanges: {{ .Values.workers.rpc.service.loadBalancerSourceRanges }} + type: {{ .Values.workers.rest.service.type }} + {{- if .Values.workers.rest.service.externalTrafficPolicy }} + externalTrafficPolicy: {{ .Values.workers.rest.service.externalTrafficPolicy }} + {{- else if .Values.workers.rest.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{ .Values.workers.rest.service.loadBalancerSourceRanges }} {{- end }} selector: {{- include "corda.workerSelectorLabels" . | nindent 4 }} @@ -32,7 +32,7 @@ metadata: labels: {{- include "corda.workerLabels" . | nindent 4 }} spec: - replicas: {{ .Values.workers.rpc.replicaCount }} + replicas: {{ .Values.workers.rest.replicaCount }} selector: matchLabels: {{- include "corda.workerSelectorLabels" . | nindent 6 }} @@ -56,7 +56,7 @@ spec: - key: "app.kubernetes.io/component" operator: In values: - - rpc-worker + - rest-worker topologyKey: "kubernetes.io/hostname" containers: - name: {{ include "corda.workerName" . | quote }} @@ -76,13 +76,13 @@ spec: ports: - name: http containerPort: 8888 - {{- if .Values.workers.rpc.debug.enabled }} + {{- if .Values.workers.rest.debug.enabled }} - name: debug containerPort: 5005 {{- end }} - name: monitor containerPort: 7000 - {{- if .Values.workers.rpc.profiling.enabled }} + {{- if .Values.workers.rest.profiling.enabled }} - name: profiling containerPort: 10045 {{- end }} diff --git a/charts/corda/values.schema.json b/charts/corda/values.schema.json index 60a05485d37..9c2d7a54435 100644 --- a/charts/corda/values.schema.json +++ b/charts/corda/values.schema.json @@ -962,7 +962,7 @@ "db", "flow", "membership", - "rpc", + "rest", "p2pLinkManager", "p2pGateway" ], @@ -1158,7 +1158,7 @@ } ] }, - "rpc": { + "rest": { "allOf": [ { "$ref": "#/$defs/worker" @@ -1181,7 +1181,7 @@ "service": { "type": "object", "default": {}, - "title": "rpc worker service configuration", + "title": "REST worker service configuration", "required": [ "type", "externalTrafficPolicy", @@ -1193,7 +1193,7 @@ "type": { "type": "string", "default": "", - "title": "the type for the RPC worker service", + "title": "the type for the REST worker service", "examples": [ "ClusterIP" ] @@ -1201,7 +1201,7 @@ "externalTrafficPolicy": { "type": "string", "default": "", - "title": "the traffic policy for the RPC worker service", + "title": "the traffic policy for the REST worker service", "examples": [ "" ] @@ -1209,7 +1209,7 @@ "loadBalancerSourceRanges": { "type": "array", "default": [], - "title": "the LoadBalancer source ranges to limit access to the RPC worker service", + "title": "the LoadBalancer source ranges to limit access to the REST worker service", "items": {}, "examples": [ [] @@ -1218,7 +1218,7 @@ "annotations": { "type": "object", "default": {}, - "title": "the annotations for RPC worker service", + "title": "the annotations for REST worker service", "required": [], "properties": {}, "examples": [ @@ -1240,7 +1240,7 @@ { "image": { "registry": "corda-os-docker.software.r3.com", - "repository": "corda-os-rpc-worker", + "repository": "corda-os-rest-worker", "tag": "" }, "replicaCount": 1, @@ -1515,10 +1515,10 @@ } } }, - "rpc": { + "rest": { "image": { "registry": "corda-os-docker.software.r3.com", - "repository": "corda-os-rpc-worker", + "repository": "corda-os-rest-worker", "tag": "" }, "replicaCount": 1, diff --git a/charts/corda/values.yaml b/charts/corda/values.yaml index d470885a332..0345cf29b33 100644 --- a/charts/corda/values.yaml +++ b/charts/corda/values.yaml @@ -638,27 +638,27 @@ workers: # -- the membership worker SASL password secret key for client connection to Kafka key: "" - # RPC worker configuration - rpc: - # RPC worker image configuration + # REST worker configuration + rest: + # REST worker image configuration image: - # -- RPC worker image registry, defaults to image.registry + # -- REST worker image registry, defaults to image.registry registry: "" - # -- RPC worker image repository - repository: "corda-os-rpc-worker" - # -- RPC worker image tag, defaults to image.tag + # -- REST worker image repository + repository: "corda-os-rest-worker" + # -- REST worker image tag, defaults to image.tag tag: "" - # -- RPC worker replica count + # -- REST worker replica count replicaCount: 1 - # -- RPC worker extra annotations + # -- REST worker extra annotations annotations: {} - # -- additional Java options for the rpc worker + # -- additional Java options for the rest worker javaOptions: "-XX:MaxRAMPercentage=75" - # RPC worker debug configuration + # REST worker debug configuration debug: - # -- run RPC worker with debug enabled + # -- run REST worker with debug enabled enabled: false - # -- if debug is enabled, suspend the RPC worker until the debugger is attached + # -- if debug is enabled, suspend the REST worker until the debugger is attached suspend: false # logging configuration logging: @@ -667,51 +667,51 @@ workers: # -- additional Log4j 2 XML configuration override: "" profiling: - # -- run RPC worker with profiling enabled + # -- run REST worker with profiling enabled enabled: false - # -- resource limits and requests configuration for the RPC worker containers. + # -- resource limits and requests configuration for the REST worker containers. resources: - # -- the CPU/memory resource requests for the RPC worker containers + # -- the CPU/memory resource requests for the REST worker containers requests: {} - # -- the CPU/memory resource limits for the RPC worker containers + # -- the CPU/memory resource limits for the REST worker containers limits: {} - # RPC worker service configuration + # REST worker service configuration service: - # -- the type for the RPC worker service + # -- the type for the REST worker service type: ClusterIP - # -- the traffic policy for the RPC worker service + # -- the traffic policy for the REST worker service externalTrafficPolicy: "" - # -- the LoadBalancer source ranges to limit access to the RPC worker service + # -- the LoadBalancer source ranges to limit access to the REST worker service loadBalancerSourceRanges: [] - # -- the annotations for RPC worker service + # -- the annotations for REST worker service annotations: {} - # RPC worker Kafka configuration + # REST worker Kafka configuration kafka: - # if kafka.sasl.enabled, the credentials to connect to Kafka with for the RPC worker + # if kafka.sasl.enabled, the credentials to connect to Kafka with for the REST worker sasl: - # RPC worker SASL username configuration for client connection to Kafka; defaults to kafka.sasl.username + # REST worker SASL username configuration for client connection to Kafka; defaults to kafka.sasl.username username: - # -- the RPC worker SASL username for client connection to Kafka + # -- the REST worker SASL username for client connection to Kafka value: "" # the boostrap SASL username secret configuration for client connection to Kafka; used in preference to value if name is set valueFrom: - # the RPC worker SASL username secret key reference for client connection to Kafka + # the REST worker SASL username secret key reference for client connection to Kafka secretKeyRef: - # -- the RPC worker SASL username secret name for client connection to Kafka + # -- the REST worker SASL username secret name for client connection to Kafka name: "" - # -- the RPC worker SASL username secret key for client connection to Kafka + # -- the REST worker SASL username secret key for client connection to Kafka key: "" - # RPC worker SASL password configuration for client connection to Kafka; defaults to kafka.sasl.password + # REST worker SASL password configuration for client connection to Kafka; defaults to kafka.sasl.password password: - # -- the RPC worker SASL password for client connection to Kafka + # -- the REST worker SASL password for client connection to Kafka value: "" - # the RPC worker SASL password secret configuration for client connection to Kafka; used in preference to value if name is set + # the REST worker SASL password secret configuration for client connection to Kafka; used in preference to value if name is set valueFrom: - # the RPC worker SASL password secret key reference for client connection to Kafka + # the REST worker SASL password secret key reference for client connection to Kafka secretKeyRef: - # -- the RPC worker SASL password secret name for client connection to Kafka + # -- the REST worker SASL password secret name for client connection to Kafka name: "" - # -- the RPC worker SASL password secret key for client connection to Kafka + # -- the REST worker SASL password secret key for client connection to Kafka key: "" # P2P link manager worker configuration diff --git a/components/chunking/chunk-db-write-impl/src/main/kotlin/net/corda/chunking/db/impl/validation/ValidationFunctions.kt b/components/chunking/chunk-db-write-impl/src/main/kotlin/net/corda/chunking/db/impl/validation/ValidationFunctions.kt index 740a29117b5..379642fec29 100644 --- a/components/chunking/chunk-db-write-impl/src/main/kotlin/net/corda/chunking/db/impl/validation/ValidationFunctions.kt +++ b/components/chunking/chunk-db-write-impl/src/main/kotlin/net/corda/chunking/db/impl/validation/ValidationFunctions.kt @@ -171,9 +171,9 @@ fun Cpi.validateAndGetGroupId(requestId: String, getGroupIdFromJson: (String) -> val groupId = try { getGroupIdFromJson(this.metadata.groupPolicy!!) // catch specific exceptions, and wrap them up so as to capture the request ID - // This exception will end up going over Kafka and being picked up by the RPC worker, + // This exception will end up going over Kafka and being picked up by the REST worker, // which then matches by class name, so we cannot use subtypes of ValidationException without - // introducing knowledge of specific failure modes into the RPC worker + // introducing knowledge of specific failure modes into the REST worker } catch (e: GroupPolicyIdNotFoundException) { throw ValidationException("Unable to upload CPI due to group ID not found", requestId) } catch (e: GroupPolicyParseException) { diff --git a/components/permissions/permission-management-cache-service/src/main/kotlin/net/corda/permissions/management/cache/PermissionManagementCacheService.kt b/components/permissions/permission-management-cache-service/src/main/kotlin/net/corda/permissions/management/cache/PermissionManagementCacheService.kt index 121ffd91895..bb32ab742e9 100644 --- a/components/permissions/permission-management-cache-service/src/main/kotlin/net/corda/permissions/management/cache/PermissionManagementCacheService.kt +++ b/components/permissions/permission-management-cache-service/src/main/kotlin/net/corda/permissions/management/cache/PermissionManagementCacheService.kt @@ -28,10 +28,10 @@ import net.corda.lifecycle.createCoordinator import net.corda.messaging.api.subscription.CompactedSubscription import net.corda.messaging.api.subscription.config.SubscriptionConfig import net.corda.messaging.api.subscription.factory.SubscriptionFactory -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_ENTITY_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_GROUP_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_ROLE_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_USER_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_ENTITY_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_GROUP_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_ROLE_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_USER_TOPIC import net.corda.schema.configuration.ConfigKeys.BOOT_CONFIG import net.corda.schema.configuration.ConfigKeys.MESSAGING_CONFIG import org.osgi.service.component.annotations.Activate @@ -233,7 +233,7 @@ class PermissionManagementCacheService @Activate constructor( kafkaConfig: SmartConfig ): CompactedSubscription { return subscriptionFactory.createCompactedSubscription( - SubscriptionConfig(CONSUMER_GROUP, RPC_PERM_USER_TOPIC), + SubscriptionConfig(CONSUMER_GROUP, REST_PERM_USER_TOPIC), permissionManagementCacheTopicProcessorFactory.createUserTopicProcessor(userData) { coordinator.postEvent(UserTopicSnapshotReceived()) }, @@ -246,7 +246,7 @@ class PermissionManagementCacheService @Activate constructor( kafkaConfig: SmartConfig ): CompactedSubscription { return subscriptionFactory.createCompactedSubscription( - SubscriptionConfig(CONSUMER_GROUP, RPC_PERM_GROUP_TOPIC), + SubscriptionConfig(CONSUMER_GROUP, REST_PERM_GROUP_TOPIC), permissionManagementCacheTopicProcessorFactory.createGroupTopicProcessor(groupData) { coordinator.postEvent(GroupTopicSnapshotReceived()) }, @@ -259,7 +259,7 @@ class PermissionManagementCacheService @Activate constructor( kafkaConfig: SmartConfig ): CompactedSubscription { return subscriptionFactory.createCompactedSubscription( - SubscriptionConfig(CONSUMER_GROUP, RPC_PERM_ROLE_TOPIC), + SubscriptionConfig(CONSUMER_GROUP, REST_PERM_ROLE_TOPIC), permissionManagementCacheTopicProcessorFactory.createRoleTopicProcessor(roleData) { coordinator.postEvent(RoleTopicSnapshotReceived()) }, @@ -272,7 +272,7 @@ class PermissionManagementCacheService @Activate constructor( kafkaConfig: SmartConfig ): CompactedSubscription { return subscriptionFactory.createCompactedSubscription( - SubscriptionConfig(CONSUMER_GROUP, RPC_PERM_ENTITY_TOPIC), + SubscriptionConfig(CONSUMER_GROUP, REST_PERM_ENTITY_TOPIC), permissionManagementCacheTopicProcessorFactory.createPermissionTopicProcessor(permissionData) { coordinator.postEvent(PermissionTopicSnapshotReceived()) }, diff --git a/components/permissions/permission-management-service/src/main/kotlin/net/corda/permissions/management/internal/PermissionManagementServiceEventHandler.kt b/components/permissions/permission-management-service/src/main/kotlin/net/corda/permissions/management/internal/PermissionManagementServiceEventHandler.kt index 19fae65a1a1..7526ffb92b8 100644 --- a/components/permissions/permission-management-service/src/main/kotlin/net/corda/permissions/management/internal/PermissionManagementServiceEventHandler.kt +++ b/components/permissions/permission-management-service/src/main/kotlin/net/corda/permissions/management/internal/PermissionManagementServiceEventHandler.kt @@ -25,7 +25,7 @@ import net.corda.messaging.api.subscription.config.RPCConfig import net.corda.permissions.management.cache.PermissionManagementCacheService import net.corda.permissions.validation.PermissionValidationService import net.corda.permissions.validation.cache.PermissionValidationCacheService -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_MGMT_REQ_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_MGMT_REQ_TOPIC import net.corda.schema.configuration.ConfigKeys.BOOT_CONFIG import net.corda.schema.configuration.ConfigKeys.MESSAGING_CONFIG import net.corda.schema.configuration.ConfigKeys.REST_CONFIG @@ -158,7 +158,7 @@ internal class PermissionManagementServiceEventHandler( RPCConfig( GROUP_NAME, CLIENT_NAME, - RPC_PERM_MGMT_REQ_TOPIC, + REST_PERM_MGMT_REQ_TOPIC, PermissionManagementRequest::class.java, PermissionManagementResponse::class.java ), diff --git a/components/permissions/permission-storage-writer-service/src/main/kotlin/net/corda/permissions/storage/writer/internal/PermissionStorageWriterServiceEventHandler.kt b/components/permissions/permission-storage-writer-service/src/main/kotlin/net/corda/permissions/storage/writer/internal/PermissionStorageWriterServiceEventHandler.kt index 31d0fc40a77..868c51c75bb 100644 --- a/components/permissions/permission-storage-writer-service/src/main/kotlin/net/corda/permissions/storage/writer/internal/PermissionStorageWriterServiceEventHandler.kt +++ b/components/permissions/permission-storage-writer-service/src/main/kotlin/net/corda/permissions/storage/writer/internal/PermissionStorageWriterServiceEventHandler.kt @@ -17,7 +17,7 @@ import net.corda.messaging.api.subscription.RPCSubscription import net.corda.messaging.api.subscription.config.RPCConfig import net.corda.messaging.api.subscription.factory.SubscriptionFactory import net.corda.permissions.storage.reader.PermissionStorageReaderService -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_MGMT_REQ_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_MGMT_REQ_TOPIC import net.corda.schema.configuration.ConfigKeys.BOOT_CONFIG import net.corda.schema.configuration.ConfigKeys.MESSAGING_CONFIG import net.corda.utilities.VisibleForTesting @@ -86,7 +86,7 @@ class PermissionStorageWriterServiceEventHandler( rpcConfig = RPCConfig( groupName = GROUP_NAME, clientName = CLIENT_NAME, - requestTopic = RPC_PERM_MGMT_REQ_TOPIC, + requestTopic = REST_PERM_MGMT_REQ_TOPIC, requestType = PermissionManagementRequest::class.java, responseType = PermissionManagementResponse::class.java ), diff --git a/debug.yaml b/debug.yaml index f243cab9e05..e08a0ed9212 100644 --- a/debug.yaml +++ b/debug.yaml @@ -40,7 +40,7 @@ workers: # suspend: true # logging: # level: "debug" - rpc: + rest: replicaCount: 1 # debug: # enabled: true diff --git a/gradle.properties b/gradle.properties index 094c1df13de..2f6053d2e9b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,7 +40,7 @@ bouncycastleVersion=1.72 # Corda API libs revision (change in 4th digit indicates a breaking change) # Change to 5.0.0.xx-SNAPSHOT to pick up maven local published copy #cordaApiVersion=5.0.0.xxx-SNAPSHOT -cordaApiVersion=5.0.0.650-beta+ +cordaApiVersion=5.0.0.651-beta+ disruptorVersion=3.4.2 felixConfigAdminVersion=1.9.26 diff --git a/libs/permissions/permission-storage-reader-impl/src/main/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImpl.kt b/libs/permissions/permission-storage-reader-impl/src/main/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImpl.kt index 0ae312d84b8..bb07bb3ff9c 100644 --- a/libs/permissions/permission-storage-reader-impl/src/main/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImpl.kt +++ b/libs/permissions/permission-storage-reader-impl/src/main/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImpl.kt @@ -18,10 +18,10 @@ import net.corda.permissions.model.Permission import net.corda.permissions.model.Role import net.corda.permissions.model.User import net.corda.schema.Schemas.Permissions.Companion.PERMISSIONS_USER_SUMMARY_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_ENTITY_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_GROUP_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_ROLE_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_USER_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_ENTITY_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_GROUP_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_ROLE_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_USER_TOPIC import net.corda.utilities.concurrent.getOrThrow import net.corda.v5.base.util.trace import org.slf4j.LoggerFactory @@ -70,15 +70,15 @@ class PermissionStorageReaderImpl( } override fun publishUpdatedUser(user: AvroUser) { - publisher.publish(listOf(Record(RPC_PERM_USER_TOPIC, key = user.loginName, value = user))).single().getOrThrow() + publisher.publish(listOf(Record(REST_PERM_USER_TOPIC, key = user.loginName, value = user))).single().getOrThrow() } override fun publishUpdatedRole(role: AvroRole) { - publisher.publish(listOf(Record(RPC_PERM_ROLE_TOPIC, key = role.id, value = role))).single().getOrThrow() + publisher.publish(listOf(Record(REST_PERM_ROLE_TOPIC, key = role.id, value = role))).single().getOrThrow() } override fun publishNewPermission(permission: AvroPermission) { - publisher.publish(listOf(Record(RPC_PERM_ENTITY_TOPIC, key = permission.id, value = permission))).single().getOrThrow() + publisher.publish(listOf(Record(REST_PERM_ENTITY_TOPIC, key = permission.id, value = permission))).single().getOrThrow() } override fun publishGroups(ids: List) { @@ -125,12 +125,12 @@ class PermissionStorageReaderImpl( private fun createUserRecords(users: List): List> { val userNames = users.map { it.loginName }.toHashSet() val updated = users.map { user -> - Record(RPC_PERM_USER_TOPIC, key = user.loginName, value = user.toAvroUser()) + Record(REST_PERM_USER_TOPIC, key = user.loginName, value = user.toAvroUser()) } val removed: List> = permissionManagementCache.users .filterKeys { loginName -> loginName !in userNames } - .map { (loginName, _) -> Record(RPC_PERM_USER_TOPIC, key = loginName, value = null) } + .map { (loginName, _) -> Record(REST_PERM_USER_TOPIC, key = loginName, value = null) } return updated + removed } @@ -138,11 +138,11 @@ class PermissionStorageReaderImpl( private fun createGroupRecords(groups: List): List> { val groupIds = groups.map { it.id }.toHashSet() val updated = groups.map { group -> - Record(RPC_PERM_GROUP_TOPIC, key = group.id, value = group.toAvroGroup()) + Record(REST_PERM_GROUP_TOPIC, key = group.id, value = group.toAvroGroup()) } val removed: List> = permissionManagementCache.groups .filterKeys { id -> id !in groupIds } - .map { (id, _) -> Record(RPC_PERM_GROUP_TOPIC, key = id, value = null) } + .map { (id, _) -> Record(REST_PERM_GROUP_TOPIC, key = id, value = null) } return updated + removed } @@ -150,11 +150,11 @@ class PermissionStorageReaderImpl( private fun createRoleRecords(roles: List): List> { val roleIds = roles.map { it.id }.toHashSet() val updated = roles.map { role -> - Record(RPC_PERM_ROLE_TOPIC, key = role.id, value = role.toAvroRole()) + Record(REST_PERM_ROLE_TOPIC, key = role.id, value = role.toAvroRole()) } val removed: List> = permissionManagementCache.roles .filterKeys { id -> id !in roleIds } - .map { (id, _) -> Record(RPC_PERM_ROLE_TOPIC, key = id, value = null) } + .map { (id, _) -> Record(REST_PERM_ROLE_TOPIC, key = id, value = null) } return updated + removed } @@ -162,11 +162,11 @@ class PermissionStorageReaderImpl( private fun createPermissionRecords(permissions: List): List> { val permissionIds = permissions.map { it.id }.toHashSet() val updated = permissions.map { perm -> - Record(RPC_PERM_ENTITY_TOPIC, key = perm.id, value = perm.toAvroPermission()) + Record(REST_PERM_ENTITY_TOPIC, key = perm.id, value = perm.toAvroPermission()) } val removed: List> = permissionManagementCache.permissions .filterKeys { id -> id !in permissionIds } - .map { (id, _) -> Record(RPC_PERM_ENTITY_TOPIC, key = id, value = null) } + .map { (id, _) -> Record(REST_PERM_ENTITY_TOPIC, key = id, value = null) } return updated + removed } diff --git a/libs/permissions/permission-storage-reader-impl/src/test/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImplTest.kt b/libs/permissions/permission-storage-reader-impl/src/test/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImplTest.kt index a2e8db73a18..4ea77907cde 100644 --- a/libs/permissions/permission-storage-reader-impl/src/test/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImplTest.kt +++ b/libs/permissions/permission-storage-reader-impl/src/test/kotlin/net/corda/libs/permissions/storage/reader/impl/PermissionStorageReaderImplTest.kt @@ -16,10 +16,10 @@ import net.corda.permissions.model.RoleGroupAssociation import net.corda.permissions.model.RolePermissionAssociation import net.corda.permissions.model.RoleUserAssociation import net.corda.permissions.model.User -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_ENTITY_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_GROUP_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_ROLE_TOPIC -import net.corda.schema.Schemas.RPC.Companion.RPC_PERM_USER_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_ENTITY_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_GROUP_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_ROLE_TOPIC +import net.corda.schema.Schemas.Rest.Companion.REST_PERM_USER_TOPIC import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.mockito.kotlin.argumentCaptor @@ -341,10 +341,10 @@ class PermissionStorageReaderImplTest { processor.start() - val userRecord = Record(RPC_PERM_USER_TOPIC, user.loginName, avroUser) - val groupRecord = Record(RPC_PERM_GROUP_TOPIC, group.id, avroGroup) - val roleRecord = Record(RPC_PERM_ROLE_TOPIC, role.id, avroRole) - val permissionRecord = Record(RPC_PERM_ENTITY_TOPIC, permission.id, avroPermission) + val userRecord = Record(REST_PERM_USER_TOPIC, user.loginName, avroUser) + val groupRecord = Record(REST_PERM_GROUP_TOPIC, group.id, avroGroup) + val roleRecord = Record(REST_PERM_ROLE_TOPIC, role.id, avroRole) + val permissionRecord = Record(REST_PERM_ENTITY_TOPIC, permission.id, avroPermission) val permissionSummayRecord = Record(PERMISSIONS_USER_SUMMARY_TOPIC, user.loginName, avroSummaryWithPermission) val captor = argumentCaptor>>() @@ -376,10 +376,10 @@ class PermissionStorageReaderImplTest { processor.start() - val userRecord = Record(RPC_PERM_USER_TOPIC, user.loginName, value = null) - val groupRecord = Record(RPC_PERM_GROUP_TOPIC, group.id, value = null) - val roleRecord = Record(RPC_PERM_ROLE_TOPIC, role.id, value = null) - val permissionRecord = Record(RPC_PERM_ENTITY_TOPIC, permission.id, value = null) + val userRecord = Record(REST_PERM_USER_TOPIC, user.loginName, value = null) + val groupRecord = Record(REST_PERM_GROUP_TOPIC, group.id, value = null) + val roleRecord = Record(REST_PERM_ROLE_TOPIC, role.id, value = null) + val permissionRecord = Record(REST_PERM_ENTITY_TOPIC, permission.id, value = null) val permissionSummayRecord = Record(PERMISSIONS_USER_SUMMARY_TOPIC, user.loginName, null) val captor = argumentCaptor>>() @@ -399,7 +399,7 @@ class PermissionStorageReaderImplTest { processor.start() - val userRecord = Record(RPC_PERM_USER_TOPIC, user.loginName, avroUser) + val userRecord = Record(REST_PERM_USER_TOPIC, user.loginName, avroUser) verify(publisher).publish(listOf(userRecord)) } @@ -413,7 +413,7 @@ class PermissionStorageReaderImplTest { processor.publishGroups(groupIds) - val groupRecord = Record(RPC_PERM_GROUP_TOPIC, group.id, avroGroup) + val groupRecord = Record(REST_PERM_GROUP_TOPIC, group.id, avroGroup) verify(publisher).publish(listOf(groupRecord)) } @@ -427,7 +427,7 @@ class PermissionStorageReaderImplTest { processor.publishRoles(roleIds) - val roleRecord = Record(RPC_PERM_ROLE_TOPIC, role.id, avroRole) + val roleRecord = Record(REST_PERM_ROLE_TOPIC, role.id, avroRole) verify(publisher).publish(listOf(roleRecord)) } @@ -439,7 +439,7 @@ class PermissionStorageReaderImplTest { processor.start() - val userRecord = Record(RPC_PERM_USER_TOPIC, user.loginName, value = null) + val userRecord = Record(REST_PERM_USER_TOPIC, user.loginName, value = null) verify(publisher).publish(listOf(userRecord)) } @@ -453,7 +453,7 @@ class PermissionStorageReaderImplTest { processor.publishGroups(groupIds) - val groupRecord = Record(RPC_PERM_GROUP_TOPIC, group.id, value = null) + val groupRecord = Record(REST_PERM_GROUP_TOPIC, group.id, value = null) verify(publisher).publish(listOf(groupRecord)) } @@ -467,7 +467,7 @@ class PermissionStorageReaderImplTest { processor.publishRoles(roleIds) - val roleRecord = Record(RPC_PERM_ROLE_TOPIC, role.id, value = null) + val roleRecord = Record(REST_PERM_ROLE_TOPIC, role.id, value = null) verify(publisher).publish(listOf(roleRecord)) } @@ -481,8 +481,8 @@ class PermissionStorageReaderImplTest { processor.start() val userRecords = listOf( - Record(RPC_PERM_USER_TOPIC, user.loginName, avroUser), - Record(RPC_PERM_USER_TOPIC, user2.loginName, value = null) + Record(REST_PERM_USER_TOPIC, user.loginName, avroUser), + Record(REST_PERM_USER_TOPIC, user2.loginName, value = null) ) verify(publisher).publish(userRecords) @@ -498,8 +498,8 @@ class PermissionStorageReaderImplTest { processor.publishGroups(groupIds) val groupRecords = listOf( - Record(RPC_PERM_GROUP_TOPIC, group.id, avroGroup), - Record(RPC_PERM_GROUP_TOPIC, group2.id, value = null) + Record(REST_PERM_GROUP_TOPIC, group.id, avroGroup), + Record(REST_PERM_GROUP_TOPIC, group2.id, value = null) ) verify(publisher).publish(groupRecords) @@ -515,8 +515,8 @@ class PermissionStorageReaderImplTest { processor.publishRoles(roleIds) val roleRecords = listOf( - Record(RPC_PERM_ROLE_TOPIC, role.id, avroRole), - Record(RPC_PERM_ROLE_TOPIC, role2.id, value = null) + Record(REST_PERM_ROLE_TOPIC, role.id, avroRole), + Record(REST_PERM_ROLE_TOPIC, role2.id, value = null) ) verify(publisher).publish(roleRecords) diff --git a/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/FakeSecurityManager.kt b/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/FakeSecurityManager.kt similarity index 100% rename from processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/FakeSecurityManager.kt rename to processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/FakeSecurityManager.kt diff --git a/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/OpenApiCompatibilityTest.kt b/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/OpenApiCompatibilityTest.kt similarity index 100% rename from processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/OpenApiCompatibilityTest.kt rename to processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/OpenApiCompatibilityTest.kt diff --git a/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/TestUtils.kt b/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/TestUtils.kt similarity index 100% rename from processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/TestUtils.kt rename to processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/TestUtils.kt diff --git a/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/diff/OpenApiDiff.kt b/processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/diff/OpenApiDiff.kt similarity index 100% rename from processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rpc/diff/OpenApiDiff.kt rename to processors/rest-processor/src/integrationTest/kotlin/net/corda/processors/rest/diff/OpenApiDiff.kt diff --git a/settings.gradle b/settings.gradle index b47538d37c3..95e48edfc48 100644 --- a/settings.gradle +++ b/settings.gradle @@ -70,7 +70,7 @@ include 'applications:workers:release:flow-worker' include 'applications:workers:release:member-worker' include 'applications:workers:release:p2p-gateway-worker' include 'applications:workers:release:p2p-link-manager-worker' -include 'applications:workers:release:rpc-worker' +include 'applications:workers:release:rest-worker' include 'applications:workers:worker-common' include 'applications:workers:workers-smoketest' include 'components:configuration:configuration-rpcops-service-impl' diff --git a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ClusterInfo.kt b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ClusterInfo.kt index 270951ea24d..0c73bf024c7 100644 --- a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ClusterInfo.kt +++ b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ClusterInfo.kt @@ -19,9 +19,9 @@ abstract class ClusterInfo { private const val DEFAULT_P2P_PORT = 8080 } - private val restHostPropertyName get() = "E2E_CLUSTER_${id}_RPC_HOST" - private val restPortPropertyName get() = "E2E_CLUSTER_${id}_RPC_PORT" - private val restPasswordPropertyName get() = "E2E_CLUSTER_${id}_RPC_PASSWORD" + private val restHostPropertyName get() = "E2E_CLUSTER_${id}_REST_HOST" + private val restPortPropertyName get() = "E2E_CLUSTER_${id}_REST_PORT" + private val restPasswordPropertyName get() = "E2E_CLUSTER_${id}_REST_PASSWORD" private val p2pHostPropertyName get() = "E2E_CLUSTER_${id}_P2P_HOST" private val p2pPortPropertyName get() = "E2E_CLUSTER_${id}_P2P_PORT" diff --git a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ConfigTestUtils.kt b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ConfigTestUtils.kt index 3e0230198c9..06f1ca68fd8 100644 --- a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ConfigTestUtils.kt +++ b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/ConfigTestUtils.kt @@ -74,7 +74,7 @@ fun updateConfig(config: String, section: String) { } /** - * Wait for the REST API on the rpc-worker to respond with an updated config value. + * Wait for the REST API on the rest-worker to respond with an updated config value. * If [expectServiceToBeDown] is set to true it is expected the config endpoint will go down before coming back up with the new config. */ fun waitForConfigurationChange( diff --git a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/MembershipUtils.kt b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/MembershipUtils.kt index c19a6b54e90..101eadffa5d 100644 --- a/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/MembershipUtils.kt +++ b/testing/e2e-test-utilities/src/main/kotlin/net/corda/e2etest/utilities/MembershipUtils.kt @@ -185,7 +185,7 @@ fun waitForRegistrationStatus( assertWithRetry { // Use a fairly long timeout here to give plenty of time for the other side to respond. Longer // term this should be changed to not use the RPC message pattern and have the information available in a - // cache on the RPC worker, but for now this will have to suffice. + // cache on the REST worker, but for now this will have to suffice. timeout(60.seconds) interval(3.seconds) command { @@ -229,7 +229,7 @@ fun registerStaticMember( assertWithRetry { // Use a fairly long timeout here to give plenty of time for the other side to respond. Longer // term this should be changed to not use the RPC message pattern and have the information available in a - // cache on the RPC worker, but for now this will have to suffice. + // cache on the REST worker, but for now this will have to suffice. timeout(60.seconds) interval(1.seconds) command { getRegistrationStatus(holdingIdentityShortHash) } diff --git a/testing/flow-worker-demo/README.md b/testing/flow-worker-demo/README.md index ebde69e80f8..be9391ec9ce 100644 --- a/testing/flow-worker-demo/README.md +++ b/testing/flow-worker-demo/README.md @@ -3,8 +3,8 @@ This very simple HTTP demo app can be used to drive some of the example apps use #prerequisites to run the app you will need to have [NodeJs](https://nodejs.org/en/) installed -At a minimum you need to have the `RPC Worker` and `Flow Worker` running and configured using the `Flow Worker Setup Tool` -The RPC worker is expected to be running on `localhost:8888` +At a minimum you need to have the `Rest Worker` and `Flow Worker` running and configured using the `Flow Worker Setup Tool` +The Rest worker is expected to be running on `localhost:8888` cd to the `flow-worker-demo` folder diff --git a/tools/plugins/topic-config/src/main/kotlin/net/corda/cli/plugins/topicconfig/Create.kt b/tools/plugins/topic-config/src/main/kotlin/net/corda/cli/plugins/topicconfig/Create.kt index af19e0bb8b3..dd97a099556 100644 --- a/tools/plugins/topic-config/src/main/kotlin/net/corda/cli/plugins/topicconfig/Create.kt +++ b/tools/plugins/topic-config/src/main/kotlin/net/corda/cli/plugins/topicconfig/Create.kt @@ -68,7 +68,7 @@ class Create( "membership" to listOf("membership", "combined"), "gateway" to listOf("p2pGateway", "combined"), "link-manager" to listOf("p2pLinkManager", "combined"), - "rpc" to listOf("rpc", "combined"), + "rest" to listOf("rest", "combined"), "uniqueness" to listOf("db", "combined") )