From 1332d8ba24bc30c452b46ba39223cba52b02e0b0 Mon Sep 17 00:00:00 2001
From: Leonard Gram <leo@xlson.com>
Date: Fri, 5 Apr 2024 18:03:45 +0200
Subject: [PATCH] Cloudmigration: Sets the runID correctly when saving (#85661)

Sets the runID correctly instead of setting it to the same as the migration id.
---
 pkg/services/cloudmigration/api/api.go                      | 6 ++++--
 pkg/services/cloudmigration/cloudmigration.go               | 2 +-
 .../cloudmigration/cloudmigrationimpl/cloudmigration.go     | 6 +++---
 .../cloudmigrationimpl/cloudmigration_noop.go               | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkg/services/cloudmigration/api/api.go b/pkg/services/cloudmigration/api/api.go
index 116e6460b2a..202e22ee4a7 100644
--- a/pkg/services/cloudmigration/api/api.go
+++ b/pkg/services/cloudmigration/api/api.go
@@ -199,7 +199,7 @@ func (cma *CloudMigrationAPI) RunMigration(c *contextmodel.ReqContext) response.
 		return response.Error(http.StatusInternalServerError, "migration data get error", err)
 	}
 
-	req, err := http.NewRequest("POST", path, bytes.NewReader(body))
+	req, err := http.NewRequest(http.MethodPost, path, bytes.NewReader(body))
 	if err != nil {
 		cma.log.Error("error creating http request for cloud migration run", "err", err.Error())
 		return response.Error(http.StatusInternalServerError, "http request error", err)
@@ -235,7 +235,7 @@ func (cma *CloudMigrationAPI) RunMigration(c *contextmodel.ReqContext) response.
 		return response.Error(http.StatusInternalServerError, "unmarshalling migration run response", err)
 	}
 
-	_, err = cma.cloudMigrationService.SaveMigrationRun(ctx, &cloudmigration.CloudMigrationRun{
+	runID, err := cma.cloudMigrationService.SaveMigrationRun(ctx, &cloudmigration.CloudMigrationRun{
 		CloudMigrationUID: stringID,
 		Result:            respData,
 	})
@@ -243,6 +243,8 @@ func (cma *CloudMigrationAPI) RunMigration(c *contextmodel.ReqContext) response.
 		response.Error(http.StatusInternalServerError, "migration run save error", err)
 	}
 
+	result.RunID = runID
+
 	return response.JSON(http.StatusOK, result)
 }
 
diff --git a/pkg/services/cloudmigration/cloudmigration.go b/pkg/services/cloudmigration/cloudmigration.go
index 69f8f768c95..d632b61d18e 100644
--- a/pkg/services/cloudmigration/cloudmigration.go
+++ b/pkg/services/cloudmigration/cloudmigration.go
@@ -16,7 +16,7 @@ type Service interface {
 	GetMigrationStatus(context.Context, string, string) (*CloudMigrationRun, error)
 	GetMigrationStatusList(context.Context, string) ([]*CloudMigrationRun, error)
 	DeleteMigration(context.Context, int64) (*CloudMigration, error)
-	SaveMigrationRun(context.Context, *CloudMigrationRun) (string, error)
+	SaveMigrationRun(context.Context, *CloudMigrationRun) (int64, error)
 
 	ParseCloudMigrationConfig() (string, error)
 }
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
index 72c0d45310d..76f1e598c39 100644
--- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration.go
@@ -442,16 +442,16 @@ func (s *Service) getDashboards(ctx context.Context, id int64) ([]dashboards.Das
 	return result, nil
 }
 
-func (s *Service) SaveMigrationRun(ctx context.Context, cmr *cloudmigration.CloudMigrationRun) (string, error) {
+func (s *Service) SaveMigrationRun(ctx context.Context, cmr *cloudmigration.CloudMigrationRun) (int64, error) {
 	cmr.Created = time.Now()
 	cmr.Updated = time.Now()
 	cmr.Finished = time.Now()
 	err := s.store.SaveMigrationRun(ctx, cmr)
 	if err != nil {
 		s.log.Error("Failed to save migration run", "err", err)
-		return "", err
+		return -1, err
 	}
-	return cmr.CloudMigrationUID, nil
+	return cmr.ID, nil
 }
 
 func (s *Service) GetMigrationStatus(ctx context.Context, id string, runID string) (*cloudmigration.CloudMigrationRun, error) {
diff --git a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go
index e43916225d3..3b10128a897 100644
--- a/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go
+++ b/pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_noop.go
@@ -50,8 +50,8 @@ func (s *NoopServiceImpl) DeleteMigration(ctx context.Context, id int64) (*cloud
 	return nil, cloudmigration.ErrFeatureDisabledError
 }
 
-func (s *NoopServiceImpl) SaveMigrationRun(ctx context.Context, cmr *cloudmigration.CloudMigrationRun) (string, error) {
-	return "", cloudmigration.ErrInternalNotImplementedError
+func (s *NoopServiceImpl) SaveMigrationRun(ctx context.Context, cmr *cloudmigration.CloudMigrationRun) (int64, error) {
+	return -1, cloudmigration.ErrInternalNotImplementedError
 }
 
 func (s *NoopServiceImpl) GetMigrationDataJSON(ctx context.Context, id int64) ([]byte, error) {