Skip to content

Make v2 client unconditionally request rule table bundles #419

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
haines merged 1 commit into from
Jun 24, 2026
Merged

Make v2 client unconditionally request rule table bundles #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 2 additions & 5 deletions bundle/client_conf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ import (
"os"

"go.uber.org/multierr"

bundlev2 "github.com/cerbos/cloud-api/genpb/cerbos/cloud/bundle/v2"
)

type ClientConf struct {
CacheDir string
TempDir string
BundleType bundlev2.BundleType
CacheDir string
TempDir string
}

func (cc ClientConf) Validate() (outErr error) {
Expand Down
20 changes: 11 additions & 9 deletions bundle/v2/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ type Client struct {
rpcClient bundlev2connect.CerbosBundleServiceClient
cache *clientcache.ClientCache
base.Client
bundleType bundlev2.BundleType
}

func NewClient(conf bundle.ClientConf, baseClient base.Client, options []connect.ClientOption) (*Client, error) {
Expand All @@ -47,10 +46,9 @@ func NewClient(conf bundle.ClientConf, baseClient base.Client, options []connect

httpClient := baseClient.StdHTTPClient() // Bidi streams don't work with retryable HTTP client.
return &Client{
Client: baseClient,
rpcClient: bundlev2connect.NewCerbosBundleServiceClient(httpClient, baseClient.APIEndpoint, options...),
cache: c,
bundleType: conf.BundleType,
Client: baseClient,
rpcClient: bundlev2connect.NewCerbosBundleServiceClient(httpClient, baseClient.APIEndpoint, options...),
cache: c,
}, nil
}

Expand All @@ -59,7 +57,7 @@ func (c *Client) BootstrapBundle(ctx context.Context, source Source) (string, bu

log.V(1).Info("Getting bootstrap bundle response")

urlPath, err := source.bootstrapBundleURLPath(c.Credentials, c.bundleType)
urlPath, err := source.bootstrapBundleURLPath(c.Credentials)
if err != nil {
return "", bundlev2.BundleType_BUNDLE_TYPE_UNSPECIFIED, nil, err
}
Expand Down Expand Up @@ -146,7 +144,11 @@ func (c *Client) GetBundle(ctx context.Context, source Source) (string, bundlev2
log := c.Logger.WithValues("source", source.String())
log.V(1).Info("Calling GetBundle RPC")

resp, err := c.rpcClient.GetBundle(ctx, connect.NewRequest(&bundlev2.GetBundleRequest{PdpId: c.PDPIdentifier, Source: source.ToProto(), BundleType: &c.bundleType}))
resp, err := c.rpcClient.GetBundle(ctx, connect.NewRequest(&bundlev2.GetBundleRequest{
PdpId: c.PDPIdentifier,
Source: source.ToProto(),
BundleType: bundlev2.BundleType_BUNDLE_TYPE_RULE_TABLE.Enum(),
}))
if err != nil {
log.Error(err, "GetBundle RPC failed")
switch connect.CodeOf(err) {
Expand Down Expand Up @@ -395,7 +397,7 @@ func (c *Client) watchStreamSend(stream *connect.BidiStreamForClient[bundlev2.Wa
Msg: &bundlev2.WatchBundleRequest_Start_{
Start: &bundlev2.WatchBundleRequest_Start{
Source: wh.Source.ToProto(),
BundleType: &c.bundleType,
BundleType: bundlev2.BundleType_BUNDLE_TYPE_RULE_TABLE.Enum(),
},
},
}); err != nil {
Expand All @@ -411,7 +413,7 @@ func (c *Client) watchStreamSend(stream *connect.BidiStreamForClient[bundlev2.Wa
Heartbeat: &bundlev2.WatchBundleRequest_Heartbeat{
Timestamp: timestamppb.Now(),
ActiveBundleId: activeBundleID,
BundleType: &c.bundleType,
BundleType: bundlev2.BundleType_BUNDLE_TYPE_RULE_TABLE.Enum(),
},
},
}); err != nil {
Expand Down
Loading