Skip to content

Commit c274941

Browse files
ryanulitryanulit
committed
add tests file back in and use replace to test predefined optional_uuid rule
1 parent a3b8afd commit c274941

File tree

4 files changed

+849
-118
lines changed

4 files changed

+849
-118
lines changed

‎service/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ go 1.24.0
44

55
toolchain go1.24.2
66

7+
replace github.com/opentdf/platform/protocol/go => github.com/opentdf/platform/protocol/go v0.2.30-0.20250414201322-c5be08e46927
8+
79
require (
810
connectrpc.com/connect v1.18.1
911
connectrpc.com/grpchealth v1.3.0

‎service/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ github.com/opentdf/platform/lib/flattening v0.1.3 h1:IuOm/wJVXNrzOV676Ticgr0wyBk
279279
github.com/opentdf/platform/lib/flattening v0.1.3/go.mod h1:Gs/T+6FGZKk9OAdz2Jf1R8CTGeNRYrq1lZGDeYT3hrY=
280280
github.com/opentdf/platform/lib/ocrypto v0.1.9 h1:GvgPB7CoK7JmWvsSvJ0hc+RC0wezgcuRpy3q2oYKjdA=
281281
github.com/opentdf/platform/lib/ocrypto v0.1.9/go.mod h1:UTtqh8mvhAYA+sEnaMxpr/406e84L5Q1sAxtKGIXfu4=
282-
github.com/opentdf/platform/protocol/go v0.2.29 h1:2L/uylxl49ALIqQwg4wmVEfxeUozM3ITpFuahmbHJ+U=
283-
github.com/opentdf/platform/protocol/go v0.2.29/go.mod h1:eldxqX2oF2ADtG8ivhfwn1lALVMX4aaUM+Lp9ynOJXs=
282+
github.com/opentdf/platform/protocol/go v0.2.30-0.20250414201322-c5be08e46927 h1:Ng444vIh6WJeP1cyZSV+SqIBMl7asOXV5qehZ3oib+s=
283+
github.com/opentdf/platform/protocol/go v0.2.30-0.20250414201322-c5be08e46927/go.mod h1:4W2L2IFWRQqzHVTXfbgtNrS41oU7iJf6rSs4Yp2OLkc=
284284
github.com/opentdf/platform/sdk v0.3.29 h1:ihTauf25sdgBKwBvK4GzFktSVINDLnwNch7xpLt88AY=
285285
github.com/opentdf/platform/sdk v0.3.29/go.mod h1:GeN7MqqIwop5sMBAPGR28ZIKXSOHAHaECma/ppsXoiw=
286286
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=

‎service/policy/registeredresources/registered_resources.go‎

Lines changed: 119 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,121 @@
11
package registeredresources
22

3-
import (
4-
"context"
5-
"errors"
6-
"fmt"
7-
"log/slog"
8-
9-
"connectrpc.com/connect"
10-
"github.com/opentdf/platform/protocol/go/policy/registeredresources"
11-
"github.com/opentdf/platform/protocol/go/policy/registeredresources/registeredresourcesconnect"
12-
"github.com/opentdf/platform/service/logger"
13-
"github.com/opentdf/platform/service/pkg/config"
14-
"github.com/opentdf/platform/service/pkg/serviceregistry"
15-
policyconfig "github.com/opentdf/platform/service/policy/config"
16-
policydb "github.com/opentdf/platform/service/policy/db"
17-
)
18-
19-
type RegisteredResourcesService struct { //nolint:revive // RegisteredResourcesService is a valid name
20-
dbClient policydb.PolicyDBClient
21-
logger *logger.Logger
22-
config *policyconfig.Config
23-
}
24-
25-
func OnConfigUpdate(s *RegisteredResourcesService) serviceregistry.OnConfigUpdateHook {
26-
return func(_ context.Context, cfg config.ServiceConfig) error {
27-
sharedCfg, err := policyconfig.GetSharedPolicyConfig(cfg)
28-
if err != nil {
29-
return fmt.Errorf("failed to get shared policy config: %w", err)
30-
}
31-
s.config = sharedCfg
32-
s.dbClient = policydb.NewClient(s.dbClient.Client, s.logger, int32(sharedCfg.ListRequestLimitMax), int32(sharedCfg.ListRequestLimitDefault))
33-
34-
s.logger.Info("registered resources service config reloaded")
35-
36-
return nil
37-
}
38-
}
39-
40-
func NewRegistration(ns string, dbRegister serviceregistry.DBRegister) *serviceregistry.Service[registeredresourcesconnect.RegisteredResourcesServiceHandler] {
41-
rrService := new(RegisteredResourcesService)
42-
onUpdateConfigHook := OnConfigUpdate(rrService)
43-
return &serviceregistry.Service[registeredresourcesconnect.RegisteredResourcesServiceHandler]{
44-
ServiceOptions: serviceregistry.ServiceOptions[registeredresourcesconnect.RegisteredResourcesServiceHandler]{
45-
Namespace: ns,
46-
DB: dbRegister,
47-
ServiceDesc: &registeredresources.RegisteredResourcesService_ServiceDesc,
48-
ConnectRPCFunc: registeredresourcesconnect.NewRegisteredResourcesServiceHandler,
49-
OnConfigUpdate: onUpdateConfigHook,
50-
RegisterFunc: func(srp serviceregistry.RegistrationParams) (registeredresourcesconnect.RegisteredResourcesServiceHandler, serviceregistry.HandlerServer) {
51-
logger := srp.Logger
52-
cfg, err := policyconfig.GetSharedPolicyConfig(srp.Config)
53-
if err != nil {
54-
logger.Error("error getting registered resources service policy config", slog.String("error", err.Error()))
55-
panic(err)
56-
}
57-
58-
rrService.logger = logger
59-
rrService.dbClient = policydb.NewClient(srp.DBClient, logger, int32(cfg.ListRequestLimitMax), int32(cfg.ListRequestLimitDefault))
60-
rrService.config = cfg
61-
return rrService, nil
62-
},
63-
},
64-
}
65-
}
66-
67-
func (s RegisteredResourcesService) IsReady(ctx context.Context) error {
68-
s.logger.TraceContext(ctx, "checking readiness of registered resources service")
69-
if err := s.dbClient.SQLDB.PingContext(ctx); err != nil {
70-
return err
71-
}
72-
73-
return nil
74-
}
75-
76-
/// Registered Resources Handlers
77-
78-
func (s RegisteredResourcesService) CreateRegisteredResource(context.Context, *connect.Request[registeredresources.CreateRegisteredResourceRequest]) (*connect.Response[registeredresources.CreateRegisteredResourceResponse], error) {
79-
return nil, errors.New("not implemented")
80-
}
81-
82-
func (s RegisteredResourcesService) GetRegisteredResource(context.Context, *connect.Request[registeredresources.GetRegisteredResourceRequest]) (*connect.Response[registeredresources.GetRegisteredResourceResponse], error) {
83-
return nil, errors.New("not implemented")
84-
}
85-
86-
func (s RegisteredResourcesService) ListRegisteredResources(context.Context, *connect.Request[registeredresources.ListRegisteredResourcesRequest]) (*connect.Response[registeredresources.ListRegisteredResourcesResponse], error) {
87-
return nil, errors.New("not implemented")
88-
}
89-
90-
func (s RegisteredResourcesService) UpdateRegisteredResource(context.Context, *connect.Request[registeredresources.UpdateRegisteredResourceRequest]) (*connect.Response[registeredresources.UpdateRegisteredResourceResponse], error) {
91-
return nil, errors.New("not implemented")
92-
}
93-
94-
func (s RegisteredResourcesService) DeleteRegisteredResource(context.Context, *connect.Request[registeredresources.DeleteRegisteredResourceRequest]) (*connect.Response[registeredresources.DeleteRegisteredResourceResponse], error) {
95-
return nil, errors.New("not implemented")
96-
}
97-
98-
/// Registered Resource Values Handlers
99-
100-
func (s RegisteredResourcesService) CreateRegisteredResourceValue(context.Context, *connect.Request[registeredresources.CreateRegisteredResourceValueRequest]) (*connect.Response[registeredresources.CreateRegisteredResourceValueResponse], error) {
101-
return nil, errors.New("not implemented")
102-
}
103-
104-
func (s RegisteredResourcesService) GetRegisteredResourceValue(context.Context, *connect.Request[registeredresources.GetRegisteredResourceValueRequest]) (*connect.Response[registeredresources.GetRegisteredResourceValueResponse], error) {
105-
return nil, errors.New("not implemented")
106-
}
107-
108-
func (s RegisteredResourcesService) ListRegisteredResourceValues(context.Context, *connect.Request[registeredresources.ListRegisteredResourceValuesRequest]) (*connect.Response[registeredresources.ListRegisteredResourceValuesResponse], error) {
109-
return nil, errors.New("not implemented")
110-
}
111-
112-
func (s RegisteredResourcesService) UpdateRegisteredResourceValue(context.Context, *connect.Request[registeredresources.UpdateRegisteredResourceValueRequest]) (*connect.Response[registeredresources.UpdateRegisteredResourceValueResponse], error) {
113-
return nil, errors.New("not implemented")
114-
}
115-
116-
func (s RegisteredResourcesService) DeleteRegisteredResourceValue(context.Context, *connect.Request[registeredresources.DeleteRegisteredResourceValueRequest]) (*connect.Response[registeredresources.DeleteRegisteredResourceValueResponse], error) {
117-
return nil, errors.New("not implemented")
118-
}
3+
// TODO:
4+
// Uncomment this once the protocol/go package is no longer being replaced and available for import
5+
6+
// import (
7+
// "context"
8+
// "errors"
9+
// "fmt"
10+
// "log/slog"
11+
12+
// "connectrpc.com/connect"
13+
// "github.com/opentdf/platform/protocol/go/policy/registeredresources"
14+
// "github.com/opentdf/platform/protocol/go/policy/registeredresources/registeredresourcesconnect"
15+
// "github.com/opentdf/platform/service/logger"
16+
// "github.com/opentdf/platform/service/pkg/config"
17+
// "github.com/opentdf/platform/service/pkg/serviceregistry"
18+
// policyconfig "github.com/opentdf/platform/service/policy/config"
19+
// policydb "github.com/opentdf/platform/service/policy/db"
20+
// )
21+
22+
// type RegisteredResourcesService struct { //nolint:revive // RegisteredResourcesService is a valid name
23+
// dbClient policydb.PolicyDBClient
24+
// logger *logger.Logger
25+
// config *policyconfig.Config
26+
// }
27+
28+
// func OnConfigUpdate(s *RegisteredResourcesService) serviceregistry.OnConfigUpdateHook {
29+
// return func(_ context.Context, cfg config.ServiceConfig) error {
30+
// sharedCfg, err := policyconfig.GetSharedPolicyConfig(cfg)
31+
// if err != nil {
32+
// return fmt.Errorf("failed to get shared policy config: %w", err)
33+
// }
34+
// s.config = sharedCfg
35+
// s.dbClient = policydb.NewClient(s.dbClient.Client, s.logger, int32(sharedCfg.ListRequestLimitMax), int32(sharedCfg.ListRequestLimitDefault))
36+
37+
// s.logger.Info("registered resources service config reloaded")
38+
39+
// return nil
40+
// }
41+
// }
42+
43+
// func NewRegistration(ns string, dbRegister serviceregistry.DBRegister) *serviceregistry.Service[registeredresourcesconnect.RegisteredResourcesServiceHandler] {
44+
// rrService := new(RegisteredResourcesService)
45+
// onUpdateConfigHook := OnConfigUpdate(rrService)
46+
// return &serviceregistry.Service[registeredresourcesconnect.RegisteredResourcesServiceHandler]{
47+
// ServiceOptions: serviceregistry.ServiceOptions[registeredresourcesconnect.RegisteredResourcesServiceHandler]{
48+
// Namespace: ns,
49+
// DB: dbRegister,
50+
// ServiceDesc: &registeredresources.RegisteredResourcesService_ServiceDesc,
51+
// ConnectRPCFunc: registeredresourcesconnect.NewRegisteredResourcesServiceHandler,
52+
// OnConfigUpdate: onUpdateConfigHook,
53+
// RegisterFunc: func(srp serviceregistry.RegistrationParams) (registeredresourcesconnect.RegisteredResourcesServiceHandler, serviceregistry.HandlerServer) {
54+
// logger := srp.Logger
55+
// cfg, err := policyconfig.GetSharedPolicyConfig(srp.Config)
56+
// if err != nil {
57+
// logger.Error("error getting registered resources service policy config", slog.String("error", err.Error()))
58+
// panic(err)
59+
// }
60+
61+
// rrService.logger = logger
62+
// rrService.dbClient = policydb.NewClient(srp.DBClient, logger, int32(cfg.ListRequestLimitMax), int32(cfg.ListRequestLimitDefault))
63+
// rrService.config = cfg
64+
// return rrService, nil
65+
// },
66+
// },
67+
// }
68+
// }
69+
70+
// func (s RegisteredResourcesService) IsReady(ctx context.Context) error {
71+
// s.logger.TraceContext(ctx, "checking readiness of registered resources service")
72+
// if err := s.dbClient.SQLDB.PingContext(ctx); err != nil {
73+
// return err
74+
// }
75+
76+
// return nil
77+
// }
78+
79+
// /// Registered Resources Handlers
80+
81+
// func (s RegisteredResourcesService) CreateRegisteredResource(context.Context, *connect.Request[registeredresources.CreateRegisteredResourceRequest]) (*connect.Response[registeredresources.CreateRegisteredResourceResponse], error) {
82+
// return nil, errors.New("not implemented")
83+
// }
84+
85+
// func (s RegisteredResourcesService) GetRegisteredResource(context.Context, *connect.Request[registeredresources.GetRegisteredResourceRequest]) (*connect.Response[registeredresources.GetRegisteredResourceResponse], error) {
86+
// return nil, errors.New("not implemented")
87+
// }
88+
89+
// func (s RegisteredResourcesService) ListRegisteredResources(context.Context, *connect.Request[registeredresources.ListRegisteredResourcesRequest]) (*connect.Response[registeredresources.ListRegisteredResourcesResponse], error) {
90+
// return nil, errors.New("not implemented")
91+
// }
92+
93+
// func (s RegisteredResourcesService) UpdateRegisteredResource(context.Context, *connect.Request[registeredresources.UpdateRegisteredResourceRequest]) (*connect.Response[registeredresources.UpdateRegisteredResourceResponse], error) {
94+
// return nil, errors.New("not implemented")
95+
// }
96+
97+
// func (s RegisteredResourcesService) DeleteRegisteredResource(context.Context, *connect.Request[registeredresources.DeleteRegisteredResourceRequest]) (*connect.Response[registeredresources.DeleteRegisteredResourceResponse], error) {
98+
// return nil, errors.New("not implemented")
99+
// }
100+
101+
// /// Registered Resource Values Handlers
102+
103+
// func (s RegisteredResourcesService) CreateRegisteredResourceValue(context.Context, *connect.Request[registeredresources.CreateRegisteredResourceValueRequest]) (*connect.Response[registeredresources.CreateRegisteredResourceValueResponse], error) {
104+
// return nil, errors.New("not implemented")
105+
// }
106+
107+
// func (s RegisteredResourcesService) GetRegisteredResourceValue(context.Context, *connect.Request[registeredresources.GetRegisteredResourceValueRequest]) (*connect.Response[registeredresources.GetRegisteredResourceValueResponse], error) {
108+
// return nil, errors.New("not implemented")
109+
// }
110+
111+
// func (s RegisteredResourcesService) ListRegisteredResourceValues(context.Context, *connect.Request[registeredresources.ListRegisteredResourceValuesRequest]) (*connect.Response[registeredresources.ListRegisteredResourceValuesResponse], error) {
112+
// return nil, errors.New("not implemented")
113+
// }
114+
115+
// func (s RegisteredResourcesService) UpdateRegisteredResourceValue(context.Context, *connect.Request[registeredresources.UpdateRegisteredResourceValueRequest]) (*connect.Response[registeredresources.UpdateRegisteredResourceValueResponse], error) {
116+
// return nil, errors.New("not implemented")
117+
// }
118+
119+
// func (s RegisteredResourcesService) DeleteRegisteredResourceValue(context.Context, *connect.Request[registeredresources.DeleteRegisteredResourceValueRequest]) (*connect.Response[registeredresources.DeleteRegisteredResourceValueResponse], error) {
120+
// return nil, errors.New("not implemented")
121+
// }

0 commit comments

Comments
 (0)