fix: update constants

Author: acke

domain/ide/command/ignores_request.go

@@ -20,7 +20,9 @@ import (
 	"context"
 	"fmt"
 
-	localworkflows "github.com/snyk/go-application-framework/pkg/local_workflows"
+	"github.com/snyk/code-client-go/sarif"
+	"github.com/snyk/go-application-framework/pkg/configuration"
+	"github.com/snyk/go-application-framework/pkg/local_workflows/ignore_workflow"
 	"github.com/snyk/snyk-ls/application/config"
 	"github.com/snyk/snyk-ls/domain/snyk"
 	"github.com/snyk/snyk-ls/internal/types"
@@ -32,10 +34,6 @@ type submitIgnoreRequest struct {
 	c             *config.Config
 }
 
-type IgnoresResponse struct {
-	SuppressionStatus string
-}
-
 func (cmd *submitIgnoreRequest) Command() types.CommandData {
 	return cmd.command
 }
@@ -47,76 +45,119 @@ func (cmd *submitIgnoreRequest) Execute(ctx context.Context) (any, error) {
 		return nil, fmt.Errorf("workflow type should be a string")
 	}
 
+	issue := cmd.issueProvider.Issue(cmd.command.Arguments[1].(string))
+	findingsId := issue.GetFindingsId()
+	contentRoot := issue.GetContentRoot()
+
 	switch workflowType {
 	case "create":
-		if len(cmd.command.Arguments) < 7 {
+		if len(cmd.command.Arguments) < 5 {
 			return nil, fmt.Errorf("insufficient arguments for ignore-create workflow")
 		}
 
-		issue := cmd.issueProvider.Issue(cmd.command.Arguments[1].(string))
-
-		findingsId := issue.GetFindingsId()
+		ignoreType, ok := cmd.command.Arguments[2].(string)
+		if !ok {
+			return nil, fmt.Errorf("ignoreType should be a string")
+		}
+		reason, ok := cmd.command.Arguments[3].(string)
+		if !ok {
+			return nil, fmt.Errorf("reason should be a string")
+		}
+		expiration, ok := cmd.command.Arguments[4].(string)
+		if !ok {
+			return nil, fmt.Errorf("expiration should be a string")
+		}
 
 		gafConfig := engine.GetConfiguration().Clone()
-		gafConfig.Set("id", findingsId)
-		gafConfig.Set("ignoreType", cmd.command.Arguments[2].(string))
-		gafConfig.Set("reason", cmd.command.Arguments[3].(string))
-		gafConfig.Set("expiration", cmd.command.Arguments[4].(string))
-		gafConfig.Set("enrichResponse", true)
-		gafConfig.Set("interactive", false)
-
-		result, err := engine.InvokeWithConfig(localworkflows.WORKFLOWID_IGNORE_CREATE, gafConfig)
+		gafConfig.Set(ignore_workflow.FindingsIdKey, findingsId)
+		gafConfig.Set(ignore_workflow.IgnoreTypeKey, ignoreType)
+		gafConfig.Set(ignore_workflow.ReasonKey, reason)
+		gafConfig.Set(ignore_workflow.ExpirationKey, expiration)
+		gafConfig.Set(ignore_workflow.EnrichResponseKey, true)
+		gafConfig.Set(ignore_workflow.InteractiveKey, false)
+		gafConfig.Set(configuration.INPUT_DIRECTORY, contentRoot)
+
+		result, err := engine.InvokeWithConfig(ignore_workflow.WORKFLOWID_IGNORE_CREATE, gafConfig)
 		if err != nil && len(result) == 0 {
 			return nil, fmt.Errorf("failed to invoke ignore-create workflow: %w", err)
 		}
 
-		response := result[0].GetPayload().(IgnoresResponse)
-		issue.SetSuppressionStatus(response.SuppressionStatus)
+		suppressionResponse, ok := result[0].GetPayload().(*sarif.Suppression)
+		if !ok {
+			return nil, fmt.Errorf("unexpected payload type: expected *sarif.Suppression")
+		}
+		issue.SetSuppressionStatus(string(suppressionResponse.Status))
 
 	case "update":
-		if len(cmd.command.Arguments) < 8 {
+		if len(cmd.command.Arguments) < 5 {
 			return nil, fmt.Errorf("insufficient arguments for ignore-edit workflow")
 		}
 
-		issue := cmd.issueProvider.Issue(cmd.command.Arguments[1].(string))
-		findingsId := issue.GetFindingsId()
+		ignoreType, ok := cmd.command.Arguments[2].(string)
+		if !ok {
+			return nil, fmt.Errorf("ignoreType should be a string")
+		}
+		reason, ok := cmd.command.Arguments[3].(string)
+		if !ok {
+			return nil, fmt.Errorf("reason should be a string")
+		}
+		expiration, ok := cmd.command.Arguments[4].(string)
+		if !ok {
+			return nil, fmt.Errorf("expiration should be a string")
+		}
+		ignoreId, ok := cmd.command.Arguments[5].(string)
+		if !ok {
+			return nil, fmt.Errorf("ignoreId should be a string")
+		}
 
 		gafConfig := engine.GetConfiguration().Clone()
-		gafConfig.Set("id", findingsId)
-		gafConfig.Set("ignoreType", cmd.command.Arguments[2].(string))
-		gafConfig.Set("reason", cmd.command.Arguments[3].(string))
-		gafConfig.Set("expiration", cmd.command.Arguments[4].(string))
-		gafConfig.Set("enrichResponse", true)
-		gafConfig.Set("interactive", false)
-
-		result, err := engine.InvokeWithConfig(localworkflows.WORKFLOWID_IGNORE_EDIT, gafConfig)
+		gafConfig.Set(ignore_workflow.FindingsIdKey, findingsId)
+		gafConfig.Set(ignore_workflow.IgnoreTypeKey, ignoreType)
+		gafConfig.Set(ignore_workflow.ReasonKey, reason)
+		gafConfig.Set(ignore_workflow.ExpirationKey, expiration)
+		gafConfig.Set(ignore_workflow.EnrichResponseKey, true)
+		gafConfig.Set(ignore_workflow.InteractiveKey, false)
+		gafConfig.Set(ignore_workflow.IgnoreIdKey, ignoreId)
+		gafConfig.Set(configuration.INPUT_DIRECTORY, contentRoot)
+
+		result, err := engine.InvokeWithConfig(ignore_workflow.WORKFLOWID_IGNORE_EDIT, gafConfig)
 		if err != nil && len(result) == 0 {
 			return nil, fmt.Errorf("failed to invoke ignore-create workflow: %w", err)
 		}
 
-		response := result[0].GetPayload().(IgnoresResponse)
-		issue.SetSuppressionStatus(response.SuppressionStatus)
+		suppressionResponse, ok := result[0].GetPayload().(*sarif.Suppression)
+		if !ok {
+			return nil, fmt.Errorf("unexpected payload type: expected *sarif.Suppression")
+		}
+		issue.SetSuppressionStatus(string(suppressionResponse.Status))
 
 	case "delete":
 		if len(cmd.command.Arguments) < 3 {
 			return nil, fmt.Errorf("insufficient arguments for ignore-delete workflow")
 		}
 
-		issue := cmd.issueProvider.Issue(cmd.command.Arguments[1].(string))
-		findingsId := issue.GetFindingsId()
+		ignoreId, ok := cmd.command.Arguments[5].(string)
+		if !ok {
+			return nil, fmt.Errorf("ignoreId should be a string")
+		}
 
 		gafConfig := engine.GetConfiguration().Clone()
-		gafConfig.Set("id", findingsId)
-		gafConfig.Set("enrichResponse", true)
-		gafConfig.Set("interactive", false)
+		gafConfig.Set(ignore_workflow.FindingsIdKey, findingsId) //TODO remove this one?
+		gafConfig.Set(ignore_workflow.IgnoreIdKey, ignoreId)
+		gafConfig.Set(ignore_workflow.EnrichResponseKey, true)
+		gafConfig.Set(ignore_workflow.InteractiveKey, false)
+		gafConfig.Set(configuration.INPUT_DIRECTORY, contentRoot)
 
-		result, err := engine.InvokeWithConfig(localworkflows.WORKFLOWID_IGNORE_DELETE, gafConfig)
+		result, err := engine.InvokeWithConfig(ignore_workflow.WORKFLOWID_IGNORE_DELETE, gafConfig)
 		if err != nil && len(result) == 0 {
 			return nil, fmt.Errorf("failed to invoke ignore-create workflow: %w", err)
 		}
 
-		response := result[0].GetPayload().(IgnoresResponse)
-		issue.SetSuppressionStatus(response.SuppressionStatus)
+		suppressionResponse, ok := result[0].GetPayload().(*sarif.Suppression)
+		if !ok {
+			return nil, fmt.Errorf("unexpected payload type: expected *sarif.Suppression")
+		}
+		issue.SetSuppressionStatus(string(suppressionResponse.Status))
 
 	default:
 		return nil, fmt.Errorf(`unkown worflow`)

internal/types/issues.go

@@ -88,6 +88,7 @@ type Issue interface {
 	GetMessage() string
 	GetFormattedMessage() string
 	GetAffectedFilePath() FilePath
+	GetContentRoot() FilePath
 	GetIsNew() bool
 	GetIsIgnored() bool
 	GetSeverity() Severity