fix: add queries

opengovern · Dec 27, 2024 · 393797e · 393797e
1 parent 70e4fd4
commit 393797e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/task/run-task.go b/task/run-task.go
@@ -27,14 +27,15 @@ type Artifact struct {
 func RunTask(ctx context.Context, inventoryServiceEndpoint string, esClient opengovernance.Client, logger *zap.Logger, request tasks.TaskRequest, response *scheduler.TaskResponse) error {
 	registryType := "ghcr"
 	var artifacts []Artifact
+	var artifactsUrls []string
 	var err error
 	if _, ok := request.TaskDefinition.Params["query_id"]; ok {
 		inventoryClient := inventoryClient.NewInventoryServiceClient(inventoryServiceEndpoint)
 		artifacts, err = GetArtifactsFromQueryID(inventoryClient, request.TaskDefinition.Params)
 		if err != nil {
 			return err
 		}
-	} else if _, ok := request.TaskDefinition.Params[""]; ok {
+	} else if _, ok := request.TaskDefinition.Params["query_to_execute"]; ok {
 		inventoryClient := inventoryClient.NewInventoryServiceClient(inventoryServiceEndpoint)
 		artifacts, err = GetArtifactsFromInlineQuery(inventoryClient, request.TaskDefinition.Params)
 		if err != nil {
@@ -69,6 +70,11 @@ func RunTask(ctx context.Context, inventoryServiceEndpoint string, esClient open
 		}
 	}
 
+	for _, ar := range artifacts {
+		artifactsUrls = append(artifactsUrls, ar.OciArtifactUrl)
+	}
+	logger.Info("running task on artifacts", zap.Strings("artifacts", artifactsUrls))
+
 	var ids []string
 	var index string
 	for _, artifact := range artifacts {

diff --git a/worker/worker.go b/worker/worker.go
@@ -33,7 +33,7 @@ var (
 	ESAwsRegion     = os.Getenv(consts.ElasticSearchAwsRegionEnv)
 	ESAssumeRoleArn = os.Getenv(consts.ElasticSearchAssumeRoleArnEnv)
 
-	InventoryServiceEndpoint = os.Getenv("INVENTORY_BASEURL")
+	InventoryServiceEndpoint = os.Getenv(consts.InventoryBaseURL)
 )
 
 type Worker struct {