Merge pull request #2284 from crossplane-contrib/backport-2283-to-release-0.57

[Backport release-0.57] Add EnableCloudwatchLogsExports in isUpToDate and ModifyDBCluster

Author: kkendzia

pkg/controller/rds/dbcluster/setup.go

@@ -45,23 +45,22 @@ type custom struct {
 	client svcsdkapi.RDSAPI
 }
 
+func setupExternal(e *external) {
+	h := &custom{client: e.client, kube: e.kube}
+	e.preObserve = preObserve
+	e.postObserve = h.postObserve
+	e.isUpToDate = h.isUpToDate
+	e.preUpdate = h.preUpdate
+	e.postUpdate = h.postUpdate
+	e.preCreate = h.preCreate
+	e.preDelete = preDelete
+	e.filterList = filterList
+}
+
 // SetupDBCluster adds a controller that reconciles DbCluster.
 func SetupDBCluster(mgr ctrl.Manager, o controller.Options) error {
 	name := managed.ControllerName(svcapitypes.DBClusterGroupKind)
-	opts := []option{
-		func(e *external) {
-			c := &custom{client: e.client, kube: e.kube}
-			e.preObserve = preObserve
-			e.postObserve = c.postObserve
-			e.isUpToDate = c.isUpToDate
-			e.preUpdate = c.preUpdate
-			e.postUpdate = c.postUpdate
-			e.preCreate = c.preCreate
-			e.preDelete = preDelete
-			e.postDelete = c.postDelete
-			e.filterList = filterList
-		},
-	}
+	opts := []option{setupExternal}
 
 	cps := []managed.ConnectionPublisher{managed.NewAPISecretPublisher(mgr.GetClient(), mgr.GetScheme())}
 	if o.Features.Enabled(features.EnableAlphaExternalSecretStores) {
@@ -615,6 +614,10 @@ func (e *custom) isUpToDate(ctx context.Context, cr *svcapitypes.DBCluster, out
 		return false, "", nil
 	}
 
+	if !areSameElements(cr.Spec.ForProvider.EnableCloudwatchLogsExports, out.DBClusters[0].EnabledCloudwatchLogsExports) {
+		return false, "", nil
+	}
+
 	if cr.Spec.ForProvider.DBClusterParameterGroupName != nil &&
 		pointer.StringValue(cr.Spec.ForProvider.DBClusterParameterGroupName) != pointer.StringValue(out.DBClusters[0].DBClusterParameterGroup) {
 		return false, "", nil
@@ -775,6 +778,10 @@ func (e *custom) preUpdate(ctx context.Context, cr *svcapitypes.DBCluster, obj *
 	obj.DBClusterIdentifier = pointer.ToOrNilIfZeroValue(meta.GetExternalName(cr))
 	obj.ApplyImmediately = cr.Spec.ForProvider.ApplyImmediately
 
+	obj.CloudwatchLogsExportConfiguration = generateCloudWatchExportConfiguration(
+		cr.Spec.ForProvider.EnableCloudwatchLogsExports,
+		cr.Status.AtProvider.EnabledCloudwatchLogsExports)
+
 	desiredPassword, err := dbinstance.GetDesiredPassword(ctx, e.kube, cr)
 	if err != nil {
 		return errors.Wrap(err, dbinstance.ErrRetrievePasswordForUpdate)
@@ -967,3 +974,54 @@ func (e *custom) updateTags(ctx context.Context, cr *svcapitypes.DBCluster, addT
 	return nil
 
 }
+
+func generateCloudWatchExportConfiguration(spec, current []*string) *svcsdk.CloudwatchLogsExportConfiguration {
+	toEnable := []*string{}
+	toDisable := []*string{}
+
+	currentMap := make(map[string]struct{}, len(current))
+	for _, currentID := range current {
+		currentMap[pointer.StringValue(currentID)] = struct{}{}
+	}
+
+	specMap := make(map[string]struct{}, len(spec))
+	for _, specID := range spec {
+		key := pointer.StringValue(specID)
+		specMap[key] = struct{}{}
+
+		if _, exists := currentMap[key]; !exists {
+			toEnable = append(toEnable, specID)
+		}
+	}
+
+	for _, currentID := range current {
+		if _, exists := specMap[pointer.StringValue(currentID)]; !exists {
+			toDisable = append(toDisable, currentID)
+		}
+	}
+
+	return &svcsdk.CloudwatchLogsExportConfiguration{
+		EnableLogTypes:  toEnable,
+		DisableLogTypes: toDisable,
+	}
+}
+
+func areSameElements(a1, a2 []*string) bool {
+	if len(a1) != len(a2) {
+		return false
+	}
+
+	m2 := make(map[string]struct{}, len(a2))
+	for _, s2 := range a2 {
+		m2[pointer.StringValue(s2)] = struct{}{}
+	}
+
+	for _, s1 := range a1 {
+		v1 := pointer.StringValue(s1)
+		if _, exists := m2[v1]; !exists {
+			return false
+		}
+	}
+
+	return true
+}

pkg/controller/rds/dbcluster/setup_test.go

@@ -835,6 +835,84 @@ func TestIsUpToDate(t *testing.T) {
 				isUpToDate: false,
 			},
 		},
+		"SameEnableCloudwatchLogsExports": {
+			args: args{
+				kube: test.NewMockClient(),
+				cr: &svcapitypes.DBCluster{
+					Spec: svcapitypes.DBClusterSpec{
+						ForProvider: svcapitypes.DBClusterParameters{
+							DBClusterParameterGroupName: ptr.To("default.aurora-postgresql15"),
+							EnableCloudwatchLogsExports: []*string{
+								ptr.To("postgresql"),
+							},
+						},
+					},
+				},
+				out: &svcsdk.DescribeDBClustersOutput{
+					DBClusters: []*svcsdk.DBCluster{
+						{
+							DBClusterParameterGroup: ptr.To("default.aurora-postgresql15"),
+							EnabledCloudwatchLogsExports: []*string{
+								ptr.To("postgresql"),
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				isUpToDate: true,
+			},
+		},
+		"DifferentEnableCloudwatchLogsExportsAddExports": {
+			args: args{
+				kube: test.NewMockClient(),
+				cr: &svcapitypes.DBCluster{
+					Spec: svcapitypes.DBClusterSpec{
+						ForProvider: svcapitypes.DBClusterParameters{
+							DBClusterParameterGroupName: ptr.To("default.aurora-postgresql15"),
+							EnableCloudwatchLogsExports: []*string{
+								ptr.To("postgresql"),
+							},
+						},
+					},
+				},
+				out: &svcsdk.DescribeDBClustersOutput{
+					DBClusters: []*svcsdk.DBCluster{
+						{
+							DBClusterParameterGroup: ptr.To("default.aurora-postgresql14"),
+						},
+					},
+				},
+			},
+			want: want{
+				isUpToDate: false,
+			},
+		},
+		"DifferentEnableCloudwatchLogsExportsRemoveExports": {
+			args: args{
+				kube: test.NewMockClient(),
+				cr: &svcapitypes.DBCluster{
+					Spec: svcapitypes.DBClusterSpec{
+						ForProvider: svcapitypes.DBClusterParameters{
+							DBClusterParameterGroupName: ptr.To("default.aurora-postgresql15"),
+						},
+					},
+				},
+				out: &svcsdk.DescribeDBClustersOutput{
+					DBClusters: []*svcsdk.DBCluster{
+						{
+							DBClusterParameterGroup: ptr.To("default.aurora-postgresql14"),
+							EnabledCloudwatchLogsExports: []*string{
+								ptr.To("postgresql"),
+							},
+						},
+					},
+				},
+			},
+			want: want{
+				isUpToDate: false,
+			},
+		},
 	}
 
 	for name, tc := range cases {