Skip to content

Use ExportedName property of operation calls instead of Name #58

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 3 commits into from
May 11, 2021
Merged

Use ExportedName property of operation calls instead of Name #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa05a2b
crossplane: ACK types don't need to be imported in Crossplane types
muvaf May 10, 2021
be27f16
crossplane: use ExportedName property of operation calls to specifica…
muvaf May 10, 2021
ec609c8
Use ExportedName property of operation calls in ACK templates as well
muvaf May 10, 2021
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
7 changes: 2 additions & 5 deletions templates/crossplane/apis/types.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@
package {{ .APIVersion }}

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

// Hack to avoid import errors during build...
var (
_ = &metav1.Time{}
_ = &aws.JSONValue{}
Copy link
Collaborator

@jaypipes jaypipes May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You won't need the ackv1alpha1 import, yes. But just double-check you won't need this one above...

Copy link
Contributor Author

@muvaf muvaf May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so. I double checked the repo.

Copy link
Collaborator

@jaypipes jaypipes May 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

k, just double-checking :)

_ = ackv1alpha1.AWSAccountID("")
)
{{- range $typeDef := .TypeDefs }}

{{ range $typeDef := .TypeDefs }}

{{ template "type_def" $typeDef }}
{{- end -}}
12 changes: 6 additions & 6 deletions templates/crossplane/pkg/controller.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
if err := e.preObserve(ctx, cr, input); err != nil {
return managed.ExternalObservation{}, errors.Wrap(err, "pre-observe failed")
}
resp, err := e.client.{{ .CRD.Ops.ReadOne.Name }}WithContext(ctx, input)
resp, err := e.client.{{ .CRD.Ops.ReadOne.ExportedName }}WithContext(ctx, input)
if err != nil {
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
}
Expand All @@ -76,7 +76,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
if err := e.preObserve(ctx, cr, input); err != nil {
return managed.ExternalObservation{}, errors.Wrap(err, "pre-observe failed")
}
resp, err := e.client.{{ .CRD.Ops.GetAttributes.Name }}WithContext(ctx, input)
resp, err := e.client.{{ .CRD.Ops.GetAttributes.ExportedName }}WithContext(ctx, input)
if err != nil {
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
}
Expand All @@ -85,7 +85,7 @@ func (e *external) Observe(ctx context.Context, mg cpresource.Managed) (managed.
if err := e.preObserve(ctx, cr, input); err != nil {
return managed.ExternalObservation{}, errors.Wrap(err, "pre-observe failed")
}
resp, err := e.client.{{ .CRD.Ops.ReadMany.Name }}WithContext(ctx, input)
resp, err := e.client.{{ .CRD.Ops.ReadMany.ExportedName }}WithContext(ctx, input)
if err != nil {
return managed.ExternalObservation{ResourceExists: false}, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDescribe)
}
Expand Down Expand Up @@ -124,7 +124,7 @@ func (e *external) Create(ctx context.Context, mg cpresource.Managed) (managed.E
if err := e.preCreate(ctx, cr, input); err != nil {
return managed.ExternalCreation{}, errors.Wrap(err, "pre-create failed")
}
resp, err := e.client.{{ .CRD.Ops.Create.Name }}WithContext(ctx, input)
resp, err := e.client.{{ .CRD.Ops.Create.ExportedName }}WithContext(ctx, input)
if err != nil {
return managed.ExternalCreation{}, awsclient.Wrap(err, errCreate)
}
Expand All @@ -142,7 +142,7 @@ func (e *external) Update(ctx context.Context, mg cpresource.Managed) (managed.E
if err := e.preUpdate(ctx, cr, input); err != nil {
return managed.ExternalUpdate{}, errors.Wrap(err, "pre-update failed")
}
resp, err := e.client.{{ .CRD.Ops.Update.Name }}WithContext(ctx, input)
resp, err := e.client.{{ .CRD.Ops.Update.ExportedName }}WithContext(ctx, input)
if err != nil {
return managed.ExternalUpdate{}, awsclient.Wrap(err, errUpdate)
}
Expand All @@ -167,7 +167,7 @@ func (e *external) Delete(ctx context.Context, mg cpresource.Managed) error {
if ignore {
return nil
}
resp, err := e.client.{{ .CRD.Ops.Delete.Name }}WithContext(ctx, input)
resp, err := e.client.{{ .CRD.Ops.Delete.ExportedName }}WithContext(ctx, input)
return e.postDelete(ctx, cr, resp, awsclient.Wrap(cpresource.Ignore(IsNotFound, err), errDelete))
{{- else }}
return e.delete(ctx, mg)
Expand Down
4 changes: 2 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 @@ -63,11 +63,11 @@ func (rm *resourceManager) sdkCreate(
{{ $hookCode }}
{{- end }}
{{ $createCode := GoCodeSetCreateOutput .CRD "resp" "ko" 1 false }}
{{ if not ( Empty $createCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Create.Name }}WithContext(ctx, input)
{{ if not ( Empty $createCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Create.ExportedName }}WithContext(ctx, input)
{{- if $hookCode := Hook .CRD "sdk_create_post_request" }}
{{ $hookCode }}
{{- end }}
rm.metrics.RecordAPICall("CREATE", "{{ .CRD.Ops.Create.Name }}", respErr)
rm.metrics.RecordAPICall("CREATE", "{{ .CRD.Ops.Create.ExportedName }}", respErr)
if respErr != nil {
return nil, respErr
}
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -21,11 +21,11 @@ func (rm *resourceManager) sdkFind(
{{ $hookCode }}
{{- end }}
{{ $setCode := GoCodeGetAttributesSetOutput .CRD "resp" "ko" 1 }}
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.GetAttributes.Name }}WithContext(ctx, input)
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.GetAttributes.ExportedName }}WithContext(ctx, input)
{{- if $hookCode := Hook .CRD "sdk_get_attributes_post_request" }}
{{ $hookCode }}
{{- end }}
rm.metrics.RecordAPICall("GET_ATTRIBUTES", "{{ .CRD.Ops.GetAttributes.Name }}", respErr)
rm.metrics.RecordAPICall("GET_ATTRIBUTES", "{{ .CRD.Ops.GetAttributes.ExportedName }}", respErr)
if respErr != nil {
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
return nil, ackerr.NotFound
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -14,11 +14,11 @@ func (rm *resourceManager) sdkFind(
{{ $hookCode }}
{{- end }}
{{ $setCode := GoCodeSetReadManyOutput .CRD "resp" "ko" 1 true }}
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadMany.Name }}WithContext(ctx, input)
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadMany.ExportedName }}WithContext(ctx, input)
{{- if $hookCode := Hook .CRD "sdk_read_many_post_request" }}
{{ $hookCode }}
{{- end }}
rm.metrics.RecordAPICall("READ_MANY", "{{ .CRD.Ops.ReadMany.Name }}", respErr)
rm.metrics.RecordAPICall("READ_MANY", "{{ .CRD.Ops.ReadMany.ExportedName }}", respErr)
if respErr != nil {
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
return nil, ackerr.NotFound
Expand Down
4 changes: 2 additions & 2 deletions 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 @@ -21,11 +21,11 @@ func (rm *resourceManager) sdkFind(
{{ $hookCode }}
{{- end }}
{{ $setCode := GoCodeSetReadOneOutput .CRD "resp" "ko" 1 true }}
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadOne.Name }}WithContext(ctx, input)
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.ReadOne.ExportedName }}WithContext(ctx, input)
{{- if $hookCode := Hook .CRD "sdk_read_one_post_request" }}
{{ $hookCode }}
{{- end }}
rm.metrics.RecordAPICall("READ_ONE", "{{ .CRD.Ops.ReadOne.Name }}", respErr)
rm.metrics.RecordAPICall("READ_ONE", "{{ .CRD.Ops.ReadOne.ExportedName }}", respErr)
if respErr != nil {
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
return nil, ackerr.NotFound
Expand Down
4 changes: 2 additions & 2 deletions templates/pkg/resource/sdk_update.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ func (rm *resourceManager) sdkUpdate(
{{ $hookCode }}
{{- end }}
{{ $setCode := GoCodeSetUpdateOutput .CRD "resp" "ko" 1 false }}
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Update.Name }}WithContext(ctx, input)
{{ if not ( Empty $setCode ) }}resp{{ else }}_{{ end }}, respErr := rm.sdkapi.{{ .CRD.Ops.Update.ExportedName }}WithContext(ctx, input)
{{- if $hookCode := Hook .CRD "sdk_update_post_request" }}
{{ $hookCode }}
{{- end }}
rm.metrics.RecordAPICall("UPDATE", "{{ .CRD.Ops.Update.Name }}", respErr)
rm.metrics.RecordAPICall("UPDATE", "{{ .CRD.Ops.Update.ExportedName }}", respErr)
if respErr != nil {
return nil, respErr
}
Expand Down
4 changes: 2 additions & 2 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 @@ -21,8 +21,8 @@ func (rm *resourceManager) sdkUpdate(
// contain any useful information. Instead, below, we'll be returning a
// DeepCopy of the supplied desired state, which should be fine because
// that desired state has been constructed from a call to GetAttributes...
_, respErr := rm.sdkapi.{{ .CRD.Ops.SetAttributes.Name }}WithContext(ctx, input)
rm.metrics.RecordAPICall("SET_ATTRIBUTES", "{{ .CRD.Ops.SetAttributes.Name }}", respErr)
_, respErr := rm.sdkapi.{{ .CRD.Ops.SetAttributes.ExportedName }}WithContext(ctx, input)
rm.metrics.RecordAPICall("SET_ATTRIBUTES", "{{ .CRD.Ops.SetAttributes.ExportedName }}", respErr)
if respErr != nil {
if awsErr, ok := ackerr.AWSError(respErr); ok && awsErr.Code() == "{{ ResourceExceptionCode .CRD 404 }}" {{ GoCodeSetExceptionMessagePrefixCheck .CRD 404 }}{
// Technically, this means someone deleted the backend resource in
Expand Down