Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions codegen/cmd/generate-untyped-resources/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -481,8 +481,7 @@ func ({{$.ReceiverName}} *{{$.Name}}) {{.Name}}WithContext_{{.HTTPMethod}}(ctx c
return nil, err
}

asyncResult, _, err := MaybeWaitAsyncResultWithContext(ctx, result, {{$.ReceiverName}}.Rest, waitTimeout)
return asyncResult, err
return MaybeWaitAsyncResultWithContext(ctx, result, {{$.ReceiverName}}.Rest, waitTimeout)
{{else}}{{if .ReturnsNoContent}}_, err := core.Request[core.Record](ctx, {{$.ReceiverName}}, http.{{.GoHTTPMethod}}, resourcePath, {{if .HasParams}}params{{else}}nil{{end}}, {{if or .HasBody .SimplifiedBody}}body{{else}}nil{{end}})
return err
{{else}}{{if .ReturnsArray}}result, err := core.Request[core.RecordSet](ctx, {{$.ReceiverName}}, http.{{.GoHTTPMethod}}, resourcePath, {{if .HasParams}}params{{else}}nil{{end}}, {{if or .HasBody .SimplifiedBody}}body{{else}}nil{{end}})
Expand Down
3 changes: 1 addition & 2 deletions codegen/templates/extramethods-only.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ func (r *{{$.Name}}) {{.Name}}WithContext_{{.HTTPMethod}}(ctx context.Context{{i
return nil, err
}

asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
return asyncResult, err
return untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
{{else}}{{if .ReturnsNoContent}}{{if and (or (and .HasParams .BodyFields) (and .HasBody .BodyFields)) (not .SimplifiedBody)}}_, err = core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
return err{{else}}_, err := core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
return err{{end}}
Expand Down
15 changes: 5 additions & 10 deletions codegen/templates/resource.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ func (r *{{.Name}}) UpdateWithContext(ctx context.Context, id any{{range .Update
return nil, err
}

asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
return asyncResult, err
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
}
{{else}}
// Update updates an existing {{.LowerName}} and returns an async task{{if .UpdateSummary}}
Expand Down Expand Up @@ -305,8 +304,7 @@ func (r *{{.Name}}) UpdateWithContext(ctx context.Context, id any, req *{{.Name}
return nil, err
}

asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
return asyncResult, err
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
}
{{end}}
{{else}}
Expand Down Expand Up @@ -422,8 +420,7 @@ func (r *{{.Name}}) DeleteWithContext(ctx context.Context, req *{{.Name}}SearchP
return nil, err
}

asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
return asyncResult, err
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
}
{{else}}
// Delete deletes a {{.LowerName}} with search parameters{{if or .DeleteQueryParams .DeleteBodyParams}}
Expand Down Expand Up @@ -493,8 +490,7 @@ func (r *{{.Name}}) DeleteByIdWithContext(ctx context.Context, id any{{range .De
return nil, err
}

asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
return asyncResult, err
return untyped.MaybeWaitAsyncResultWithContext(ctx, record, r.Untyped, waitTimeout)
}
{{else}}
// DeleteById deletes a {{.LowerName}} by ID{{if .DeleteSummary}}
Expand Down Expand Up @@ -675,8 +671,7 @@ func (r *{{$.Name}}) {{.Name}}WithContext_{{.HTTPMethod}}(ctx context.Context{{i
return nil, err
}

asyncResult, _, err := untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
return asyncResult, err
return untyped.MaybeWaitAsyncResultWithContext(ctx, result, r.Untyped, waitTimeout)
{{else}}{{if .ReturnsNoContent}}{{if and (or (and .HasParams .BodyFields) (and .HasBody .BodyFields)) (not .SimplifiedBody)}}_, err = core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
return err{{else}}_, err := core.Request[core.Record](ctx, r.Untyped.GetResourceMap()[r.GetResourceType()], http.{{.GoHTTPMethod}}, resourcePath, reqParams, reqBody)
return err{{end}}
Expand Down
Loading
Loading