MM-61944: Decouple vacuum step from Terraform.Create and use it in Comparison #853
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
This way we run the vacuum step when we need it: *after* we load the database dump. We can also remove the duplicated clearLicensesCmd, since that's also ran in the post-processing step.
|
Actually, @fmartingr, can you take a look as well? Specially to the extra SQL commands stuff, since that's something you have more context on. The ordering of steps is still correct, right? |
fmartingr
approved these changes
Nov 25, 2024
streamer45
approved these changes
Nov 25, 2024
| @@ -28,12 +29,20 @@ func RunCreateCmdF(cmd *cobra.Command, args []string) error { | |||
| return fmt.Errorf("failed to create terraform engine: %w", err) | |||
| } | |||
|
|
|||
| initData := config.DBDumpURI == "" | |||
| err = t.Create(initData) | |||
| extAgent, err := ssh.NewAgent() | |||
There was a problem hiding this comment.
Curious, is there any advantage in passing this agent around vs creating it inside these methods (Create and PostProcessDatabase)?
There was a problem hiding this comment.
Not really, to be honest, apart from the code duplication. I was in refactor mode, so duplicated code I saw, duplicated code I removed 😂
agarciamontoro
added
4: Reviews Complete
|
Thanks Felipe and Claudio for taking care of the review! |
|
They were quick! |
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.
Summary
Last week, @streamer45 realized that we're not running the
vacuumstep in comparison runs. Actually, we do run it, but we do it before loading the database dump, which is of course completely useless.This PR refactors that step (and the rest of post-processing we do after the DB is ready: clear licenses data and run extra SQL commands) out from
Terraform.Create, so we can call it when needed in both usages of that function: in the usualdeployment createcommand and in thecomparison runcommand.There's still a lot of work to decouple everything going on in
Terraform.Create, but this is a baby step in that direction.Ticket Link
https://mattermost.atlassian.net/browse/MM-61944