[windows] Use windows_agent_url to download script #656
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
Use case: if our S3 bucket is mirrored, we should also pull the script from local mirror
truthbk
approved these changes
Nov 13, 2019
| @@ -106,7 +106,7 @@ | |||
| # As of v1.37, the windows cookbook doesn't upgrade the package if a newer version is downloaded | |||
| # As a workaround uninstall the package first if a new MSI is downloaded | |||
| code <<-EOH | |||
| ((New-Object System.Net.WebClient).DownloadFile('https://s3.amazonaws.com/ddagent-windows-stable/scripts/fix_6_14.ps1', $env:temp + '\\fix_6_14.ps1')); &$env:temp\\fix_6_14.ps1 | |||
| ((New-Object System.Net.WebClient).DownloadFile('#{node['datadog']['windows_agent_url']}scripts/fix_6_14.ps1', $env:temp + '\\fix_6_14.ps1')); &$env:temp\\fix_6_14.ps1 | |||
There was a problem hiding this comment.
should we maybe use a helper var and do:
URI::join(node['datadog']['windows_agent_uri'], 'scripts/fix_6_14.ps1')
?
There was a problem hiding this comment.
OK, just realized we don't do this for the remote_file source, so we wouldn't even get this far. Probably not something we need to do.
There was a problem hiding this comment.
indeed I used this for consistency, I think we can update both to use URI::join in a later PR
There was a problem hiding this comment.
Quick question, why do we use Powershell to download the script and not Chef's remote_file directly ?
truthbk
pushed a commit
that referenced
this pull request
Nov 15, 2019
Use case: if our S3 bucket is mirrored, we should also pull the script from local mirror
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.
Use case: if our S3 bucket is mirrored, we should also pull the script from local mirror.
We should also probably mention in the readme and/or changelog that on windows the cookbook expects a script to be present on local mirror (if any is used).
Note: should be backported to
2.xas well (and to the upcoming 4.x)