-
Notifications
You must be signed in to change notification settings - Fork 148
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
"install -f" uses exec to uninstall an existing agent #4965
Changes from 10 commits
2332b43
b27ce20
38784de
bcceff5
ed57cf0
37d51d6
f0b7d88
b210ac2
71ba9e7
2a527d5
dc66162
26dae28
a700b50
3048715
5ffd08a
848da37
39b5220
bfd819e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
# Kind can be one of: | ||
# - breaking-change: a change to previously-documented behavior | ||
# - deprecation: functionality that is being removed in a later release | ||
# - bug-fix: fixes a problem in a previous version | ||
# - enhancement: extends functionality but does not break or fix existing behavior | ||
# - feature: new functionality | ||
# - known-issue: problems that we are aware of in a given version | ||
# - security: impacts on the security of a product or a user’s deployment. | ||
# - upgrade: important information for someone upgrading from a prior version | ||
# - other: does not fit into any of the other categories | ||
kind: bug | ||
|
||
# Change summary; a 80ish characters long description of the change. | ||
summary: Check for tamper protection when install --force is used | ||
|
||
# Long description; in case the summary is not enough to describe the change | ||
# this field accommodate a description without length limits. | ||
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment. | ||
description: | | ||
When using "elastic-agent install -f", the agent will exec "elastic-agent uninstall -f" | ||
so that all path references are correctly loaded and tamper protection errors will cause | ||
the install attempt to fail. | ||
|
||
# Affected component; a word indicating the component this changeset affects. | ||
component: | ||
|
||
# PR URL; optional; the PR number that added the changeset. | ||
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added. | ||
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number. | ||
# Please provide it if you are adding a fragment for a different PR. | ||
#pr: https://github.com/owner/repo/1234 | ||
|
||
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of). | ||
# If not present is automatically filled by the tooling with the issue linked to the PR number. | ||
issue: https://github.com/elastic/elastic-agent/issues/4506 |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,26 +46,6 @@ func Install(cfgFile, topPath string, unprivileged bool, log *logp.Logger, pt *p | |
return utils.FileOwner{}, errors.New(err, "failed to discover the source directory for installation", errors.TypeFilesystem) | ||
} | ||
|
||
// We only uninstall Agent if it is currently installed. | ||
status, _ := Status(topPath) | ||
if status == Installed { | ||
// Uninstall current installation | ||
// | ||
// There is no uninstall token for "install" command. | ||
// Uninstall will fail on protected agent. | ||
// The protected Agent will need to be uninstalled first before it can be installed. | ||
pt.Describe("Uninstalling current Elastic Agent") | ||
err = Uninstall(cfgFile, topPath, "", log, pt) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Previously this call to uninstall was failing because |
||
if err != nil { | ||
pt.Describe("Failed to uninstall current Elastic Agent") | ||
return utils.FileOwner{}, errors.New( | ||
err, | ||
fmt.Sprintf("failed to uninstall Agent at (%s)", filepath.Dir(topPath)), | ||
errors.M("directory", filepath.Dir(topPath))) | ||
} | ||
pt.Describe("Successfully uninstalled current Elastic Agent") | ||
} | ||
|
||
var ownership utils.FileOwner | ||
username := "" | ||
groupName := "" | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should move this to its own function. Then cleanup the errors to be more generic in the function and then wrap the error output like so:
That ensures that the error back to the user is clear that its failing installing the currently installed Elastic Agent.