Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow-up: Extract useful changes from the reverted #2482 PR #2546

Merged
merged 2 commits into from
Dec 20, 2023

Conversation

rina23q
Copy link
Member

@rina23q rina23q commented Dec 20, 2023

Proposed changes

The reverted PR #2482 contains the changes which should not have to be reverted. This PR is the collection of such commits.

Two commits are cherry-picked from #2482 and changed the hash (important to have different hash to merge them again).

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Improvement (general improvements like code refactoring that doesn't explicitly fix a bug or add any new functionality)
  • Documentation Update (if none of the other choices apply)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Paste Link to the issue


Checklist

  • I have read the CONTRIBUTING doc
  • I have signed the CLA (in all commits with git commit -s)
  • I ran cargo fmt as mentioned in CODING_GUIDELINES
  • I used cargo clippy as mentioned in CODING_GUIDELINES
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

@rina23q rina23q changed the title Improve/extract misc change from 2482 Follow-up: Extract useful changes from the reverted #2482 PR Dec 20, 2023
Copy link
Contributor

@didier-wenzek didier-wenzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This exactly re-introduces the reverted commits, but one slight fix might be better.

Copy link

codecov bot commented Dec 20, 2023

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (9ff6d57) 75.8% compared to head (a17f15c) 76.0%.
Report is 6 commits behind head on main.

Additional details and impacted files
Files Coverage Δ
...es/core/tedge/src/cli/connect/bridge_config_c8y.rs 88.7% <100.0%> (+0.1%) ⬆️
...nsions/c8y_mapper_ext/src/compatibility_adapter.rs 0.0% <0.0%> (ø)

... and 9 files with indirect coverage changes

Copy link
Contributor

github-actions bot commented Dec 20, 2023

Robot Results

✅ Passed ❌ Failed ⏭️ Skipped Total Pass % ⏱️ Duration
378 0 3 378 100 1h17m49.047s

If user uses the combination of new mapper and old agent, the new mapper
gives a cmd_id with the "c8y-mapper" prefix, however, the compatibility
adapter adds the prefix again. So, cmd_id "c8y-mapper-1234" became
"c8y-mapper-c8y-mapper-1234". This commit fixes this issue.

Signed-off-by: Rina Fujino <rina.fujino.23@gmail.com>
Signed-off-by: Rina Fujino <rina.fujino.23@gmail.com>
@rina23q rina23q force-pushed the improve/extract-misc-change-from-2482 branch from 566124f to a17f15c Compare December 20, 2023 15:25
@rina23q rina23q merged commit 742ae21 into thin-edge:main Dec 20, 2023
18 checks passed
@rina23q rina23q deleted the improve/extract-misc-change-from-2482 branch December 20, 2023 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants