Add DBCluster serverlessV2ScalingConfiguration update support (#96)

* Update cluster custom update logic for serverlessV2ScalingConfiguration

Co-authored-by: Tenglong Gu <[email protected]>

Author: brucegucode

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-06-23T23:45:42Z"
-  build_hash: 4b54669d709a0eb2c1fab659e329060350a40e84
-  go_version: go1.18.3
-  version: v0.19.2
-api_directory_checksum: b0c5acd3d10a1214f5cc46d2fb8b887d9ecc2fe4
+  build_date: "2022-07-06T21:17:58Z"
+  build_hash: f9ab7cca7c2ea2ac77d0c4d2dfeb0b42ade56f38
+  go_version: go1.18.2
+  version: v0.19.2-4-gf9ab7cc
+api_directory_checksum: d6c6f02d6f5547b3092054e9c7c35f5840f8bef9
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.27
 generator_config_info:
-  file_checksum: 48d07f9a7b6ea79f8398bcd10254d912cd90cb6d
+  file_checksum: 2d0c40614a7482376d47885f84cdb713d4307392
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/db_cluster.go

@@ -107,6 +107,14 @@ resources:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+    renames:
+      operations:
+        CreateDBCluster:
+          output_fields:
+            ScalingConfigurationInfo: ScalingConfiguration
+        ModifyDBCluster:
+          output_fields:
+            ScalingConfigurationInfo: ScalingConfiguration
   DBClusterParameterGroup:
     renames:
       operations:

apis/v1alpha1/generator.yaml

@@ -869,29 +869,6 @@ spec:
                   to other Aurora Replicas in the cluster, you can then reconnect
                   to the reader endpoint."
                 type: string
-              scalingConfigurationInfo:
-                description: "Shows the scaling configuration for an Aurora DB cluster
-                  in serverless DB engine mode. \n For more information, see Using
-                  Amazon Aurora Serverless v1 (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html)
-                  in the Amazon Aurora User Guide."
-                properties:
-                  autoPause:
-                    type: boolean
-                  maxCapacity:
-                    format: int64
-                    type: integer
-                  minCapacity:
-                    format: int64
-                    type: integer
-                  secondsBeforeTimeout:
-                    format: int64
-                    type: integer
-                  secondsUntilAutoPause:
-                    format: int64
-                    type: integer
-                  timeoutAction:
-                    type: string
-                type: object
               status:
                 description: Specifies the current state of this DB cluster.
                 type: string

apis/v1alpha1/zz_generated.deepcopy.go

@@ -107,6 +107,14 @@ resources:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+    renames:
+      operations:
+        CreateDBCluster:
+          output_fields:
+            ScalingConfigurationInfo: ScalingConfiguration
+        ModifyDBCluster:
+          output_fields:
+            ScalingConfigurationInfo: ScalingConfiguration
   DBClusterParameterGroup:
     renames:
       operations:

config/crd/bases/rds.services.k8s.aws_dbclusters.yaml

@@ -869,29 +869,6 @@ spec:
                   to other Aurora Replicas in the cluster, you can then reconnect
                   to the reader endpoint."
                 type: string
-              scalingConfigurationInfo:
-                description: "Shows the scaling configuration for an Aurora DB cluster
-                  in serverless DB engine mode. \n For more information, see Using
-                  Amazon Aurora Serverless v1 (https://docs.aws.amazon.com/AmazonRDS/latest/AuroraUserGuide/aurora-serverless.html)
-                  in the Amazon Aurora User Guide."
-                properties:
-                  autoPause:
-                    type: boolean
-                  maxCapacity:
-                    format: int64
-                    type: integer
-                  minCapacity:
-                    format: int64
-                    type: integer
-                  secondsBeforeTimeout:
-                    format: int64
-                    type: integer
-                  secondsUntilAutoPause:
-                    format: int64
-                    type: integer
-                  timeoutAction:
-                    type: string
-                type: object
               status:
                 description: Specifies the current state of this DB cluster.
                 type: string

generator.yaml

@@ -62,7 +62,6 @@ func (rm *resourceManager) customUpdate(
 		ackcondition.SetSynced(desired, corev1.ConditionTrue, nil, nil)
 		return desired, nil
 	}
-
 	input, err := rm.newCustomUpdateRequestPayload(ctx, desired, delta)
 	if err != nil {
 		return nil, err
@@ -459,27 +458,6 @@ func (rm *resourceManager) customUpdate(
 	} else {
 		ko.Spec.ReplicationSourceIdentifier = nil
 	}
-	if resp.DBCluster.ScalingConfigurationInfo != nil {
-		f51 := &svcapitypes.ScalingConfigurationInfo{}
-		if resp.DBCluster.ScalingConfigurationInfo.AutoPause != nil {
-			f51.AutoPause = resp.DBCluster.ScalingConfigurationInfo.AutoPause
-		}
-		if resp.DBCluster.ScalingConfigurationInfo.MaxCapacity != nil {
-			f51.MaxCapacity = resp.DBCluster.ScalingConfigurationInfo.MaxCapacity
-		}
-		if resp.DBCluster.ScalingConfigurationInfo.MinCapacity != nil {
-			f51.MinCapacity = resp.DBCluster.ScalingConfigurationInfo.MinCapacity
-		}
-		if resp.DBCluster.ScalingConfigurationInfo.SecondsUntilAutoPause != nil {
-			f51.SecondsUntilAutoPause = resp.DBCluster.ScalingConfigurationInfo.SecondsUntilAutoPause
-		}
-		if resp.DBCluster.ScalingConfigurationInfo.TimeoutAction != nil {
-			f51.TimeoutAction = resp.DBCluster.ScalingConfigurationInfo.TimeoutAction
-		}
-		ko.Status.ScalingConfigurationInfo = f51
-	} else {
-		ko.Status.ScalingConfigurationInfo = nil
-	}
 	if resp.DBCluster.Status != nil {
 		ko.Status.Status = resp.DBCluster.Status
 	} else {
@@ -630,6 +608,18 @@ func (rm *resourceManager) newCustomUpdateRequestPayload(
 		}
 		res.SetVpcSecurityGroupIds(f23)
 	}
-
+	// For ServerlessV2ScalingConfiguration, MaxCapacity and MinCapacity,  both need appear in modify call to get ServerlessV2ScalingConfiguration modified
+	if r.ko.Spec.ServerlessV2ScalingConfiguration != nil && delta.DifferentAt("Spec.ServerlessV2ScalingConfiguration") {
+		f23 := &svcsdk.ServerlessV2ScalingConfiguration{}
+		if delta.DifferentAt("Spec.ServerlessV2ScalingConfiguration.MaxCapacity") || delta.DifferentAt("Spec.ServerlessV2ScalingConfiguration.MinCapacity") {
+			if r.ko.Spec.ServerlessV2ScalingConfiguration.MaxCapacity != nil {
+				f23.SetMaxCapacity(*r.ko.Spec.ServerlessV2ScalingConfiguration.MaxCapacity)
+			}
+			if r.ko.Spec.ServerlessV2ScalingConfiguration.MaxCapacity != nil {
+				f23.SetMinCapacity(*r.ko.Spec.ServerlessV2ScalingConfiguration.MinCapacity)
+			}
+		}
+		res.SetServerlessV2ScalingConfiguration(f23)
+	}
 	return res, nil
 }