Skip to content
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.

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

Added default tags to CertificateAuthority #1113

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 31 additions & 4 deletions pkg/controller/acmpca/certificateauthority/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,7 @@ func SetupCertificateAuthority(mgr ctrl.Manager, l logging.Logger, rl workqueue.
managed.WithExternalConnecter(&connector{client: mgr.GetClient(), newClientFn: acmpca.NewClient}),
managed.WithConnectionPublishers(),
managed.WithPollInterval(poll),

// TODO: implement tag initializer

managed.WithInitializers(),
managed.WithInitializers(&tagger{kube: mgr.GetClient()}),
managed.WithLogger(l.WithValues("controller", name)),
managed.WithRecorder(event.NewAPIRecorder(mgr.GetEventRecorderFor(name)))))
}
Expand Down Expand Up @@ -256,3 +253,33 @@ func (e *external) Delete(ctx context.Context, mgd resource.Managed) error {

return awsclient.Wrap(resource.Ignore(acmpca.IsErrorNotFound, err), errDelete)
}

type tagger struct {
kube client.Client
}

func (t *tagger) Initialize(ctx context.Context, mgd resource.Managed) error {
cr, ok := mgd.(*v1beta1.CertificateAuthority)
if !ok {
return errors.New(errUnexpectedObject)
}
added := false
tagMap := map[string]string{}
for _, t := range cr.Spec.ForProvider.Tags {
tagMap[t.Key] = t.Value
}
for k, v := range resource.GetExternalTags(mgd) {
if p, ok := tagMap[k]; !ok || v != p {
cr.Spec.ForProvider.Tags = append(cr.Spec.ForProvider.Tags, v1beta1.Tag{Key: k, Value: v})
added = true
}
}
if !added {
return nil
}
err := t.kube.Update(ctx, cr)
if err != nil {
return errors.Wrap(err, errKubeUpdateFailed)
}
return nil
}
110 changes: 101 additions & 9 deletions pkg/controller/acmpca/certificateauthority/controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ package certificateauthority

import (
"context"

"testing"

v1alpha1 "github.com/crossplane/provider-aws/apis/acmpca/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/crossplane/provider-aws/apis/acmpca/v1beta1"

"github.com/aws/aws-sdk-go-v2/aws"
awsacmpca "github.com/aws/aws-sdk-go-v2/service/acmpca"
awsacmpcatypes "github.com/aws/aws-sdk-go-v2/service/acmpca/types"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/pkg/errors"

xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
Expand Down Expand Up @@ -59,52 +63,74 @@ var (
title = "someTitle"

errBoom = errors.New("boom")

sortTags = cmpopts.SortSlices(func(a, b v1beta1.Tag) bool {
return a.Key > b.Key
})
)

type args struct {
acmpca acmpca.Client
cr resource.Managed
}

type certificateAuthorityModifier func(*v1alpha1.CertificateAuthority)
type certificateAuthorityModifier func(*v1beta1.CertificateAuthority)

func withConditions(c ...xpv1.Condition) certificateAuthorityModifier {
return func(r *v1alpha1.CertificateAuthority) { r.Status.ConditionedStatus.Conditions = c }
return func(r *v1beta1.CertificateAuthority) { r.Status.ConditionedStatus.Conditions = c }
}

func withCertificateAuthorityArn() certificateAuthorityModifier {
return func(r *v1alpha1.CertificateAuthority) {
return func(r *v1beta1.CertificateAuthority) {
r.Status.AtProvider.CertificateAuthorityARN = certificateAuthorityArn
meta.SetExternalName(r, certificateAuthorityArn)
}
}

func withCertificateAuthorityType() certificateAuthorityModifier {
return func(r *v1alpha1.CertificateAuthority) {
return func(r *v1beta1.CertificateAuthority) {
r.Spec.ForProvider.Type = awsacmpcatypes.CertificateAuthorityTypeRoot
r.Status.AtProvider.CertificateAuthorityARN = certificateAuthorityArn
meta.SetExternalName(r, certificateAuthorityArn)
}
}

func withCertificateAuthorityAtProviderStatus(s string) certificateAuthorityModifier {
return func(r *v1alpha1.CertificateAuthority) {
return func(r *v1beta1.CertificateAuthority) {
r.Status.AtProvider.Status = s
}
}

func withCertificateAuthorityStatus() certificateAuthorityModifier {
status := "ACTIVE"

return func(r *v1alpha1.CertificateAuthority) {
return func(r *v1beta1.CertificateAuthority) {
r.Spec.ForProvider.Status = &status
r.Status.AtProvider.CertificateAuthorityARN = certificateAuthorityArn
meta.SetExternalName(r, certificateAuthorityArn)
}
}

func certificateAuthority(m ...certificateAuthorityModifier) *v1alpha1.CertificateAuthority {
cr := &v1alpha1.CertificateAuthority{}
func withTags(tagMaps ...map[string]string) certificateAuthorityModifier {
var tagList []v1beta1.Tag
for _, tagMap := range tagMaps {
for k, v := range tagMap {
tagList = append(tagList, v1beta1.Tag{Key: k, Value: v})
}
}
return func(r *v1beta1.CertificateAuthority) {
r.Spec.ForProvider.Tags = tagList
}
}

func withGroupVersionKind() certificateAuthorityModifier {
return func(r *v1beta1.CertificateAuthority) {
r.TypeMeta.SetGroupVersionKind(v1beta1.CertificateAuthorityGroupVersionKind)
}
}

func certificateAuthority(m ...certificateAuthorityModifier) *v1beta1.CertificateAuthority {
cr := &v1beta1.CertificateAuthority{}
meta.SetExternalName(cr, certificateAuthorityArn)
for _, f := range m {
f(cr)
Expand Down Expand Up @@ -532,3 +558,69 @@ func TestDelete(t *testing.T) {
})
}
}

func TestInitialize(t *testing.T) {
type args struct {
cr resource.Managed
kube client.Client
}
type want struct {
cr *v1beta1.CertificateAuthority
err error
}

cases := map[string]struct {
args
want
}{
"InvalidInput": {
args: args{
cr: unexpectedItem,
},
want: want{
err: errors.New(errUnexpectedObject),
},
},
"Successful": {
args: args{
cr: certificateAuthority(withTags(map[string]string{"foo": "bar"})),
kube: &test.MockClient{MockUpdate: test.NewMockUpdateFn(nil)},
},
want: want{
cr: certificateAuthority(withTags(resource.GetExternalTags(certificateAuthority()), map[string]string{"foo": "bar"})),
},
},
"Check Tag values": {
args: args{
cr: certificateAuthority(withTags(map[string]string{"foo": "bar"}), withGroupVersionKind()),
kube: &test.MockClient{MockUpdate: test.NewMockUpdateFn(nil)},
},
want: want{
cr: certificateAuthority(withTags(resource.GetExternalTags(certificateAuthority(withGroupVersionKind())), map[string]string{"foo": "bar"}), withGroupVersionKind()),
},
},
"UpdateFailed": {
args: args{
cr: certificateAuthority(),
kube: &test.MockClient{MockUpdate: test.NewMockUpdateFn(errBoom)},
},
want: want{
err: errors.Wrap(errBoom, errKubeUpdateFailed),
},
},
}

for name, tc := range cases {
t.Run(name, func(t *testing.T) {
e := &tagger{kube: tc.kube}
err := e.Initialize(context.Background(), tc.args.cr)

if diff := cmp.Diff(tc.want.err, err, test.EquateErrors()); diff != "" {
t.Errorf("r: -want, +got:\n%s", diff)
}
if diff := cmp.Diff(tc.want.cr, tc.args.cr, sortTags); err == nil && diff != "" {
t.Errorf("r: -want, +got:\n%s", diff)
}
})
}
}