Skip to content

Commit bae956a

Browse files
ibetitsmikeibetitsmike
committed
chore: fixed slim build failing
1 parent 0b03f24 commit bae956a

File tree

5 files changed

+56
-30
lines changed

5 files changed

+56
-30
lines changed

‎agent/api.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/go-chi/chi/v5"
99
"github.com/google/uuid"
1010

11-
"github.com/coder/coder/v2/coderd/agentapi"
11+
"github.com/coder/coder/v2/agent/immortalstreams"
1212
"github.com/coder/coder/v2/coderd/httpapi"
1313
"github.com/coder/coder/v2/codersdk"
1414
)
@@ -69,7 +69,7 @@ func (a *agent) apiHandler() http.Handler {
6969

7070
// Mount immortal streams API
7171
if a.immortalStreamsManager != nil {
72-
immortalStreamsHandler := agentapi.NewImmortalStreamsHandler(a.logger, a.immortalStreamsManager)
72+
immortalStreamsHandler := immortalstreams.NewHandler(a.logger, a.immortalStreamsManager)
7373
r.Mount("/api/v0/immortal-stream", immortalStreamsHandler.Routes())
7474
}
7575

‎coderd/agentapi/immortalstreams.go renamed to ‎agent/immortalstreams/handler.go

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package agentapi
1+
package immortalstreams
22

33
import (
44
"context"
@@ -12,28 +12,27 @@ import (
1212
"golang.org/x/xerrors"
1313

1414
"cdr.dev/slog"
15-
"github.com/coder/coder/v2/agent/immortalstreams"
1615
"github.com/coder/coder/v2/coderd/httpapi"
1716
"github.com/coder/coder/v2/codersdk"
1817
"github.com/coder/websocket"
1918
)
2019

21-
// ImmortalStreamsHandler handles immortal stream requests
22-
type ImmortalStreamsHandler struct {
20+
// Handler handles immortal stream requests
21+
type Handler struct {
2322
logger slog.Logger
24-
manager *immortalstreams.Manager
23+
manager *Manager
2524
}
2625

27-
// NewImmortalStreamsHandler creates a new immortal streams handler
28-
func NewImmortalStreamsHandler(logger slog.Logger, manager *immortalstreams.Manager) *ImmortalStreamsHandler {
29-
return &ImmortalStreamsHandler{
26+
// NewHandler creates a new immortal streams handler
27+
func NewHandler(logger slog.Logger, manager *Manager) *Handler {
28+
return &Handler{
3029
logger: logger,
3130
manager: manager,
3231
}
3332
}
3433

3534
// Routes registers the immortal streams routes
36-
func (h *ImmortalStreamsHandler) Routes() chi.Router {
35+
func (h *Handler) Routes() chi.Router {
3736
r := chi.NewRouter()
3837

3938
r.Post("/", h.createStream)
@@ -48,7 +47,7 @@ func (h *ImmortalStreamsHandler) Routes() chi.Router {
4847
}
4948

5049
// streamMiddleware validates and extracts the stream ID
51-
func (*ImmortalStreamsHandler) streamMiddleware(next http.Handler) http.Handler {
50+
func (*Handler) streamMiddleware(next http.Handler) http.Handler {
5251
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
5352
streamIDStr := chi.URLParam(r, "streamID")
5453
streamID, err := uuid.Parse(streamIDStr)
@@ -65,7 +64,7 @@ func (*ImmortalStreamsHandler) streamMiddleware(next http.Handler) http.Handler
6564
}
6665

6766
// createStream creates a new immortal stream
68-
func (h *ImmortalStreamsHandler) createStream(w http.ResponseWriter, r *http.Request) {
67+
func (h *Handler) createStream(w http.ResponseWriter, r *http.Request) {
6968
ctx := r.Context()
7069

7170
var req codersdk.CreateImmortalStreamRequest
@@ -95,14 +94,14 @@ func (h *ImmortalStreamsHandler) createStream(w http.ResponseWriter, r *http.Req
9594
}
9695

9796
// listStreams lists all immortal streams
98-
func (h *ImmortalStreamsHandler) listStreams(w http.ResponseWriter, r *http.Request) {
97+
func (h *Handler) listStreams(w http.ResponseWriter, r *http.Request) {
9998
ctx := r.Context()
10099
streams := h.manager.ListStreams()
101100
httpapi.Write(ctx, w, http.StatusOK, streams)
102101
}
103102

104103
// handleStreamRequest handles GET requests for a specific stream and returns stream info or handles WebSocket upgrades
105-
func (h *ImmortalStreamsHandler) handleStreamRequest(w http.ResponseWriter, r *http.Request) {
104+
func (h *Handler) handleStreamRequest(w http.ResponseWriter, r *http.Request) {
106105
ctx := r.Context()
107106
streamID := getStreamID(ctx)
108107

@@ -125,7 +124,7 @@ func (h *ImmortalStreamsHandler) handleStreamRequest(w http.ResponseWriter, r *h
125124
}
126125

127126
// deleteStream deletes a stream
128-
func (h *ImmortalStreamsHandler) deleteStream(w http.ResponseWriter, r *http.Request) {
127+
func (h *Handler) deleteStream(w http.ResponseWriter, r *http.Request) {
129128
ctx := r.Context()
130129
streamID := getStreamID(ctx)
131130

@@ -145,7 +144,7 @@ func (h *ImmortalStreamsHandler) deleteStream(w http.ResponseWriter, r *http.Req
145144
}
146145

147146
// handleUpgrade handles WebSocket upgrade for immortal stream connections
148-
func (h *ImmortalStreamsHandler) handleUpgrade(w http.ResponseWriter, r *http.Request) {
147+
func (h *Handler) handleUpgrade(w http.ResponseWriter, r *http.Request) {
149148
ctx := r.Context()
150149
streamID := getStreamID(ctx)
151150

‎coderd/agentapi/immortalstreams_test.go renamed to ‎agent/immortalstreams/handler_test.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package agentapi_test
1+
package immortalstreams_test
22

33
import (
44
"bytes"
@@ -18,7 +18,6 @@ import (
1818

1919
"cdr.dev/slog/sloggers/slogtest"
2020
"github.com/coder/coder/v2/agent/immortalstreams"
21-
"github.com/coder/coder/v2/coderd/agentapi"
2221
"github.com/coder/coder/v2/codersdk"
2322
"github.com/coder/coder/v2/testutil"
2423
"github.com/coder/websocket"
@@ -55,11 +54,11 @@ func TestImmortalStreamsHandler_CreateStream(t *testing.T) {
5554
}()
5655

5756
// Create handler
58-
dialer := &testDialer{}
57+
dialer := &handlerTestDialer{}
5958
manager := immortalstreams.New(logger, dialer)
6059
defer manager.Close()
6160

62-
handler := agentapi.NewImmortalStreamsHandler(logger, manager)
61+
handler := immortalstreams.NewHandler(logger, manager)
6362
router := chi.NewRouter()
6463
router.Mount("/api/v0/immortal-stream", handler.Routes())
6564

@@ -100,11 +99,11 @@ func TestImmortalStreamsHandler_CreateStream(t *testing.T) {
10099
logger := slogtest.Make(t, nil)
101100

102101
// Create handler
103-
dialer := &testDialer{}
102+
dialer := &handlerTestDialer{}
104103
manager := immortalstreams.New(logger, dialer)
105104
defer manager.Close()
106105

107-
handler := agentapi.NewImmortalStreamsHandler(logger, manager)
106+
handler := immortalstreams.NewHandler(logger, manager)
108107
router := chi.NewRouter()
109108
router.Mount("/api/v0/immortal-stream", handler.Routes())
110109

@@ -165,7 +164,7 @@ func TestImmortalStreamsHandler_ListStreams(t *testing.T) {
165164
manager := immortalstreams.New(logger, dialer)
166165
defer manager.Close()
167166

168-
handler := agentapi.NewImmortalStreamsHandler(logger, manager)
167+
handler := immortalstreams.NewHandler(logger, manager)
169168
router := chi.NewRouter()
170169
router.Mount("/api/v0/immortal-stream", handler.Routes())
171170

@@ -244,7 +243,7 @@ func TestImmortalStreamsHandler_GetStream(t *testing.T) {
244243
manager := immortalstreams.New(logger, dialer)
245244
defer manager.Close()
246245

247-
handler := agentapi.NewImmortalStreamsHandler(logger, manager)
246+
handler := immortalstreams.NewHandler(logger, manager)
248247
router := chi.NewRouter()
249248
router.Mount("/api/v0/immortal-stream", handler.Routes())
250249

@@ -311,7 +310,7 @@ func TestImmortalStreamsHandler_DeleteStream(t *testing.T) {
311310
manager := immortalstreams.New(logger, dialer)
312311
defer manager.Close()
313312

314-
handler := agentapi.NewImmortalStreamsHandler(logger, manager)
313+
handler := immortalstreams.NewHandler(logger, manager)
315314
router := chi.NewRouter()
316315
router.Mount("/api/v0/immortal-stream", handler.Routes())
317316

@@ -375,7 +374,7 @@ func TestImmortalStreamsHandler_Upgrade(t *testing.T) {
375374
manager := immortalstreams.New(logger, dialer)
376375
defer manager.Close()
377376

378-
handler := agentapi.NewImmortalStreamsHandler(logger, manager)
377+
handler := immortalstreams.NewHandler(logger, manager)
379378

380379
// Create a test server
381380
server := httptest.NewServer(handler.Routes())
@@ -420,8 +419,8 @@ func TestImmortalStreamsHandler_Upgrade(t *testing.T) {
420419

421420
// Test helpers
422421

423-
type testDialer struct{}
422+
type handlerTestDialer struct{}
424423

425-
func (*testDialer) DialContext(_ context.Context, network, address string) (net.Conn, error) {
424+
func (*handlerTestDialer) DialContext(_ context.Context, network, address string) (net.Conn, error) {
426425
return net.Dial(network, address)
427426
}

‎agent/immortalstreams/stream.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"golang.org/x/xerrors"
1212

1313
"cdr.dev/slog"
14-
"github.com/coder/coder/v2/coderd/agentapi/backedpipe"
14+
"github.com/coder/coder/v2/agent/immortalstreams/backedpipe"
1515
"github.com/coder/coder/v2/codersdk"
1616
)
1717

‎site/src/api/typesGenerated.ts

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy