Add cleanup for Windows env vars #694
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
albertvaka
reviewed
Feb 27, 2020
recipes/_install-windows.rb
Outdated
Comment on lines
145
to
151
| windows_env 'DDAGENTUSER_NAME' do | ||
| action :delete | ||
| end | ||
|
|
||
| windows_env 'DDAGENTUSER_PASSWORD' do | ||
| action :delete | ||
| end |
There was a problem hiding this comment.
I think we can still keep these deletes, so the env vars are cleaned earlier than at run_completed or run_failed.
Eg: if a run takes long and you kill it, on_failed might not get called, so it's better to delete the env vars earlier when we know we don't need them anymore.
albertvaka
reviewed
Feb 27, 2020
libraries/windows_cleanup.rb
Outdated
Comment on lines
6
to
13
| def do_cleanup(context) | ||
| Chef::Log.info 'Cleanup started.' | ||
| resource = context.resource_collection.lookup("windows_env[DDAGENTUSER_NAME]") | ||
| resource.run_action(:delete) if resource | ||
| resource = context.resource_collection.lookup("windows_env[DDAGENTUSER_PASSWORD]") | ||
| resource.run_action(:delete) if resource | ||
| Chef::Log.info 'Cleanup finished.' | ||
| end |
There was a problem hiding this comment.
I would go for compact code and keep this helper function in recipes/_install-windows.rb instead of having several small files, but no strong opinion in case you prefer it this way.
albertvaka
approved these changes
Feb 27, 2020
kbogtob
added a commit
that referenced
this pull request
Mar 3, 2020
* Revert "Merge pull request #694 from DataDog/julien.lebot/fix_credentials_leak" This reverts commit fa40d3d, reversing changes made to 018ff8b. * Revert "Set windows installer as sensitive resource and use env var to specify win credentials (#691)" This reverts commit 07d3a62. * Update CHANGELOG.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the
windows_package[Datadog Agent]fails, it does not cleanup the environment variables containing the credentials for the installer.This PR aims to fix that by setting a hanlder that runs after the recipe.