diff --git a/provider/notification-gcp/README.md b/provider/notification-gcp/README.md index 6cd8d84afaef7cecdf61c24f688a2056a4c8f883..3f73c6807b45196421132241c087fd9690ae5d82 100644 --- a/provider/notification-gcp/README.md +++ b/provider/notification-gcp/README.md @@ -115,7 +115,7 @@ Also, the following IAM roles should be assigned to the service's Google service When using non-Google-Cloud-native technologies, property sets must be defined on the Partition service as part of PartitionInfo for each Tenant. #### for OQM - RabbitMQ: -**prefix:** `register.oqm.rabbitmq` +**prefix:** `oqm.rabbitmq` It can be overridden by: - through the Spring Boot property `oqm.rabbitmq.partitionPropertiesPrefix` @@ -125,17 +125,17 @@ It can be overridden by: | Property | Description | | --- | --- | -| register.oqm.rabbitmq.amqp.host | messaging hostnameorIP | -| register.oqm.rabbitmq.amqp.port | - port | -| register.oqm.rabbitmq.amqp.path | - path | -| register.oqm.rabbitmq.amqp.username | - username | -| register.oqm.rabbitmq.amqp.password | - password | -| register.oqm.rabbitmq.admin.schema | admin host schema | -| register.oqm.rabbitmq.admin.host | - host name | -| register.oqm.rabbitmq.admin.port | - port | -| register.oqm.rabbitmq.admin.path | - path | -| register.oqm.rabbitmq.admin.username | - username | -| register.oqm.rabbitmq.admin.password | - password | +| oqm.rabbitmq.amqp.host | messaging hostnameorIP | +| oqm.rabbitmq.amqp.port | - port | +| oqm.rabbitmq.amqp.path | - path | +| oqm.rabbitmq.amqp.username | - username | +| oqm.rabbitmq.amqp.password | - password | +| oqm.rabbitmq.admin.schema | admin host schema | +| oqm.rabbitmq.admin.host | - host name | +| oqm.rabbitmq.admin.port | - port | +| oqm.rabbitmq.admin.path | - path | +| oqm.rabbitmq.admin.username | - username | +| oqm.rabbitmq.admin.password | - password | <details><summary>Example of a single tenant definition</summary> @@ -143,48 +143,48 @@ It can be overridden by: curl -L -X PATCH 'https://dev.osdu.club/api/partition/v1/partitions/opendes' -H 'data-partition-id: opendes' -H 'Authorization: Bearer ...' -H 'Content-Type: application/json' --data-raw '{ "properties": { - "register.oqm.rabbitmq.amqp.host": { + "oqm.rabbitmq.amqp.host": { "sensitive": false, "value": "localhost" }, - "register.oqm.rabbitmq.amqp.port": { + "oqm.rabbitmq.amqp.port": { "sensitive": false, "value": "5672" }, - "register.oqm.rabbitmq.amqp.path": { + "oqm.rabbitmq.amqp.path": { "sensitive": false, "value": "" }, - "register.oqm.rabbitmq.amqp.username": { + "oqm.rabbitmq.amqp.username": { "sensitive": false, "value": "guest" }, - "register.oqm.rabbitmq.amqp.password": { + "oqm.rabbitmq.amqp.password": { "sensitive": true, "value": "guest" }, - "register.oqm.rabbitmq.admin.schema": { + "oqm.rabbitmq.admin.schema": { "sensitive": false, "value": "http" }, - "register.oqm.rabbitmq.admin.host": { + "oqm.rabbitmq.admin.host": { "sensitive": false, "value": "localhost" }, - "register.oqm.rabbitmq.admin.port": { + "oqm.rabbitmq.admin.port": { "sensitive": false, "value": "9002" }, - "register.oqm.rabbitmq.admin.path": { + "oqm.rabbitmq.admin.path": { "sensitive": false, "value": "/api" }, - "register.oqm.rabbitmq.admin.username": { + "oqm.rabbitmq.admin.username": { "sensitive": false, "value": "guest" }, - "register.oqm.rabbitmq.admin.password": { + "oqm.rabbitmq.admin.password": { "sensitive": true, "value": "guest" } diff --git a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java index 50c70ecdbd701ac34a686d89b50221af59f3185d..b367df2cd5dbc80400156c52e63befb7221f6da6 100644 --- a/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java +++ b/provider/notification-gcp/src/main/java/org/opengroup/osdu/notification/provider/gcp/mappers/oqm/MqOqmConfigurationProperties.java @@ -18,6 +18,6 @@ import org.springframework.context.annotation.Configuration; @Setter public class MqOqmConfigurationProperties { - private String partitionPropertiesPrefix = "register.oqm.rabbitmq"; + private String partitionPropertiesPrefix = "oqm.rabbitmq"; }