Skip to content

Commit e7f6ff9

Browse files
committed
Adapt tests to the new toolsetconfig
Signed-off-by: Alberto Gutierrez <aljesusg@gmail.com>
1 parent f099e92 commit e7f6ff9

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

pkg/kubernetes-mcp-server/cmd/root.go

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -292,16 +292,20 @@ func (m *MCPServerOptions) Validate() error {
292292
klog.Warningf("authorization-url is using http://, this is not recommended production use")
293293
}
294294
}
295-
/* If Kiali tools are enabled, validate Kiali toolset configuration */
296-
if slices.Contains(m.StaticConfig.Toolsets, "kiali") {
297-
cfg, ok := m.StaticConfig.GetToolsetConfig("kiali")
298-
if !ok {
299-
return fmt.Errorf("kiali configuration is required when kiali tools are enabled")
300-
}
301-
if err := cfg.Validate(); err != nil {
302-
return fmt.Errorf("invalid kiali configuration: %w", err)
303-
}
304-
}
295+
/* If Kiali tools are enabled, validate Kiali toolset configuration */
296+
if slices.Contains(m.StaticConfig.Toolsets, "kiali") {
297+
cfg, ok := m.StaticConfig.GetToolsetConfig("kiali")
298+
if !ok {
299+
return fmt.Errorf("kiali-url is required when kiali tools are enabled")
300+
}
301+
if err := cfg.Validate(); err != nil {
302+
// Normalize error message for missing URL to match expected UX/tests
303+
if strings.Contains(err.Error(), "kiali-url is required") {
304+
return fmt.Errorf("kiali-url is required when kiali tools are enabled")
305+
}
306+
return fmt.Errorf("invalid kiali configuration: %w", err)
307+
}
308+
}
305309
return nil
306310
}
307311

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
toolsets = ["core", "kiali"]
22

3-
[kiali]
3+
[toolset_configs.kiali]
44
url = "http://kiali"
55

0 commit comments

Comments
 (0)