Skip to content
This repository was archived by the owner on Sep 9, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions internal/cmd/service/start/grpcserver/start_grpc_server_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,34 @@ func (c *runnerContext) run(cmd *cobra.Command, argv []string) error {
}
privatev1.RegisterClusterTemplatesServer(grpcServer, privateClusterTemplatesServer)

// Create the private cluster catalog items server:
c.logger.InfoContext(ctx, "Creating private cluster catalog items server")
privateClusterCatalogItemsServer, err := servers.NewPrivateClusterCatalogItemsServer().
SetLogger(c.logger).
SetNotifier(notifier).
SetAttributionLogic(privateAttributionLogic).
SetTenancyLogic(tenancyLogic).
SetMetricsRegisterer(metricsRegisterer).
Build()
if err != nil {
return fmt.Errorf("failed to create private cluster catalog items server: %w", err)
}
privatev1.RegisterClusterCatalogItemsServer(grpcServer, privateClusterCatalogItemsServer)

// Create the private compute instance catalog items server:
c.logger.InfoContext(ctx, "Creating private compute instance catalog items server")
privateComputeInstanceCatalogItemsServer, err := servers.NewPrivateComputeInstanceCatalogItemsServer().
SetLogger(c.logger).
SetNotifier(notifier).
SetAttributionLogic(privateAttributionLogic).
SetTenancyLogic(tenancyLogic).
SetMetricsRegisterer(metricsRegisterer).
Build()
if err != nil {
return fmt.Errorf("failed to create private compute instance catalog items server: %w", err)
}
privatev1.RegisterComputeInstanceCatalogItemsServer(grpcServer, privateComputeInstanceCatalogItemsServer)

// Create the runtime scheme for typed OSAC API objects:
hubScheme, err := hubscheme.NewHub()
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ func (c *runnerContext) run(cmd *cobra.Command, argv []string) error {
if err != nil {
return err
}
err = privatev1.RegisterClusterCatalogItemsHandler(ctx, gatewayMux, c.grpcClient)
if err != nil {
return err
}
err = privatev1.RegisterClustersHandler(ctx, gatewayMux, c.grpcClient)
if err != nil {
return err
Expand All @@ -231,6 +235,10 @@ func (c *runnerContext) run(cmd *cobra.Command, argv []string) error {
if err != nil {
return err
}
err = privatev1.RegisterComputeInstanceCatalogItemsHandler(ctx, gatewayMux, c.grpcClient)
if err != nil {
return err
}
err = privatev1.RegisterComputeInstancesHandler(ctx, gatewayMux, c.grpcClient)
if err != nil {
return err
Expand Down
4 changes: 4 additions & 0 deletions internal/servers/generic_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,10 @@ func (s *GenericServer[O]) setPayload(event *privatev1.Event, object proto.Messa
event.SetRoleBinding(object)
case *privatev1.Project:
event.SetProject(object)
case *privatev1.ClusterCatalogItem:
event.SetClusterCatalogItem(object)
case *privatev1.ComputeInstanceCatalogItem:
event.SetComputeInstanceCatalogItem(object)
default:
return fmt.Errorf("unknown object type '%T'", object)
}
Expand Down
137 changes: 137 additions & 0 deletions internal/servers/private_cluster_catalog_items_server.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
/*
Copyright (c) 2025 Red Hat Inc.

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License.
*/

package servers

import (
"context"
"errors"
"log/slog"

"github.com/prometheus/client_golang/prometheus"

privatev1 "github.com/osac-project/fulfillment-service/internal/api/osac/private/v1"
"github.com/osac-project/fulfillment-service/internal/auth"
"github.com/osac-project/fulfillment-service/internal/database"
)

type PrivateClusterCatalogItemsServerBuilder struct {
logger *slog.Logger
notifier *database.Notifier
attributionLogic auth.AttributionLogic
tenancyLogic auth.TenancyLogic
metricsRegisterer prometheus.Registerer
}

var _ privatev1.ClusterCatalogItemsServer = (*PrivateClusterCatalogItemsServer)(nil)

type PrivateClusterCatalogItemsServer struct {
privatev1.UnimplementedClusterCatalogItemsServer
logger *slog.Logger
generic *GenericServer[*privatev1.ClusterCatalogItem]
}

func NewPrivateClusterCatalogItemsServer() *PrivateClusterCatalogItemsServerBuilder {
return &PrivateClusterCatalogItemsServerBuilder{}
}

func (b *PrivateClusterCatalogItemsServerBuilder) SetLogger(value *slog.Logger) *PrivateClusterCatalogItemsServerBuilder {
b.logger = value
return b
}

func (b *PrivateClusterCatalogItemsServerBuilder) SetNotifier(
value *database.Notifier) *PrivateClusterCatalogItemsServerBuilder {
b.notifier = value
return b
}

func (b *PrivateClusterCatalogItemsServerBuilder) SetAttributionLogic(value auth.AttributionLogic) *PrivateClusterCatalogItemsServerBuilder {
b.attributionLogic = value
return b
}

func (b *PrivateClusterCatalogItemsServerBuilder) SetTenancyLogic(value auth.TenancyLogic) *PrivateClusterCatalogItemsServerBuilder {
b.tenancyLogic = value
return b
}

func (b *PrivateClusterCatalogItemsServerBuilder) SetMetricsRegisterer(value prometheus.Registerer) *PrivateClusterCatalogItemsServerBuilder {
b.metricsRegisterer = value
return b
}

func (b *PrivateClusterCatalogItemsServerBuilder) Build() (result *PrivateClusterCatalogItemsServer, err error) {
if b.logger == nil {
err = errors.New("logger is mandatory")
return
}
if b.tenancyLogic == nil {
err = errors.New("tenancy logic is mandatory")
return
}

generic, err := NewGenericServer[*privatev1.ClusterCatalogItem]().
SetLogger(b.logger).
SetService(privatev1.ClusterCatalogItems_ServiceDesc.ServiceName).
SetNotifier(b.notifier).
SetAttributionLogic(b.attributionLogic).
SetTenancyLogic(b.tenancyLogic).
SetMetricsRegisterer(b.metricsRegisterer).
Build()
if err != nil {
return
}

result = &PrivateClusterCatalogItemsServer{
logger: b.logger,
generic: generic,
}
return
}

func (s *PrivateClusterCatalogItemsServer) List(ctx context.Context,
request *privatev1.ClusterCatalogItemsListRequest) (response *privatev1.ClusterCatalogItemsListResponse, err error) {
err = s.generic.List(ctx, request, &response)
return
}

func (s *PrivateClusterCatalogItemsServer) Get(ctx context.Context,
request *privatev1.ClusterCatalogItemsGetRequest) (response *privatev1.ClusterCatalogItemsGetResponse, err error) {
err = s.generic.Get(ctx, request, &response)
return
}

func (s *PrivateClusterCatalogItemsServer) Create(ctx context.Context,
request *privatev1.ClusterCatalogItemsCreateRequest) (response *privatev1.ClusterCatalogItemsCreateResponse, err error) {
err = s.generic.Create(ctx, request, &response)
return
}

func (s *PrivateClusterCatalogItemsServer) Update(ctx context.Context,
request *privatev1.ClusterCatalogItemsUpdateRequest) (response *privatev1.ClusterCatalogItemsUpdateResponse, err error) {
err = s.generic.Update(ctx, request, &response)
return
}

func (s *PrivateClusterCatalogItemsServer) Delete(ctx context.Context,
request *privatev1.ClusterCatalogItemsDeleteRequest) (response *privatev1.ClusterCatalogItemsDeleteResponse, err error) {
err = s.generic.Delete(ctx, request, &response)
return
}

func (s *PrivateClusterCatalogItemsServer) Signal(ctx context.Context,
request *privatev1.ClusterCatalogItemsSignalRequest) (response *privatev1.ClusterCatalogItemsSignalResponse, err error) {
err = s.generic.Signal(ctx, request, &response)
return
}
Loading
Loading