Skip to content

Handle permission denied errors from the API #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charithe merged 2 commits into from
Jun 24, 2026
Merged

Handle permission denied errors from the API #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cfbfe0
Handle permission denied errors from the API
charithe Jun 24, 2026
db39dcb
Shorten error message
charithe Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bundle/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ var (
ErrDownloadFailed = errors.New("download failed")
ErrNoSegmentDownloadURL = errors.New("no download URLs")
ErrInvalidResponse = errors.New("invalid response from server")
ErrPermissionDenied = errors.New("permission denied")
ErrStreamEnded = errors.New("stream ended")
)

Expand Down
28 changes: 20 additions & 8 deletions bundle/v2/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,14 @@ func (c *Client) GetBundle(ctx context.Context, source Source) (string, bundlev2
resp, err := c.rpcClient.GetBundle(ctx, connect.NewRequest(&bundlev2.GetBundleRequest{PdpId: c.PDPIdentifier, Source: source.ToProto(), BundleType: &c.bundleType}))
if err != nil {
log.Error(err, "GetBundle RPC failed")
return "", bundlev2.BundleType_BUNDLE_TYPE_UNSPECIFIED, nil, err
switch connect.CodeOf(err) {
case connect.CodeNotFound:
return "", bundlev2.BundleType_BUNDLE_TYPE_UNSPECIFIED, nil, bundle.ErrBundleNotFound
case connect.CodePermissionDenied:
return "", bundlev2.BundleType_BUNDLE_TYPE_UNSPECIFIED, nil, bundle.ErrPermissionDenied
default:
return "", bundlev2.BundleType_BUNDLE_TYPE_UNSPECIFIED, nil, err
}
}

base.LogResponsePayload(log, resp.Msg)
Expand Down Expand Up @@ -318,15 +325,20 @@ func (c *Client) watchStreamRecv(stream *connect.BidiStreamForClient[bundlev2.Wa
return r.err
}

if connect.CodeOf(r.err) == connect.CodeNotFound {
switch connect.CodeOf(r.err) {
case connect.CodeNotFound:
log.V(1).Error(r.err, "Label does not exist")
_ = publishWatchEvent(bundle.ServerEvent{Kind: bundle.ServerEventError, Error: bundle.ErrBundleNotFound})
return bundle.ErrBundleNotFound
case connect.CodePermissionDenied:
log.V(1).Error(r.err, "Permission denied")
_ = publishWatchEvent(bundle.ServerEvent{Kind: bundle.ServerEventError, Error: bundle.ErrPermissionDenied})
return bundle.ErrPermissionDenied
default:
log.V(1).Error(r.err, "Error receiving message")
_ = publishWatchEvent(bundle.ServerEvent{Kind: bundle.ServerEventError, Error: r.err})
return r.err
}

log.V(1).Error(r.err, "Error receiving message")
_ = publishWatchEvent(bundle.ServerEvent{Kind: bundle.ServerEventError, Error: r.err})
return r.err
}

if r.msg != nil {
Expand Down Expand Up @@ -448,7 +460,7 @@ func (c *Client) getBundleFile(ctx context.Context, binfo *bundlev2.BundleInfo)
return "", err
}

bdlCacheKey := *((*cache.ActionID)(binfo.OutputHash))
bdlCacheKey := *(*cache.ActionID)(binfo.OutputHash)
defer func() {
if outErr == nil && outPath != "" {
source, err := sourceFromProto(binfo.GetSource())
Expand Down Expand Up @@ -580,7 +592,7 @@ func (c *Client) GetCachedBundle(source Source) (string, error) {
return "", fmt.Errorf("no cache entry for %s: %w", source, err)
}

bdlCacheKey := *((*cache.ActionID)(entry))
bdlCacheKey := *(*cache.ActionID)(entry)
bdlEntry, err := c.cache.Get(bdlCacheKey)
if err != nil {
return "", fmt.Errorf("failed to find bundle in cache: %w", err)
Expand Down