Clean up gerrit interaction options

Collect the parameters in a struct to reduce the amount of parameters to pass through.
This is done also in preparation for making the code easier when dealing with multiple batches.

Change-Id: I3bbe99286b8cf14f9f948bc27c95664d4959db08
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/qtmoduleupdater/qt5.go b/src/qtmoduleupdater/qt5.go
index 73710d24..738a084b 100644
--- a/src/qtmoduleupdater/qt5.go
+++ b/src/qtmoduleupdater/qt5.go
@@ -171,7 +171,7 @@ func getQt5ProductModules(productProject string, branchOrRef string, productFetc
 	return listSubmodules(productRepo, productRepoURL, productHead)
 }
 
-func prepareQt5Update(product string, branch string, updatedModules map[string]*Module, pushUserName string, manualStage bool) error {
+func prepareQt5Update(product string, branch string, updatedModules map[string]*Module, gerrit *gerritInstance) error {
 	productRepoURL, err := RepoURL(product)
 	if err != nil {
 		return fmt.Errorf("Error determining %s repo URL: %s", product, err)
@@ -246,13 +246,9 @@ func prepareQt5Update(product string, branch string, updatedModules map[string]*
 
 	fmt.Printf("Created new commit for submodule update: %s\n", commitOid)
 
-	if err = pushChange(product, branch, commitOid, "Updating all submodules with a new consistent set", pushUserName); err != nil {
+	if err = gerrit.pushChange(product, branch, commitOid, "Updating all submodules with a new consistent set"); err != nil {
 		return fmt.Errorf("Error pushing qt5 change: %s", err)
 	}
 
-	if manualStage {
-		return nil
-	}
-
-	return reviewAndStageChange(product, branch, commitOid, "Updating all submodules with a new consistent set")
+	return gerrit.reviewAndStageChange(product, branch, commitOid, "Updating all submodules with a new consistent set")
 }