Keep config.yaml file if existing #139
Merged
Conversation
This file contains hidden or 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
|
Sync'ed with @qingling128. We need to make consistency among Linux and Windows. Thus default-config.yaml isn't necessary to have in this case. I will remove it in next commit |
pkg/goo/maint.ps1
Outdated
| $InstallDir = [regex]::Replace($InstallDir,'^<([^>]+)>',$envFromMatch) | ||
|
|
||
| $configFilePath = "$InstallDir\config\config.yaml" | ||
| if (-not(Test-Path -Path $configFilePath -PathType Leaf)) { |
There was a problem hiding this comment.
Let's add a space after -not.
pkg/goo/maint.ps1
Outdated
| Write-Host "The file [$configFilePath] has been created." | ||
| } | ||
| catch { | ||
| throw $_.Exception.Message |
There was a problem hiding this comment.
Why catch and rethrow, when you can just let it propagate naturally?
pkg/goo/maint.ps1
Outdated
| if (-not(Test-Path -Path $configFilePath -PathType Leaf)) { | ||
| try { | ||
| Copy-Item -Path "$InstallDir\config\default-config.yaml" -Destination $configFilePath | ||
| Write-Host "The file [$configFilePath] has been created." |
There was a problem hiding this comment.
How about something like Copied default config into [$configFilePath].?
pkg/goo/maint.ps1
Outdated
| } | ||
| } | ||
| else { | ||
| Write-Host "Keep [$configFilePath] as-is because a file with that name already exists." |
There was a problem hiding this comment.
Probably not worth adding this message…
pkg/goo/maint.ps1
Outdated
| $InstallDir = [regex]::Replace($InstallDir,'^<([^>]+)>',$envFromMatch) | ||
|
|
||
| $configFilePath = "$InstallDir\config\config.yaml" | ||
| if (-not(Test-Path -Path $configFilePath -PathType Leaf)) { |
There was a problem hiding this comment.
Careful — this will run both when $Action is "install" and when $Action is "uninstall". You probably want to run it only in the "install" case.
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.
Test when there is no config file
Test when there is config file
ToDOO
work with jimmy on documenting the caveat for previous versions as a known issue SGTM. e.g. a note in https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/installation#upgrade and https://cloud.google.com/stackdriver/docs/solutions/agents/ops-agent/transition#migrate_preview
later after we have at least two versions of ops-agent that contains this change, we can add a testcase in ops-agent-test.go for checking if existing config file is kept untouched.