save config api for upgrade service #4681
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
cbodonnell
changed the title
cbodonnell
force-pushed
the
cbo/sc-105494/kots-upgrader-config-api
branch
3 times, most recently
from
f86b6a3 to
500848e
Compare
cbodonnell
changed the title
cbodonnell
force-pushed
the
cbo/sc-105494/kots-upgrader-config-api
branch
2 times, most recently
from
c71219c to
0912496
Compare
cbodonnell
force-pushed
the
cbo/sc-105494/kots-upgrader-config-api
branch
from
3c4353d to
e759d7f
Compare
sgalsaleh
reviewed
Jun 14, 2024
Co-authored-by: Salah Al Saleh <[email protected]>
sgalsaleh
reviewed
Jun 14, 2024
| @@ -141,8 +142,23 @@ func Run(appID string, appSlug string, sequence int64, isAirgap bool, archiveDir | |||
| var preflightErr error | |||
| defer func() { | |||
| if preflightErr != nil { | |||
| err := setPreflightResult(appID, sequence, &types.PreflightResults{}, preflightErr) | |||
| preflightResults := &types.PreflightResults{ | |||
There was a problem hiding this comment.
how about combining this with the setResults function below? it can also be defined outside of entire function to make it smaller. same for setProgress.
sgalsaleh
reviewed
Jun 14, 2024
pkg/preflight/execute.go
Outdated
| @@ -18,7 +18,7 @@ import ( | |||
|
|
|||
| // Execute will Execute the preflights using spec in preflightSpec. | |||
| // This spec should be rendered, no template functions remaining | |||
| func Execute(preflightSpec *troubleshootv1beta2.Preflight, ignorePermissionErrors bool, setProgress func(progress map[string]interface{}) error, setResults func(results *types.PreflightResults) error) (*types.PreflightResults, error) { | |||
| func Execute(preflightSpec *troubleshootv1beta2.Preflight, ignorePermissionErrors bool, setProgress func(progress map[string]interface{}) error, setResults func(results *types.PreflightResults, runError error) error) (*types.PreflightResults, error) { | |||
There was a problem hiding this comment.
why is runError param needed here?
sgalsaleh
reviewed
Jun 14, 2024
| preflightData, err := getPreflightData() | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to get preflight data") | ||
| } | ||
| preflightData.Results = results | ||
| if runError != nil { | ||
| if preflightData.Results.Errors == nil { |
There was a problem hiding this comment.
sorry to be nit picky, but to be consistent with the other implementation, let's update results before updating preflightData.Results. would probably look cleaner.
sgalsaleh
approved these changes
Jun 14, 2024
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.
What this PR does / why we need it:
This PR adds an API endpoint to the upgrade service for saving config. The handler will trigger preflights to run in the background after successfully saving the config and rendering the base archive.
Which issue(s) this PR fixes:
https://app.shortcut.com/replicated/story/105494/upgrade-service-api-side-of-the-config-page-in-the-deployment-wizard
Special notes for your reviewer:
Steps to reproduce
Does this PR introduce a user-facing change?
Does this PR require documentation?