Skip to content

wrap deferred exit(err) in functor #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 15, 2022
Merged

wrap deferred exit(err) in functor #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion templates/pkg/resource/references_read_referenced_resource.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ Where field is of type 'Field' from aws-controllers-k8s/code-generator/pkg/model
"{{ .FieldConfig.References.Path }}")
}
{{- end -}}
{{- end -}}
{{- end -}}
8 changes: 6 additions & 2 deletions templates/pkg/resource/sdk.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ func (rm *resourceManager) sdkCreate(
) (created *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkCreate")
defer exit(err)
defer func() {
exit(err)
}()

{{- if $hookCode := Hook .CRD "sdk_create_pre_build_request" }}
{{ $hookCode }}
Expand Down Expand Up @@ -133,7 +135,9 @@ func (rm *resourceManager) sdkDelete(
) (latest *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkDelete")
defer exit(err)
defer func() {
exit(err)
}()

{{- if .CRD.Ops.Delete }}
{{- if $hookCode := Hook .CRD "sdk_delete_pre_build_request" }}
Expand Down
4 changes: 3 additions & 1 deletion templates/pkg/resource/sdk_find_get_attributes.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ func (rm *resourceManager) sdkFind(
) (latest *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkFind")
defer exit(err)
defer func() {
exit(err)
}()

{{- if $hookCode := Hook .CRD "sdk_get_attributes_pre_build_request" }}
{{ $hookCode }}
Expand Down
4 changes: 3 additions & 1 deletion templates/pkg/resource/sdk_find_read_many.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ func (rm *resourceManager) sdkFind(
) (latest *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkFind")
defer exit(err)
defer func() {
exit(err)
}()

{{- if $hookCode := Hook .CRD "sdk_read_many_pre_build_request" }}
{{ $hookCode }}
Expand Down
4 changes: 3 additions & 1 deletion templates/pkg/resource/sdk_find_read_one.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ func (rm *resourceManager) sdkFind(
) (latest *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkFind")
defer exit(err)
defer func() {
exit(err)
}()

{{- if $hookCode := Hook .CRD "sdk_read_one_pre_build_request" }}
{{ $hookCode }}
Expand Down
4 changes: 3 additions & 1 deletion templates/pkg/resource/sdk_update.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ func (rm *resourceManager) sdkUpdate(
) (updated *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkUpdate")
defer exit(err)
defer func() {
exit(err)
}()

{{- if $hookCode := Hook .CRD "sdk_update_pre_build_request" }}
{{ $hookCode }}
Expand Down
6 changes: 6 additions & 0 deletions templates/pkg/resource/sdk_update_set_attributes.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ func (rm *resourceManager) sdkUpdate(
latest *resource,
delta *ackcompare.Delta,
) (*resource, error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.sdkUpdate")
defer func() {
exit(err)
}()

// If any required fields in the input shape are missing, AWS resource is
// not created yet. And sdkUpdate should never be called if this is the
// case, and it's an error in the generated code if it is...
Expand Down