Skip to content

Dataplane Roles API #1750

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
bojand merged 14 commits into from
May 6, 2025
Merged

Dataplane Roles API #1750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3651b72
backend: initial add of v1 dataplane api proto and setup for security…
Apr 30, 2025
f514da7
backend: update permissions for viewer roles API
Apr 30, 2025
c1ce050
backend: update permissions for viewer roles API
Apr 30, 2025
d7215ae
backend: register cloud storage service and security service into gat…
May 1, 2025
d7ecabc
backend: register cloud storage service and security service into gat…
May 1, 2025
b65b709
frontend, proto: make console security service embed the dataplane se…
May 1, 2025
6cb4a13
Merge branch 'master' into bd/dataplane_api_roles
May 2, 2025
e8e6482
backend: add nolint comments
May 2, 2025
93cfb14
frontend: fix roles query to use new embedded structure
May 2, 2025
4ba717a
frontend: fix newRole in RoleForm
May 2, 2025
18283ee
proto: pin buf.build/redpandadata/common
May 2, 2025
3c4c92c
frontend: remove unused imports
May 2, 2025
f07cea8
proto: make all security api permissions admin, fix proto taskfile
May 5, 2025
72e8fa4
proto: make all security api permissions admin in console service
May 5, 2025
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
19 changes: 17 additions & 2 deletions backend/pkg/api/routes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ func (api *API) setupConnectWithGRPCGateway(r chi.Router) {
dataplanev1connect.TransformServiceName: transformSvcV1,
dataplanev1connect.KafkaConnectServiceName: kafkaConnectSvcV1,
dataplanev1connect.CloudStorageServiceName: dataplanev1connect.UnimplementedCloudStorageServiceHandler{},
dataplanev1connect.SecurityServiceName: dataplanev1connect.UnimplementedSecurityServiceHandler{},
},
})

Expand Down Expand Up @@ -260,8 +261,9 @@ func (api *API) setupConnectWithGRPCGateway(r chi.Router) {
kafkaConnectSvcPathV1Alpha2, kafkaConnectSvcHandlerV1Alpha2 := dataplanev1alpha2connect.NewKafkaConnectServiceHandler(
hookOutput.Services[dataplanev1alpha2connect.KafkaConnectServiceName].(dataplanev1alpha2connect.KafkaConnectServiceHandler),
connect.WithInterceptors(hookOutput.Interceptors...))
cloudStorageSvcV1Alpha2 := hookOutput.Services[dataplanev1alpha2connect.CloudStorageServiceName].(dataplanev1alpha2connect.CloudStorageServiceHandler) //nolint:revive // we control the map
cloudStorageSvcPathV1Alpha2, cloudStorageSvcHandlerV1Alpha2 := dataplanev1alpha2connect.NewCloudStorageServiceHandler(
hookOutput.Services[dataplanev1alpha2connect.CloudStorageServiceName].(dataplanev1alpha2connect.CloudStorageServiceHandler),
cloudStorageSvcV1Alpha2,
connect.WithInterceptors(hookOutput.Interceptors...))

// v1
Expand All @@ -281,8 +283,13 @@ func (api *API) setupConnectWithGRPCGateway(r chi.Router) {
kafkaConnectSvcPathV1, kafkaConnectSvcHandlerV1 := dataplanev1connect.NewKafkaConnectServiceHandler(
hookOutput.Services[dataplanev1connect.KafkaConnectServiceName].(dataplanev1connect.KafkaConnectServiceHandler),
connect.WithInterceptors(hookOutput.Interceptors...))
cloudStorageSvcV1 := hookOutput.Services[dataplanev1connect.CloudStorageServiceName].(dataplanev1connect.CloudStorageServiceHandler) //nolint:revive // we control the map
cloudStorageSvcPathV1, cloudStorageSvcHandlerV1 := dataplanev1connect.NewCloudStorageServiceHandler(
hookOutput.Services[dataplanev1connect.CloudStorageServiceName].(dataplanev1connect.CloudStorageServiceHandler),
cloudStorageSvcV1,
connect.WithInterceptors(hookOutput.Interceptors...))
securitySvcV1 := hookOutput.Services[dataplanev1connect.SecurityServiceName].(dataplanev1connect.SecurityServiceHandler) //nolint:revive // we control the map
securitySvcPathV1, securitySvcHandlerV1 := dataplanev1connect.NewSecurityServiceHandler(
securitySvcV1,
connect.WithInterceptors(hookOutput.Interceptors...))

ossServices := []ConnectService{
Expand Down Expand Up @@ -406,6 +413,11 @@ func (api *API) setupConnectWithGRPCGateway(r chi.Router) {
MountPath: consoleSecretsServicePath,
Handler: consoleSecretsServiceHandler,
},
{
ServiceName: dataplanev1connect.SecurityServiceName,
MountPath: securitySvcPathV1,
Handler: securitySvcHandlerV1,
},
}

// Order matters. OSS services first, so Enterprise handlers override OSS.
Expand Down Expand Up @@ -434,6 +446,7 @@ func (api *API) setupConnectWithGRPCGateway(r chi.Router) {
dataplanev1alpha2connect.RegisterUserServiceHandlerGatewayServer(gwMux, userSvcV1alpha2, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1alpha2connect.RegisterTransformServiceHandlerGatewayServer(gwMux, transformSvcV1alpha2, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1alpha2connect.RegisterKafkaConnectServiceHandlerGatewayServer(gwMux, kafkaConnectSvcV1alpha2, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1alpha2connect.RegisterCloudStorageServiceHandlerGatewayServer(gwMux, cloudStorageSvcV1Alpha2, connectgateway.WithInterceptors(hookOutput.Interceptors...))
Copy link
Copy Markdown
Contributor Author

@bojand bojand May 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like a bug and omission where never registered cloud storage API with gateway mux?


// v1

Expand All @@ -442,6 +455,8 @@ func (api *API) setupConnectWithGRPCGateway(r chi.Router) {
dataplanev1connect.RegisterUserServiceHandlerGatewayServer(gwMux, userSvcV1, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1connect.RegisterTransformServiceHandlerGatewayServer(gwMux, transformSvcV1, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1connect.RegisterKafkaConnectServiceHandlerGatewayServer(gwMux, kafkaConnectSvcV1, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1connect.RegisterCloudStorageServiceHandlerGatewayServer(gwMux, cloudStorageSvcV1, connectgateway.WithInterceptors(hookOutput.Interceptors...))
dataplanev1connect.RegisterSecurityServiceHandlerGatewayServer(gwMux, securitySvcV1, connectgateway.WithInterceptors(hookOutput.Interceptors...))

// mount

Expand Down
Loading
Loading