Skip to content

Commit d16d5ac

Browse files
jaypipesjaypipes
authored
Merge pull request #58 from muvaf/cp-remove-unnecessary-imports
Use ExportedName property of operation calls instead of Name
2 parents 38898fc + ec609c8 commit d16d5ac

File tree

8 files changed

+20
-23
lines changed

8 files changed

+20
-23
lines changed

‎templates/crossplane/apis/types.go.tpl‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55
package {{ .APIVersion }}
66

77
import (
8-
ackv1alpha1 "github.com/aws-controllers-k8s/runtime/apis/core/v1alpha1"
9-
"github.com/aws/aws-sdk-go/aws"
108
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
119
)
1210

1311
// Hack to avoid import errors during build...
1412
var (
1513
_ = &metav1.Time{}
16-
_ = &aws.JSONValue{}
17-
_ = ackv1alpha1.AWSAccountID("")
1814
)
19-
{{- range $typeDef := .TypeDefs }}
15+
16+
{{ range $typeDef := .TypeDefs }}
2017

2118
{{ template "type_def" $typeDef }}
2219
{{- end -}}

‎templates/crossplane/pkg/controller.go.tpl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
6767
if err := e.preObserve(ctx, cr, input); err != nil {
6868
return managed.ExternalObservation{}, errors.Wrap(err, "pre-observe failed")
6969
}
70-
resp, err := e.client.{{ .CRD.Ops.ReadOne.Name }}WithContext(ctx, input)
70+
resp, err := e.client.{{ .CRD.Ops.ReadOne.ExportedName }}WithContext(ctx, input)
7171
if err != nil {
7272
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
7373
}
@@ -76,7 +76,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
7676
if err := e.preObserve(ctx, cr, input); err != nil {
7777
return managed.ExternalObservation{}, errors.Wrap(err, "pre-observe failed")
7878
}
79-
resp, err := e.client.{{ .CRD.Ops.GetAttributes.Name }}WithContext(ctx, input)
79+
resp, err := e.client.{{ .CRD.Ops.GetAttributes.ExportedName }}WithContext(ctx, input)
8080
if err != nil {
8181
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
8282
}
@@ -85,7 +85,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
8585
if err := e.preObserve(ctx, cr, input); err != nil {
8686
return managed.ExternalObservation{}, errors.Wrap(err, "pre-observe failed")
8787
}
88-
resp, err := e.client.{{ .CRD.Ops.ReadMany.Name }}WithContext(ctx, input)
88+
resp, err := e.client.{{ .CRD.Ops.ReadMany.ExportedName }}WithContext(ctx, input)
8989
if err != nil {
9090
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
9191
}
@@ -124,7 +124,7 @@ func (e *external) Create(ctx context.Context, mg cpresource.Managed) (managed.E
124124
if err := e.preCreate(ctx, cr, input); err != nil {
125125
return managed.ExternalCreation{}, errors.Wrap(err, "pre-create failed")
126126
}
127-
resp, err := e.client.{{ .CRD.Ops.Create.Name }}WithContext(ctx, input)
127+
resp, err := e.client.{{ .CRD.Ops.Create.ExportedName }}WithContext(ctx, input)
128128
if err != nil {
129129
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
130130
}
@@ -142,7 +142,7 @@ func (e *external) Update(ctx context.Context, mg cpresource.Managed) (managed.E
142142
if err := e.preUpdate(ctx, cr, input); err != nil {
143143
return managed.ExternalUpdate{}, errors.Wrap(err, "pre-update failed")
144144
}
145-
resp, err := e.client.{{ .CRD.Ops.Update.Name }}WithContext(ctx, input)
145+
resp, err := e.client.{{ .CRD.Ops.Update.ExportedName }}WithContext(ctx, input)
146146
if err != nil {
147147
return managed.ExternalUpdate{}, awsclient.Wrap(err, errUpdate)
148148
}
@@ -167,7 +167,7 @@ func (e *external) Delete(ctx context.Context, mg cpresource.Managed) error {
167167
if ignore {
168168
return nil
169169
}
170-
resp, err := e.client.{{ .CRD.Ops.Delete.Name }}WithContext(ctx, input)
170+
resp, err := e.client.{{ .CRD.Ops.Delete.ExportedName }}WithContext(ctx, input)
171171
return e.postDelete(ctx, cr, resp, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDelete))
172172
{{- else }}
173173
return e.delete(ctx, mg)

‎templates/pkg/resource/sdk.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ func (rm *resourceManager) sdkCreate(
6363
{{ $hookCode }}
6464
{{- end }}
6565
{{ $createCode := GoCodeSetCreateOutput .CRD "resp" "ko" 1 false }}
66-
{{ if not ( Empty $createCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Create.Name }}WithContext(ctx, input)
66+
{{ if not ( Empty $createCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Create.ExportedName }}WithContext(ctx, input)
6767
{{- if $hookCode := Hook .CRD "sdk_create_post_request" }}
6868
{{ $hookCode }}
6969
{{- end }}
70-
rm.metrics.RecordAPICall("CREATE", "{{ .CRD.Ops.Create.Name }}", respErr)
70+
rm.metrics.RecordAPICall("CREATE", "{{ .CRD.Ops.Create.ExportedName }}", respErr)
7171
if respErr != nil {
7272
return nil, respErr
7373
}

‎templates/pkg/resource/sdk_find_get_attributes.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ func (rm *resourceManager) sdkFind(
2121
{{ $hookCode }}
2222
{{- end }}
2323
{{ $setCode := GoCodeGetAttributesSetOutput .CRD "resp" "ko" 1 }}
24-
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.GetAttributes.Name }}WithContext(ctx, input)
24+
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.GetAttributes.ExportedName }}WithContext(ctx, input)
2525
{{- if $hookCode := Hook .CRD "sdk_get_attributes_post_request" }}
2626
{{ $hookCode }}
2727
{{- end }}
28-
rm.metrics.RecordAPICall("GET_ATTRIBUTES", "{{ .CRD.Ops.GetAttributes.Name }}", respErr)
28+
rm.metrics.RecordAPICall("GET_ATTRIBUTES", "{{ .CRD.Ops.GetAttributes.ExportedName }}", respErr)
2929
if respErr != nil {
3030
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
3131
return nil, ackerr.NotFound

‎templates/pkg/resource/sdk_find_read_many.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ func (rm *resourceManager) sdkFind(
1414
{{ $hookCode }}
1515
{{- end }}
1616
{{ $setCode := GoCodeSetReadManyOutput .CRD "resp" "ko" 1 true }}
17-
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadMany.Name }}WithContext(ctx, input)
17+
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadMany.ExportedName }}WithContext(ctx, input)
1818
{{- if $hookCode := Hook .CRD "sdk_read_many_post_request" }}
1919
{{ $hookCode }}
2020
{{- end }}
21-
rm.metrics.RecordAPICall("READ_MANY", "{{ .CRD.Ops.ReadMany.Name }}", respErr)
21+
rm.metrics.RecordAPICall("READ_MANY", "{{ .CRD.Ops.ReadMany.ExportedName }}", respErr)
2222
if respErr != nil {
2323
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
2424
return nil, ackerr.NotFound

‎templates/pkg/resource/sdk_find_read_one.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ func (rm *resourceManager) sdkFind(
2121
{{ $hookCode }}
2222
{{- end }}
2323
{{ $setCode := GoCodeSetReadOneOutput .CRD "resp" "ko" 1 true }}
24-
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadOne.Name }}WithContext(ctx, input)
24+
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadOne.ExportedName }}WithContext(ctx, input)
2525
{{- if $hookCode := Hook .CRD "sdk_read_one_post_request" }}
2626
{{ $hookCode }}
2727
{{- end }}
28-
rm.metrics.RecordAPICall("READ_ONE", "{{ .CRD.Ops.ReadOne.Name }}", respErr)
28+
rm.metrics.RecordAPICall("READ_ONE", "{{ .CRD.Ops.ReadOne.ExportedName }}", respErr)
2929
if respErr != nil {
3030
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
3131
return nil, ackerr.NotFound

‎templates/pkg/resource/sdk_update.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ func (rm *resourceManager) sdkUpdate(
2424
{{ $hookCode }}
2525
{{- end }}
2626
{{ $setCode := GoCodeSetUpdateOutput .CRD "resp" "ko" 1 false }}
27-
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Update.Name }}WithContext(ctx, input)
27+
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Update.ExportedName }}WithContext(ctx, input)
2828
{{- if $hookCode := Hook .CRD "sdk_update_post_request" }}
2929
{{ $hookCode }}
3030
{{- end }}
31-
rm.metrics.RecordAPICall("UPDATE", "{{ .CRD.Ops.Update.Name }}", respErr)
31+
rm.metrics.RecordAPICall("UPDATE", "{{ .CRD.Ops.Update.ExportedName }}", respErr)
3232
if respErr != nil {
3333
return nil, respErr
3434
}

‎templates/pkg/resource/sdk_update_set_attributes.go.tpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ func (rm *resourceManager) sdkUpdate(
2121
// contain any useful information. Instead, below, we'll be returning a
2222
// DeepCopy of the supplied desired state, which should be fine because
2323
// that desired state has been constructed from a call to GetAttributes...
24-
_, respErr := rm.sdkapi.{{ .CRD.Ops.SetAttributes.Name }}WithContext(ctx, input)
25-
rm.metrics.RecordAPICall("SET_ATTRIBUTES", "{{ .CRD.Ops.SetAttributes.Name }}", respErr)
24+
_, respErr := rm.sdkapi.{{ .CRD.Ops.SetAttributes.ExportedName }}WithContext(ctx, input)
25+
rm.metrics.RecordAPICall("SET_ATTRIBUTES", "{{ .CRD.Ops.SetAttributes.ExportedName }}", respErr)
2626
if respErr != nil {
2727
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
2828
// Technically, this means someone deleted the backend resource in

0 commit comments

Comments
 (0)