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.

Sign up for GitHub

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

Jump to bottom

Fix/5595 force uninstall correct installation #6559

Merged
merged 8 commits into from
Feb 3, 2025
Merged

Fix/5595 force uninstall correct installation #6559

merged 8 commits into from
Feb 3, 2025

Conversation

kaanyalti
Copy link
Contributor

@kaanyalti kaanyalti commented Jan 21, 2025 •
edited
Loading

  • Bug

What does this PR do?

Updates the uninstall command so that when the development agent is installed with --force flag and if there is already a development agent, then the command will replace the already existing development agent

Why is it important?

Currently force installing the development agent removes the production agent.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

How to test this PR locally

  • Install the agent with and without the --develop flag
  • Try to reinstall each agent with the --force flag
  • Validate that the force installation replaces the correct agent
    • Development replaces development
    • Production replaces production

Related issues

@kaanyalti kaanyalti force-pushed the fix/5595_force_uninstall_correct_installation branch from 7066058 to 4991423 Compare January 21, 2025 04:47
@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 21, 2025

This pull request does not have a backport label. Could you fix it @kaanyalti? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-./d./d is the label to automatically backport to the 8./d branch. /d is the digit

@mergify Mergify
Copy link
Contributor

mergify bot commented Jan 21, 2025

backport-v8.x has been added to help with the transition to the new branch 8.x.
If you don't need it please use backport-skip label and remove the backport-8.x label.

@mergify mergify bot added the backport-8.x Automated backport to the 8.x branch with mergify label Jan 21, 2025
@kaanyalti kaanyalti marked this pull request as ready for review January 21, 2025 06:32
@kaanyalti kaanyalti requested a review from a team as a code owner January 21, 2025 06:32
@swiatekm swiatekm added the Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team label Jan 21, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

jlind23
jlind23 reviewed Jan 21, 2025
View reviewed changes
Copy link
Contributor

@jlind23 jlind23 left a comment

Choose a reason for hiding this comment

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

Could you please add a changelog.

@kaanyalti kaanyalti requested a review from jlind23 January 21, 2025 16:18
blakerouse
blakerouse reviewed Jan 21, 2025
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Looks good overall, just a question before approval.

internal/pkg/agent/cmd/install.go Outdated Show resolved Hide resolved
internal/pkg/agent/cmd/install.go Show resolved Hide resolved
@kaanyalti kaanyalti requested a review from blakerouse January 22, 2025 16:13
@kaanyalti kaanyalti force-pushed the fix/5595_force_uninstall_correct_installation branch from 22a0dec to a2fe26b Compare January 22, 2025 16:15
blakerouse
blakerouse approved these changes Jan 22, 2025
View reviewed changes
Copy link
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Okay thanks for the explanation. Looks good!

@kaanyalti kaanyalti force-pushed the fix/5595_force_uninstall_correct_installation branch from e039471 to 4340b8c Compare January 31, 2025 03:14
@elastic-sonarqube Elastic SonarQube
Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
47.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@kaanyalti kaanyalti merged commit 6b9ff26 into elastic:main Feb 3, 2025
14 checks passed
mergify bot pushed a commit that referenced this pull request Feb 3, 2025
@kaanyalti @mergify
Fix/5595 force uninstall correct installation (#6559)
5c6fe11 
* fix(5595): using topPath and binary name to execute uninstall, using service display name for messages

* fix(5595): added unit tests for exeUninstall

* fix(5595): updated comment

* fix(5595): added --force flag to integration tests

* fix(5595): added changelog

* fix(5595): fixed typo

* fix(5595): remove ErrNotExist check

* fix(5595): fix test agent path

(cherry picked from commit 6b9ff26)

# Conflicts:
#	testing/integration/install_test.go
@mergify mergify bot mentioned this pull request Feb 3, 2025
Open
6 tasks
@cmacknz cmacknz added backport-9.0 Automated backport to the 9.0 branch backport-8.18 Automated backport to the 8.18 branch labels Feb 3, 2025
mergify bot pushed a commit that referenced this pull request Feb 3, 2025
@kaanyalti @mergify
Fix/5595 force uninstall correct installation (#6559)
269fc7e 
* fix(5595): using topPath and binary name to execute uninstall, using service display name for messages

* fix(5595): added unit tests for exeUninstall

* fix(5595): updated comment

* fix(5595): added --force flag to integration tests

* fix(5595): added changelog

* fix(5595): fixed typo

* fix(5595): remove ErrNotExist check

* fix(5595): fix test agent path

(cherry picked from commit 6b9ff26)

# Conflicts:
#	testing/integration/install_test.go
@mergify mergify bot mentioned this pull request Feb 3, 2025
Merged
6 tasks
@pierrehilbert pierrehilbert added backport-9.0 Automated backport to the 9.0 branch and removed backport-9.0 Automated backport to the 9.0 branch labels Feb 7, 2025
mergify bot pushed a commit that referenced this pull request Feb 7, 2025
@kaanyalti @mergify
Fix/5595 force uninstall correct installation (#6559)
dc7a20a 
* fix(5595): using topPath and binary name to execute uninstall, using service display name for messages

* fix(5595): added unit tests for exeUninstall

* fix(5595): updated comment

* fix(5595): added --force flag to integration tests

* fix(5595): added changelog

* fix(5595): fixed typo

* fix(5595): remove ErrNotExist check

* fix(5595): fix test agent path

(cherry picked from commit 6b9ff26)
@mergify mergify bot mentioned this pull request Feb 7, 2025
Open
6 tasks
kaanyalti added a commit that referenced this pull request Feb 13, 2025
@mergify @kaanyalti
[8.18](backport #6559) Fix/5595 force uninstall correct installation (#…
d5084c7 
…6702)

* Fix/5595 force uninstall correct installation (#6559)

* fix(5595): using topPath and binary name to execute uninstall, using service display name for messages

* fix(5595): added unit tests for exeUninstall

* fix(5595): updated comment

* fix(5595): added --force flag to integration tests

* fix(5595): added changelog

* fix(5595): fixed typo

* fix(5595): remove ErrNotExist check

* fix(5595): fix test agent path

(cherry picked from commit 6b9ff26)

# Conflicts:
#	testing/integration/install_test.go

* fix(5595): resolve conflict

---------

Co-authored-by: Kaan Yalti <[email protected]>
kaanyalti added a commit that referenced this pull request Feb 13, 2025
@kaanyalti
Fix/5595 force uninstall correct installation (#6559)
e56e31e 
* fix(5595): using topPath and binary name to execute uninstall, using service display name for messages

* fix(5595): added unit tests for exeUninstall

* fix(5595): updated comment

* fix(5595): added --force flag to integration tests

* fix(5595): added changelog

* fix(5595): fixed typo

* fix(5595): remove ErrNotExist check

* fix(5595): fix test agent path

(cherry picked from commit 6b9ff26)

# Conflicts:
#	testing/integration/install_test.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blakerouse blakerouse blakerouse approved these changes

@michalpristas michalpristas Awaiting requested review from michalpristas michalpristas is a code owner automatically assigned from elastic/elastic-agent-control-plane

@jlind23 jlind23 Awaiting requested review from jlind23

Assignees

@kaanyalti kaanyalti

Labels
backport-8.x Automated backport to the 8.x branch with mergify backport-8.18 Automated backport to the 8.18 branch backport-9.0 Automated backport to the 9.0 branch Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

--force ignores --develop and uninstalls production agent instead
7 participants
@kaanyalti @elasticmachine @blakerouse @jlind23 @pierrehilbert @cmacknz @swiatekm