Skip to content
This repository was archived by the owner on Nov 14, 2024. It is now read-only.

Commit ca8679d

Browse files
committed
chore: improve text output for resource check
* Remove the synthetic error and create a failed result manually * Add the resource, group, and groupVersion in Details, so that it will be included in JSON output
1 parent d342613 commit ca8679d

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

internal/checks/kube/resources.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"context"
55
"fmt"
66

7-
"golang.org/x/xerrors"
87
"k8s.io/apimachinery/pkg/runtime/schema"
98

109
"cdr.dev/coder-doctor/internal/api"
@@ -46,14 +45,23 @@ func (k *KubernetesChecker) CheckResources(_ context.Context) []*api.CheckResult
4645
}
4746

4847
for versionReq := range k.reqs.ResourceRequirements {
49-
if !resourcesAvailable[*versionReq] {
50-
msg := fmt.Sprintf("missing required resource:%q group:%q version:%q", versionReq.Resource, versionReq.Group, versionReq.Version)
51-
errResult := api.ErrorResult(checkName, msg, xerrors.New(msg))
52-
results = append(results, errResult)
53-
continue
48+
result := &api.CheckResult{
49+
Summary: checkName,
50+
Details: map[string]interface{}{
51+
"resource": versionReq.Resource,
52+
"group": versionReq.Group,
53+
"groupVersion": versionReq.Version,
54+
},
55+
}
56+
57+
if resourcesAvailable[*versionReq] {
58+
result.Summary = fmt.Sprintf("Cluster supports %s resource %s", versionReq.Version, versionReq.Resource)
59+
result.State = api.StatePassed
60+
} else {
61+
result.Summary = fmt.Sprintf("Cluster does not support %s resource %s", versionReq.Version, versionReq.Resource)
62+
result.State = api.StateFailed
5463
}
55-
msg := fmt.Sprintf("found required resource:%q group:%q version:%q", versionReq.Resource, versionReq.Group, versionReq.Version)
56-
results = append(results, api.PassResult(checkName, msg))
64+
results = append(results, result)
5765
}
5866

5967
return results

0 commit comments

Comments
 (0)