Skip to content

Commit 0eb8425

Browse files
bobbyhousebobbyhouse
committed
fix: lint
1 parent a66c4c4 commit 0eb8425

File tree

1 file changed

+43
-38
lines changed

1 file changed

+43
-38
lines changed

‎pkg/workingset/server_test.go‎

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package workingset
33
import (
44
"testing"
55

6-
"github.com/docker/mcp-gateway/pkg/db"
76
"github.com/stretchr/testify/assert"
87
"github.com/stretchr/testify/require"
8+
9+
"github.com/docker/mcp-gateway/pkg/db"
910
)
1011

1112
var oneServerError = "at least one server must be specified"
@@ -22,7 +23,7 @@ func TestAddOneServerToWorkingSet(t *testing.T) {
2223
})
2324
require.NoError(t, err)
2425

25-
var servers = []string{
26+
servers := []string{
2627
"docker://myimage:latest",
2728
}
2829

@@ -47,7 +48,7 @@ func TestAddMultipleServersToWorkingSet(t *testing.T) {
4748
})
4849
require.NoError(t, err)
4950

50-
var servers = []string{
51+
servers := []string{
5152
"docker://myimage:latest",
5253
"docker://anotherimage:v1.0",
5354
}
@@ -74,7 +75,7 @@ func TestAddRegistryServerToWorkingSet(t *testing.T) {
7475
})
7576
require.NoError(t, err)
7677

77-
var servers = []string{
78+
servers := []string{
7879
"https://example.com/v0/servers/server1",
7980
}
8081

@@ -99,7 +100,7 @@ func TestAddMixTypeServerToWorkingSet(t *testing.T) {
99100
})
100101
require.NoError(t, err)
101102

102-
var servers = []string{
103+
servers := []string{
103104
"docker://myimage:latest",
104105
"https://example.com/v0/servers/server1",
105106
}
@@ -126,7 +127,7 @@ func TestAddNoServersToWorkingSet(t *testing.T) {
126127
})
127128
require.NoError(t, err)
128129

129-
var servers = []string{}
130+
servers := []string{}
130131

131132
err = AddServers(ctx, dao, getMockRegistryClient(), getMockOciService(), "test-set", servers)
132133
require.Error(t, err)
@@ -137,74 +138,77 @@ func TestRemoveOneServerFromWorkingSet(t *testing.T) {
137138
dao := setupTestDB(t)
138139
ctx := t.Context()
139140

140-
var serverName = "https://example.com/v0/servers/server1"
141-
var setId = "test-set"
141+
serverName := "https://example.com/v0/servers/server1"
142+
setID := "test-set"
142143

143144
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), "test-set", "test-set", []string{
144145
serverName,
145146
})
146147
require.NoError(t, err)
147148

148-
dbSet, err := dao.GetWorkingSet(ctx, setId)
149+
dbSet, err := dao.GetWorkingSet(ctx, setID)
150+
require.NoError(t, err)
149151
assert.Len(t, dbSet.Servers, 1)
150152

151-
err = RemoveServers(ctx, dao, setId, []string{
153+
err = RemoveServers(ctx, dao, setID, []string{
152154
"https://example.com/v0/servers/server1/versions/0.1.0",
153155
})
154-
assert.NoError(t, err)
156+
require.NoError(t, err)
155157

156-
dbSet, err = dao.GetWorkingSet(ctx, setId)
157-
assert.NoError(t, err)
158+
dbSet, err = dao.GetWorkingSet(ctx, setID)
159+
require.NoError(t, err)
158160

159-
assert.Len(t, dbSet.Servers, 0)
161+
assert.Empty(t, dbSet.Servers)
160162
}
161163

162164
func TestRemoveMultipleServersFromWorkingSet(t *testing.T) {
163165
dao := setupTestDB(t)
164166
ctx := t.Context()
165167

166-
var workingSetId = "test-set"
168+
workingSetID := "test-set"
167169

168-
var servers = []string{
170+
servers := []string{
169171
"docker://myimage:latest",
170172
"docker://anotherimage:v1.0",
171173
}
172174

173-
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetId, "My Test Set", servers)
175+
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetID, "My Test Set", servers)
174176
require.NoError(t, err)
175177

176-
dbSet, err := dao.GetWorkingSet(ctx, workingSetId)
178+
dbSet, err := dao.GetWorkingSet(ctx, workingSetID)
179+
require.NoError(t, err)
177180
assert.Len(t, dbSet.Servers, 2)
178181

179-
err = RemoveServers(ctx, dao, workingSetId, servers)
182+
err = RemoveServers(ctx, dao, workingSetID, servers)
180183
require.NoError(t, err)
181184

182-
dbSet, err = dao.GetWorkingSet(ctx, workingSetId)
185+
dbSet, err = dao.GetWorkingSet(ctx, workingSetID)
183186
require.NoError(t, err)
184-
assert.Len(t, dbSet.Servers, 0)
187+
assert.Empty(t, dbSet.Servers)
185188
}
186189

187190
func TestRemoveOneOfManyServerFromWorkingSet(t *testing.T) {
188191
dao := setupTestDB(t)
189192
ctx := t.Context()
190193

191-
var workingSetId = "test-set"
194+
workingSetID := "test-set"
192195

193-
var servers = []string{
196+
servers := []string{
194197
"docker://myimage:latest",
195198
"docker://anotherimage:v1.0",
196199
}
197200

198-
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetId, "My Test Set", servers)
201+
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetID, "My Test Set", servers)
199202
require.NoError(t, err)
200203

201-
dbSet, err := dao.GetWorkingSet(ctx, workingSetId)
204+
dbSet, err := dao.GetWorkingSet(ctx, workingSetID)
205+
require.NoError(t, err)
202206
assert.Len(t, dbSet.Servers, 2)
203207

204-
err = RemoveServers(ctx, dao, workingSetId, []string{servers[0]})
208+
err = RemoveServers(ctx, dao, workingSetID, []string{servers[0]})
205209
require.NoError(t, err)
206210

207-
dbSet, err = dao.GetWorkingSet(ctx, workingSetId)
211+
dbSet, err = dao.GetWorkingSet(ctx, workingSetID)
208212
require.NoError(t, err)
209213
assert.Len(t, dbSet.Servers, 1)
210214
assert.Equal(t, "anotherimage:v1.0", dbSet.Servers[0].Image)
@@ -214,45 +218,46 @@ func TestRemoveMixTypeServerFromWorkingSet(t *testing.T) {
214218
dao := setupTestDB(t)
215219
ctx := t.Context()
216220

217-
var workingSetId = "test-set"
221+
workingSetID := "test-set"
218222

219-
var servers = []string{
223+
servers := []string{
220224
"docker://myimage:latest",
221225
"https://example.com/v0/servers/server1",
222226
}
223227

224-
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetId, "My Test Set", servers)
228+
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetID, "My Test Set", servers)
225229
require.NoError(t, err)
226230

227-
dbSet, err := dao.GetWorkingSet(ctx, workingSetId)
231+
dbSet, err := dao.GetWorkingSet(ctx, workingSetID)
232+
require.NoError(t, err)
228233
assert.Len(t, dbSet.Servers, 2)
229234

230-
err = RemoveServers(ctx, dao, workingSetId, []string{
235+
err = RemoveServers(ctx, dao, workingSetID, []string{
231236
"docker://myimage:latest",
232237
"https://example.com/v0/servers/server1/versions/0.1.0",
233238
})
234239
require.NoError(t, err)
235240

236-
dbSet, err = dao.GetWorkingSet(ctx, workingSetId)
241+
dbSet, err = dao.GetWorkingSet(ctx, workingSetID)
237242
require.NoError(t, err)
238-
assert.Len(t, dbSet.Servers, 0)
243+
assert.Empty(t, dbSet.Servers)
239244
}
240245

241246
func TestRemoveNoServersFromWorkingSet(t *testing.T) {
242247
dao := setupTestDB(t)
243248
ctx := t.Context()
244249

245-
var workingSetId = "test-set"
250+
workingSetID := "test-set"
246251

247-
var servers = []string{
252+
servers := []string{
248253
"docker://myimage:latest",
249254
"https://example.com/v0/servers/server1",
250255
}
251256

252-
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetId, "My Test Set", servers)
257+
err := Create(ctx, dao, getMockRegistryClient(), getMockOciService(), workingSetID, "My Test Set", servers)
253258
require.NoError(t, err)
254259

255-
err = RemoveServers(ctx, dao, workingSetId, []string{})
260+
err = RemoveServers(ctx, dao, workingSetID, []string{})
256261
require.Error(t, err)
257262
assert.Contains(t, err.Error(), oneServerError)
258263
}

0 commit comments

Comments
 (0)