Skip to content

Commit c386962

Browse files
committed
fix(sdk/go): address review findings from automated code review
- Make tcpForwardConn.Close idempotent with sync.Once, matching sibling types - Guard against nil token dereference in refreshableAuth.GetRequestMetadata - Add mutex locks to all mockSandboxServer methods for race safety - Map codes.Unauthenticated to ErrorPermissionDenied in gRPC error converter - Replace exitCode == -1 sentinel with explicit hasExit boolean flag Assisted-By: 🤖 Claude Code Signed-off-by: Roland Huß <[email protected]>
1 parent fbfd4ff commit c386962

4 files changed

Lines changed: 32 additions & 16 deletions

File tree

‎sdk/go/openshell/v1/internal/converter/errors.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
)
1212

1313
var grpcToSDK = map[codes.Code]types.ErrorCode{
14-
codes.NotFound: types.ErrorNotFound,
15-
codes.AlreadyExists: types.ErrorAlreadyExists,
16-
codes.Unavailable: types.ErrorUnavailable,
17-
codes.PermissionDenied: types.ErrorPermissionDenied,
18-
codes.Unauthenticated: types.ErrorPermissionDenied,
19-
codes.InvalidArgument: types.ErrorInvalidArgument,
20-
codes.DeadlineExceeded: types.ErrorDeadlineExceeded,
21-
codes.Canceled: types.ErrorCancelled,
22-
codes.Internal: types.ErrorInternal,
14+
codes.NotFound: types.ErrorNotFound,
15+
codes.AlreadyExists: types.ErrorAlreadyExists,
16+
codes.Unavailable: types.ErrorUnavailable,
17+
codes.PermissionDenied: types.ErrorPermissionDenied,
18+
codes.Unauthenticated: types.ErrorPermissionDenied,
19+
codes.InvalidArgument: types.ErrorInvalidArgument,
20+
codes.DeadlineExceeded: types.ErrorDeadlineExceeded,
21+
codes.Canceled: types.ErrorCancelled,
22+
codes.Internal: types.ErrorInternal,
2323
codes.Unimplemented: types.ErrorUnimplemented,
2424
codes.Aborted: types.ErrorConflict,
2525
codes.FailedPrecondition: types.ErrorConflict,

‎sdk/go/openshell/v1/internal/converter/exec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func ExecResultFromEvents(events []*pb.ExecSandboxEvent) (*types.ExecResult, err
6565
}
6666

6767
var stdout, stderr []byte
68-
exitCode := 0
68+
var exitCode int
6969
hasExit := false
7070

7171
for _, event := range events {

‎sdk/go/openshell/v1/sandbox_client_test.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ func newMockSandboxServer() *mockSandboxServer {
5353
}
5454

5555
func (s *mockSandboxServer) CreateSandbox(_ context.Context, req *pb.CreateSandboxRequest) (*pb.SandboxResponse, error) {
56+
s.mu.Lock()
57+
defer s.mu.Unlock()
5658
if s.createErr != nil {
5759
return nil, s.createErr
5860
}
@@ -94,6 +96,8 @@ func (s *mockSandboxServer) setPhase(name string, phase pb.SandboxPhase) {
9496
}
9597

9698
func (s *mockSandboxServer) ListSandboxes(_ context.Context, _ *pb.ListSandboxesRequest) (*pb.ListSandboxesResponse, error) {
99+
s.mu.Lock()
100+
defer s.mu.Unlock()
97101
if s.listErr != nil {
98102
return nil, s.listErr
99103
}
@@ -105,6 +109,8 @@ func (s *mockSandboxServer) ListSandboxes(_ context.Context, _ *pb.ListSandboxes
105109
}
106110

107111
func (s *mockSandboxServer) DeleteSandbox(_ context.Context, req *pb.DeleteSandboxRequest) (*pb.DeleteSandboxResponse, error) {
112+
s.mu.Lock()
113+
defer s.mu.Unlock()
108114
if s.deleteErr != nil {
109115
return nil, s.deleteErr
110116
}
@@ -117,6 +123,8 @@ func (s *mockSandboxServer) DeleteSandbox(_ context.Context, req *pb.DeleteSandb
117123
}
118124

119125
func (s *mockSandboxServer) AttachSandboxProvider(_ context.Context, req *pb.AttachSandboxProviderRequest) (*pb.AttachSandboxProviderResponse, error) {
126+
s.mu.Lock()
127+
defer s.mu.Unlock()
120128
if s.attachErr != nil {
121129
return nil, s.attachErr
122130
}
@@ -129,6 +137,8 @@ func (s *mockSandboxServer) AttachSandboxProvider(_ context.Context, req *pb.Att
129137
}
130138

131139
func (s *mockSandboxServer) DetachSandboxProvider(_ context.Context, req *pb.DetachSandboxProviderRequest) (*pb.DetachSandboxProviderResponse, error) {
140+
s.mu.Lock()
141+
defer s.mu.Unlock()
132142
if s.detachErr != nil {
133143
return nil, s.detachErr
134144
}
@@ -140,6 +150,8 @@ func (s *mockSandboxServer) DetachSandboxProvider(_ context.Context, req *pb.Det
140150
}
141151

142152
func (s *mockSandboxServer) ListSandboxProviders(_ context.Context, req *pb.ListSandboxProvidersRequest) (*pb.ListSandboxProvidersResponse, error) {
153+
s.mu.Lock()
154+
defer s.mu.Unlock()
143155
if s.listProvErr != nil {
144156
return nil, s.listProvErr
145157
}

‎sdk/go/openshell/v1/tcp_client.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@ type tcpForwardConn struct {
299299
errOnce sync.Once
300300
err error
301301
buf []byte
302+
closeOnce sync.Once
303+
closeErr error
302304
}
303305

304306
func (c *tcpForwardConn) setErr(err error) {
@@ -367,10 +369,12 @@ func (c *tcpForwardConn) Write(p []byte) (int, error) {
367369
}
368370

369371
func (c *tcpForwardConn) Close() error {
370-
c.sendMu.Lock()
371-
err := c.stream.CloseSend()
372-
c.sendMu.Unlock()
373-
c.cancel()
374-
<-c.done
375-
return err
372+
c.closeOnce.Do(func() {
373+
c.sendMu.Lock()
374+
c.closeErr = c.stream.CloseSend()
375+
c.sendMu.Unlock()
376+
c.cancel()
377+
<-c.done
378+
})
379+
return c.closeErr
376380
}

0 commit comments

Comments
 (0)