[ws-daemon] Fix workspace location for log backup #18401
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
kylos101
approved these changes
Aug 2, 2023
easyCZ
reviewed
Aug 2, 2023
| @@ -345,9 +344,9 @@ func ensureCleanSlate(location string) error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (wso *DefaultWorkspaceOperations) uploadWorkspaceLogs(ctx context.Context, opts BackupOptions) (err error) { | |||
| func (wso *DefaultWorkspaceOperations) uploadWorkspaceLogs(ctx context.Context, opts BackupOptions, location string) (err error) { | |||
There was a problem hiding this comment.
Any unit tests we need to add/update as part of this to ensure the regression doesn't happen again in the future?
There was a problem hiding this comment.
I've updated an existing integration test to check for uploaded logs. There's no unit tests nor is it easy to add one now that would catch this regression
Furisto
approved these changes
Aug 2, 2023
|
/unhold |
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.
Description
Fix workspace location for logs backup. Use the session's location (path on daemon host) instead of the WorkspaceLocation of the CRD (comes from .gitpod.yml's workspaceLocation)
Summary generated by Copilot
🤖 Generated by Copilot at 4c9fa34
Refactor
uploadWorkspaceLogsandBackupOptionsto use workspace location fromWorkspaceobject. This reduces code complexity and redundancy.Related Issue(s)
Fixes ENG-50
How to test
Tested in a preview env, by creating a prebuild without this change (no logs in dashboard when viewing the completed prebuild), and then a prebuild after this change, which does show logs even after reloading the page.
Documentation
Preview status
gitpod:summary
Build Options
Build
Run the build with werft instead of GHA
Run Leeway with
--dont-testPublish
Installer
Add desired feature flags to the end of the line above, space separated
Preview Environment / Integration Tests
If enabled this will build
install/previewIf enabled this will create the environment on GCE infra
Valid options are
all,workspace,webapp,ide,jetbrains,vscode,ssh. If enabled,with-previewandwith-large-vmwill be enabled./hold