From e6dc4c65d46445c09efb5a60fc7c1799d4162fcd Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Tue, 15 Jul 2025 20:31:44 -0700 Subject: [PATCH] make internal service fields private --- pkg/cmds/serve.go | 6 ++---- pkg/service_internal/mapfixes.go | 14 +++++++------- pkg/service_internal/operations.go | 2 +- pkg/service_internal/script_policy.go | 6 +++--- pkg/service_internal/scripts.go | 6 +++--- pkg/service_internal/service_internal.go | 10 +++++++++- pkg/service_internal/submissions.go | 16 ++++++++-------- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/pkg/cmds/serve.go b/pkg/cmds/serve.go index f937679..8fc2499 100644 --- a/pkg/cmds/serve.go +++ b/pkg/cmds/serve.go @@ -159,11 +159,9 @@ func serve(ctx *cli.Context) error { log.WithError(err).Fatal("failed to initialize api server") } - svc_internal := &service_internal.Service{ - Inner: svc_inner, - } + svc_internal := service_internal.MakeService(&svc_inner) - srv_internal, err := internal.NewServer(svc_internal, internal.WithPathPrefix("/v1")) + srv_internal, err := internal.NewServer(&svc_internal, internal.WithPathPrefix("/v1")) if err != nil { log.WithError(err).Fatal("failed to initialize api server") } diff --git a/pkg/service_internal/mapfixes.go b/pkg/service_internal/mapfixes.go index 5da4912..2eef92a 100644 --- a/pkg/service_internal/mapfixes.go +++ b/pkg/service_internal/mapfixes.go @@ -53,7 +53,7 @@ func (svc *Service) UpdateMapfixValidatedModel(ctx context.Context, params inter ValidatedModelVersion: ValidatedModelVersion, } - return svc.Inner.CreateAuditEventChangeValidatedModel( + return svc.inner.CreateAuditEventChangeValidatedModel( ctx, ValidtorUserID, model.Resource{ @@ -87,7 +87,7 @@ func (svc *Service) ActionMapfixSubmitted(ctx context.Context, params internal.A TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -117,7 +117,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params inter TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -160,7 +160,7 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.Ac TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -190,7 +190,7 @@ func (svc *Service) ActionMapfixUploaded(ctx context.Context, params internal.Ac TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -211,7 +211,7 @@ func (svc *Service) CreateMapfixAuditError(ctx context.Context, params internal. Error: params.ErrorMessage, } - return svc.Inner.CreateAuditEventError( + return svc.inner.CreateAuditEventError( ctx, ValidtorUserID, model.Resource{ @@ -241,7 +241,7 @@ func (svc *Service) CreateMapfixAuditCheckList(ctx context.Context, check_list i CheckList: check_list2, } - return svc.Inner.CreateAuditEventCheckList( + return svc.inner.CreateAuditEventCheckList( ctx, ValidtorUserID, model.Resource{ diff --git a/pkg/service_internal/operations.go b/pkg/service_internal/operations.go index b5c59f6..ed255d6 100644 --- a/pkg/service_internal/operations.go +++ b/pkg/service_internal/operations.go @@ -18,5 +18,5 @@ func (svc *Service) ActionOperationFailed(ctx context.Context, params internal.A model.OperationStatusFailed, params.StatusMessage, ) - return svc.Inner.FailOperation(ctx, params.OperationID, fail_params) + return svc.inner.FailOperation(ctx, params.OperationID, fail_params) } diff --git a/pkg/service_internal/script_policy.go b/pkg/service_internal/script_policy.go index c11bdd3..c37bfd2 100644 --- a/pkg/service_internal/script_policy.go +++ b/pkg/service_internal/script_policy.go @@ -14,14 +14,14 @@ import ( // // POST /script-policy func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ScriptPolicyID, error) { - from_script, err := svc.Inner.GetScript(ctx, req.FromScriptID) + from_script, err := svc.inner.GetScript(ctx, req.FromScriptID) if err != nil { return nil, err } // the existence of ToScriptID does not need to be validated because it's checked by a foreign key constraint. - script, err := svc.Inner.CreateScriptPolicy(ctx, model.ScriptPolicy{ + script, err := svc.inner.CreateScriptPolicy(ctx, model.ScriptPolicy{ ID: 0, FromScriptHash: from_script.Hash, ToScriptID: req.ToScriptID, @@ -59,7 +59,7 @@ func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptP policy, policy_ok, ) - items, err := svc.Inner.ListScriptPolicies(ctx, filter, model.Page{ + items, err := svc.inner.ListScriptPolicies(ctx, filter, model.Page{ Number: params.Page, Size: params.Limit, }) diff --git a/pkg/service_internal/scripts.go b/pkg/service_internal/scripts.go index d3d8d40..df66902 100644 --- a/pkg/service_internal/scripts.go +++ b/pkg/service_internal/scripts.go @@ -14,7 +14,7 @@ import ( // // POST /scripts func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ScriptID, error) { - script, err := svc.Inner.CreateScript(ctx, model.Script{ + script, err := svc.inner.CreateScript(ctx, model.Script{ ID: 0, Name: req.Name, Hash: int64(model.HashSource(req.Source)), @@ -58,7 +58,7 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam resource_id, resource_id_ok, ) - items, err := svc.Inner.ListScripts(ctx, filter, model.Page{ + items, err := svc.inner.ListScripts(ctx, filter, model.Page{ Number: params.Page, Size: params.Limit, }) @@ -87,7 +87,7 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam // // GET /scripts/{ScriptID} func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) { - script, err := svc.Inner.GetScript(ctx, params.ScriptID) + script, err := svc.inner.GetScript(ctx, params.ScriptID) if err != nil { return nil, err } diff --git a/pkg/service_internal/service_internal.go b/pkg/service_internal/service_internal.go index a4edce8..c803dc6 100644 --- a/pkg/service_internal/service_internal.go +++ b/pkg/service_internal/service_internal.go @@ -19,7 +19,15 @@ var ( ) type Service struct { - Inner *service_inner.Service + inner *service_inner.Service +} + +func MakeService( + inner *service_inner.Service, +) Service { + return Service{ + inner: inner, + } } // yay duplicate code diff --git a/pkg/service_internal/submissions.go b/pkg/service_internal/submissions.go index f6e12a2..435baf6 100644 --- a/pkg/service_internal/submissions.go +++ b/pkg/service_internal/submissions.go @@ -53,7 +53,7 @@ func (svc *Service) UpdateSubmissionValidatedModel(ctx context.Context, params i ValidatedModelVersion: ValidatedModelVersion, } - return svc.Inner.CreateAuditEventChangeValidatedModel( + return svc.inner.CreateAuditEventChangeValidatedModel( ctx, ValidtorUserID, model.Resource{ @@ -87,7 +87,7 @@ func (svc *Service) ActionSubmissionSubmitted(ctx context.Context, params intern TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -118,7 +118,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params i TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -148,7 +148,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params intern TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -179,7 +179,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params interna TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -210,7 +210,7 @@ func (svc *Service) ActionSubmissionUploaded(ctx context.Context, params interna TargetStatus: uint32(target_status), } - return svc.Inner.CreateAuditEventAction( + return svc.inner.CreateAuditEventAction( ctx, ValidtorUserID, model.Resource{ @@ -231,7 +231,7 @@ func (svc *Service) CreateSubmissionAuditError(ctx context.Context, params inter Error: params.ErrorMessage, } - return svc.Inner.CreateAuditEventError( + return svc.inner.CreateAuditEventError( ctx, ValidtorUserID, model.Resource{ @@ -261,7 +261,7 @@ func (svc *Service) CreateSubmissionAuditCheckList(ctx context.Context, check_li CheckList: check_list2, } - return svc.Inner.CreateAuditEventCheckList( + return svc.inner.CreateAuditEventCheckList( ctx, ValidtorUserID, model.Resource{