Abstract thin-edge MQTT topic schema #2189
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
didier-wenzek
had a problem deploying
to
Test Pull Request
GitHub Actions
Failure
Codecov Report
Additional details and impacted files
|
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
Robot Results
|
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
didier-wenzek
commented
Aug 24, 2023
Comment on lines
-105
to
107
| #[async_trait] | ||
| pub trait Converter: Send + Sync { | ||
| type Error: Display; | ||
|
|
||
| fn get_mapper_config(&self) -> &MapperConfig; | ||
|
|
||
| async fn try_convert(&mut self, input: &Message) -> Result<Vec<Message>, Self::Error>; | ||
|
|
||
| async fn convert(&mut self, input: &Message) -> Vec<Message> { | ||
| impl CumulocityConverter { | ||
| pub async fn convert(&mut self, input: &Message) -> Vec<Message> { | ||
| let messages_or_err = self.try_convert(input).await; |
There was a problem hiding this comment.
The Converter trait has been removed as implemented only once.
There are now several impl CumulocityConverter { ... } parts in this file. This has been done on purpose to ease this PR review. It would be good to reorganize this later.
Comment on lines
+667
to
+670
| match self.mqtt_schema.entity_channel_of(&message.topic) { | ||
| Ok((source, channel)) => self.try_convert_te_topics(source, channel, message).await, | ||
| Err(_) => self.try_convert_tedge_topics(message).await, | ||
| } |
There was a problem hiding this comment.
To ease the transition there is now two separate methods, each used for a specific topic schema.
The end goal is to get rid of try_convert_tedge_topics.
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
didier-wenzek
force-pushed
the
feat/mqtt-topic-scheme
branch
from
ca1e1ec
to
9a7924f
Compare
didier-wenzek
had a problem deploying
to
Test Pull Request
GitHub Actions
Failure
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
didier-wenzek
had a problem deploying
to
Test Pull Request
GitHub Actions
Failure
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
Bravo555
requested changes
Aug 28, 2023
didier-wenzek
had a problem deploying
to
Test Pull Request
GitHub Actions
Failure
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
Bravo555
approved these changes
Aug 28, 2023
The aim of this module is to abstract the MQTT topics used by thin-edge. Entities, such as devices and services, have to be described by the `entity_store` module. Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
This is just a sketch of the API. The implementation is done using the former `EntityTopic` concept. The latter will be deprecated in the following steps. Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
To ease the transition phase where messages are sent over `tedge/#` while others use `te/#`, the c8y converter main conversion method has been broken in two parts: te vs tedge. Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
EntityId is confusing when used for devices which already have an id. Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
Signed-off-by: Didier Wenzek <didier.wenzek@free.fr>
didier-wenzek
force-pushed
the
feat/mqtt-topic-scheme
branch
from
a341a31
to
5d28f11
Compare
didier-wenzek
temporarily deployed
to
Test Pull Request
GitHub Actions
Inactive
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed changes
struct MqttSchemaabstracting all topic definitionsstruct EntityTopicChanneltype to abstract away all topic parsing.Types of changes
Paste Link to the issue
Checklist
cargo fmtas mentioned in CODING_GUIDELINEScargo clippyas mentioned in CODING_GUIDELINESFurther comments