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

[22463] Fix Discovery CLI Tool in Windows (No privileges) #5493

Merged
merged 3 commits into from
Dec 18, 2024

Conversation

cferreiragonz
Copy link
Contributor

@cferreiragonz cferreiragonz commented Dec 13, 2024

Description

When Fast DDS is compiled without admin privileges, no symlink is created to link to the fast-discovery-server-1.0.1.exe file. In this case, an alternative .bat is created to call the tool. However, the .bat file contains an error and fails to properly call the tool because it adds an unknown parameter as argument. To solve this, the .bat file was removed and the .exe file is called from the Python script directly. This gives more control over the tool as it does not bypass the Python script when compiling without admin privileges.

@Mergifyio backport 3.1.x 3.0.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • N/A Any new configuration API has an equivalent XML API (with the corresponding XSD extension)
  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

@cferreiragonz cferreiragonz added this to the v3.2.0 milestone Dec 13, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label Dec 16, 2024
@cferreiragonz cferreiragonz removed the request for review from richiprosima December 16, 2024 10:44
@cferreiragonz cferreiragonz added the needs-review PR that is ready to be reviewed label Dec 16, 2024
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

Nice addition, I think getting rid of the .bat file makes sense.
Changes LGTM and tested in my local.

We would need to add psutil to the windows and mac reusable workflows just at the point where we specify the required Python dependencies vcstool xmlschema

tools/fastdds/discovery/parser.py Outdated Show resolved Hide resolved
@Mario-DL Mario-DL removed the needs-review PR that is ready to be reviewed label Dec 17, 2024
Signed-off-by: cferreiragonz <[email protected]>
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

@cferreiragonz
Copy link
Contributor Author

@Mergifyio backport 3.1.x 3.0.x

Copy link
Contributor

mergify bot commented Dec 18, 2024

backport 3.1.x 3.0.x

✅ Backports have been created

@cferreiragonz cferreiragonz added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Dec 18, 2024
@MiguelCompany MiguelCompany merged commit 2cdc2d9 into master Dec 18, 2024
16 of 17 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/fix_windows_tool_compile_no_privileges branch December 18, 2024 07:53
mergify bot pushed a commit that referenced this pull request Dec 18, 2024
* Refs #22463: Add test to check proper link between python and cpp files

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22463: Remove .bat.in and call .exe from python

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22463: Apply suggestions

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 2cdc2d9)

# Conflicts:
#	tools/fastdds/discovery/parser.py
mergify bot pushed a commit that referenced this pull request Dec 18, 2024
* Refs #22463: Add test to check proper link between python and cpp files

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22463: Remove .bat.in and call .exe from python

Signed-off-by: cferreiragonz <[email protected]>

* Refs #22463: Apply suggestions

Signed-off-by: cferreiragonz <[email protected]>

---------

Signed-off-by: cferreiragonz <[email protected]>
(cherry picked from commit 2cdc2d9)

# Conflicts:
#	tools/fastdds/discovery/parser.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants