Skip to content

Commit 9c234fd

Browse files
committed
crossplane: update controller template to use aws-specific error wrapper
Signed-off-by: Muvaffak Onus <[email protected]>
1 parent bf4130e commit 9c234fd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

templates/crossplane/pkg/controller.go.tpl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
6969
}
7070
resp, err := e.client.{{ .CRD.Ops.ReadOne.Name }}WithContext(ctx, input)
7171
if err != nil {
72-
return managed.ExternalObservation{ResourceExists: false}, errors.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
72+
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
7373
}
7474
{{- else if .CRD.Ops.GetAttributes }}
7575
input := Generate{{ .CRD.Ops.GetAttributes.InputRef.Shape.ShapeName }}(cr)
@@ -78,7 +78,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
7878
}
7979
resp, err := e.client.{{ .CRD.Ops.GetAttributes.Name }}WithContext(ctx, input)
8080
if err != nil {
81-
return managed.ExternalObservation{ResourceExists: false}, errors.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
81+
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
8282
}
8383
{{- else if .CRD.Ops.ReadMany }}
8484
input := Generate{{ .CRD.Ops.ReadMany.InputRef.Shape.ShapeName }}(cr)
@@ -87,7 +87,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
8787
}
8888
resp, err := e.client.{{ .CRD.Ops.ReadMany.Name }}WithContext(ctx, input)
8989
if err != nil {
90-
return managed.ExternalObservation{ResourceExists: false}, errors.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
90+
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
9191
}
9292
resp = e.filterList(cr, resp)
9393
if len(resp.{{ ListMemberNameInReadManyOutput .CRD }}) == 0 {
@@ -126,7 +126,7 @@ func (e *external) Create(ctx context.Context, mg cpresource.Managed) (managed.E
126126
}
127127
resp, err := e.client.{{ .CRD.Ops.Create.Name }}WithContext(ctx, input)
128128
if err != nil {
129-
return managed.ExternalCreation{}, errors.Wrap(err, errCreate)
129+
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
130130
}
131131
{{ GoCodeSetCreateOutput .CRD "resp" "cr" 1 false }}
132132
return e.postCreate(ctx, cr, resp, managed.ExternalCreation{}, err)
@@ -144,7 +144,7 @@ func (e *external) Update(ctx context.Context, mg cpresource.Managed) (managed.E
144144
}
145145
resp, err := e.client.{{ .CRD.Ops.Update.Name }}WithContext(ctx, input)
146146
if err != nil {
147-
return managed.ExternalUpdate{}, errors.Wrap(err, errUpdate)
147+
return managed.ExternalUpdate{}, awsclient.Wrap(err, errUpdate)
148148
}
149149
return e.postUpdate(ctx, cr, resp, managed.ExternalUpdate{}, err)
150150
{{- else }}
@@ -164,7 +164,7 @@ func (e *external) Delete(ctx context.Context, mg cpresource.Managed) error {
164164
return errors.Wrap(err, "pre-delete failed")
165165
}
166166
_, err := e.client.{{ .CRD.Ops.Delete.Name }}WithContext(ctx, input)
167-
return errors.Wrap(cpresource.Ignore(IsNotFound, err), errDelete)
167+
return awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDelete)
168168
{{- else }}
169169
return e.delete(ctx, mg)
170170
{{ end }}

0 commit comments

Comments
 (0)