Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 369cb18

Browse files
committed
fix: allow startup scripts larger than 32k
1 parent 4d63a47 commit 369cb18

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

coderd/workspaceagentsrpc_test.go

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package coderd_test
2+
3+
import (
4+
"context"
5+
"testing"
6+
7+
"github.com/stretchr/testify/require"
8+
9+
agentproto "github.com/coder/coder/v2/agent/proto"
10+
"github.com/coder/coder/v2/coderd/coderdtest"
11+
"github.com/coder/coder/v2/coderd/database"
12+
"github.com/coder/coder/v2/coderd/database/dbfake"
13+
"github.com/coder/coder/v2/codersdk/agentsdk"
14+
"github.com/coder/coder/v2/provisionersdk/proto"
15+
)
16+
17+
func TestAgentAPI_LargeManifest(t *testing.T) {
18+
t.Parallel()
19+
ctx := context.Background()
20+
client, store := coderdtest.NewWithDatabase(t, nil)
21+
adminUser := coderdtest.CreateFirstUser(t, client)
22+
n := 512000
23+
longScript := make([]byte, n)
24+
for i := range longScript {
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+
return agents
37+
}).Do()
38+
ac := agentsdk.New(client.URL)
39+
ac.SetSessionToken(r.AgentToken)
40+
conn, err := ac.ConnectRPC(ctx)
41+
defer conn.Close()
42+
require.NoError(t, err)
43+
agentAPI := agentproto.NewDRPCAgentClient(conn)
44+
manifest, err := agentAPI.GetManifest(ctx, &agentproto.GetManifestRequest{})
45+
require.NoError(t, err)
46+
require.Len(t, manifest.Scripts, 1)
47+
require.Len(t, manifest.Scripts[0].Script, n)
48+
}

codersdk/agentsdk/agentsdk.go

+1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ func (c *Client) ConnectRPC(ctx context.Context) (drpc.Conn, error) {
202202
}
203203
return nil, codersdk.ReadBodyAsError(res)
204204
}
205+
conn.SetReadLimit(1 << 22) // 4 MiB -- about the limit for protobufs
205206

206207
_, wsNetConn := websocketNetConn(ctx, conn, websocket.MessageBinary)
207208

0 commit comments

Comments
 (0)