fix: replaced Suppression.status with IgnoreDetails

Author: acke

domain/ide/command/ignores_request.go

@@ -18,13 +18,15 @@ package command
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 
 	"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/infrastructure/code"
 	"github.com/snyk/snyk-ls/internal/types"
 )
 
@@ -77,16 +79,28 @@ func (cmd *submitIgnoreRequest) Execute(ctx context.Context) (any, error) {
 		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)
+		data, err := engine.InvokeWithConfig(ignore_workflow.WORKFLOWID_IGNORE_CREATE, gafConfig)
+		if err != nil {
+			return nil, err
 		}
 
-		suppressionResponse, ok := result[0].GetPayload().(*sarif.Suppression)
+		if data == nil || len(data) == 0 {
+			return nil, fmt.Errorf("no data returned from ignore workflow")
+		}
+
+		output, ok := data[0].GetPayload().([]byte)
 		if !ok {
-			return nil, fmt.Errorf("unexpected payload type: expected *sarif.Suppression")
+			return nil, fmt.Errorf("invalid response from ignore workflow") //TODO fix this
+		}
+
+		var suppression *sarif.Suppression
+		err = json.Unmarshal(output, suppression)
+		if err != nil {
+			return nil, err
 		}
-		issue.SetSuppressionStatus(string(suppressionResponse.Status))
+		ignoreDetails := code.SarifSuppressionToIgnoreDetails(suppression)
+
+		issue.SetIgnoreDetails(ignoreDetails)
 
 	case "update":
 		if len(cmd.command.Arguments) < 5 {
@@ -129,7 +143,7 @@ func (cmd *submitIgnoreRequest) Execute(ctx context.Context) (any, error) {
 		if !ok {
 			return nil, fmt.Errorf("unexpected payload type: expected *sarif.Suppression")
 		}
-		issue.SetSuppressionStatus(string(suppressionResponse.Status))
+		issue.SetIgnoreDetails(string(suppressionResponse.Status))
 
 	case "delete":
 		if len(cmd.command.Arguments) < 3 {
@@ -157,7 +171,7 @@ func (cmd *submitIgnoreRequest) Execute(ctx context.Context) (any, error) {
 		if !ok {
 			return nil, fmt.Errorf("unexpected payload type: expected *sarif.Suppression")
 		}
-		issue.SetSuppressionStatus(string(suppressionResponse.Status))
+		issue.SetIgnoreDetails(string(suppressionResponse.Status))
 
 	default:
 		return nil, fmt.Errorf(`unkown worflow`)

domain/snyk/issues.go

@@ -110,7 +110,6 @@ func (i *Issue) Clone() *Issue {
 		LessonUrl:           i.LessonUrl,
 		Fingerprint:         i.Fingerprint,
 		GlobalIdentity:      i.GlobalIdentity,
-		SuppressionStatus:   i.SuppressionStatus,
 		m:                   sync.RWMutex{},
 	}
 }
@@ -479,6 +478,6 @@ func (i *Issue) SetID(id string) {
 	i.ID = id
 }
 
-func (i *Issue) SetSuppressionStatus(status string) {
-	i.SuppressionStatus = status
+func (i *Issue) SetIgnoreDetails(ignoreDetails *types.IgnoreDetails) {
+	i.IgnoreDetails = ignoreDetails
 }

infrastructure/code/convert.go

@@ -442,22 +442,31 @@ func (s *SarifConverter) getIgnoreDetails(result codeClientSarif.Result) (bool,
 		isIgnored = true
 		suppression := result.Suppressions[0]
 
-		reason := suppression.Justification
-		if reason == "" {
-			reason = "None given"
-		}
-		ignoreDetails = &types.IgnoreDetails{
-			Category:   string(suppression.Properties.Category),
-			Reason:     reason,
-			Expiration: parseExpirationDateFromString(suppression.Properties.Expiration),
-			IgnoredOn:  parseDateFromString(suppression.Properties.IgnoredOn),
-			IgnoredBy:  suppression.Properties.IgnoredBy.Name,
-			Status:     suppression.Status,
-		}
+		ignoreDetails = SarifSuppressionToIgnoreDetails(&suppression)
 	}
 	return isIgnored, ignoreDetails
 }
 
+func SarifSuppressionToIgnoreDetails(suppression *codeClientSarif.Suppression) *types.IgnoreDetails {
+	if suppression == nil {
+		return nil
+	}
+
+	reason := suppression.Justification
+	if reason == "" {
+		reason = "None given"
+	}
+	ignoreDetails := &types.IgnoreDetails{
+		Category:   string(suppression.Properties.Category),
+		Reason:     reason,
+		Expiration: parseExpirationDateFromString(suppression.Properties.Expiration),
+		IgnoredOn:  parseDateFromString(suppression.Properties.IgnoredOn),
+		IgnoredBy:  suppression.Properties.IgnoredBy.Name,
+		Status:     suppression.Status,
+	}
+	return ignoreDetails
+}
+
 func parseExpirationDateFromString(date *string) string {
 	if date == nil {
 		return ""

internal/types/issues.go

@@ -116,7 +116,7 @@ type Issue interface {
 	SetIsNew(isNew bool)
 	SetCodeActions(actions []CodeAction)
 	SetRange(r Range)
-	SetSuppressionStatus(status string)
+	SetIgnoreDetails(ignoreDetails *IgnoreDetails)
 }
 
 type IssueAdditionalData interface {