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

Fixes #5564: remove invalid condition (!kept) for tools copy to permit t... #508

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions initial-promises/node-server/common/1.0/update.cf
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,8 @@ bundle agent update_action
classes => success("rudder_tools_updated_repaired", "rudder_tools_updated_error", "rudder_tools_updated_kept"),
comment => "Check if we need to update the tools";

# We copy only if we have the class rudder_tools_updated_repaired and not kept, because this class is persistant
# so it could copy during the failsafe and normal run.
rudder_tools_updated_repaired.!rudder_tools_updated_kept::
# We copy only if we have the class rudder_tools_updated_repaired
rudder_tools_updated_repaired::
Copy link
Member Author

Choose a reason for hiding this comment

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

this comment was a lie, and the kept class is defined by the copy as the permission is correct !

"${g.rudder_tools}"
copy_from => remote_unsecured("${server_info.cfserved}", "${g.rudder_tools_origin}"),
depth_search => recurse_ignore("inf", @{g.excludedreps}),
Expand Down
5 changes: 2 additions & 3 deletions techniques/system/common/1.0/update.st
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,8 @@ bundle agent update_action
classes => success("rudder_tools_updated_repaired", "rudder_tools_updated_error", "rudder_tools_updated_kept"),
comment => "Check if we need to update the tools";

# We copy only if we have the class rudder_tools_updated_repaired and not kept, because this class is persistant
# so it could copy during the failsafe and normal run.
rudder_tools_updated_repaired.!rudder_tools_updated_kept::
# We copy only if we have the class rudder_tools_updated_repaired
rudder_tools_updated_repaired::
"${g.rudder_tools}"
copy_from => remote_unsecured("${server_info.cfserved}", "${g.rudder_tools_origin}"),
depth_search => recurse_ignore("inf", @{g.excludedreps}),
Expand Down