fix(database): revert breaking field removal part of crossplane-contr…

…ib#1835 Signed-off-by: Charel Baum (external expert on behalf of DB Netz AG) <[email protected]>
swisscom · Oct 13, 2023 · 21e7496 · 21e7496
1 parent 8712064
commit 21e7496
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 0 deletions.
diff --git a/apis/database/v1beta1/rdsinstance_types.go b/apis/database/v1beta1/rdsinstance_types.go
@@ -57,6 +57,24 @@ type ProcessorFeature struct {
 	Value string `json:"value"`
 }
 
+// CloudwatchLogsExportConfiguration is the configuration setting for the log types to be enabled for export to CloudWatch
+// Logs for a specific DB instance or DB cluster.
+// The EnableLogTypes and DisableLogTypes arrays determine which logs will be
+// exported (or not exported) to CloudWatch Logs. The values within these arrays
+// depend on the DB engine being used. For more information, see Publishing
+// Database Logs to Amazon CloudWatch Logs  (http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_LogAccess.html#USER_LogAccess.Procedural.UploadtoCloudWatch)
+// in the Amazon RDS User Guide.
+// Please also see https://docs.aws.amazon.com/goto/WebAPI/rds-2014-10-31/CloudwatchLogsExportConfiguration
+type CloudwatchLogsExportConfiguration struct {
+	// DisableLogTypes is the list of log types to disable.
+	// +immutable
+	DisableLogTypes []string `json:"disableLogTypes,omitempty"`
+
+	// EnableLogTypes is the list of log types to enable.
+	// +immutable
+	EnableLogTypes []string `json:"enableLogTypes,omitempty"`
+} // TODO: remove deprecated field + code. Mapping to EnableCloudwatchLogsExports while in deprecation.
+
 // ScalingConfiguration contains the scaling configuration of an Aurora Serverless DB cluster.
 // For more information, see Using Amazon Aurora Serverless (http://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html)
 // in the Amazon Aurora User Guide.
@@ -774,6 +792,14 @@ type RDSInstanceParameters struct {
 	// +optional
 	ApplyModificationsImmediately *bool `json:"applyModificationsImmediately,omitempty"`
 
+	// Deprecated: This field will be removed. Use `enableCloudwatchLogsExports` instead.
+	// CloudwatchLogsExportConfiguration is the configuration setting for the log types to be enabled for export to CloudWatch
+	// Logs for a specific DB instance.
+	// +immutable
+	// +optional
+	CloudwatchLogsExportConfiguration *CloudwatchLogsExportConfiguration `json:"cloudwatchLogsExportConfiguration,omitempty"`
+	// TODO: remove deprecated field + code. Mapping to EnableCloudwatchLogsExports while in deprecation.
+
 	// DBParameterGroupName is the name of the DB parameter group to associate with this DB instance. If
 	// this argument is omitted, the default DBParameterGroup for the specified
 	// engine is used.

diff --git a/apis/database/v1beta1/zz_generated.deepcopy.go b/apis/database/v1beta1/zz_generated.deepcopy.go
diff --git a/package/crds/database.aws.crossplane.io_rdsinstances.yaml b/package/crds/database.aws.crossplane.io_rdsinstances.yaml
@@ -170,6 +170,23 @@ spec:
                       engines, Amazon Aurora Not applicable. The character set is
                       managed by the DB cluster. For more information, see CreateDBCluster.
                     type: string
+                  cloudwatchLogsExportConfiguration:
+                    description: 'Deprecated: This field will be removed. Use `enableCloudwatchLogsExports`
+                      instead. CloudwatchLogsExportConfiguration is the configuration
+                      setting for the log types to be enabled for export to CloudWatch
+                      Logs for a specific DB instance.'
+                    properties:
+                      disableLogTypes:
+                        description: DisableLogTypes is the list of log types to disable.
+                        items:
+                          type: string
+                        type: array
+                      enableLogTypes:
+                        description: EnableLogTypes is the list of log types to enable.
+                        items:
+                          type: string
+                        type: array
+                    type: object
                   copyTagsToSnapshot:
                     description: CopyTagsToSnapshot should be true to copy all tags
                       from the DB instance to snapshots of the DB instance, and otherwise

diff --git a/pkg/clients/database/rds.go b/pkg/clients/database/rds.go
@@ -651,6 +651,11 @@ func LateInitialize(in *v1beta1.RDSInstanceParameters, db *rdstypes.DBInstance)
 			}
 		}
 	}
+	// TODO: remove deprecated field + code. Mapping to EnableCloudwatchLogsExports while in deprecation.
+	// nolint:staticcheck
+	if len(in.EnableCloudwatchLogsExports) == 0 && in.CloudwatchLogsExportConfiguration != nil {
+		in.EnableCloudwatchLogsExports = in.CloudwatchLogsExportConfiguration.EnableLogTypes
+	}
 }
 
 // IsUpToDate checks whether there is a change in any of the modifiable fields.
@@ -676,6 +681,8 @@ func IsUpToDate(ctx context.Context, kube client.Client, r *v1beta1.RDSInstance,
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "MasterPasswordSecretRef"),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "OptionGroupName"),
 		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "EnableCloudwatchLogsExports"),
+		// TODO: remove deprecated field + code. Mapping to EnableCloudwatchLogsExports while in deprecation.
+		cmpopts.IgnoreFields(v1beta1.RDSInstanceParameters{}, "CloudwatchLogsExportConfiguration"),
 	)
 
 	engineVersionChanged := !isEngineVersionUpToDate(r, db)