Skip to content

Commit ea70e8f

Browse files
committed
Apply suggestions from code review
1 parent 9102c1b commit ea70e8f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

hivesim/hive.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ func (sim *Simulation) StartSharedClient(testSuite SuiteID, clientType string, o
215215
return "", nil, errors.New("StartSharedClient is not supported in docs mode")
216216
}
217217
var (
218-
url = fmt.Sprintf("%s/testsuite/%d/shared-client", sim.url, testSuite)
218+
url = fmt.Sprintf("%s/testsuite/%d/node", sim.url, testSuite)
219219
resp simapi.StartNodeResponse
220220
)
221221

@@ -249,7 +249,7 @@ func (sim *Simulation) GetSharedClientInfo(testSuite SuiteID, clientID string) (
249249
return nil, errors.New("GetSharedClientInfo is not supported in docs mode")
250250
}
251251
var (
252-
url = fmt.Sprintf("%s/testsuite/%d/shared-client/%s", sim.url, testSuite, clientID)
252+
url = fmt.Sprintf("%s/testsuite/%d/node/%s", sim.url, testSuite, clientID)
253253
resp SharedClientInfo
254254
)
255255
err := get(url, &resp)
@@ -263,7 +263,7 @@ func (sim *Simulation) GetClientLogOffset(testSuite SuiteID, clientID string) (i
263263
return 0, errors.New("GetClientLogOffset is not supported in docs mode")
264264
}
265265
var (
266-
url = fmt.Sprintf("%s/testsuite/%d/shared-client/%s/log-offset", sim.url, testSuite, clientID)
266+
url = fmt.Sprintf("%s/testsuite/%d/node/%s/log-offset", sim.url, testSuite, clientID)
267267
resp int64
268268
)
269269
err := get(url, &resp)
@@ -276,7 +276,7 @@ func (sim *Simulation) ExecSharedClient(testSuite SuiteID, clientID string, cmd
276276
return nil, errors.New("ExecSharedClient is not supported in docs mode")
277277
}
278278
var (
279-
url = fmt.Sprintf("%s/testsuite/%d/shared-client/%s/exec", sim.url, testSuite, clientID)
279+
url = fmt.Sprintf("%s/testsuite/%d/node/%s/exec", sim.url, testSuite, clientID)
280280
req = &simapi.ExecRequest{Command: cmd}
281281
resp *ExecInfo
282282
)

hivesim/shared_client_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ func TestStartSharedClient(t *testing.T) {
2121
case "/testsuite":
2222
// StartSuite
2323
json.NewEncoder(w).Encode(0) // Return suite ID
24-
case "/testsuite/0/shared-client":
24+
case "/testsuite/0/node":
2525
// StartSharedClient
2626
json.NewEncoder(w).Encode(simapi.StartNodeResponse{
2727
ID: "container1",
2828
IP: "192.0.2.1",
2929
})
30-
case "/testsuite/0/shared-client/container1":
30+
case "/testsuite/0/node/container1":
3131
// GetSharedClientInfo
3232
json.NewEncoder(w).Encode(simapi.NodeResponse{
3333
ID: "container1",
@@ -148,18 +148,18 @@ func TestSharedClientLogOffset(t *testing.T) {
148148
case "/testsuite":
149149
// StartSuite
150150
json.NewEncoder(w).Encode(0) // Return suite ID
151-
case "/testsuite/0/shared-client":
151+
case "/testsuite/0/node":
152152
// StartSharedClient
153153
json.NewEncoder(w).Encode(simapi.StartNodeResponse{
154154
ID: "container1",
155155
IP: "192.0.2.1",
156156
})
157-
case "/testsuite/0/shared-client/container1/log-offset":
157+
case "/testsuite/0/node/container1/log-offset":
158158
// GetClientLogOffset - increment the offset each time it's called
159159
currentOffset := offsetValue
160160
offsetValue += 100 // Simulate log growth
161161
json.NewEncoder(w).Encode(currentOffset)
162-
case "/testsuite/0/shared-client/container1/exec":
162+
case "/testsuite/0/node/container1/exec":
163163
// ExecSharedClient
164164
json.NewEncoder(w).Encode(&ExecInfo{
165165
Stdout: "test output",
@@ -254,13 +254,13 @@ func TestGetClientLogOffset(t *testing.T) {
254254
case "/testsuite":
255255
// StartSuite
256256
json.NewEncoder(w).Encode(0) // Return suite ID
257-
case "/testsuite/0/shared-client":
257+
case "/testsuite/0/node":
258258
// StartSharedClient
259259
json.NewEncoder(w).Encode(simapi.StartNodeResponse{
260260
ID: "container1",
261261
IP: "192.0.2.1",
262262
})
263-
case "/testsuite/0/shared-client/container1/log-offset":
263+
case "/testsuite/0/node/container1/log-offset":
264264
// GetClientLogOffset
265265
json.NewEncoder(w).Encode(int64(0)) // Initial log offset
266266
default:

internal/libhive/api.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ func newSimulationAPI(b ContainerBackend, env SimEnv, tm *TestManager, hive Hive
4343
router.HandleFunc("/testsuite/{suite}/test/{test}", api.endTest).Methods("POST")
4444

4545
// Shared client routes
46-
router.HandleFunc("/testsuite/{suite}/shared-client", api.startSharedClient).Methods("POST")
47-
router.HandleFunc("/testsuite/{suite}/shared-client/{node}", api.getSharedClientInfo).Methods("GET")
48-
router.HandleFunc("/testsuite/{suite}/shared-client/{node}/log-offset", api.getSharedClientLogOffset).Methods("GET")
49-
router.HandleFunc("/testsuite/{suite}/shared-client/{node}/exec", api.execInSharedClient).Methods("POST")
50-
router.HandleFunc("/testsuite/{suite}/shared-client/{node}", api.stopSharedClient).Methods("DELETE")
46+
router.HandleFunc("/testsuite/{suite}/node", api.startSharedClient).Methods("POST")
47+
router.HandleFunc("/testsuite/{suite}/node/{node}", api.getSharedClientInfo).Methods("GET")
48+
router.HandleFunc("/testsuite/{suite}/node/{node}/log-offset", api.getSharedClientLogOffset).Methods("GET")
49+
router.HandleFunc("/testsuite/{suite}/node/{node}/exec", api.execInSharedClient).Methods("POST")
50+
router.HandleFunc("/testsuite/{suite}/node/{node}", api.stopSharedClient).Methods("DELETE")
5151

5252
// Regular client routes
5353
router.HandleFunc("/testsuite/{suite}/test/{test}/node/{node}/exec", api.execInClient).Methods("POST")

0 commit comments

Comments
 (0)