Skip to content

Commit

Permalink
IAMUserPolicyAttachment: update metadata names
Browse files Browse the repository at this point in the history
Signed-off-by: sahil-lakhwani <sahilakhwani@gmail.com>
  • Loading branch information
sahil-lakhwani committed Apr 29, 2020
1 parent 0e93c27 commit 4be7d8f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
12 changes: 6 additions & 6 deletions apis/identity/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ var (
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
)

// User type metadata.
// IAMUser type metadata.
var (
IAMUserKind = reflect.TypeOf(IAMUser{}).Name()
IAMUserGroupKind = schema.GroupKind{Group: Group, Kind: IAMUserKind}.String()
IAMUserKindAPIVersion = IAMUserKind + "." + SchemeGroupVersion.String()
IAMUserGroupVersionKind = SchemeGroupVersion.WithKind(IAMUserKind)
)

// UserPolicyAttachment type metadata.
// IAMUserPolicyAttachment type metadata.
var (
UserPolicyAttachmentKind = reflect.TypeOf(IAMUserPolicyAttachment{}).Name()
UserPolicyAttachmentGroupKind = schema.GroupKind{Group: Group, Kind: UserPolicyAttachmentKind}.String()
UserPolicyAttachmentKindAPIVersion = UserPolicyAttachmentKind + "." + SchemeGroupVersion.String()
UserPolicyAttachmentGroupVersionKind = SchemeGroupVersion.WithKind(UserPolicyAttachmentKind)
IAMUserPolicyAttachmentKind = reflect.TypeOf(IAMUserPolicyAttachment{}).Name()
IAMUserPolicyAttachmentGroupKind = schema.GroupKind{Group: Group, Kind: IAMUserPolicyAttachmentKind}.String()
IAMUserPolicyAttachmentKindAPIVersion = IAMUserPolicyAttachmentKind + "." + SchemeGroupVersion.String()
IAMUserPolicyAttachmentGroupVersionKind = SchemeGroupVersion.WithKind(IAMUserPolicyAttachmentKind)
)

func init() {
Expand Down
8 changes: 5 additions & 3 deletions pkg/controller/identity/iamuserpolicyattachment/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ const (
// SetupIAMUserPolicyAttachment adds a controller that reconciles
// IAMUserPolicyAttachments.
func SetupIAMUserPolicyAttachment(mgr ctrl.Manager, l logging.Logger) error {
name := managed.ControllerName(v1alpha1.UserPolicyAttachmentGroupKind)
name := managed.ControllerName(v1alpha1.IAMUserPolicyAttachmentGroupKind)

return ctrl.NewControllerManagedBy(mgr).
Named(name).
For(&v1alpha1.IAMUserPolicyAttachment{}).
Complete(managed.NewReconciler(mgr,
resource.ManagedKind(v1alpha1.UserPolicyAttachmentGroupVersionKind),
resource.ManagedKind(v1alpha1.IAMUserPolicyAttachmentGroupVersionKind),
managed.WithExternalConnecter(&connector{kube: mgr.GetClient(), newClientFn: iam.NewUserPolicyAttachmentClient}),
managed.WithConnectionPublishers(),
managed.WithReferenceResolver(managed.NewAPISimpleReferenceResolver(mgr.GetClient())),
Expand Down Expand Up @@ -177,7 +177,9 @@ func (e *external) Create(ctx context.Context, mgd resource.Managed) (managed.Ex
}

func (e *external) Update(ctx context.Context, mgd resource.Managed) (managed.ExternalUpdate, error) {
// PolicyARN is the only distinguishing field and on update to that, new policy is attached
// Updating any field will create a new User-Policy attachment in AWS, which will be
// irrelevant/out-of-sync to the original defined attachment.
// It is encouraged to instead create a new IAMUserPolicyAttachment resource.
return managed.ExternalUpdate{}, nil
}

Expand Down

0 comments on commit 4be7d8f

Please sign in to comment.