RHINENG-17345: remove redundant parameter

Author: MichaelMraka

listener/upload.go

@@ -363,7 +363,7 @@ func hostTemplate(tx *gorm.DB, accountID int, host *Host) *int64 {
 
 // nolint: funlen
 // Stores or updates base system profile, returing internal system id
-func updateSystemPlatform(tx *gorm.DB, inventoryID string, accountID int, host *Host,
+func updateSystemPlatform(tx *gorm.DB, accountID int, host *Host,
 	yumUpdates *YumUpdates, updatesReq *vmaas.UpdatesV3Request) (*models.SystemPlatform, error) {
 	tStart := time.Now()
 	defer utils.ObserveSecondsSince(tStart, messagePartDuration.WithLabelValues("update-system-platform"))
@@ -373,7 +373,7 @@ func updateSystemPlatform(tx *gorm.DB, inventoryID string, accountID int, host *
 	if err != nil {
 		return nil, errors.Wrap(err, "Serializing vmaas request")
 	}
-
+	inventoryID := host.ID
 	hash := sha256.Sum256(updatesReqJSON)
 	jsonChecksum := hex.EncodeToString(hash[:])
 	hash = sha256.Sum256(yumUpdates.GetRawParsed())
@@ -769,7 +769,7 @@ func processUpload(host *Host, yumUpdates *YumUpdates) (*models.SystemPlatform,
 		utils.LogInfo("inventoryID", host.ID, "Received recently deleted system")
 		return nil, nil
 	}
-	sys, err := updateSystemPlatform(tx, host.ID, accountID, host, yumUpdates, &updatesReq)
+	sys, err := updateSystemPlatform(tx, accountID, host, yumUpdates, &updatesReq)
 	if err != nil {
 		return nil, errors.Wrap(err, "saving system into the database")
 	}

listener/upload_test.go

@@ -42,6 +42,7 @@ func createTestInvHost(t *testing.T) *Host {
 
 	now := time.Now()
 	host := Host{
+		ID:             id,
 		StaleTimestamp: &correctTime,
 		Reporter:       "puptoo",
 		PerReporterStaleness: map[string]inventory.ReporterStaleness{
@@ -69,7 +70,7 @@ func TestUpdateSystemPlatform(t *testing.T) {
 		Basearch:       utils.PtrString("x86_64"),
 	}
 
-	sys1, err := updateSystemPlatform(database.DB, id, accountID1, createTestInvHost(t), nil, &req)
+	sys1, err := updateSystemPlatform(database.DB, accountID1, createTestInvHost(t), nil, &req)
 	assert.Nil(t, err)
 
 	reporterID1 := 1
@@ -79,7 +80,7 @@ func TestUpdateSystemPlatform(t *testing.T) {
 	host2 := createTestInvHost(t)
 	host2.Reporter = "yupana"
 	req.PackageList = []string{"package0", "package1"}
-	sys2, err := updateSystemPlatform(database.DB, id, accountID2, host2, nil, &req)
+	sys2, err := updateSystemPlatform(database.DB, accountID2, host2, nil, &req)
 	assert.Nil(t, err)
 
 	reporterID2 := 3
@@ -300,7 +301,7 @@ func TestUpdateSystemPlatformYumUpdates(t *testing.T) {
 
 	req := vmaas.UpdatesV3Request{}
 
-	_, err = updateSystemPlatform(database.DB, id, accountID1, createTestInvHost(t), yumUpdates, &req)
+	_, err = updateSystemPlatform(database.DB, accountID1, createTestInvHost(t), yumUpdates, &req)
 	assert.Nil(t, err)
 
 	reporterID1 := 1
@@ -310,7 +311,7 @@ func TestUpdateSystemPlatformYumUpdates(t *testing.T) {
 
 	// check that yumUpdates has been updated
 	yumUpdates.RawParsed = []byte("{}")
-	_, err = updateSystemPlatform(database.DB, id, accountID1, createTestInvHost(t), yumUpdates, &req)
+	_, err = updateSystemPlatform(database.DB, accountID1, createTestInvHost(t), yumUpdates, &req)
 	assert.Nil(t, err)
 	assertYumUpdatesInDB(t, id, yumUpdates)