Merge pull request #1407 from kaytu-io/fix-steampipe-upgrade

Fix steampipe upgrade
opengovern · Aug 2, 2024 · 1eb29ec · 1eb29ec
2 parents 1267c5f + 9c297ae
commit 1eb29ec
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 8 deletions.
diff --git a/pkg/describe/server.go b/pkg/describe/server.go
@@ -686,18 +686,14 @@ type ReEvaluateDescribeJob struct {
 
 func (h HttpServer) getReEvaluateParams(benchmarkID string, connectionIDs, controlIDs []string) (*model2.JobSequencerJobTypeBenchmarkRunnerParameters, []ReEvaluateDescribeJob, error) {
 	var controls []complianceapi.Control
+	var err error
 	if len(controlIDs) == 0 {
-		benchmark, err := h.Scheduler.complianceClient.GetBenchmark(&httpclient.Context{UserRole: apiAuth.InternalRole}, benchmarkID)
+		controlIDs, err = h.getBenchmarkChildrenControls(benchmarkID)
 		if err != nil {
-			h.Scheduler.logger.Error("failed to get benchmark", zap.Error(err))
 			return nil, nil, err
 		}
-		controlIDs = make([]string, 0, len(benchmark.Controls))
-		for _, control := range benchmark.Controls {
-			controlIDs = append(controlIDs, control)
-		}
 	}
-	controls, err := h.Scheduler.complianceClient.ListControl(&httpclient.Context{UserRole: apiAuth.InternalRole}, controlIDs, nil)
+	controls, err = h.Scheduler.complianceClient.ListControl(&httpclient.Context{UserRole: apiAuth.InternalRole}, controlIDs, nil)
 	if err != nil {
 		h.Scheduler.logger.Error("failed to get controls", zap.Error(err))
 		return nil, nil, err
@@ -751,6 +747,30 @@ func (h HttpServer) getReEvaluateParams(benchmarkID string, connectionIDs, contr
 	}, describeJobs, nil
 }
 
+func (h HttpServer) getBenchmarkChildrenControls(benchmarkID string) ([]string, error) {
+	benchmark, err := h.Scheduler.complianceClient.GetBenchmark(&httpclient.Context{UserRole: apiAuth.InternalRole}, benchmarkID)
+	if err != nil {
+		h.Scheduler.logger.Error("failed to get benchmark", zap.Error(err))
+		return nil, err
+	}
+	if benchmark == nil {
+		return nil, echo.NewHTTPError(http.StatusNotFound, "benchmark not found")
+	}
+
+	var controlIDs []string
+	for _, control := range benchmark.Controls {
+		controlIDs = append(controlIDs, control)
+	}
+	for _, childBenchmarkID := range benchmark.Children {
+		childControlIDs, err := h.getBenchmarkChildrenControls(childBenchmarkID)
+		if err != nil {
+			return nil, err
+		}
+		controlIDs = append(controlIDs, childControlIDs...)
+	}
+	return controlIDs, nil
+}
+
 // ReEvaluateComplianceJob godoc
 //
 //	@Summary		Re-evaluates compliance job

diff --git a/services/migrator/job/git.go b/services/migrator/job/git.go
@@ -25,11 +25,13 @@ func GitClone(conf config.MigratorConfig, logger *zap.Logger) (string, error) {
 		UserRole: api.AdminRole,
 	}, models.MetadataKeyAnalyticsGitURL)
 
+	logger.Info("url before metadata", zap.String("url", gitConfig.AnalyticsGitURL))
 	if err == nil && len(value.GetValue().(string)) > 0 {
 		gitConfig.AnalyticsGitURL = value.GetValue().(string)
 	} else if err != nil {
 		logger.Error("failed to get analytics git url from metadata", zap.Error(err))
 	}
+	logger.Info("url after metadata", zap.String("url", gitConfig.AnalyticsGitURL))
 	gitConfig.AnalyticsGitURL = "https://github.com/kaytu-io/configz-deprecated"
 
 	logger.Info("using git repo", zap.String("url", gitConfig.AnalyticsGitURL))

diff --git a/services/migrator/job/updated.go b/services/migrator/job/updated.go
@@ -14,7 +14,6 @@ import (
 )
 
 func (w *Job) CheckIfUpdateIsNeeded(name string, mig types.Migration) (bool, error) {
-	return true, nil
 	m, err := w.db.GetMigration(name)
 	if err != nil {
 		return false, err