Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitade3543

Browse files
committed
fix: allow startup scripts larger than 32k
1 parent4d63a47 commitade3543

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

‎coderd/workspaceagentsrpc_test.go

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package coderd_test
2+
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/require"
7+
8+
agentproto"github.com/coder/coder/v2/agent/proto"
9+
"github.com/coder/coder/v2/coderd/coderdtest"
10+
"github.com/coder/coder/v2/coderd/database"
11+
"github.com/coder/coder/v2/coderd/database/dbfake"
12+
"github.com/coder/coder/v2/codersdk/agentsdk"
13+
"github.com/coder/coder/v2/provisionersdk/proto"
14+
"github.com/coder/coder/v2/testutil"
15+
)
16+
17+
funcTestAgentAPI_LargeManifest(t*testing.T) {
18+
t.Parallel()
19+
ctx:=testutil.Context(t,testutil.WaitLong)
20+
client,store:=coderdtest.NewWithDatabase(t,nil)
21+
adminUser:=coderdtest.CreateFirstUser(t,client)
22+
n:=512000
23+
longScript:=make([]byte,n)
24+
fori:=rangelongScript {
25+
longScript[i]='q'
26+
}
27+
r:=dbfake.WorkspaceBuild(t,store, database.Workspace{
28+
OrganizationID:adminUser.OrganizationID,
29+
OwnerID:adminUser.UserID,
30+
}).WithAgent(func(agents []*proto.Agent) []*proto.Agent {
31+
agents[0].Scripts= []*proto.Script{
32+
{
33+
Script:string(longScript),
34+
},
35+
}
36+
returnagents
37+
}).Do()
38+
ac:=agentsdk.New(client.URL)
39+
ac.SetSessionToken(r.AgentToken)
40+
conn,err:=ac.ConnectRPC(ctx)
41+
deferfunc() {
42+
_=conn.Close()
43+
}()
44+
require.NoError(t,err)
45+
agentAPI:=agentproto.NewDRPCAgentClient(conn)
46+
manifest,err:=agentAPI.GetManifest(ctx,&agentproto.GetManifestRequest{})
47+
require.NoError(t,err)
48+
require.Len(t,manifest.Scripts,1)
49+
require.Len(t,manifest.Scripts[0].Script,n)
50+
}

‎codersdk/agentsdk/agentsdk.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,9 @@ func (c *wsNetConn) Close() error {
629629
// during read or write will cancel the context, but not close the
630630
// conn. Close should be called to release context resources.
631631
funcwebsocketNetConn(ctx context.Context,conn*websocket.Conn,msgType websocket.MessageType) (context.Context, net.Conn) {
632+
// Set the read limit to 4 MiB -- about the limit for protobufs. This needs to be larger than
633+
// the default because some of our protocols can include large messages like startup scripts.
634+
conn.SetReadLimit(1<<22)
632635
ctx,cancel:=context.WithCancel(ctx)
633636
nc:=websocket.NetConn(ctx,conn,msgType)
634637
returnctx,&wsNetConn{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp