Skip to content

Commit 182d2c5

Browse files
authored
chore: update ignore workflow (#341)
1 parent ef785a7 commit 182d2c5

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/mattn/go-isatty v0.0.20
3131
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
3232
github.com/oapi-codegen/runtime v1.1.1
33-
github.com/snyk/error-catalog-golang-public v0.0.0-20250218074309-307ad7b38a60
33+
github.com/snyk/error-catalog-golang-public v0.0.0-20250429130542-564b0605020e
3434
github.com/subosito/gotenv v1.4.1
3535
golang.org/x/sync v0.13.0
3636
gopkg.in/yaml.v3 v3.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ github.com/skeema/knownhosts v1.3.1 h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnB
232232
github.com/skeema/knownhosts v1.3.1/go.mod h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
233233
github.com/snyk/code-client-go v1.20.1 h1:38nEGzrQIh/aVLjR99jiTUQM0sL9SQAvhMfZGmd9G0w=
234234
github.com/snyk/code-client-go v1.20.1/go.mod h1:WH6lNkJc785hfXmwhixxWHix3O6z+1zwz40oK8vl/zg=
235-
github.com/snyk/error-catalog-golang-public v0.0.0-20250218074309-307ad7b38a60 h1:iB6z2BhBpfN9p0/dEZfwWvs7fpdZk3loooAih8yspS8=
236-
github.com/snyk/error-catalog-golang-public v0.0.0-20250218074309-307ad7b38a60/go.mod h1:Ytttq7Pw4vOCu9NtRQaOeDU2dhBYUyNBe6kX4+nIIQ4=
235+
github.com/snyk/error-catalog-golang-public v0.0.0-20250429130542-564b0605020e h1:XFGkHDWA8JTPLr82QzoKVqGytofEYBf68VqoUq8yvXk=
236+
github.com/snyk/error-catalog-golang-public v0.0.0-20250429130542-564b0605020e/go.mod h1:Ytttq7Pw4vOCu9NtRQaOeDU2dhBYUyNBe6kX4+nIIQ4=
237237
github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530 h1:s9PHNkL6ueYRiAKNfd8OVxlUOqU3qY0VDbgCD1f6WQY=
238238
github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg=
239239
github.com/speakeasy-api/jsonpath v0.6.1 h1:FWbuCEPGaJTVB60NZg2orcYHGZlelbNJAcIk/JGnZvo=

pkg/local_workflows/ignore_workflow/config.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,16 @@ func addCreateIgnoreDefaultConfigurationValues(invocationCtx workflow.Invocation
2727
})
2828

2929
config.AddDefaultValue(ExpirationKey, func(existingValue interface{}) (interface{}, error) {
30-
isSet := config.IsSet(ExpirationKey)
31-
return defaultFuncWithValidator(existingValue, userInterface, interactive, isSet, expirationDescription, isValidExpirationDate)
30+
if !config.IsSet(ExpirationKey) {
31+
return existingValue, nil
32+
}
33+
34+
err := isValidExpirationDate(existingValue)
35+
if err != nil {
36+
return "", err
37+
}
38+
39+
return existingValue, nil
3240
})
3341

3442
config.AddDefaultValue(FindingsIdKey, func(existingValue interface{}) (interface{}, error) {

pkg/local_workflows/ignore_workflow/ignore_workflow.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/spf13/pflag"
1414

1515
"github.com/snyk/code-client-go/sarif"
16+
"github.com/snyk/error-catalog-golang-public/cli"
1617

1718
policyApi "github.com/snyk/go-application-framework/internal/api/policy/2024-10-15"
1819
"github.com/snyk/go-application-framework/pkg/configuration"
@@ -27,7 +28,7 @@ const (
2728
ignoreEditWorkflowName = "ignore.edit"
2829
ignoreDeleteWorkflowName = "ignore.delete"
2930

30-
FindingsIdKey = "id"
31+
FindingsIdKey = "finding-id"
3132
findingsIdDescription = "Finding Id"
3233

3334
IgnoreIdKey = "ignore-id"
@@ -85,7 +86,7 @@ func ignoreCreateWorkflowEntryPoint(invocationCtx workflow.InvocationContext, _
8586
id := invocationCtx.GetWorkflowIdentifier()
8687

8788
if !config.GetBool(configuration.FF_IAW_ENABLED) {
88-
return nil, fmt.Errorf("ignoreApprovalWorkflow Feature flag is not enabled")
89+
return nil, cli.NewFeatureUnderDevelopmentError("")
8990
}
9091

9192
interactive := config.GetBool(InteractiveKey)

0 commit comments

Comments
 (0)