From 3fcf5e437c1ce36b99f7de04c77e7057c9564f13 Mon Sep 17 00:00:00 2001 From: gearnode Date: Sun, 2 Feb 2025 11:13:16 -0800 Subject: [PATCH] Move gid and page pkg Signed-off-by: gearnode --- pkg/api/console/v1/schema/schema.go | 96 +++++++++---------- pkg/api/console/v1/types/control.go | 2 +- .../v1/types/control_state_transition.go | 2 +- pkg/api/console/v1/types/cursorkey.go | 2 +- pkg/api/console/v1/types/evidence.go | 2 +- .../v1/types/evidence_state_transition.go | 2 +- pkg/api/console/v1/types/framework.go | 2 +- pkg/api/console/v1/types/gid.go | 2 +- pkg/api/console/v1/types/pageinfo.go | 2 +- pkg/api/console/v1/types/people.go | 2 +- pkg/api/console/v1/types/task.go | 2 +- .../console/v1/types/task_state_transition.go | 2 +- pkg/api/console/v1/types/types.go | 4 +- pkg/api/console/v1/types/vendor.go | 2 +- pkg/api/console/v1/v1_resolver.go | 4 +- pkg/{probo/coredata => }/gid/gid.go | 0 pkg/{probo/coredata => }/page/cursor.go | 0 pkg/{probo/coredata => }/page/cursorkey.go | 0 pkg/{probo/coredata => }/page/page.go | 0 pkg/probo/coredata/control.go | 4 +- .../coredata/control_state_transition.go | 4 +- pkg/probo/coredata/evidence.go | 4 +- .../coredata/evidence_state_transition.go | 4 +- pkg/probo/coredata/framework.go | 4 +- pkg/probo/coredata/organization.go | 2 +- pkg/probo/coredata/people.go | 4 +- pkg/probo/coredata/state_transition.go | 2 +- pkg/probo/coredata/task.go | 4 +- pkg/probo/coredata/task_state_transition.go | 4 +- pkg/probo/coredata/vendor.go | 4 +- pkg/probo/probo.go | 4 +- 31 files changed, 86 insertions(+), 86 deletions(-) rename pkg/{probo/coredata => }/gid/gid.go (100%) rename pkg/{probo/coredata => }/page/cursor.go (100%) rename pkg/{probo/coredata => }/page/cursorkey.go (100%) rename pkg/{probo/coredata => }/page/page.go (100%) diff --git a/pkg/api/console/v1/schema/schema.go b/pkg/api/console/v1/schema/schema.go index 0144683ac..37b671947 100644 --- a/pkg/api/console/v1/schema/schema.go +++ b/pkg/api/console/v1/schema/schema.go @@ -15,8 +15,8 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/introspection" "github.com/getprobo/probo/pkg/api/console/v1/types" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" gqlparser "github.com/vektah/gqlparser/v2" "github.com/vektah/gqlparser/v2/ast" ) @@ -1512,7 +1512,7 @@ func (ec *executionContext) field_Control_stateTransisions_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1538,7 +1538,7 @@ func (ec *executionContext) field_Control_stateTransisions_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1589,7 +1589,7 @@ func (ec *executionContext) field_Control_tasks_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1615,7 +1615,7 @@ func (ec *executionContext) field_Control_tasks_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1666,7 +1666,7 @@ func (ec *executionContext) field_Evidence_stateTransisions_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1692,7 +1692,7 @@ func (ec *executionContext) field_Evidence_stateTransisions_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1743,7 +1743,7 @@ func (ec *executionContext) field_Framework_controls_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1769,7 +1769,7 @@ func (ec *executionContext) field_Framework_controls_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1820,7 +1820,7 @@ func (ec *executionContext) field_Organization_frameworks_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1846,7 +1846,7 @@ func (ec *executionContext) field_Organization_frameworks_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1897,7 +1897,7 @@ func (ec *executionContext) field_Organization_peoples_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1923,7 +1923,7 @@ func (ec *executionContext) field_Organization_peoples_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -1974,7 +1974,7 @@ func (ec *executionContext) field_Organization_vendors_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -2000,7 +2000,7 @@ func (ec *executionContext) field_Organization_vendors_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -2046,7 +2046,7 @@ func (ec *executionContext) field_Query_node_argsID( ) (gid.GID, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("id")) if tmp, ok := rawArgs["id"]; ok { - return ec.unmarshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, tmp) + return ec.unmarshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, tmp) } var zeroVal gid.GID @@ -2097,7 +2097,7 @@ func (ec *executionContext) field_Task_evidences_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -2123,7 +2123,7 @@ func (ec *executionContext) field_Task_evidences_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -2174,7 +2174,7 @@ func (ec *executionContext) field_Task_stateTransisions_argsAfter( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("after")) if tmp, ok := rawArgs["after"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -2200,7 +2200,7 @@ func (ec *executionContext) field_Task_stateTransisions_argsBefore( ) (*page.CursorKey, error) { ctx = graphql.WithPathContext(ctx, graphql.NewPathWithField("before")) if tmp, ok := rawArgs["before"]; ok { - return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, tmp) + return ec.unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, tmp) } var zeroVal *page.CursorKey @@ -2283,7 +2283,7 @@ func (ec *executionContext) _Control_id(ctx context.Context, field graphql.Colle } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Control_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2701,7 +2701,7 @@ func (ec *executionContext) _ControlEdge_cursor(ctx context.Context, field graph } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_ControlEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2795,7 +2795,7 @@ func (ec *executionContext) _ControlStateTransition_id(ctx context.Context, fiel } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_ControlStateTransition_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3109,7 +3109,7 @@ func (ec *executionContext) _ControlStateTransitionEdge_cursor(ctx context.Conte } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_ControlStateTransitionEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3199,7 +3199,7 @@ func (ec *executionContext) _Evidence_id(ctx context.Context, field graphql.Coll } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Evidence_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3606,7 +3606,7 @@ func (ec *executionContext) _EvidenceEdge_cursor(ctx context.Context, field grap } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_EvidenceEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3700,7 +3700,7 @@ func (ec *executionContext) _EvidenceStateTransition_id(ctx context.Context, fie } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_EvidenceStateTransition_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4014,7 +4014,7 @@ func (ec *executionContext) _EvidenceStateTransitionEdge_cursor(ctx context.Cont } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_EvidenceStateTransitionEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4104,7 +4104,7 @@ func (ec *executionContext) _Framework_id(ctx context.Context, field graphql.Col } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Framework_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4435,7 +4435,7 @@ func (ec *executionContext) _FrameworkEdge_cursor(ctx context.Context, field gra } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_FrameworkEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4525,7 +4525,7 @@ func (ec *executionContext) _Organization_id(ctx context.Context, field graphql. } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Organization_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4897,7 +4897,7 @@ func (ec *executionContext) _PageInfo_startCursor(ctx context.Context, field gra } res := resTmp.(*page.CursorKey) fc.Result = res - return ec.marshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_PageInfo_startCursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4932,7 +4932,7 @@ func (ec *executionContext) _PageInfo_endCursor(ctx context.Context, field graph } res := resTmp.(*page.CursorKey) fc.Result = res - return ec.marshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_PageInfo_endCursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4970,7 +4970,7 @@ func (ec *executionContext) _People_id(ctx context.Context, field graphql.Collec } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_People_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -5290,7 +5290,7 @@ func (ec *executionContext) _PeopleEdge_cursor(ctx context.Context, field graphq } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_PeopleEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -5534,7 +5534,7 @@ func (ec *executionContext) _Task_id(ctx context.Context, field graphql.Collecte } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Task_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -5952,7 +5952,7 @@ func (ec *executionContext) _TaskEdge_cursor(ctx context.Context, field graphql. } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_TaskEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6046,7 +6046,7 @@ func (ec *executionContext) _TaskStateTransition_id(ctx context.Context, field g } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_TaskStateTransition_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6360,7 +6360,7 @@ func (ec *executionContext) _TaskStateTransitionEdge_cursor(ctx context.Context, } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_TaskStateTransitionEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6450,7 +6450,7 @@ func (ec *executionContext) _Vendor_id(ctx context.Context, field graphql.Collec } res := resTmp.(gid.GID) fc.Result = res - return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx, field.Selections, res) + return ec.marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Vendor_id(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6694,7 +6694,7 @@ func (ec *executionContext) _VendorEdge_cursor(ctx context.Context, field graphq } res := resTmp.(page.CursorKey) fc.Result = res - return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx, field.Selections, res) + return ec.marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_VendorEdge_cursor(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -10658,12 +10658,12 @@ func (ec *executionContext) marshalNControlStateTransitionEdge2ᚖgithubᚗcom return ec._ControlStateTransitionEdge(ctx, sel, v) } -func (ec *executionContext) unmarshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx context.Context, v any) (page.CursorKey, error) { +func (ec *executionContext) unmarshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx context.Context, v any) (page.CursorKey, error) { res, err := types.UnmarshalCursorKeyScalar(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx context.Context, sel ast.SelectionSet, v page.CursorKey) graphql.Marshaler { +func (ec *executionContext) marshalNCursorKey2githubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx context.Context, sel ast.SelectionSet, v page.CursorKey) graphql.Marshaler { res := types.MarshalCursorKeyScalar(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -10914,12 +10914,12 @@ func (ec *executionContext) marshalNFrameworkEdge2ᚖgithubᚗcomᚋgetproboᚋp return ec._FrameworkEdge(ctx, sel, v) } -func (ec *executionContext) unmarshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx context.Context, v any) (gid.GID, error) { +func (ec *executionContext) unmarshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx context.Context, v any) (gid.GID, error) { res, err := types.UnmarshalGIDScalar(v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋgidᚐGID(ctx context.Context, sel ast.SelectionSet, v gid.GID) graphql.Marshaler { +func (ec *executionContext) marshalNID2githubᚗcomᚋgetproboᚋproboᚋpkgᚋgidᚐGID(ctx context.Context, sel ast.SelectionSet, v gid.GID) graphql.Marshaler { res := types.MarshalGIDScalar(v) if res == graphql.Null { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { @@ -11580,7 +11580,7 @@ func (ec *executionContext) marshalOControlState2ᚖgithubᚗcomᚋgetproboᚋpr return v } -func (ec *executionContext) unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx context.Context, v any) (*page.CursorKey, error) { +func (ec *executionContext) unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx context.Context, v any) (*page.CursorKey, error) { if v == nil { return nil, nil } @@ -11588,7 +11588,7 @@ func (ec *executionContext) unmarshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋpro return &res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) marshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋproboᚋcoredataᚋpageᚐCursorKey(ctx context.Context, sel ast.SelectionSet, v *page.CursorKey) graphql.Marshaler { +func (ec *executionContext) marshalOCursorKey2ᚖgithubᚗcomᚋgetproboᚋproboᚋpkgᚋpageᚐCursorKey(ctx context.Context, sel ast.SelectionSet, v *page.CursorKey) graphql.Marshaler { if v == nil { return graphql.Null } diff --git a/pkg/api/console/v1/types/control.go b/pkg/api/console/v1/types/control.go index fdda80515..f0e64cb52 100644 --- a/pkg/api/console/v1/types/control.go +++ b/pkg/api/console/v1/types/control.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewControlConnection(p *page.Page[*coredata.Control]) *ControlConnection { diff --git a/pkg/api/console/v1/types/control_state_transition.go b/pkg/api/console/v1/types/control_state_transition.go index 56904d8dc..89145866c 100644 --- a/pkg/api/console/v1/types/control_state_transition.go +++ b/pkg/api/console/v1/types/control_state_transition.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewControlStateTransitionConnection( diff --git a/pkg/api/console/v1/types/cursorkey.go b/pkg/api/console/v1/types/cursorkey.go index 238f59987..7baf7bf4c 100644 --- a/pkg/api/console/v1/types/cursorkey.go +++ b/pkg/api/console/v1/types/cursorkey.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/99designs/gqlgen/graphql" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/page" ) func NewCursor( diff --git a/pkg/api/console/v1/types/evidence.go b/pkg/api/console/v1/types/evidence.go index 1a35ffef1..9da572c9b 100644 --- a/pkg/api/console/v1/types/evidence.go +++ b/pkg/api/console/v1/types/evidence.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewEvidenceConnection(p *page.Page[*coredata.Evidence]) *EvidenceConnection { diff --git a/pkg/api/console/v1/types/evidence_state_transition.go b/pkg/api/console/v1/types/evidence_state_transition.go index dd5fe1713..464e14b33 100644 --- a/pkg/api/console/v1/types/evidence_state_transition.go +++ b/pkg/api/console/v1/types/evidence_state_transition.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewEvidenceStateTransitionConnection( diff --git a/pkg/api/console/v1/types/framework.go b/pkg/api/console/v1/types/framework.go index bf5be1d8e..6ce0fe162 100644 --- a/pkg/api/console/v1/types/framework.go +++ b/pkg/api/console/v1/types/framework.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewFrameworkConnection(p *page.Page[*coredata.Framework]) *FrameworkConnection { diff --git a/pkg/api/console/v1/types/gid.go b/pkg/api/console/v1/types/gid.go index 6a1756f68..2f7ca1869 100644 --- a/pkg/api/console/v1/types/gid.go +++ b/pkg/api/console/v1/types/gid.go @@ -20,7 +20,7 @@ import ( "strconv" "github.com/99designs/gqlgen/graphql" - "github.com/getprobo/probo/pkg/probo/coredata/gid" + "github.com/getprobo/probo/pkg/gid" ) func MarshalGIDScalar(id gid.GID) graphql.Marshaler { diff --git a/pkg/api/console/v1/types/pageinfo.go b/pkg/api/console/v1/types/pageinfo.go index 73b9c2e46..5dae92089 100644 --- a/pkg/api/console/v1/types/pageinfo.go +++ b/pkg/api/console/v1/types/pageinfo.go @@ -16,7 +16,7 @@ package types import ( "gearno.de/ref" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/page" ) func NewPageInfo[T page.Paginable](p *page.Page[T]) *PageInfo { diff --git a/pkg/api/console/v1/types/people.go b/pkg/api/console/v1/types/people.go index d35f20b43..e0fd30c72 100644 --- a/pkg/api/console/v1/types/people.go +++ b/pkg/api/console/v1/types/people.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewPeopleConnection(p *page.Page[*coredata.People]) *PeopleConnection { diff --git a/pkg/api/console/v1/types/task.go b/pkg/api/console/v1/types/task.go index 36a9afc6f..2f5be1841 100644 --- a/pkg/api/console/v1/types/task.go +++ b/pkg/api/console/v1/types/task.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewTaskConnection(p *page.Page[*coredata.Task]) *TaskConnection { diff --git a/pkg/api/console/v1/types/task_state_transition.go b/pkg/api/console/v1/types/task_state_transition.go index 742757069..72d7209b2 100644 --- a/pkg/api/console/v1/types/task_state_transition.go +++ b/pkg/api/console/v1/types/task_state_transition.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewTaskStateTransitionConnection( diff --git a/pkg/api/console/v1/types/types.go b/pkg/api/console/v1/types/types.go index 9c0eb84ee..56bf85b91 100644 --- a/pkg/api/console/v1/types/types.go +++ b/pkg/api/console/v1/types/types.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" ) type Node interface { diff --git a/pkg/api/console/v1/types/vendor.go b/pkg/api/console/v1/types/vendor.go index 73028ce18..0f6213263 100644 --- a/pkg/api/console/v1/types/vendor.go +++ b/pkg/api/console/v1/types/vendor.go @@ -15,8 +15,8 @@ package types import ( + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/page" ) func NewVendorConnection(p *page.Page[*coredata.Vendor]) *VendorConnection { diff --git a/pkg/api/console/v1/v1_resolver.go b/pkg/api/console/v1/v1_resolver.go index fc1c3c4c5..4d4a3d9a9 100644 --- a/pkg/api/console/v1/v1_resolver.go +++ b/pkg/api/console/v1/v1_resolver.go @@ -10,9 +10,9 @@ import ( "github.com/getprobo/probo/pkg/api/console/v1/schema" "github.com/getprobo/probo/pkg/api/console/v1/types" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" "github.com/vektah/gqlparser/v2/gqlerror" ) diff --git a/pkg/probo/coredata/gid/gid.go b/pkg/gid/gid.go similarity index 100% rename from pkg/probo/coredata/gid/gid.go rename to pkg/gid/gid.go diff --git a/pkg/probo/coredata/page/cursor.go b/pkg/page/cursor.go similarity index 100% rename from pkg/probo/coredata/page/cursor.go rename to pkg/page/cursor.go diff --git a/pkg/probo/coredata/page/cursorkey.go b/pkg/page/cursorkey.go similarity index 100% rename from pkg/probo/coredata/page/cursorkey.go rename to pkg/page/cursorkey.go diff --git a/pkg/probo/coredata/page/page.go b/pkg/page/page.go similarity index 100% rename from pkg/probo/coredata/page/page.go rename to pkg/page/page.go diff --git a/pkg/probo/coredata/control.go b/pkg/probo/coredata/control.go index 03ee70e25..59f2f0192 100644 --- a/pkg/probo/coredata/control.go +++ b/pkg/probo/coredata/control.go @@ -20,8 +20,8 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" diff --git a/pkg/probo/coredata/control_state_transition.go b/pkg/probo/coredata/control_state_transition.go index 884c539ae..2ba54b019 100644 --- a/pkg/probo/coredata/control_state_transition.go +++ b/pkg/probo/coredata/control_state_transition.go @@ -19,8 +19,8 @@ import ( "fmt" "maps" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/evidence.go b/pkg/probo/coredata/evidence.go index a2a1951ce..d62141cf1 100644 --- a/pkg/probo/coredata/evidence.go +++ b/pkg/probo/coredata/evidence.go @@ -20,8 +20,8 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/evidence_state_transition.go b/pkg/probo/coredata/evidence_state_transition.go index 6e70efb98..9811ba11c 100644 --- a/pkg/probo/coredata/evidence_state_transition.go +++ b/pkg/probo/coredata/evidence_state_transition.go @@ -19,8 +19,8 @@ import ( "fmt" "maps" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/framework.go b/pkg/probo/coredata/framework.go index 5eb233bbb..54a3b9abb 100644 --- a/pkg/probo/coredata/framework.go +++ b/pkg/probo/coredata/framework.go @@ -20,8 +20,8 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/organization.go b/pkg/probo/coredata/organization.go index ac78b18a4..f417b873c 100644 --- a/pkg/probo/coredata/organization.go +++ b/pkg/probo/coredata/organization.go @@ -20,7 +20,7 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" + "github.com/getprobo/probo/pkg/gid" "github.com/jackc/pgx/v5" "go.gearno.de/kit/pg" ) diff --git a/pkg/probo/coredata/people.go b/pkg/probo/coredata/people.go index 864cad631..6d6220cad 100644 --- a/pkg/probo/coredata/people.go +++ b/pkg/probo/coredata/people.go @@ -20,8 +20,8 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/state_transition.go b/pkg/probo/coredata/state_transition.go index 823d9c1c5..7310269d9 100644 --- a/pkg/probo/coredata/state_transition.go +++ b/pkg/probo/coredata/state_transition.go @@ -16,7 +16,7 @@ package coredata import ( "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" + "github.com/getprobo/probo/pkg/gid" ) type ( diff --git a/pkg/probo/coredata/task.go b/pkg/probo/coredata/task.go index ee011d882..b7330612c 100644 --- a/pkg/probo/coredata/task.go +++ b/pkg/probo/coredata/task.go @@ -20,8 +20,8 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" diff --git a/pkg/probo/coredata/task_state_transition.go b/pkg/probo/coredata/task_state_transition.go index 12791fee1..a9bbad41d 100644 --- a/pkg/probo/coredata/task_state_transition.go +++ b/pkg/probo/coredata/task_state_transition.go @@ -19,8 +19,8 @@ import ( "fmt" "maps" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/coredata/vendor.go b/pkg/probo/coredata/vendor.go index 2665f4ae8..63f90a21c 100644 --- a/pkg/probo/coredata/vendor.go +++ b/pkg/probo/coredata/vendor.go @@ -20,8 +20,8 @@ import ( "maps" "time" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/jackc/pgx/v5" "go.gearno.de/crypto/uuid" "go.gearno.de/kit/pg" diff --git a/pkg/probo/probo.go b/pkg/probo/probo.go index 4603da071..a033ee23f 100644 --- a/pkg/probo/probo.go +++ b/pkg/probo/probo.go @@ -18,9 +18,9 @@ import ( "context" "fmt" + "github.com/getprobo/probo/pkg/gid" + "github.com/getprobo/probo/pkg/page" "github.com/getprobo/probo/pkg/probo/coredata" - "github.com/getprobo/probo/pkg/probo/coredata/gid" - "github.com/getprobo/probo/pkg/probo/coredata/page" "go.gearno.de/kit/migrator" "go.gearno.de/kit/pg" )