Merge pull request #2438 from opengovern/fix-queries

fix: get organization parameter in PullRequests
opengovern · Jan 13, 2025 · dad9474 · dad9474
2 parents 1b08ad2 + 86e19d3
commit dad9474
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 36 deletions.
diff --git a/services/integration/integration-type/github-account/configs/resource_type_configs.go b/services/integration/integration-type/github-account/configs/resource_type_configs.go
@@ -71,4 +71,16 @@ var ResourceTypeConfigs = map[string]*interfaces.ResourceTypeConfiguration{
 			},
 		},
 	},
+	"Github/PullRequest": {
+		Name:            "Github/PullRequest",
+		IntegrationType: IntegrationTypeGithubAccount,
+		Description:     "",
+		Params: []interfaces.Param{
+			{
+				Name:        "organization",
+				Description: `Please provide the organization name`,
+				Required:    false,
+			},
+		},
+	},
 }
diff --git a/services/scheduler/schedulers/compliance-quick-run/publisher.go b/services/scheduler/schedulers/compliance-quick-run/publisher.go
@@ -30,24 +30,24 @@ func (s *JobScheduler) runPublisher(ctx context.Context) error {
 	}
 	s.logger.Info("Fetch Created Policy Runner Jobs", zap.Any("Jobs Count", len(jobs)))
 	for _, job := range jobs {
-		if job.Status == model.ComplianceJobCreated {
-			framework, err := s.complianceClient.GetBenchmark(&httpclient.Context{UserRole: api.AdminRole}, job.FrameworkID)
-			if err != nil {
-				s.logger.Error("error while getting framework", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
-				continue
-			}
-			if framework == nil {
-				s.logger.Error("framework not exist", zap.String("frameworkID", job.FrameworkID))
-				continue
-			}
-			s.logger.Info("validating compliance job")
-			err = s.validateComplianceJob(*framework)
-			if err != nil {
-				s.logger.Error("framework validation failed", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
-				_ = s.db.UpdateComplianceJob(job.ID, model.ComplianceJobFailed, err.Error())
-				continue
-			}
-		}
+		//if job.Status == model.ComplianceJobCreated {
+		//	framework, err := s.complianceClient.GetBenchmark(&httpclient.Context{UserRole: api.AdminRole}, job.FrameworkID)
+		//	if err != nil {
+		//		s.logger.Error("error while getting framework", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
+		//		continue
+		//	}
+		//	if framework == nil {
+		//		s.logger.Error("framework not exist", zap.String("frameworkID", job.FrameworkID))
+		//		continue
+		//	}
+		//	s.logger.Info("validating compliance job")
+		//	err = s.validateComplianceJob(*framework)
+		//	if err != nil {
+		//		s.logger.Error("framework validation failed", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
+		//		_ = s.db.UpdateComplianceJob(job.ID, model.ComplianceJobFailed, err.Error())
+		//		continue
+		//	}
+		//}
 
 		auditJobMsg := auditjob.AuditJob{
 			JobID:          job.ID,

diff --git a/services/scheduler/schedulers/compliance/trigger.go b/services/scheduler/schedulers/compliance/trigger.go
@@ -256,23 +256,23 @@ func (s *JobScheduler) enqueueRunnersCycle() error {
 	}
 	s.logger.Info("jobs with unqueued runners", zap.Int("count", len(jobsWithUnqueuedRunners)))
 	for _, job := range jobsWithUnqueuedRunners {
-		if job.Status == model.ComplianceJobCreated {
-			framework, err := s.complianceClient.GetBenchmark(&httpclient.Context{UserRole: api.AdminRole}, job.FrameworkID)
-			if err != nil {
-				s.logger.Error("error while getting framework", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
-				continue
-			}
-			if framework == nil {
-				s.logger.Error("framework not exist", zap.String("frameworkID", job.FrameworkID))
-				continue
-			}
-			err = s.validateComplianceJob(*framework)
-			if err != nil {
-				s.logger.Error("framework validation failed", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
-				_ = s.db.UpdateComplianceJob(job.ID, model.ComplianceJobFailed, err.Error())
-				continue
-			}
-		}
+		//if job.Status == model.ComplianceJobCreated {
+		//	framework, err := s.complianceClient.GetBenchmark(&httpclient.Context{UserRole: api.AdminRole}, job.FrameworkID)
+		//	if err != nil {
+		//		s.logger.Error("error while getting framework", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
+		//		continue
+		//	}
+		//	if framework == nil {
+		//		s.logger.Error("framework not exist", zap.String("frameworkID", job.FrameworkID))
+		//		continue
+		//	}
+		//	err = s.validateComplianceJob(*framework)
+		//	if err != nil {
+		//		s.logger.Error("framework validation failed", zap.String("frameworkID", job.FrameworkID), zap.Error(err))
+		//		_ = s.db.UpdateComplianceJob(job.ID, model.ComplianceJobFailed, err.Error())
+		//		continue
+		//	}
+		//}
 		s.logger.Info("processing job with unqueued runners", zap.Uint("jobID", job.ID))
 		var allRunners []*model.ComplianceRunner
 		var assignments *complianceApi.BenchmarkAssignedEntities

diff --git a/services/scheduler/server.go b/services/scheduler/server.go
@@ -1592,7 +1592,9 @@ func (h HttpServer) RunDiscovery(ctx echo.Context) error {
 				}
 			} else {
 				jobId = job.ID
-				status = string(job.Status)
+				if status == "" {
+					status = string(job.Status)
+				}
 			}
 			jobs = append(jobs, api.RunDiscoveryJob{
 				JobId:         jobId,