Skip to content

Commit 480beaa

Browse files
committed
Rename to error on unknown
1 parent 54e0aff commit 480beaa

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/toolsets/toolsets.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ func (tg *ToolsetGroup) IsEnabled(name string) bool {
204204
}
205205

206206
type EnableToolsetsOptions struct {
207-
IgnoreUnknown bool
207+
ErrorOnUnknown bool
208208
}
209209

210210
func (tg *ToolsetGroup) EnableToolsets(names []string, options *EnableToolsetsOptions) error {
211211
if options == nil {
212212
options = &EnableToolsetsOptions{
213-
IgnoreUnknown: true,
213+
ErrorOnUnknown: false,
214214
}
215215
}
216216

@@ -221,15 +221,15 @@ func (tg *ToolsetGroup) EnableToolsets(names []string, options *EnableToolsetsOp
221221
break
222222
}
223223
err := tg.EnableToolset(name)
224-
if err != nil && !options.IgnoreUnknown {
224+
if err != nil && options.ErrorOnUnknown {
225225
return err
226226
}
227227
}
228228
// Do this after to ensure all toolsets are enabled if "all" is present anywhere in list
229229
if tg.everythingOn {
230230
for name := range tg.Toolsets {
231231
err := tg.EnableToolset(name)
232-
if err != nil && !options.IgnoreUnknown {
232+
if err != nil && options.ErrorOnUnknown {
233233
return err
234234
}
235235
}

pkg/toolsets/toolsets_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,13 @@ func TestEnableToolsets(t *testing.T) {
154154
}
155155

156156
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{
157-
IgnoreUnknown: true,
157+
ErrorOnUnknown: false,
158158
})
159159
if err != nil {
160160
t.Errorf("Expected no error when ignoring unknown toolsets, got: %v", err)
161161
}
162162

163-
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{IgnoreUnknown: false})
163+
err = tsg.EnableToolsets([]string{"toolset1", "non-existent"}, &EnableToolsetsOptions{ErrorOnUnknown: true})
164164
if err == nil {
165165
t.Error("Expected error when enabling list with non-existent toolset")
166166
}

0 commit comments

Comments
 (0)