Render function in https://brandur.org/two-phase-render

[roman-vanesyan]

Article: https://brandur.org/two-phase-render What a nice reading! Like the idea outlined in the article, it is so elegant, yet powerful. Indeed, in general, explicit splitting of fetching step from render/transforming step of the resource makes it cleaner and less error prune. We kinda did something similar at my current work.

But I have a rather technical question regarding the Render[...] function declaration. What is the reason of having TLoadBundle as the first generic argument? Won't having it next to the TRendenderable make it inferrable as well?

Practically changing this:

func Render[TLoadBundle any, TRenderable Renderable[TLoadBundle, TModel, TRenderable], TModel any](
    ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, model TModel,
) (TRenderable, error)

to:

func Render[TRenderable Renderable[TLoadBundle, TModel, TRenderable], TLoadBundle any, TModel any](
    ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, model TModel,
) (TRenderable, error)

will help to change call from:

apiresource.Render[*apiresourcekind.ProductLoadBundle, *apiresourcekind.Product](...)

to:

apiresource.Render[*apiresourcekind.Product](...)

as apiresourcekind.Product already references *apiresourcekind.ProductLoadBundle when implementing Renderable#Render.

[brandur]

Hi Roman,

DUDE! I'm not sure how I didn't see this originally, as I thought I'd played around with that type parameter ordering to try and get it as nice as possible, but apparently I did not.

I just plugged the change into our codebase and it cleans things up so much. For fun, I've included a real world diff below to show how much nicer/shorter all the code gets.

I'll update the blog post tomorrow and credit you. Thanks!

Real world code improvement (so nice!)

``` diff diff --git a/apiresource/renderer.go b/apiresource/renderer.go index 39f94163d..615f5d41e 100644 --- a/apiresource/renderer.go +++ b/apiresource/renderer.go @@ -31,7 +31,7 @@ type Renderable[TLoadBundle any, TModel any, TResource any] interface { // parameters that can be inferred can be omitted, and although use of this // function won't be able to infer TLoadBundle or TRenderable, it will infer // TModel because it's in a parameter. -func Render[TLoadBundle any, TRenderable Renderable[TLoadBundle, TModel, TRenderable], TModel any](ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, model TModel) (TRenderable, error) { +func Render[TRenderable Renderable[TLoadBundle, TModel, TRenderable], TLoadBundle any, TModel any](ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, model TModel) (TRenderable, error) { var renderable TRenderable bundle, err := renderable.LoadBundle(ctx, e, baseParams, []TModel{model}) @@ -48,7 +48,7 @@ func Render[TLoadBundle any, TRenderable Renderable[TLoadBundle, TModel, TRender } // RenderMany is similar to Render, but renders many API resources at once. -func RenderMany[TLoadBundle any, TRenderable Renderable[TLoadBundle, TModel, TRenderable], TModel any](ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, models []TModel) ([]TRenderable, error) { +func RenderMany[TRenderable Renderable[TLoadBundle, TModel, TRenderable], TLoadBundle any, TModel any](ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, models []TModel) ([]TRenderable, error) { var renderable TRenderable bundle, err := renderable.LoadBundle(ctx, e, baseParams, models) @@ -83,10 +83,10 @@ func RenderMany[TLoadBundle any, TRenderable Renderable[TLoadBundle, TModel, TRe // A helper for two API resources (rather than 3, 4, etc.) is provided because // it's commonly necessary to render a previous and updated model when emitting // an updated event with `pevent.CaptureUpdated`. -func RenderTwo[TLoadBundle any, TRenderable Renderable[TLoadBundle, TModel, TRenderable], TModel any](ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, model1, model2 TModel) (TRenderable, TRenderable, error) { +func RenderTwo[TRenderable Renderable[TLoadBundle, TModel, TRenderable], TLoadBundle any, TModel any](ctx context.Context, e db.Executor, baseParams *pbaseparam.BaseParams, model1, model2 TModel) (TRenderable, TRenderable, error) { var renderable TRenderable - resources, err := RenderMany[TLoadBundle, TRenderable](ctx, e, baseParams, []TModel{model1, model2}) + resources, err := RenderMany[TRenderable](ctx, e, baseParams, []TModel{model1, model2}) if err != nil { return renderable, renderable, err } diff --git a/apiresource/renderer_test.go b/apiresource/renderer_test.go index 5633131ae..a6a362811 100644 --- a/apiresource/renderer_test.go +++ b/apiresource/renderer_test.go @@ -44,7 +44,7 @@ func TestRender(t *testing.T) { ctx := ptesting.Context(t) tx := &db.Tx{} - resource, err := Render[*TestLoadBundle, *TestRenderableResource](ctx, tx, pbaseparamtest.DefaultBaseParams(), &TestModel{ + resource, err := Render[*TestRenderableResource](ctx, tx, pbaseparamtest.DefaultBaseParams(), &TestModel{ FromModel: "this property came from a model", }) require.NoError(t, err) @@ -60,7 +60,7 @@ func TestRenderMany(t *testing.T) { ctx := ptesting.Context(t) tx := &db.Tx{} - resources, err := RenderMany[*TestLoadBundle, *TestRenderableResource](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*TestModel{ + resources, err := RenderMany[*TestRenderableResource](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*TestModel{ { FromModel: "this property came from a model 1", }, @@ -87,7 +87,7 @@ func TestRenderTwo(t *testing.T) { ctx := ptesting.Context(t) tx := &db.Tx{} - resource1, resource2, err := RenderTwo[*TestLoadBundle, *TestRenderableResource](ctx, tx, pbaseparamtest.DefaultBaseParams(), + resource1, resource2, err := RenderTwo[*TestRenderableResource](ctx, tx, pbaseparamtest.DefaultBaseParams(), &TestModel{ FromModel: "this property came from a model 1", }, diff --git a/invoicing/bundle_loader.go b/invoicing/bundle_loader.go index 983235e47..e8cb8eaf8 100644 --- a/invoicing/bundle_loader.go +++ b/invoicing/bundle_loader.go @@ -133,7 +133,7 @@ func (*BundleLoader) Load(ctx context.Context, e db.Executor, baseParams *pbasep return nil, nil, xerrors.Errorf("error getting team: %w", err) } - teamResource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, e, baseParams, team) + teamResource, err := apiresource.Render[*apiresourcekind.Team](ctx, e, baseParams, team) if err != nil { return nil, nil, err } diff --git a/invoicing/invoicing.go b/invoicing/invoicing.go index 3e82a84be..c76e30d73 100644 --- a/invoicing/invoicing.go +++ b/invoicing/invoicing.go @@ -382,7 +382,7 @@ func updateInvoiceDetails(ctx context.Context, e db.Executor, baseParams *pbasep invoiceBundleClusters[i] = &apiresourcekind.InvoiceBundleCluster{ID: eid.EID(cluster.ID), Name: cluster.Name} } - teamResource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, e, baseParams, team) + teamResource, err := apiresource.Render[*apiresourcekind.Team](ctx, e, baseParams, team) if err != nil { return nil, nil, err } diff --git a/pcommandkind/account_create.go b/pcommandkind/account_create.go index 31e569f29..071e39962 100644 --- a/pcommandkind/account_create.go +++ b/pcommandkind/account_create.go @@ -291,7 +291,7 @@ func (c *AccountCreate) Run(ctx context.Context, e db.Executor, params *AccountC // right actor. ctx = authn.SetContextContainerVal(ctx, &authn.AuthContainer{Account: account}) - resource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, account) + resource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, account) if err != nil { return nil, err } diff --git a/pcommandkind/api_key_create.go b/pcommandkind/api_key_create.go index e6af6b7a2..90a95b32d 100644 --- a/pcommandkind/api_key_create.go +++ b/pcommandkind/api_key_create.go @@ -132,7 +132,7 @@ func (c *APIKeyCreate) Run(ctx context.Context, e db.Executor, params *APIKeyCre return nil, err } - resource, err := apiresource.Render[*apiresourcekind.APIKeyLoadBundle, *apiresourcekind.APIKey](ctx, e, c.BaseParams, apiKey) + resource, err := apiresource.Render[*apiresourcekind.APIKey](ctx, e, c.BaseParams, apiKey) if err != nil { return nil, err } diff --git a/pcommandkind/api_key_destroy.go b/pcommandkind/api_key_destroy.go index ad8c76003..57e27dc73 100644 --- a/pcommandkind/api_key_destroy.go +++ b/pcommandkind/api_key_destroy.go @@ -53,7 +53,7 @@ func (c *APIKeyDestroy) Run(ctx context.Context, e db.Executor, params *APIKeyDe return nil, xerrors.Errorf("error deleting API key: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.APIKeyLoadBundle, *apiresourcekind.APIKey](ctx, e, c.BaseParams, deletedAPIKey) + resource, err := apiresource.Render[*apiresourcekind.APIKey](ctx, e, c.BaseParams, deletedAPIKey) if err != nil { return nil, err } diff --git a/pcommandkind/cluster_create.go b/pcommandkind/cluster_create.go index dd2b8d8e3..d7b9a940c 100644 --- a/pcommandkind/cluster_create.go +++ b/pcommandkind/cluster_create.go @@ -274,7 +274,7 @@ func (c *ClusterCreate) Run(ctx context.Context, e db.Executor, params *ClusterC } } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, e, c.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, e, c.BaseParams, cluster) if err != nil { return nil, err } diff --git a/pcommandkind/cluster_destroy.go b/pcommandkind/cluster_destroy.go index 3995bb519..cd1c60bf7 100644 --- a/pcommandkind/cluster_destroy.go +++ b/pcommandkind/cluster_destroy.go @@ -175,7 +175,7 @@ func (c *ClusterDestroy) Run(ctx context.Context, e db.Executor, params *Cluster // Event // - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, e, c.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, e, c.BaseParams, cluster) if err != nil { return nil, err } diff --git a/pcommandkind/email_change_update.go b/pcommandkind/email_change_update.go index b50a883ef..baed2fcd2 100644 --- a/pcommandkind/email_change_update.go +++ b/pcommandkind/email_change_update.go @@ -105,11 +105,11 @@ func (c *EmailChangeUpdate) Run(ctx context.Context, e db.Executor, params *Emai return nil, xerrors.Errorf("error looking up account: %w", err) } - accountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, account) + accountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, account) if err != nil { return nil, err } - updatedAccountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, updatedAccount) + updatedAccountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, updatedAccount) if err != nil { return nil, err } diff --git a/pcommandkind/email_verification_update.go b/pcommandkind/email_verification_update.go index 2d1b0392c..4399604fa 100644 --- a/pcommandkind/email_verification_update.go +++ b/pcommandkind/email_verification_update.go @@ -190,11 +190,11 @@ func (c *EmailVerificationUpdate) Run(ctx context.Context, e db.Executor, params } } - accountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, account) + accountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, account) if err != nil { return nil, err } - updatedAccountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, updatedAccount) + updatedAccountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, updatedAccount) if err != nil { return nil, err } @@ -241,11 +241,11 @@ func (c *EmailVerificationUpdate) Run(ctx context.Context, e db.Executor, params return nil, xerrors.Errorf("error looking up team: %w", err) } - originalTeamResource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, e, c.BaseParams, originalTeam) + originalTeamResource, err := apiresource.Render[*apiresourcekind.Team](ctx, e, c.BaseParams, originalTeam) if err != nil { return nil, err } - updatedTeamResource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, e, c.BaseParams, updatedTeam) + updatedTeamResource, err := apiresource.Render[*apiresourcekind.Team](ctx, e, c.BaseParams, updatedTeam) if err != nil { return nil, err } diff --git a/pcommandkind/password_reset_update.go b/pcommandkind/password_reset_update.go index 1ffa22cd9..a9a6cfb93 100644 --- a/pcommandkind/password_reset_update.go +++ b/pcommandkind/password_reset_update.go @@ -144,11 +144,11 @@ func (c *PasswordResetUpdate) Run(ctx context.Context, e db.Executor, params *Pa return nil, xerrors.Errorf("error invalidating outstanding sessions: %w", err) } - accountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, account) + accountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, account) if err != nil { return nil, err } - updatedAccountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, updatedAccount) + updatedAccountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, updatedAccount) if err != nil { return nil, err } diff --git a/pcommandkind/query_create.go b/pcommandkind/query_create.go index c1f7c1501..b8eb4fa97 100644 --- a/pcommandkind/query_create.go +++ b/pcommandkind/query_create.go @@ -117,7 +117,7 @@ func (c *QueryCreate) Run(ctx context.Context, e db.Executor, params *QueryCreat return nil, xerrors.Errorf("error inserting query: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.QueryLoadBundle, *apiresourcekind.Query](ctx, e, c.BaseParams, query) + resource, err := apiresource.Render[*apiresourcekind.Query](ctx, e, c.BaseParams, query) if err != nil { return nil, err } diff --git a/pcommandkind/session_create.go b/pcommandkind/session_create.go index d834b6bef..7a980b485 100644 --- a/pcommandkind/session_create.go +++ b/pcommandkind/session_create.go @@ -304,7 +304,7 @@ func (c *SessionCreate) Run(ctx context.Context, e db.Executor, params *SessionC return nil, err } - accountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, params.Account) + accountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, params.Account) if err != nil { return nil, err } diff --git a/pcommandkind/session_destroy.go b/pcommandkind/session_destroy.go index 100039076..c50f0cc74 100644 --- a/pcommandkind/session_destroy.go +++ b/pcommandkind/session_destroy.go @@ -55,7 +55,7 @@ func (c *SessionDestroy) Run(ctx context.Context, e db.Executor, params *Session } if params.Account != nil { - accountResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, e, c.BaseParams, params.Account) + accountResource, err := apiresource.Render[*apiresourcekind.Account](ctx, e, c.BaseParams, params.Account) if err != nil { return nil, err } diff --git a/pcommandkind/tailscale_connect.go b/pcommandkind/tailscale_connect.go index 5e0def5b0..2ca02dc57 100644 --- a/pcommandkind/tailscale_connect.go +++ b/pcommandkind/tailscale_connect.go @@ -94,7 +94,7 @@ func (c *TailscaleConnect) Run(ctx context.Context, e db.Executor, params *Tails return nil, apierror.NewServiceUnavailableError(ctx, apierror.ServiceOwl, err) } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, e, c.BaseParams, params.Cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, e, c.BaseParams, params.Cluster) if err != nil { return nil, err } diff --git a/pcommandkind/team_create.go b/pcommandkind/team_create.go index 4170a2221..63307593f 100644 --- a/pcommandkind/team_create.go +++ b/pcommandkind/team_create.go @@ -83,7 +83,7 @@ func (c *TeamCreate) Run(ctx context.Context, e db.Executor, params *TeamCreateP return nil, xerrors.Errorf("error inserting team: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, e, c.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, e, c.BaseParams, team) if err != nil { return nil, err } diff --git a/pcommandkind/team_destroy.go b/pcommandkind/team_destroy.go index 73ab324c7..a647002ba 100644 --- a/pcommandkind/team_destroy.go +++ b/pcommandkind/team_destroy.go @@ -132,7 +132,7 @@ func (c *TeamDestroy) Run(ctx context.Context, e db.Executor, params *TeamDestro "team_resources": teamResourceMapNonZero, }).Infof(c.Name+": team_destroy_line: Destroyed team %q", team.ID) - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, e, c.BaseParams, destroyedTeam) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, e, c.BaseParams, destroyedTeam) if err != nil { return nil, err } diff --git a/pcommandkind/team_member_create.go b/pcommandkind/team_member_create.go index 242a2518a..75d1575f9 100644 --- a/pcommandkind/team_member_create.go +++ b/pcommandkind/team_member_create.go @@ -81,7 +81,7 @@ func (c *TeamMemberCreate) Run(ctx context.Context, e db.Executor, params *TeamM // Team member exists and the role is the same. No work to do. if existingTeamMember.Role == string(params.Role) { - existingResource, err := apiresource.Render[*apiresourcekind.TeamMemberLoadBundle, *apiresourcekind.TeamMember](ctx, e, c.BaseParams, existingTeamMember) + existingResource, err := apiresource.Render[*apiresourcekind.TeamMember](ctx, e, c.BaseParams, existingTeamMember) if err != nil { return nil, err } @@ -99,7 +99,7 @@ func (c *TeamMemberCreate) Run(ctx context.Context, e db.Executor, params *TeamM } if existingTeamMember.ID == uuid.Nil { - updatedResource, err := apiresource.Render[*apiresourcekind.TeamMemberLoadBundle, *apiresourcekind.TeamMember](ctx, e, c.BaseParams, updatedTeamMember) + updatedResource, err := apiresource.Render[*apiresourcekind.TeamMember](ctx, e, c.BaseParams, updatedTeamMember) if err != nil { return nil, err } @@ -112,7 +112,7 @@ func (c *TeamMemberCreate) Run(ctx context.Context, e db.Executor, params *TeamM return &TeamMemberCreateResult{APIResource: updatedResource, TeamMember: updatedTeamMember}, nil } - existingResource, updatedResource, err := apiresource.RenderTwo[*apiresourcekind.TeamMemberLoadBundle, *apiresourcekind.TeamMember](ctx, e, c.BaseParams, existingTeamMember, updatedTeamMember) + existingResource, updatedResource, err := apiresource.RenderTwo[*apiresourcekind.TeamMember](ctx, e, c.BaseParams, existingTeamMember, updatedTeamMember) if err != nil { return nil, err } diff --git a/pcommandkind/team_member_destroy.go b/pcommandkind/team_member_destroy.go index 0b407bdcc..a78cbcc52 100644 --- a/pcommandkind/team_member_destroy.go +++ b/pcommandkind/team_member_destroy.go @@ -90,7 +90,7 @@ func (c *TeamMemberDestroy) Run(ctx context.Context, e db.Executor, params *Team return nil, xerrors.Errorf("error deleting team member: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.TeamMemberLoadBundle, *apiresourcekind.TeamMember](ctx, e, c.BaseParams, deletedTeamMember) + resource, err := apiresource.Render[*apiresourcekind.TeamMember](ctx, e, c.BaseParams, deletedTeamMember) if err != nil { return nil, err } diff --git a/server/api/account_service.go b/server/api/account_service.go index ce8fa0fed..729bf0427 100644 --- a/server/api/account_service.go +++ b/server/api/account_service.go @@ -258,7 +258,7 @@ func (svc *accountService) GetOwn(ctx context.Context, req *AccountGetOwnRequest return nil, err } - resource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, tx, svc.BaseParams, account) + resource, err := apiresource.Render[*apiresourcekind.Account](ctx, tx, svc.BaseParams, account) if err != nil { return nil, err } @@ -603,7 +603,7 @@ func (svc *accountService) UpdateOwn(ctx context.Context, req *AccountUpdateOwnR } } - resource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, tx, svc.BaseParams, account) + resource, err := apiresource.Render[*apiresourcekind.Account](ctx, tx, svc.BaseParams, account) if err != nil { return nil, err } @@ -621,7 +621,7 @@ func (svc *accountService) UpdateOwn(ctx context.Context, req *AccountUpdateOwnR } } - updatedResource, err := apiresource.Render[*apiresourcekind.AccountLoadBundle, *apiresourcekind.Account](ctx, tx, svc.BaseParams, updatedAccount) + updatedResource, err := apiresource.Render[*apiresourcekind.Account](ctx, tx, svc.BaseParams, updatedAccount) if err != nil { return nil, err } diff --git a/server/api/api_key_service.go b/server/api/api_key_service.go index 2f2106a2d..2c9d9d9e1 100644 --- a/server/api/api_key_service.go +++ b/server/api/api_key_service.go @@ -163,7 +163,7 @@ func (svc *apiKeyService) List(ctx context.Context, req *APIKeyListRequest) (*ap return nil, err } - resources, err := apiresource.RenderMany[*apiresourcekind.APIKeyLoadBundle, *apiresourcekind.APIKey](ctx, tx, svc.BaseParams, apiKeys) + resources, err := apiresource.RenderMany[*apiresourcekind.APIKey](ctx, tx, svc.BaseParams, apiKeys) if err != nil { return nil, err } diff --git a/server/api/cluster_analytics_credential_service.go b/server/api/cluster_analytics_credential_service.go index b54c0a5b2..30b9ae17a 100644 --- a/server/api/cluster_analytics_credential_service.go +++ b/server/api/cluster_analytics_credential_service.go @@ -73,7 +73,7 @@ func (svc *clusterAnalyticsCredentialService) Attach(ctx context.Context, req *C return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -124,7 +124,7 @@ func (svc *clusterAnalyticsCredentialService) Detach(ctx context.Context, req *C return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } diff --git a/server/api/cluster_group_service.go b/server/api/cluster_group_service.go index 1db5b7d96..5f085a2e8 100644 --- a/server/api/cluster_group_service.go +++ b/server/api/cluster_group_service.go @@ -139,7 +139,7 @@ func (svc *clusterGroupService) Create(ctx context.Context, req *ClusterGroupCre return nil, xerrors.Errorf("error updating cluster group: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.ClusterGroupLoadBundle, *apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) + resource, err := apiresource.Render[*apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) if err != nil { return nil, err } @@ -184,7 +184,7 @@ func (svc *clusterGroupService) Delete(ctx context.Context, req *ClusterGroupDel return nil, apierror.NewBadRequestError(ctx, errMessageClusterGroupDeleteExistingClusters) } - resource, err := apiresource.Render[*apiresourcekind.ClusterGroupLoadBundle, *apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) + resource, err := apiresource.Render[*apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) if err != nil { return nil, err } @@ -229,7 +229,7 @@ func (svc *clusterGroupService) Get(ctx context.Context, req *ClusterGroupGetReq return nil, err } - resource, err := apiresource.Render[*apiresourcekind.ClusterGroupLoadBundle, *apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) + resource, err := apiresource.Render[*apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) if err != nil { return nil, err } @@ -286,7 +286,7 @@ func (svc *clusterGroupService) List(ctx context.Context, req *ClusterGroupListR return nil, xerrors.Errorf("error getting cluster groups: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.ClusterGroupLoadBundle, *apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusters) + resources, err := apiresource.RenderMany[*apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusters) if err != nil { return nil, err } @@ -315,7 +315,7 @@ func (svc *clusterGroupService) Update(ctx context.Context, req *ClusterGroupUpd return nil, err } - resource, err := apiresource.Render[*apiresourcekind.ClusterGroupLoadBundle, *apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) + resource, err := apiresource.Render[*apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, clusterGroup) if err != nil { return nil, err } @@ -352,7 +352,7 @@ func (svc *clusterGroupService) Update(ctx context.Context, req *ClusterGroupUpd return nil, apierror.NewServiceUnavailableError(ctx, apierror.ServiceOwl, err) } - resource, err = apiresource.Render[*apiresourcekind.ClusterGroupLoadBundle, *apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, updatedClusterGroup) + resource, err = apiresource.Render[*apiresourcekind.ClusterGroup](ctx, tx, svc.BaseParams, updatedClusterGroup) if err != nil { return nil, err } diff --git a/server/api/cluster_replica_service.go b/server/api/cluster_replica_service.go index 3f3cd4475..9b7e02c3b 100644 --- a/server/api/cluster_replica_service.go +++ b/server/api/cluster_replica_service.go @@ -87,7 +87,7 @@ func (svc *clusterReplicaService) ActionDetach(ctx context.Context, req *Cluster return nil, apierror.NewServiceUnavailableError(ctx, apierror.ServiceOwl, err) } - updatedClusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, updatedCluster) + updatedClusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, updatedCluster) if err != nil { return nil, err } diff --git a/server/api/cluster_service.go b/server/api/cluster_service.go index 8e505297d..b67ed743d 100644 --- a/server/api/cluster_service.go +++ b/server/api/cluster_service.go @@ -129,7 +129,7 @@ func (svc *clusterService) ActionDisableHA(ctx context.Context, req *ClusterActi return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -177,7 +177,7 @@ func (svc *clusterService) ActionEnableHA(ctx context.Context, req *ClusterActio return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -293,7 +293,7 @@ func (svc *clusterService) ActionRestart(ctx context.Context, req *ClusterAction return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -365,7 +365,7 @@ func (svc *clusterService) ActionResume(ctx context.Context, req *ClusterActionR return nil, err } - updatedClusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + updatedClusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -376,7 +376,7 @@ func (svc *clusterService) ActionResume(ctx context.Context, req *ClusterActionR } } else { var err error - clusterResource, err = apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err = apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -476,7 +476,7 @@ func (svc *clusterService) ActionSuspend(ctx context.Context, req *ClusterAction return nil, err } - updatedClusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, updatedCluster) + updatedClusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, updatedCluster) if err != nil { return nil, err } @@ -487,7 +487,7 @@ func (svc *clusterService) ActionSuspend(ctx context.Context, req *ClusterAction } } else { var err error - clusterResource, err = apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err = apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -597,7 +597,7 @@ func (svc *clusterService) ActionTailscaleDisconnect(ctx context.Context, req *C return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -1161,7 +1161,7 @@ func (svc *clusterService) Get(ctx context.Context, req *ClusterGetRequest) (*ap return nil, err } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -1325,7 +1325,7 @@ func (svc *clusterService) List(ctx context.Context, req *ClusterListRequest) (* return nil, xerrors.Errorf("error getting clusters: %w", err) } - clusterResources, err := apiresource.RenderMany[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, clusters) + clusterResources, err := apiresource.RenderMany[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, clusters) if err != nil { return nil, err } @@ -1479,7 +1479,7 @@ func (svc *clusterService) Update(ctx context.Context, req *ClusterUpdateRequest } } - clusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) + clusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, cluster) if err != nil { return nil, err } @@ -1501,7 +1501,7 @@ func (svc *clusterService) Update(ctx context.Context, req *ClusterUpdateRequest } } - updatedClusterResource, err := apiresource.Render[*apiresourcekind.ClusterLoadBundle, *apiresourcekind.Cluster](ctx, tx, svc.BaseParams, updatedCluster) + updatedClusterResource, err := apiresource.Render[*apiresourcekind.Cluster](ctx, tx, svc.BaseParams, updatedCluster) if err != nil { return nil, err } diff --git a/server/api/notification_setting_service.go b/server/api/notification_setting_service.go index 2cfe26703..d92d02a58 100644 --- a/server/api/notification_setting_service.go +++ b/server/api/notification_setting_service.go @@ -104,7 +104,7 @@ func (svc *notificationSettingService) List(ctx context.Context, req *Notificati settings := maputil.Values(settingsMap) slices.SortFunc(settings, func(s1, s2 *dbsqlc.NotificationSetting) int { return strings.Compare(s1.Kind, s2.Kind) }) - resources, err := apiresource.RenderMany[*apiresourcekind.NotificationSettingLoadBundle, *apiresourcekind.NotificationSetting](ctx, tx, svc.BaseParams, settings) + resources, err := apiresource.RenderMany[*apiresourcekind.NotificationSetting](ctx, tx, svc.BaseParams, settings) if err != nil { return nil, err } @@ -165,7 +165,7 @@ func (svc *notificationSettingService) Update(ctx context.Context, req *Notifica setting = upsertedSetting } - resource, err := apiresource.Render[*apiresourcekind.NotificationSettingLoadBundle, *apiresourcekind.NotificationSetting](ctx, tx, svc.BaseParams, setting) + resource, err := apiresource.Render[*apiresourcekind.NotificationSetting](ctx, tx, svc.BaseParams, setting) if err != nil { return nil, err } diff --git a/server/api/openid_connect_service.go b/server/api/openid_connect_service.go index 743289f22..97adb072b 100644 --- a/server/api/openid_connect_service.go +++ b/server/api/openid_connect_service.go @@ -350,7 +350,7 @@ func (svc *openIDConnectService) CustomProviderCreate(ctx context.Context, req * return nil, xerrors.Errorf("error inserting OpenID Connect provider: %w", err) } - resource, err = apiresource.Render[*apiresourcekind.CustomOpenIDConnectProviderLoadBundle, *apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) + resource, err = apiresource.Render[*apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) if err != nil { return nil, err } @@ -376,7 +376,7 @@ func (svc *openIDConnectService) CustomProviderCreate(ctx context.Context, req * } } - previousResource, err := apiresource.Render[*apiresourcekind.CustomOpenIDConnectProviderLoadBundle, *apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) + previousResource, err := apiresource.Render[*apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) if err != nil { return nil, err } @@ -396,7 +396,7 @@ func (svc *openIDConnectService) CustomProviderCreate(ctx context.Context, req * return nil, xerrors.Errorf("error updating custom OpenID Connect provider: %w", err) } - resource, err = apiresource.Render[*apiresourcekind.CustomOpenIDConnectProviderLoadBundle, *apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) + resource, err = apiresource.Render[*apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) if err != nil { return nil, err } @@ -443,7 +443,7 @@ func (svc *openIDConnectService) CustomProviderUpdate(ctx context.Context, req * return nil, apierror.NewBadRequestErrorf(ctx, errMessageOpenIDConnectProviderDisabled) } - resource, err := apiresource.Render[*apiresourcekind.CustomOpenIDConnectProviderLoadBundle, *apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) + resource, err := apiresource.Render[*apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, openIDProvider) if err != nil { return nil, err } @@ -465,7 +465,7 @@ func (svc *openIDConnectService) CustomProviderUpdate(ctx context.Context, req * return nil, xerrors.Errorf("error updating custom OpenID Connect provider: %w", err) } - updatedResource, err := apiresource.Render[*apiresourcekind.CustomOpenIDConnectProviderLoadBundle, *apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, updatedCustomOpenIDConnectProvider) + updatedResource, err := apiresource.Render[*apiresourcekind.CustomOpenIDConnectProvider](ctx, tx, svc.BaseParams, updatedCustomOpenIDConnectProvider) if err != nil { return nil, err } diff --git a/server/api/payment_service.go b/server/api/payment_service.go index d560d82c5..3f135b346 100644 --- a/server/api/payment_service.go +++ b/server/api/payment_service.go @@ -254,7 +254,7 @@ func (svc *paymentService) Update(ctx context.Context, req *PaymentUpdateRequest return nil, xerrors.Errorf("could not get valid payment method: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, updatedTeam) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, updatedTeam) if err != nil { return nil, xerrors.Errorf("error rendering team: %w", err) } diff --git a/server/api/playground_tutorial_category_service.go b/server/api/playground_tutorial_category_service.go index 861a5e2e7..afdb2ca8d 100644 --- a/server/api/playground_tutorial_category_service.go +++ b/server/api/playground_tutorial_category_service.go @@ -93,7 +93,7 @@ func (svc *playgroundTutorialCategoryService) Create(ctx context.Context, req *P return nil, svc.interpretDatabaseError(ctx, xerrors.Errorf("error inserting playground tutorial: %w", err)) } - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategoryLoadBundle, *apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) if err != nil { return nil, err } @@ -144,7 +144,7 @@ func (svc *playgroundTutorialCategoryService) Delete(ctx context.Context, req *P return nil, xerrors.Errorf("error deleting playground tutorial category: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategoryLoadBundle, *apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, deletedPlaygroundTutorialCategory) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, deletedPlaygroundTutorialCategory) if err != nil { return nil, err } @@ -187,7 +187,7 @@ func (svc *playgroundTutorialCategoryService) Get(ctx context.Context, req *Play } } - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategoryLoadBundle, *apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) if err != nil { return nil, err } @@ -276,7 +276,7 @@ func (svc *playgroundTutorialCategoryService) List(ctx context.Context, req *Pla return nil, xerrors.Errorf("error getting playground tutorial categories: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.PlaygroundTutorialCategoryLoadBundle, *apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorials) + resources, err := apiresource.RenderMany[*apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorials) if err != nil { return nil, err } @@ -307,7 +307,7 @@ func (svc *playgroundTutorialCategoryService) Update(ctx context.Context, req *P queries := dbsqlc.New(tx) - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategoryLoadBundle, *apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) if err != nil { return nil, err } @@ -331,7 +331,7 @@ func (svc *playgroundTutorialCategoryService) Update(ctx context.Context, req *P playgroundTutorialCategory = updatedPlaygroundTutorialCategory } - updatedResource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategoryLoadBundle, *apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) + updatedResource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialCategory](ctx, tx, svc.BaseParams, playgroundTutorialCategory) if err != nil { return nil, err } diff --git a/server/api/playground_tutorial_service.go b/server/api/playground_tutorial_service.go index 2a4145d83..4a0b66fc9 100644 --- a/server/api/playground_tutorial_service.go +++ b/server/api/playground_tutorial_service.go @@ -143,7 +143,7 @@ func (svc *playgroundTutorialService) Create(ctx context.Context, req *Playgroun return nil, xerrors.Errorf("error inserting playground tutorial: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialLoadBundle, *apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) if err != nil { return nil, err } @@ -180,7 +180,7 @@ func (svc *playgroundTutorialService) Delete(ctx context.Context, req *Playgroun return nil, xerrors.Errorf("error deleting playground tutorial: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialLoadBundle, *apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, deletedPlaygroundTutorial) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, deletedPlaygroundTutorial) if err != nil { return nil, err } @@ -217,7 +217,7 @@ func (svc *playgroundTutorialService) Get(ctx context.Context, req *PlaygroundTu } } - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialLoadBundle, *apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) if err != nil { return nil, err } @@ -371,7 +371,7 @@ func (svc *playgroundTutorialService) List(ctx context.Context, req *PlaygroundT return nil, xerrors.Errorf("error getting playground tutorials: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.PlaygroundTutorialLoadBundle, *apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorials) + resources, err := apiresource.RenderMany[*apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorials) if err != nil { return nil, err } @@ -440,7 +440,7 @@ func (svc *playgroundTutorialService) Update(ctx context.Context, req *Playgroun queries := dbsqlc.New(tx) - resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialLoadBundle, *apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) + resource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) if err != nil { return nil, err } @@ -526,7 +526,7 @@ func (svc *playgroundTutorialService) Update(ctx context.Context, req *Playgroun playgroundTutorial = updatedPlaygroundTutorial } - updatedResource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorialLoadBundle, *apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) + updatedResource, err := apiresource.Render[*apiresourcekind.PlaygroundTutorial](ctx, tx, svc.BaseParams, playgroundTutorial) if err != nil { return nil, err } diff --git a/server/api/postgres_version_service.go b/server/api/postgres_version_service.go index 0cdb7c338..33693f96d 100644 --- a/server/api/postgres_version_service.go +++ b/server/api/postgres_version_service.go @@ -88,7 +88,7 @@ func (svc *postgresVersionService) Get(ctx context.Context, req *PostgresVersion return nil, xerrors.Errorf("error committing transaction: %w", err) } - postgresVersionResource, err := apiresource.Render[*apiresourcekind.PostgresVersionLoadBundle, *apiresourcekind.PostgresVersion](ctx, tx, svc.BaseParams, postgresVersion) + postgresVersionResource, err := apiresource.Render[*apiresourcekind.PostgresVersion](ctx, tx, svc.BaseParams, postgresVersion) if err != nil { return nil, err } @@ -142,7 +142,7 @@ func (svc *postgresVersionService) List(ctx context.Context, req *PostgresVersio return nil, err } - postgresVersionResources, err := apiresource.RenderMany[*apiresourcekind.PostgresVersionLoadBundle, *apiresourcekind.PostgresVersion](ctx, tx, svc.BaseParams, postgresVersions) + postgresVersionResources, err := apiresource.RenderMany[*apiresourcekind.PostgresVersion](ctx, tx, svc.BaseParams, postgresVersions) if err != nil { return nil, err } diff --git a/server/api/query_service.go b/server/api/query_service.go index d6608d782..88f2df148 100644 --- a/server/api/query_service.go +++ b/server/api/query_service.go @@ -130,7 +130,7 @@ func (svc *queryService) ActionsCancel(ctx context.Context, req *QueryActionsCan return nil, xerrors.Errorf("error upserting query cancellation: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.QueryLoadBundle, *apiresourcekind.Query](ctx, tx, svc.BaseParams, query) + resource, err := apiresource.Render[*apiresourcekind.Query](ctx, tx, svc.BaseParams, query) if err != nil { return nil, err } @@ -294,7 +294,7 @@ func (svc *queryService) Get(ctx context.Context, req *QueryGetRequest) (*apires return nil, err } - resource, err := apiresource.Render[*apiresourcekind.QueryLoadBundle, *apiresourcekind.Query](ctx, tx, svc.BaseParams, query) + resource, err := apiresource.Render[*apiresourcekind.Query](ctx, tx, svc.BaseParams, query) if err != nil { return nil, err } @@ -462,7 +462,7 @@ func (svc *queryService) List(ctx context.Context, req *QueryListRequest) (*apir return nil, xerrors.Errorf("error getting queries: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.QueryLoadBundle, *apiresourcekind.Query](ctx, tx, svc.BaseParams, asyncQueries) + resources, err := apiresource.RenderMany[*apiresourcekind.Query](ctx, tx, svc.BaseParams, asyncQueries) if err != nil { return nil, err } diff --git a/server/api/saved_query_folder_service.go b/server/api/saved_query_folder_service.go index 993e186f3..d6f08f5b4 100644 --- a/server/api/saved_query_folder_service.go +++ b/server/api/saved_query_folder_service.go @@ -97,7 +97,7 @@ func (svc *savedQueryFolderService) Create(ctx context.Context, req *SavedQueryF return nil, svc.interpretDatabaseError(ctx, xerrors.Errorf("error inserting saved query: %w", err)) } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolderLoadBundle, *apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) if err != nil { return nil, err } @@ -148,7 +148,7 @@ func (svc *savedQueryFolderService) Delete(ctx context.Context, req *SavedQueryF return nil, xerrors.Errorf("error deleting saved query folder: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolderLoadBundle, *apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, deletedSavedQueryFolder) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, deletedSavedQueryFolder) if err != nil { return nil, err } @@ -178,7 +178,7 @@ func (svc *savedQueryFolderService) Get(ctx context.Context, req *SavedQueryFold return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolderLoadBundle, *apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) if err != nil { return nil, err } @@ -252,7 +252,7 @@ func (svc *savedQueryFolderService) List(ctx context.Context, req *SavedQueryFol return nil, xerrors.Errorf("error getting saved query folders: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.SavedQueryFolderLoadBundle, *apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueries) + resources, err := apiresource.RenderMany[*apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueries) if err != nil { return nil, err } @@ -287,7 +287,7 @@ func (svc *savedQueryFolderService) Update(ctx context.Context, req *SavedQueryF queries := dbsqlc.New(tx) - resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolderLoadBundle, *apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) if err != nil { return nil, err } @@ -331,7 +331,7 @@ func (svc *savedQueryFolderService) Update(ctx context.Context, req *SavedQueryF savedQueryFolder = updatedSavedQueryFolder } - updatedResource, err := apiresource.Render[*apiresourcekind.SavedQueryFolderLoadBundle, *apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) + updatedResource, err := apiresource.Render[*apiresourcekind.SavedQueryFolder](ctx, tx, svc.BaseParams, savedQueryFolder) if err != nil { return nil, err } diff --git a/server/api/saved_query_link_service.go b/server/api/saved_query_link_service.go index 7c88e361f..8601510ce 100644 --- a/server/api/saved_query_link_service.go +++ b/server/api/saved_query_link_service.go @@ -119,7 +119,7 @@ func (svc *savedQueryLinkService) Create(ctx context.Context, req *SavedQueryLin return nil, xerrors.Errorf("error inserting saved query: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLinkLoadBundle, *apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueryLink) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueryLink) if err != nil { return nil, err } @@ -156,7 +156,7 @@ func (svc *savedQueryLinkService) Delete(ctx context.Context, req *SavedQueryLin return nil, xerrors.Errorf("error deleting saved query link: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLinkLoadBundle, *apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, deletedSavedQueryLink) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, deletedSavedQueryLink) if err != nil { return nil, err } @@ -186,7 +186,7 @@ func (svc *savedQueryLinkService) Get(ctx context.Context, req *SavedQueryLinkGe return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLinkLoadBundle, *apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueryLink) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueryLink) if err != nil { return nil, err } @@ -251,7 +251,7 @@ func (svc *savedQueryLinkService) List(ctx context.Context, req *SavedQueryLinkL return nil, xerrors.Errorf("error getting saved query links: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.SavedQueryLinkLoadBundle, *apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueries) + resources, err := apiresource.RenderMany[*apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueries) if err != nil { return nil, err } @@ -301,7 +301,7 @@ func (svc *savedQueryLinkService) Update(ctx context.Context, req *SavedQueryLin queries := dbsqlc.New(tx) - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLinkLoadBundle, *apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueryLink) + resource, err := apiresource.Render[*apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, savedQueryLink) if err != nil { return nil, err } @@ -337,7 +337,7 @@ func (svc *savedQueryLinkService) Update(ctx context.Context, req *SavedQueryLin return nil, xerrors.Errorf("error updating saved query link: %w", err) } - updatedResource, err := apiresource.Render[*apiresourcekind.SavedQueryLinkLoadBundle, *apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, updatedSavedQueryLink) + updatedResource, err := apiresource.Render[*apiresourcekind.SavedQueryLink](ctx, tx, svc.BaseParams, updatedSavedQueryLink) if err != nil { return nil, err } diff --git a/server/api/saved_query_service.go b/server/api/saved_query_service.go index 2c7f1dfdd..845f96296 100644 --- a/server/api/saved_query_service.go +++ b/server/api/saved_query_service.go @@ -110,7 +110,7 @@ func (svc *savedQueryService) ActionsRun(ctx context.Context, req *SavedQueryAct return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) + resource, err := apiresource.Render[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) if err != nil { return nil, err } @@ -240,7 +240,7 @@ func (svc *savedQueryService) Create(ctx context.Context, req *SavedQueryCreateR } okay: - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) + resource, err := apiresource.Render[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) if err != nil { return nil, err } @@ -278,7 +278,7 @@ func (svc *savedQueryService) Delete(ctx context.Context, req *SavedQueryDeleteR } deletedSavedQuery := deletedSavedQueries[0] - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, deletedSavedQuery) + resource, err := apiresource.Render[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, deletedSavedQuery) if err != nil { return nil, err } @@ -343,7 +343,7 @@ func (svc *savedQueryService) Get(ctx context.Context, req *SavedQueryGetRequest return nil, xerrors.Errorf("error updating saved query: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) + resource, err := apiresource.Render[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) if err != nil { return nil, err } @@ -460,7 +460,7 @@ func (svc *savedQueryService) List(ctx context.Context, req *SavedQueryListReque return nil, xerrors.Errorf("error getting saved queries: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQueries) + resources, err := apiresource.RenderMany[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQueries) if err != nil { return nil, err } @@ -534,7 +534,7 @@ func (svc *savedQueryService) Update(ctx context.Context, req *SavedQueryUpdateR queries := dbsqlc.New(tx) - resource, err := apiresource.Render[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) + resource, err := apiresource.Render[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) if err != nil { return nil, err } @@ -678,7 +678,7 @@ func (svc *savedQueryService) Update(ctx context.Context, req *SavedQueryUpdateR } } - updatedResource, err := apiresource.Render[*apiresourcekind.SavedQueryLoadBundle, *apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) + updatedResource, err := apiresource.Render[*apiresourcekind.SavedQuery](ctx, tx, svc.BaseParams, savedQuery) if err != nil { return nil, err } diff --git a/server/api/tailscale_oauth_client_service.go b/server/api/tailscale_oauth_client_service.go index e8ea92344..27a344390 100644 --- a/server/api/tailscale_oauth_client_service.go +++ b/server/api/tailscale_oauth_client_service.go @@ -88,7 +88,7 @@ func (svc *tailscaleOAuthClientService) Create(ctx context.Context, req *Tailsca return nil, err } - resource, err := apiresource.Render[*apiresourcekind.TailscaleOAuthClientLoadBundle, *apiresourcekind.TailscaleOAuthClient](ctx, tx, svc.BaseParams, tailscaleOAuthClient) + resource, err := apiresource.Render[*apiresourcekind.TailscaleOAuthClient](ctx, tx, svc.BaseParams, tailscaleOAuthClient) if err != nil { return nil, err } @@ -137,7 +137,7 @@ func (svc *tailscaleOAuthClientService) Delete(ctx context.Context, req *Tailsca return nil, err } - resource, err := apiresource.Render[*apiresourcekind.TailscaleOAuthClientLoadBundle, *apiresourcekind.TailscaleOAuthClient](ctx, tx, svc.BaseParams, deletedTailscaleOAuthClient) + resource, err := apiresource.Render[*apiresourcekind.TailscaleOAuthClient](ctx, tx, svc.BaseParams, deletedTailscaleOAuthClient) if err != nil { return nil, err } @@ -206,7 +206,7 @@ func (svc *tailscaleOAuthClientService) List(ctx context.Context, req *Tailscale return nil, err } - resources, err := apiresource.RenderMany[*apiresourcekind.TailscaleOAuthClientLoadBundle, *apiresourcekind.TailscaleOAuthClient](ctx, tx, svc.BaseParams, tailscaleOAuthClients) + resources, err := apiresource.RenderMany[*apiresourcekind.TailscaleOAuthClient](ctx, tx, svc.BaseParams, tailscaleOAuthClients) if err != nil { return nil, err } diff --git a/server/api/team_member_service.go b/server/api/team_member_service.go index 3ffea7446..c647761d2 100644 --- a/server/api/team_member_service.go +++ b/server/api/team_member_service.go @@ -392,7 +392,7 @@ func (svc *teamMemberService) List(ctx context.Context, req *TeamMemberListReque return nil, xerrors.Errorf("error getting team members: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.TeamMemberLoadBundle, *apiresourcekind.TeamMember](ctx, tx, svc.BaseParams, teamMembers) + resources, err := apiresource.RenderMany[*apiresourcekind.TeamMember](ctx, tx, svc.BaseParams, teamMembers) if err != nil { return nil, err } @@ -439,7 +439,7 @@ func (svc *teamMemberService) Get(ctx context.Context, req *TeamMemberGetRequest return nil, xerrors.Errorf("error getting team member: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.TeamMemberLoadBundle, *apiresourcekind.TeamMember](ctx, tx, svc.BaseParams, teamMember) + resource, err := apiresource.Render[*apiresourcekind.TeamMember](ctx, tx, svc.BaseParams, teamMember) if err != nil { return nil, err } diff --git a/server/api/team_service.go b/server/api/team_service.go index 83a983553..2ab83147f 100644 --- a/server/api/team_service.go +++ b/server/api/team_service.go @@ -96,7 +96,7 @@ func (svc *teamService) ActionFinalizeBilling(ctx context.Context, req *TeamActi return nil, apierror.NewBadRequestError(ctx, pcommandkind.ErrMessageTeamDeleteExistingClusters) } - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } @@ -111,7 +111,7 @@ func (svc *teamService) ActionFinalizeBilling(ctx context.Context, req *TeamActi return nil, xerrors.Errorf("error updating team: %w", err) } - resource, err = apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, updatedTeam) + resource, err = apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, updatedTeam) if err != nil { return nil, err } @@ -198,7 +198,7 @@ func (svc *teamService) Create(ctx context.Context, req *TeamCreateRequest) (*ap return nil, err } - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } @@ -269,7 +269,7 @@ func (svc *teamService) Get(ctx context.Context, req *TeamGetRequest) (*apiresou return nil, err } - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } @@ -359,7 +359,7 @@ func (svc *teamService) List(ctx context.Context, req *TeamListRequest) (*apires return nil, xerrors.Errorf("error getting teams: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, teams) + resources, err := apiresource.RenderMany[*apiresourcekind.Team](ctx, tx, svc.BaseParams, teams) if err != nil { return nil, err } @@ -609,7 +609,7 @@ func (svc *teamService) Update(ctx context.Context, req *TeamUpdateRequest) (*ap } } - resource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } @@ -620,7 +620,7 @@ func (svc *teamService) Update(ctx context.Context, req *TeamUpdateRequest) (*ap return nil, err } - updatedResource, err := apiresource.Render[*apiresourcekind.TeamLoadBundle, *apiresourcekind.Team](ctx, tx, svc.BaseParams, updatedTeam) + updatedResource, err := apiresource.Render[*apiresourcekind.Team](ctx, tx, svc.BaseParams, updatedTeam) if err != nil { return nil, err } diff --git a/server/apiresourcekind/account_test.go b/server/apiresourcekind/account_test.go index e06a03968..674b81f68 100644 --- a/server/apiresourcekind/account_test.go +++ b/server/apiresourcekind/account_test.go @@ -132,7 +132,7 @@ func TestAccountMinimalRender(t *testing.T) { account2 := dbfactory.Account(ctx, t, tx, &dbfactory.AccountOpts{}) - resources, err := apiresource.RenderMany[*AccountMinimalLoadBundle, *AccountMinimal](ctx, tx, bp(), []*dbsqlc.Account{account1, account2}) + resources, err := apiresource.RenderMany[*AccountMinimal](ctx, tx, bp(), []*dbsqlc.Account{account1, account2}) require.NoError(t, err) { @@ -197,7 +197,7 @@ func TestAccountMinimalRender(t *testing.T) { ProviderName: ptrutil.Ptr(dbsqlc.AccountFederatedIdentityProviderNameGoogle), }) - resources, err := apiresource.RenderMany[*AccountMinimalLoadBundle, *AccountMinimal](ctx, tx, bp(), []*dbsqlc.Account{ + resources, err := apiresource.RenderMany[*AccountMinimal](ctx, tx, bp(), []*dbsqlc.Account{ accountAzure, accountGoogle, accountNoSSO, @@ -300,7 +300,7 @@ func TestAccountRender(t *testing.T) { ctx := authntest.Account(account1).Context(ctx) - resources, err := apiresource.RenderMany[*AccountLoadBundle, *Account](ctx, tx, bp(), []*dbsqlc.Account{account1, account2}) + resources, err := apiresource.RenderMany[*Account](ctx, tx, bp(), []*dbsqlc.Account{account1, account2}) require.NoError(t, err) prequire.PartialEqual(t, &Account{ @@ -345,7 +345,7 @@ func TestAccountRender(t *testing.T) { ctx := authntest.Account(account).Context(ctx) - resource, err := apiresource.Render[*AccountLoadBundle, *Account](ctx, tx, bp(), account) + resource, err := apiresource.Render[*Account](ctx, tx, bp(), account) require.NoError(t, err) prequire.PartialEqual(t, &Account{ @@ -386,7 +386,7 @@ func TestAccountRender(t *testing.T) { { ctx := authntest.Account(account).Context(ctx) - resource, err := apiresource.Render[*AccountLoadBundle, *Account](ctx, tx, bp(), account) + resource, err := apiresource.Render[*Account](ctx, tx, bp(), account) require.NoError(t, err) prequire.PartialEqual(t, &Account{ @@ -429,7 +429,7 @@ func TestAccountRender(t *testing.T) { SSOIdentityProvider(authn.SSOIdentityProvider(federatedIdentity.ProviderName)). Context(ctx) - resource, err := apiresource.Render[*AccountLoadBundle, *Account](ctx, tx, bp(), account) + resource, err := apiresource.Render[*Account](ctx, tx, bp(), account) require.NoError(t, err) prequire.PartialEqual(t, &Account{ @@ -451,7 +451,7 @@ func TestAccountRender(t *testing.T) { SSOIdentityProvider(authn.SSOIdentityProviderCustomOpenIDConnectProvider). Context(ctx) - resource, err := apiresource.Render[*AccountLoadBundle, *Account](ctx, tx, bp(), account) + resource, err := apiresource.Render[*Account](ctx, tx, bp(), account) require.NoError(t, err) prequire.PartialEqual(t, &Account{ @@ -476,7 +476,7 @@ func TestAccountRender(t *testing.T) { SSOIdentityProvider(authn.SSOIdentityProvider(federatedIdentity.ProviderName)). Context(ctx) - resource, err := apiresource.Render[*AccountLoadBundle, *Account](ctx, tx, bp(), account) + resource, err := apiresource.Render[*Account](ctx, tx, bp(), account) require.NoError(t, err) prequire.PartialEqual(t, &Account{ diff --git a/server/apiresourcekind/api_key_test.go b/server/apiresourcekind/api_key_test.go index ada40ed69..63095dd85 100644 --- a/server/apiresourcekind/api_key_test.go +++ b/server/apiresourcekind/api_key_test.go @@ -45,7 +45,7 @@ func TestAPIKeyRender(t *testing.T) { AccountID: account.ID, }) - resources, err := apiresource.RenderMany[*APIKeyLoadBundle, *APIKey](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.APIKey{apiKey1, apiKey2}) + resources, err := apiresource.RenderMany[*APIKey](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.APIKey{apiKey1, apiKey2}) require.NoError(t, err) apiKey1Resource := resources[0] diff --git a/server/apiresourcekind/cluster_group_test.go b/server/apiresourcekind/cluster_group_test.go index 9164aaedc..dfc987b90 100644 --- a/server/apiresourcekind/cluster_group_test.go +++ b/server/apiresourcekind/cluster_group_test.go @@ -65,7 +65,7 @@ func TestClusterGroupRender(t *testing.T) { }) cluster2A := dbfactory.Cluster(ctx, t, tx, &dbfactory.ClusterOpts{ID: ptrutil.Ptr(pulid.New()), ClusterGroupID: &clusterGroup2.ID, TeamID: team.ID}) - resources, err := apiresource.RenderMany[*ClusterGroupLoadBundle, *ClusterGroup](ctx, tx, bp(), []*dbsqlc.ClusterGroup{clusterGroup1, clusterGroup2}) + resources, err := apiresource.RenderMany[*ClusterGroup](ctx, tx, bp(), []*dbsqlc.ClusterGroup{clusterGroup1, clusterGroup2}) require.NoError(t, err) clusterGroup1Resource := resources[0] diff --git a/server/apiresourcekind/cluster_test.go b/server/apiresourcekind/cluster_test.go index cb5c66d76..7f8d99559 100644 --- a/server/apiresourcekind/cluster_test.go +++ b/server/apiresourcekind/cluster_test.go @@ -109,7 +109,7 @@ func TestClusterRender(t *testing.T) { planA := providers.Default.MustGet(dbsqlc.ProviderID(clusterA.ProviderID)).MustGetPlan(clusterA.PlanID, true) planB := providers.Default.MustGet(dbsqlc.ProviderID(clusterB.ProviderID)).MustGetPlan(clusterB.PlanID, true) - resources, err := apiresource.RenderMany[*ClusterLoadBundle, *Cluster](ctx, tx, bp(), []*dbsqlc.Cluster{clusterA, clusterB}) + resources, err := apiresource.RenderMany[*Cluster](ctx, tx, bp(), []*dbsqlc.Cluster{clusterA, clusterB}) require.NoError(t, err) clusterAResource := resources[0] @@ -186,7 +186,7 @@ func TestClusterRender(t *testing.T) { TeamID: team.ID, }) - resources, err := apiresource.RenderMany[*ClusterLoadBundle, *Cluster](ctx, tx, bp(), []*dbsqlc.Cluster{cluster}) + resources, err := apiresource.RenderMany[*Cluster](ctx, tx, bp(), []*dbsqlc.Cluster{cluster}) require.NoError(t, err) prequire.PartialEqual(t, &Cluster{ diff --git a/server/apiresourcekind/custom_openid_connect_provider_test.go b/server/apiresourcekind/custom_openid_connect_provider_test.go index 034ff06b5..8f54175b8 100644 --- a/server/apiresourcekind/custom_openid_connect_provider_test.go +++ b/server/apiresourcekind/custom_openid_connect_provider_test.go @@ -44,7 +44,7 @@ func TestCustomOpenIDConnectProviderRender(t *testing.T) { }) openIDProvider2 := dbfactory.CustomOpenIDConnectProvider(ctx, t, tx, &dbfactory.CustomOpenIDConnectProviderOpts{}) - resources, err := apiresource.RenderMany[*CustomOpenIDConnectProviderLoadBundle, *CustomOpenIDConnectProvider](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.CustomOpenIDConnectProvider{openIDProvider1, openIDProvider2}) + resources, err := apiresource.RenderMany[*CustomOpenIDConnectProvider](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.CustomOpenIDConnectProvider{openIDProvider1, openIDProvider2}) require.NoError(t, err) openIDProvider1Resource := resources[0] diff --git a/server/apiresourcekind/notification_setting_test.go b/server/apiresourcekind/notification_setting_test.go index 1244fe967..8ad7f18f5 100644 --- a/server/apiresourcekind/notification_setting_test.go +++ b/server/apiresourcekind/notification_setting_test.go @@ -52,7 +52,7 @@ func TestNotificationSettingRender(t *testing.T) { Kind: string(dbsqlc.NotificationKindEmailChanged), } - resources, err := apiresource.RenderMany[*NotificationSettingLoadBundle, *NotificationSetting](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.NotificationSetting{setting1, setting2}) + resources, err := apiresource.RenderMany[*NotificationSetting](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.NotificationSetting{setting1, setting2}) require.NoError(t, err) setting1Resource := resources[0] diff --git a/server/apiresourcekind/playground_tutorial_category_test.go b/server/apiresourcekind/playground_tutorial_category_test.go index e2494f1f2..46461313a 100644 --- a/server/apiresourcekind/playground_tutorial_category_test.go +++ b/server/apiresourcekind/playground_tutorial_category_test.go @@ -45,7 +45,7 @@ func TestPlaygroundTutorialCategoryRender(t *testing.T) { TeamID: team.ID, }) - resources, err := apiresource.RenderMany[*PlaygroundTutorialCategoryLoadBundle, *PlaygroundTutorialCategory](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.PlaygroundTutorialCategory{savedQueryCategory1, savedQueryCategory2}) + resources, err := apiresource.RenderMany[*PlaygroundTutorialCategory](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.PlaygroundTutorialCategory{savedQueryCategory1, savedQueryCategory2}) require.NoError(t, err) savedQueryCategory1Resource := resources[0] diff --git a/server/apiresourcekind/playground_tutorial_test.go b/server/apiresourcekind/playground_tutorial_test.go index 2fd235567..75a6d0667 100644 --- a/server/apiresourcekind/playground_tutorial_test.go +++ b/server/apiresourcekind/playground_tutorial_test.go @@ -61,7 +61,7 @@ func TestPlaygroundTutorialRender(t *testing.T) { TeamID: team.ID, }) - resources, err := apiresource.RenderMany[*PlaygroundTutorialLoadBundle, *PlaygroundTutorial](ctx, tx, bp(), []*dbsqlc.PlaygroundTutorial{playgroundTutorial1, playgroundTutorial2}) + resources, err := apiresource.RenderMany[*PlaygroundTutorial](ctx, tx, bp(), []*dbsqlc.PlaygroundTutorial{playgroundTutorial1, playgroundTutorial2}) require.NoError(t, err) playgroundTutorial1Resource := resources[0] diff --git a/server/apiresourcekind/postgres_version_test.go b/server/apiresourcekind/postgres_version_test.go index 63a7a4431..3b82c5551 100644 --- a/server/apiresourcekind/postgres_version_test.go +++ b/server/apiresourcekind/postgres_version_test.go @@ -40,7 +40,7 @@ func TestPostgresVersionRender(t *testing.T) { postgresVersion := dbfactory.PostgresVersion_15(ctx, t, tx) postgresVersionDefault := dbfactory.PostgresVersion_Default(ctx, t, tx) - resources, err := apiresource.RenderMany[*PostgresVersionLoadBundle, *PostgresVersion](ctx, tx, bp(), []*dbsqlc.PostgresVersion{ + resources, err := apiresource.RenderMany[*PostgresVersion](ctx, tx, bp(), []*dbsqlc.PostgresVersion{ postgresVersion, postgresVersionDefault, }) diff --git a/server/apiresourcekind/query_test.go b/server/apiresourcekind/query_test.go index c749e26e4..0b614fae6 100644 --- a/server/apiresourcekind/query_test.go +++ b/server/apiresourcekind/query_test.go @@ -80,7 +80,7 @@ func TestQueryRender(t *testing.T) { }, nil } - resources, err := apiresource.RenderMany[*QueryLoadBundle, *Query](ctx, tx, baseParams, []*dbsqlc.Query{query1, query2}) + resources, err := apiresource.RenderMany[*Query](ctx, tx, baseParams, []*dbsqlc.Query{query1, query2}) require.NoError(t, err) query1Resource := resources[0] @@ -138,7 +138,7 @@ func TestQueryRender(t *testing.T) { Status: ptrutil.Ptr(dbsqlc.QueryStatusPending), }) - resource, err := apiresource.Render[*QueryLoadBundle, *Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) + resource, err := apiresource.Render[*Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) require.NoError(t, err) prequire.PartialEqual(t, &Query{ @@ -172,7 +172,7 @@ func TestQueryRender(t *testing.T) { Status: ptrutil.Ptr(dbsqlc.QueryStatusPending), }) - resource, err := apiresource.Render[*QueryLoadBundle, *Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) + resource, err := apiresource.Render[*Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) require.NoError(t, err) prequire.PartialEqual(t, &Query{ @@ -203,7 +203,7 @@ func TestQueryRender(t *testing.T) { Status: ptrutil.Ptr(dbsqlc.QueryStatusPending), }) - resource, err := apiresource.Render[*QueryLoadBundle, *Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) + resource, err := apiresource.Render[*Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) require.NoError(t, err) prequire.PartialEqual(t, &Query{ @@ -221,7 +221,7 @@ func TestQueryRender(t *testing.T) { QueryID: query.ID, }) - resource, err := apiresource.Render[*QueryLoadBundle, *Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) + resource, err := apiresource.Render[*Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) require.NoError(t, err) prequire.PartialEqual(t, &Query{ @@ -241,7 +241,7 @@ func TestQueryRender(t *testing.T) { QueryID: query.ID, }) - resource, err := apiresource.Render[*QueryLoadBundle, *Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) + resource, err := apiresource.Render[*Query](ctx, tx, pbaseparamtest.DefaultBaseParams(), query) require.NoError(t, err) prequire.PartialEqual(t, &Query{ diff --git a/server/apiresourcekind/saved_query_folder_test.go b/server/apiresourcekind/saved_query_folder_test.go index 694680ce5..142da85bd 100644 --- a/server/apiresourcekind/saved_query_folder_test.go +++ b/server/apiresourcekind/saved_query_folder_test.go @@ -52,7 +52,7 @@ func TestSavedQueryFolderRender(t *testing.T) { TeamID: team.ID, }) - resources, err := apiresource.RenderMany[*SavedQueryFolderLoadBundle, *SavedQueryFolder](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.SavedQueryFolder{savedQueryFolder1, savedQueryFolder2}) + resources, err := apiresource.RenderMany[*SavedQueryFolder](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.SavedQueryFolder{savedQueryFolder1, savedQueryFolder2}) require.NoError(t, err) savedQueryFolder1Resource := resources[0] @@ -96,7 +96,7 @@ func TestSavedQueryFolderRender(t *testing.T) { ctx := authntest.Account(account).Context(ctx) - resources, err := apiresource.RenderMany[*SavedQueryFolderLoadBundle, *SavedQueryFolder](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.SavedQueryFolder{savedQueryFolder1, savedQueryFolder2}) + resources, err := apiresource.RenderMany[*SavedQueryFolder](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.SavedQueryFolder{savedQueryFolder1, savedQueryFolder2}) require.NoError(t, err) savedQueryFolder1Resource := resources[0] diff --git a/server/apiresourcekind/saved_query_test.go b/server/apiresourcekind/saved_query_test.go index cd01741f0..b7982283d 100644 --- a/server/apiresourcekind/saved_query_test.go +++ b/server/apiresourcekind/saved_query_test.go @@ -103,7 +103,7 @@ func TestSavedQueryRender(t *testing.T) { }, nil } - resources, err := apiresource.RenderMany[*SavedQueryLoadBundle, *SavedQuery](ctx, tx, baseParams, []*dbsqlc.SavedQuery{savedQuery1, savedQuery2}) + resources, err := apiresource.RenderMany[*SavedQuery](ctx, tx, baseParams, []*dbsqlc.SavedQuery{savedQuery1, savedQuery2}) require.NoError(t, err) savedQuery1Resource := resources[0] @@ -182,7 +182,7 @@ func TestSavedQueryRender(t *testing.T) { ctx := authntest.Account(account).Context(ctx) - resources, err := apiresource.RenderMany[*SavedQueryLoadBundle, *SavedQuery](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.SavedQuery{savedQuery1, savedQuery2}) + resources, err := apiresource.RenderMany[*SavedQuery](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.SavedQuery{savedQuery1, savedQuery2}) require.NoError(t, err) savedQuery1Resource := resources[0] diff --git a/server/apiresourcekind/scim_group_test.go b/server/apiresourcekind/scim_group_test.go index 43f3fdca0..97de51644 100644 --- a/server/apiresourcekind/scim_group_test.go +++ b/server/apiresourcekind/scim_group_test.go @@ -54,7 +54,7 @@ func TestSCIMGroupRender(t *testing.T) { }) _ = dbfactory.TeamMember(ctx, t, tx, &dbfactory.TeamMemberOpts{AccountID: account1.ID, TeamID: team1.ID}) - resources, err := apiresource.RenderMany[*SCIMGroupLoadBundle, *SCIMGroup](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.Team{team1, team2}) + resources, err := apiresource.RenderMany[*SCIMGroup](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.Team{team1, team2}) require.NoError(t, err) group1Resource := resources[0] diff --git a/server/apiresourcekind/scim_user_test.go b/server/apiresourcekind/scim_user_test.go index 0bd1c4786..d8184a274 100644 --- a/server/apiresourcekind/scim_user_test.go +++ b/server/apiresourcekind/scim_user_test.go @@ -52,7 +52,7 @@ func TestSCIMUserRender(t *testing.T) { SCIMOrganizationID: &org.ID, }) - resources, err := apiresource.RenderMany[*SCIMUserLoadBundle, *SCIMUser](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.Account{account1, account2}) + resources, err := apiresource.RenderMany[*SCIMUser](ctx, tx, pbaseparamtest.DefaultBaseParams(), []*dbsqlc.Account{account1, account2}) require.NoError(t, err) savedQueryFolder1Resource := resources[0] diff --git a/server/apiresourcekind/team_member_test.go b/server/apiresourcekind/team_member_test.go index 6c18b8069..f85adc14c 100644 --- a/server/apiresourcekind/team_member_test.go +++ b/server/apiresourcekind/team_member_test.go @@ -56,7 +56,7 @@ func TestTeamMemberRender(t *testing.T) { teamMember1 := dbfactory.TeamMember_Manager(ctx, t, tx, team.ID, account1.ID) teamMember2 := dbfactory.TeamMember_Member(ctx, t, tx, team.ID, account2.ID) - resources, err := apiresource.RenderMany[*TeamMemberLoadBundle, *TeamMember](ctx, tx, bp(), []*dbsqlc.TeamMember{teamMember1, teamMember2}) + resources, err := apiresource.RenderMany[*TeamMember](ctx, tx, bp(), []*dbsqlc.TeamMember{teamMember1, teamMember2}) require.NoError(t, err) prequire.PartialEqual(t, &TeamMember{ diff --git a/server/apiresourcekind/team_test.go b/server/apiresourcekind/team_test.go index 058864a4f..ce7f69ca2 100644 --- a/server/apiresourcekind/team_test.go +++ b/server/apiresourcekind/team_test.go @@ -81,7 +81,7 @@ func TestTeamRender(t *testing.T) { ssoDomain1 := dbfactory.TeamSSODomain(ctx, t, tx, &dbfactory.TeamSSODomainOpts{TeamID: team1.ID}) - resources, err := apiresource.RenderMany[*TeamLoadBundle, *Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) + resources, err := apiresource.RenderMany[*Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -139,7 +139,7 @@ func TestTeamRender(t *testing.T) { }) ctx = authntest.Account(account).Context(ctx) - resources, err := apiresource.RenderMany[*TeamLoadBundle, *Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) + resources, err := apiresource.RenderMany[*Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -160,7 +160,7 @@ func TestTeamRender(t *testing.T) { }) team2 := dbfactory.Team(ctx, t, tx, &dbfactory.TeamOpts{}) - resources, err := apiresource.RenderMany[*TeamLoadBundle, *Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) + resources, err := apiresource.RenderMany[*Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -184,7 +184,7 @@ func TestTeamRender(t *testing.T) { CreatedForAccountID: &account.ID, }) - resources, err := apiresource.RenderMany[*TeamLoadBundle, *Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) + resources, err := apiresource.RenderMany[*Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -203,7 +203,7 @@ func TestTeamRender(t *testing.T) { ctx = authn.SetContextContainer(ctx) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) require.Nil(t, resource.Role) })) @@ -213,7 +213,7 @@ func TestTeamRender(t *testing.T) { { team := dbfactory.Team(ctx, t, tx, &dbfactory.TeamOpts{}) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) require.Nil(t, resource.BillingAddress) } @@ -225,7 +225,7 @@ func TestTeamRender(t *testing.T) { BillingAddressPostalCode: ptrutil.Ptr("12345"), }) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) require.Nil(t, resource.BillingAddress) } @@ -241,7 +241,7 @@ func TestTeamRender(t *testing.T) { BillingAddressState: ptrutil.Ptr("AZ"), }) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) prequire.PartialEqual(t, &Team{ BillingAddress: &TeamBillingAddress{ @@ -261,7 +261,7 @@ func TestTeamRender(t *testing.T) { _ = makeInvoice(1000_00, 0, dbsqlc.InvoiceStatusPaid, team) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -277,7 +277,7 @@ func TestTeamRender(t *testing.T) { _ = makeInvoice(1000_00, -1, dbsqlc.InvoiceStatusPending, team) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -293,7 +293,7 @@ func TestTeamRender(t *testing.T) { _ = makeInvoice(1000_00, 0, dbsqlc.InvoiceStatusCurrent, team) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -309,7 +309,7 @@ func TestTeamRender(t *testing.T) { _ = makeInvoice(4_99, 0, dbsqlc.InvoiceStatusCurrent, team) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -339,7 +339,7 @@ func TestTeamRender(t *testing.T) { }) _ = dbfactory.TeamMember_Member(ctx, t, tx, teamMember.ID, account.ID) - resources, err := apiresource.RenderMany[*TeamLoadBundle, *Team](ctx, tx, bp(), []*dbsqlc.Team{teamAdmin, teamManager, teamMember}) + resources, err := apiresource.RenderMany[*Team](ctx, tx, bp(), []*dbsqlc.Team{teamAdmin, teamManager, teamMember}) require.NoError(t, err) resourceAdmin := resources[0] @@ -387,7 +387,7 @@ func TestTeamRender(t *testing.T) { Tier: ptrutil.Ptr(dbsqlc.TeamSupportTierPremium), }) - resources, err := apiresource.RenderMany[*TeamLoadBundle, *Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) + resources, err := apiresource.RenderMany[*Team](ctx, tx, bp(), []*dbsqlc.Team{team1, team2}) require.NoError(t, err) prequire.PartialEqual(t, &Team{ @@ -410,7 +410,7 @@ func TestTeamRender(t *testing.T) { TeamID: team.ID, }) - resource, err := apiresource.Render[*TeamLoadBundle, *Team](ctx, tx, bp(), team) + resource, err := apiresource.Render[*Team](ctx, tx, bp(), team) require.NoError(t, err) prequire.PartialEqual(t, &Team{ diff --git a/server/vendorapi/github_service.go b/server/vendorapi/github_service.go index 4e131ada9..876b69eb5 100644 --- a/server/vendorapi/github_service.go +++ b/server/vendorapi/github_service.go @@ -289,7 +289,7 @@ func (svc *githubService) VerifySecret(ctx context.Context, req *GitHubVerifySec return nil, xerrors.Errorf("error deleting API key: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.APIKeyLoadBundle, *apiresourcekind.APIKey](ctx, tx, svc.BaseParams, deletedAPIKey) + resource, err := apiresource.Render[*apiresourcekind.APIKey](ctx, tx, svc.BaseParams, deletedAPIKey) if err != nil { return nil, err } diff --git a/server/vendorapi/scimapi/scim_group_service.go b/server/vendorapi/scimapi/scim_group_service.go index fc1869e20..3a5c999a4 100644 --- a/server/vendorapi/scimapi/scim_group_service.go +++ b/server/vendorapi/scimapi/scim_group_service.go @@ -154,7 +154,7 @@ func (svc *scimGroupService) GroupCreate(ctx context.Context, req *SCIMGroupCrea return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SCIMGroupLoadBundle, *apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } @@ -239,7 +239,7 @@ func (svc *scimGroupService) GroupGet(ctx context.Context, req *SCIMGroupGetRequ return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SCIMGroupLoadBundle, *apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } @@ -320,7 +320,7 @@ func (svc *scimGroupService) GroupList(ctx context.Context, req *SCIMGroupListRe return nil, xerrors.Errorf("error getting teams: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.SCIMGroupLoadBundle, *apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, teams) + resources, err := apiresource.RenderMany[*apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, teams) if err != nil { return nil, err } @@ -384,7 +384,7 @@ func (svc *scimGroupService) GroupReplace(ctx context.Context, req *SCIMGroupRep return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SCIMGroupLoadBundle, *apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, updatedTeam) + resource, err := apiresource.Render[*apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, updatedTeam) if err != nil { return nil, err } @@ -504,7 +504,7 @@ func (svc *scimGroupService) GroupUpdate(ctx context.Context, req *SCIMGroupUpda team = updatedTeam } - resource, err := apiresource.Render[*apiresourcekind.SCIMGroupLoadBundle, *apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, team) + resource, err := apiresource.Render[*apiresourcekind.SCIMGroup](ctx, tx, svc.BaseParams, team) if err != nil { return nil, err } diff --git a/server/vendorapi/scimapi/scim_user_service.go b/server/vendorapi/scimapi/scim_user_service.go index c07bb305e..8941ef639 100644 --- a/server/vendorapi/scimapi/scim_user_service.go +++ b/server/vendorapi/scimapi/scim_user_service.go @@ -111,7 +111,7 @@ func (svc *scimUserService) UserCreate(ctx context.Context, req *SCIMUserCreateR return nil, xerrors.Errorf("error inserting account: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.SCIMUserLoadBundle, *apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, account) + resource, err := apiresource.Render[*apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, account) if err != nil { return nil, err } @@ -201,7 +201,7 @@ func (svc *scimUserService) UserGet(ctx context.Context, req *SCIMUserGetRequest return nil, err } - resource, err := apiresource.Render[*apiresourcekind.SCIMUserLoadBundle, *apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, account) + resource, err := apiresource.Render[*apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, account) if err != nil { return nil, err } @@ -305,7 +305,7 @@ func (svc *scimUserService) UserList(ctx context.Context, req *SCIMUserListReque return nil, xerrors.Errorf("error getting accounts: %w", err) } - resources, err := apiresource.RenderMany[*apiresourcekind.SCIMUserLoadBundle, *apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, accounts) + resources, err := apiresource.RenderMany[*apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, accounts) if err != nil { return nil, err } @@ -380,7 +380,7 @@ func (svc *scimUserService) UserReplace(ctx context.Context, req *SCIMUserReplac return nil, xerrors.Errorf("error updating account: %w", err) } - resource, err := apiresource.Render[*apiresourcekind.SCIMUserLoadBundle, *apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, updatedAccount) + resource, err := apiresource.Render[*apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, updatedAccount) if err != nil { return nil, err } @@ -538,7 +538,7 @@ func (svc *scimUserService) UserUpdate(ctx context.Context, req *SCIMUserUpdateR account = updatedAccount } - resource, err := apiresource.Render[*apiresourcekind.SCIMUserLoadBundle, *apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, account) + resource, err := apiresource.Render[*apiresourcekind.SCIMUser](ctx, tx, svc.BaseParams, account) if err != nil { return nil, err } diff --git a/tools/procure-access-token/main.go b/tools/procure-access-token/main.go index f80498727..fdbbb3d9f 100644 --- a/tools/procure-access-token/main.go +++ b/tools/procure-access-token/main.go @@ -239,7 +239,7 @@ func procureAccessToken(ctx context.Context, config *EnvConfig) (*procureAccessT apiKey = apiKeyRes.APIKey } - apiKeyResource, err := apiresource.Render[*apiresourcekind.APIKeyLoadBundle, *apiresourcekind.APIKey](ctx, tx, commandBaseParams, apiKey) + apiKeyResource, err := apiresource.Render[*apiresourcekind.APIKey](ctx, tx, commandBaseParams, apiKey) if err != nil { return nil, err } ```

[brandur]

Thanks again for this.

Updated the article here:

https://brandur.org/two-phase-render#renderable

And wrote an atom about it:

https://brandur.org/atoms/guecb42