Skip to content

Commit 024ee49

Browse files
committed
Fix lint and test configurations
1 parent d317371 commit 024ee49

File tree

7 files changed

+56
-23
lines changed

7 files changed

+56
-23
lines changed

cmd/jaeger/internal/extension/jaegermcp/internal/skills/loader.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2026 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package skills
25

36
import (

cmd/jaeger/internal/extension/jaegermcp/internal/skills/loader_test.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2026 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package skills
25

36
import (
@@ -6,6 +9,7 @@ import (
69
"testing"
710

811
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/require"
913
"go.uber.org/zap"
1014
)
1115

@@ -27,8 +31,8 @@ system_prompt: "You are a test."
2731
version: "1.0"
2832
author: "test"
2933
`
30-
err := os.WriteFile(filepath.Join(tempDir, "test.yaml"), []byte(skillData), 0644)
31-
assert.NoError(t, err)
34+
err := os.WriteFile(filepath.Join(tempDir, "test.yaml"), []byte(skillData), 0o644)
35+
require.NoError(t, err)
3236

3337
skills := LoadSkills(tempDir, logger)
3438
assert.Len(t, skills, 1)
@@ -42,8 +46,8 @@ author: "test"
4246
description: "A test skill"
4347
system_prompt: "You are a test."
4448
`
45-
err := os.WriteFile(filepath.Join(tempDir, "missing_name.yaml"), []byte(skillData), 0644)
46-
assert.NoError(t, err)
49+
err := os.WriteFile(filepath.Join(tempDir, "missing_name.yaml"), []byte(skillData), 0o644)
50+
require.NoError(t, err)
4751

4852
skills := LoadSkills(tempDir, logger)
4953
assert.Empty(t, skills)
@@ -55,8 +59,8 @@ system_prompt: "You are a test."
5559
name: test-skill
5660
description: "A test skill"
5761
`
58-
err := os.WriteFile(filepath.Join(tempDir, "missing_prompt.yaml"), []byte(skillData), 0644)
59-
assert.NoError(t, err)
62+
err := os.WriteFile(filepath.Join(tempDir, "missing_prompt.yaml"), []byte(skillData), 0o644)
63+
require.NoError(t, err)
6064

6165
skills := LoadSkills(tempDir, logger)
6266
assert.Empty(t, skills)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright (c) 2024 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package skills
5+
6+
import (
7+
"testing"
8+
9+
"github.com/jaegertracing/jaeger/internal/testutils"
10+
)
11+
12+
func TestMain(m *testing.M) {
13+
testutils.VerifyGoLeaks(m)
14+
}

cmd/jaeger/internal/extension/jaegermcp/internal/skills/registry.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2026 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package skills
25

36
import (
@@ -21,7 +24,7 @@ func NewRegistry() *Registry {
2124
func (r *Registry) Register(skill Skill) {
2225
r.mu.Lock()
2326
defer r.mu.Unlock()
24-
27+
2528
if skill.Name == "" {
2629
return
2730
}
@@ -32,7 +35,7 @@ func (r *Registry) Register(skill Skill) {
3235
func (r *Registry) Get(name string) (Skill, bool) {
3336
r.mu.RLock()
3437
defer r.mu.RUnlock()
35-
38+
3639
skill, ok := r.skills[name]
3740
return skill, ok
3841
}
@@ -41,7 +44,7 @@ func (r *Registry) Get(name string) (Skill, bool) {
4144
func (r *Registry) List() []Skill {
4245
r.mu.RLock()
4346
defer r.mu.RUnlock()
44-
47+
4548
var skills []Skill
4649
for _, skill := range r.skills {
4750
skills = append(skills, skill)
Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2026 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package skills
25

36
import (
@@ -8,30 +11,30 @@ import (
811

912
func TestRegistryRegisterAndGet(t *testing.T) {
1013
registry := NewRegistry()
11-
14+
1215
skill := Skill{
1316
Name: "test-skill",
1417
Description: "A test skill",
1518
SystemPrompt: "You are a test.",
1619
}
17-
20+
1821
registry.Register(skill)
19-
22+
2023
retrievedSkill, ok := registry.Get("test-skill")
2124
assert.True(t, ok)
2225
assert.Equal(t, skill, retrievedSkill)
2326
}
2427

2528
func TestRegistryGetMissing(t *testing.T) {
2629
registry := NewRegistry()
27-
30+
2831
_, ok := registry.Get("missing-skill")
2932
assert.False(t, ok)
3033
}
3134

3235
func TestRegistryList(t *testing.T) {
3336
registry := NewRegistry()
34-
37+
3538
skill1 := Skill{
3639
Name: "test-skill-1",
3740
Description: "A test skill 1",
@@ -42,21 +45,24 @@ func TestRegistryList(t *testing.T) {
4245
Description: "A test skill 2",
4346
SystemPrompt: "You are a test 2.",
4447
}
45-
48+
4649
registry.Register(skill1)
4750
registry.Register(skill2)
48-
51+
4952
skills := registry.List()
5053
assert.Len(t, skills, 2)
51-
54+
5255
// Registry map iteration order is not guaranteed, so just check contents
5356
found1 := false
5457
found2 := false
5558
for _, s := range skills {
56-
if s.Name == "test-skill-1" {
59+
switch s.Name {
60+
case "test-skill-1":
5761
found1 = true
58-
} else if s.Name == "test-skill-2" {
62+
case "test-skill-2":
5963
found2 = true
64+
default:
65+
// Ignore other skills
6066
}
6167
}
6268
assert.True(t, found1)
@@ -65,14 +71,14 @@ func TestRegistryList(t *testing.T) {
6571

6672
func TestRegistryRegisterEmptyName(t *testing.T) {
6773
registry := NewRegistry()
68-
74+
6975
skill := Skill{
7076
Description: "A test skill",
7177
SystemPrompt: "You are a test.",
7278
}
73-
79+
7480
registry.Register(skill)
75-
81+
7682
skills := registry.List()
7783
assert.Empty(t, skills)
7884
}

cmd/jaeger/internal/extension/jaegermcp/internal/skills/skills.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright (c) 2026 The Jaeger Authors.
2+
// SPDX-License-Identifier: Apache-2.0
3+
14
package skills
25

36
// SkillTool represents a tool that a skill can use

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ require (
105105
golang.org/x/sys v0.41.0
106106
google.golang.org/grpc v1.79.1
107107
google.golang.org/protobuf v1.36.11
108+
gopkg.in/yaml.v3 v3.0.1
108109
)
109110

110111
require (
@@ -151,7 +152,6 @@ require (
151152
golang.org/x/oauth2 v0.34.0 // indirect
152153
golang.org/x/time v0.14.0 // indirect
153154
google.golang.org/api v0.258.0 // indirect
154-
gopkg.in/yaml.v3 v3.0.1 // indirect
155155
k8s.io/apimachinery v0.34.3 // indirect
156156
k8s.io/client-go v0.34.3 // indirect
157157
k8s.io/klog/v2 v2.130.1 // indirect

0 commit comments

Comments
 (0)