syz-cluster: refactor fuzz config structures

Keep the fuzz-step parameters in a separate structure to minimize the
field duplication.

It will also facilitate the reuse of the same syzkaller config in
several fuzzing configurations.

2 files changed, 6 insertions, 6 deletions

diff --git a/syz-cluster/pkg/triage/fuzz_config.go b/syz-cluster/pkg/triage/fuzz_config.go
index fbe576162..05443d704 100644
--- a/syz-cluster/pkg/triage/fuzz_config.go
+++ b/syz-cluster/pkg/triage/fuzz_config.go
@@ -9,7 +9,7 @@ import (
 	"github.com/google/syzkaller/syz-cluster/pkg/api"
 )
 
-func SelectFuzzConfig(series *api.Series, fuzzConfigs []*api.FuzzConfig) *api.FuzzConfig {
+func SelectFuzzConfig(series *api.Series, fuzzConfigs []*api.TriageFuzzConfig) *api.TriageFuzzConfig {
 	seriesCc := map[string]bool{}
 	for _, cc := range series.Cc {
 		seriesCc[strings.ToLower(cc)] = true
diff --git a/syz-cluster/pkg/triage/fuzz_config_test.go b/syz-cluster/pkg/triage/fuzz_config_test.go
index 7a58cf464..04f948493 100644
--- a/syz-cluster/pkg/triage/fuzz_config_test.go
+++ b/syz-cluster/pkg/triage/fuzz_config_test.go
@@ -11,18 +11,18 @@ import (
 )
 
 func TestSelectFuzzConfig(t *testing.T) {
-	configs := []*api.FuzzConfig{
+	configs := []*api.TriageFuzzConfig{
 		{
-			Name:       "bpf",
 			EmailLists: []string{"bpf@list"},
+			FuzzConfig: api.FuzzConfig{Config: "bpf"},
 		},
 		{
-			Name:       "net",
 			EmailLists: []string{"net@list"},
+			FuzzConfig: api.FuzzConfig{Config: "net"},
 		},
 		{
-			Name:       "mainline",
 			EmailLists: nil,
+			FuzzConfig: api.FuzzConfig{Config: "mainline"},
 		},
 	}
 	tests := []struct {
@@ -45,7 +45,7 @@ func TestSelectFuzzConfig(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
 			ret := SelectFuzzConfig(test.series, configs)
-			assert.Equal(t, test.result, ret.Name)
+			assert.Equal(t, test.result, ret.Config)
 		})
 	}
 }