Skip to content

Commit ded7834

Browse files
committed
Fix lints.
1 parent 0e8d42e commit ded7834

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

cmd/cluster/context.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ func (o ContextOptions) Validate() error {
7373
default:
7474
return fmt.Errorf("unknown Output Format: %s", o.Output)
7575
}
76-
return nil
7776
}
7877

7978
// ContextCache holds the runtime state and cluster information needed during execution.
@@ -284,7 +283,10 @@ func GenerateContextData(clusterId string) (string, []error) {
284283

285284
builder := &strings.Builder{}
286285
presenter := NewClusterContextPresenter(builder)
287-
presenter.Render(contextData, queryOpts)
286+
err = presenter.Render(contextData, queryOpts)
287+
if err != nil {
288+
errs = append(errs, err)
289+
}
288290
return builder.String(), errs
289291
}
290292

cmd/cluster/context_presenter.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func (p *ClusterContextPresenter) RenderJSON(data *contextData) error {
159159

160160
// printOtherLinks prints external resource links
161161
func (p *ClusterContextPresenter) printOtherLinks(data *contextData, opts ContextOptions) {
162-
var name string = "External resources"
162+
name := "External resources"
163163
fmt.Fprintln(p.writer, delimiter+name)
164164

165165
var ohssQueryURL = fmt.Sprintf("%[1]s/issues/?jql=project%%20%%3D%%22OpenShift%%20Hosted%%20SRE%%20Support%%22and%%20(%%22Cluster%%20ID%%22%%20~%%20%%20%%22%[2]s%%22OR%%22Cluster%%20ID%%22~%%22%[3]s%%22OR%%22description%%22~%%22%[2]s%%22OR%%22description%%22~%%22%[3]s%%22)",
@@ -235,7 +235,7 @@ func buildHCPSplunkURL(baseURL string, environment string, cluster *cmv1.Cluster
235235

236236
// printHistoricalPDAlertSummary prints a summary of historical PagerDuty alerts
237237
func (p *ClusterContextPresenter) printHistoricalPDAlertSummary(incidentCounters map[string][]*pagerduty.IncidentOccurrenceTracker, serviceIDs []string, sinceDays int) {
238-
var name string = "PagerDuty Historical Alerts"
238+
name := "PagerDuty Historical Alerts"
239239
fmt.Fprintln(p.writer, delimiter+name)
240240

241241
for _, serviceID := range serviceIDs {
@@ -266,7 +266,7 @@ func (p *ClusterContextPresenter) printHistoricalPDAlertSummary(incidentCounters
266266

267267
// printJIRASupportExceptions prints JIRA support exception tickets
268268
func (p *ClusterContextPresenter) printJIRASupportExceptions(issues []jira.Issue) {
269-
var name string = "Support Exceptions"
269+
name := "Support Exceptions"
270270
fmt.Fprintln(p.writer, delimiter+name)
271271

272272
for _, i := range issues {
@@ -281,7 +281,7 @@ func (p *ClusterContextPresenter) printJIRASupportExceptions(issues []jira.Issue
281281

282282
// printCloudTrailLogs prints potentially interesting CloudTrail events
283283
func (p *ClusterContextPresenter) printCloudTrailLogs(events []*types.Event) {
284-
var name string = "Potentially interesting CloudTrail events"
284+
name := "Potentially interesting CloudTrail events"
285285
fmt.Fprintln(p.writer, delimiter+name)
286286

287287
if events == nil {
@@ -327,7 +327,7 @@ func (p *ClusterContextPresenter) printNetworkInfo(data *contextData) {
327327

328328
// printDynatraceResources prints Dynatrace-related URLs and information
329329
func (p *ClusterContextPresenter) printDynatraceResources(data *contextData) {
330-
var name string = "Dynatrace Details"
330+
name := "Dynatrace Details"
331331
fmt.Fprintln(p.writer, delimiter+name)
332332

333333
links := map[string]string{
@@ -360,7 +360,7 @@ func (p *ClusterContextPresenter) printDynatraceResources(data *contextData) {
360360

361361
// printUserBannedStatus prints user ban status and details
362362
func (p *ClusterContextPresenter) printUserBannedStatus(data *contextData) {
363-
var name string = "User Ban Details"
363+
name := "User Ban Details"
364364
fmt.Fprintln(p.writer, "\n"+delimiter+name)
365365
if data.UserBanned {
366366
fmt.Fprintln(p.writer, "User is banned")

cmd/cluster/context_test.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ func TestPrintShortOutput(t *testing.T) {
395395

396396
buffer := strings.Builder{}
397397
p := NewClusterContextPresenter(&buffer)
398-
p.RenderShort(data, opts)
398+
err := p.RenderShort(data, opts)
399+
assert.NoError(t, err)
399400
output := buffer.String()
400401

401402
assert.Contains(t, output, "Version")
@@ -418,11 +419,12 @@ func TestPrintJsonOutput(t *testing.T) {
418419

419420
buffer := strings.Builder{}
420421
p := NewClusterContextPresenter(&buffer)
421-
p.RenderJSON(data)
422+
err := p.RenderJSON(data)
423+
assert.NoError(t, err)
422424
output := buffer.String()
423425

424426
var result map[string]interface{}
425-
err := json.Unmarshal([]byte(output), &result)
427+
err = json.Unmarshal([]byte(output), &result)
426428
assert.NoError(t, err)
427429
assert.Contains(t, output, `"JSON Test Cluster"`)
428430
assert.Contains(t, output, `"4.9"`)
@@ -518,7 +520,8 @@ func TestPrintLongOutput(t *testing.T) {
518520

519521
buffer := strings.Builder{}
520522
p := NewClusterContextPresenter(&buffer)
521-
p.RenderLong(mockData, *o)
523+
err := p.RenderLong(mockData, *o)
524+
assert.NoError(t, err)
522525
output := buffer.String()
523526

524527
assert.Contains(t, output, "ClusterABC")

cmd/mcp/cmd.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"net/http"
7+
"time"
78

89
"github.com/google/jsonschema-go/jsonschema"
910
"github.com/modelcontextprotocol/go-sdk/mcp"
@@ -81,7 +82,12 @@ func runMCP(cmd *cobra.Command, argv []string) error {
8182
handler := mcp.NewStreamableHTTPHandler(func(req *http.Request) *mcp.Server {
8283
return server
8384
}, nil)
84-
if err := http.ListenAndServe(fmt.Sprintf("http://localhost:%d", httpPort), handler); err != nil {
85+
server := &http.Server{
86+
Addr: fmt.Sprintf("http://localhost:%d", httpPort),
87+
ReadHeaderTimeout: 3 * time.Second,
88+
}
89+
http.Handle("/", handler)
90+
if err := server.ListenAndServe(); err != nil {
8591
return err
8692
}
8793
}

0 commit comments

Comments
 (0)