Skip to content

Commit 9c14b19

Browse files
committedDec 17, 2024
Fix lint /tableflip
1 parent 082416c commit 9c14b19

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed
 

‎internal/engine/eval/eval.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
"errors"
1111
"fmt"
1212

13+
"github.com/open-feature/go-sdk/openfeature"
14+
1315
"github.com/mindersec/minder/internal/engine/eval/homoglyphs/application"
1416
"github.com/mindersec/minder/internal/engine/eval/jq"
1517
"github.com/mindersec/minder/internal/engine/eval/rego"
@@ -19,7 +21,6 @@ import (
1921
minderv1 "github.com/mindersec/minder/pkg/api/protobuf/go/minder/v1"
2022
"github.com/mindersec/minder/pkg/engine/v1/interfaces"
2123
provinfv1 "github.com/mindersec/minder/pkg/providers/v1"
22-
"github.com/open-feature/go-sdk/openfeature"
2324
)
2425

2526
// NewRuleEvaluator creates a new rule data evaluator

‎internal/engine/eval/rego/lib.go

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ var MinderRegoLib = []func(res *interfaces.Result) func(*rego.Rego){
4545
JQIsTrue,
4646
}
4747

48+
// MinderRegoLibExperiments contains Minder-specific functions which
49+
// should only be exposed when the given experiment is enabled.
4850
var MinderRegoLibExperiments = map[flags.Experiment][]func(res *interfaces.Result) func(*rego.Rego){
4951
flags.TarGzFunctions: {FileArchive, BaseFileArchive},
5052
flags.GitPRDiffs: {

‎internal/engine/eval/rego/lib_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1003,7 +1003,7 @@ allow {
10031003
Def: regoCode,
10041004
},
10051005
nil,
1006-
)
1006+
)
10071007
require.NoError(t, err, "could not create evaluator")
10081008

10091009
emptyPol := map[string]any{}
@@ -1109,7 +1109,7 @@ allow {
11091109
Def: regoCode,
11101110
},
11111111
nil,
1112-
)
1112+
)
11131113
require.NoError(t, err, "could not create evaluator")
11141114

11151115
_, err = e.Eval(context.Background(), map[string]any{}, nil, &interfaces.Result{})

‎internal/engine/eval/rego/rego_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ func TestCantCreateEvaluatorWithInvalidConfig(t *testing.T) {
419419
Type: "invalid",
420420
},
421421
nil,
422-
)
422+
)
423423
require.Error(t, err, "should have failed to create evaluator")
424424
})
425425
}

‎internal/engine/ingester/deps/deps.go

+1
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ func (gi *Deps) ingestPullRequest(
262262
}, nil
263263
}
264264

265+
// TODO: this first part is fairly shared with fetchClone from ../git/git.go.
265266
func (gi *Deps) scanFromUrl(ctx context.Context, url string, branch string) (*sbom.NodeList, *plumbing.Reference, error) {
266267
// We clone to the memfs go-billy filesystem driver, which doesn't
267268
// allow for direct access to the underlying filesystem. This is

‎internal/engine/rtengine/cache.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ func cacheRuleEngine(
128128
ctx context.Context,
129129
ruleType *db.RuleType,
130130
provider provinfv1.Provider,
131-
experiments openfeature.IClient,
131+
featureFlags openfeature.IClient,
132132
ingestCache ingestcache.Cache,
133133
engineCache cacheType,
134134
dssvc datasourceservice.DataSourcesService,
@@ -156,7 +156,7 @@ func cacheRuleEngine(
156156
opts = append(opts, eoptions.WithDataSources(dsreg))
157157

158158
// Create the rule type engine
159-
ruleEngine, err := rtengine2.NewRuleTypeEngine(ctx, pbRuleType, provider, experiments, opts...)
159+
ruleEngine, err := rtengine2.NewRuleTypeEngine(ctx, pbRuleType, provider, featureFlags, opts...)
160160
if err != nil {
161161
return nil, fmt.Errorf("error creating rule type engine: %w", err)
162162
}

‎internal/flags/constants.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const (
2121
PRCommentAlert Experiment = "pr_comment_alert"
2222
// GitPRDiffs enables the git ingester for pull requests.
2323
GitPRDiffs Experiment = "git_pr_diffs"
24-
// Add tar.gz functions to the rego evaluation environment.
24+
// TarGzFunctions enables functions to produce tar.gz data in the rego
25+
// evaluation environment.
2526
TarGzFunctions Experiment = "tar_gz_functions"
2627
)

0 commit comments

Comments
 (0)