reorganize delta pre compare

Author: michaelhtm

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-11-29T03:44:25Z"
-  build_hash: 23c7074fa310ad1ccb38946775397c203b49f024
+  build_date: "2025-12-10T19:01:54Z"
+  build_hash: 5c8b9050006ef6c7d3a97c279e7b1bc163f20a0a
   go_version: go1.25.4
-  version: v0.56.0
+  version: v0.56.0-3-g5c8b905
 api_directory_checksum: 90b0d1adcc91f4a1b1f1b436e3ac0c30d9271678
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 23c3c400e5913ebaa0047af70fda453b065ce321
+  file_checksum: c41ea4048464974d8ea8548e1933551a483f72c9
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -293,7 +293,7 @@ resources:
   DBInstance:
     hooks:
       delta_pre_compare:
-        template_path: hooks/db_instance/delta_pre_compare.go.tpl
+        code: customPreCompare(delta, a, b)
       sdk_create_pre_build_request:
         template_path: hooks/db_instance/sdk_create_pre_build_request.go.tpl
       sdk_create_post_set_output:

generator.yaml

@@ -293,7 +293,7 @@ resources:
   DBInstance:
     hooks:
       delta_pre_compare:
-        template_path: hooks/db_instance/delta_pre_compare.go.tpl
+        code: customPreCompare(delta, a, b)
       sdk_create_pre_build_request:
         template_path: hooks/db_instance/sdk_create_pre_build_request.go.tpl
       sdk_create_post_set_output:

helm/templates/deployment.yaml

@@ -51,6 +51,13 @@ spec:
         - "$(AWS_REGION)"
         - --aws-endpoint-url
         - "$(AWS_ENDPOINT_URL)"
+{{- if .Values.aws.identity_endpoint_url }}
+        - --aws-identity-endpoint-url
+        - "$(AWS_IDENTITY_ENDPOINT_URL)"
+{{- end }}
+{{- if .Values.aws.allow_unsafe_aws_endpoint_urls }}
+        - --allow-unsafe-aws-endpoint-urls
+{{- end }}
 {{- if .Values.log.enable_development_logging }}
         - --enable-development-logging
 {{- end }}
@@ -109,6 +116,8 @@ spec:
           value: {{ .Values.aws.region }}
         - name: AWS_ENDPOINT_URL
           value: {{ .Values.aws.endpoint_url | quote }}
+        - name: AWS_IDENTITY_ENDPOINT_URL
+          value: {{ .Values.aws.identity_endpoint_url | quote }}
         - name: ACK_WATCH_NAMESPACE
           value: {{ include "ack-rds-controller.watch-namespace" . }}
         - name: ACK_WATCH_SELECTORS

helm/values.schema.json

@@ -171,9 +171,16 @@
         "region": {
           "type": "string"
         },
-        "endpoint": {
+        "endpoint_url": {
           "type": "string"
         },
+        "identity_endpoint_url": {
+          "type": "string"
+        },
+        "allow_unsafe_aws_endpoint_urls": {
+          "type": "boolean",
+          "default": false
+        },
         "credentials": {
           "description": "AWS credentials information",
           "properties": {

helm/values.yaml

@@ -90,6 +90,8 @@ aws:
   # If specified, use the AWS region for AWS API calls
   region: ""
   endpoint_url: ""
+  identity_endpoint_url: ""
+  allow_unsafe_aws_endpoint_urls: false
   credentials:
     # If specified, Secret with shared credentials file to use.
     secretName: ""

pkg/resource/db_instance/delta.go

@@ -111,6 +111,42 @@ var (
 	)
 )
 
+func customPreCompare(delta *ackcompare.Delta, a *resource, b *resource) {
+	// Do not consider any of the following fields for delta if they are missing in
+	// desired(a) but are present in latest(b) because each of these fields is
+	// late-initialized
+	// This special handling is only needed for DBInstance because late
+	// initialized values are not returned after successful ModifyDBInstance
+	// call. They are only populated once the DBInstance returns back to
+	// available.
+	if a.ko.Spec.AvailabilityZone == nil &&
+		b.ko.Spec.AvailabilityZone != nil {
+		a.ko.Spec.AvailabilityZone = b.ko.Spec.AvailabilityZone
+	}
+	if a.ko.Spec.BackupTarget == nil &&
+		b.ko.Spec.BackupTarget != nil &&
+		*b.ko.Spec.BackupTarget == ServiceDefaultBackupTarget {
+		a.ko.Spec.BackupTarget = b.ko.Spec.BackupTarget
+	}
+	if a.ko.Spec.NetworkType == nil &&
+		b.ko.Spec.NetworkType != nil &&
+		*b.ko.Spec.NetworkType == ServiceDefaultNetworkType {
+		a.ko.Spec.NetworkType = b.ko.Spec.NetworkType
+	}
+	if a.ko.Spec.PerformanceInsightsEnabled == nil &&
+		b.ko.Spec.PerformanceInsightsEnabled != nil {
+		a.ko.Spec.PerformanceInsightsEnabled = func() *bool { a := false; return &a }()
+	}
+
+	// RDS will choose preferred engine minor version if only
+	// engine major version is provided and controler should not
+	// treat them as different, such as spec has 14, status has 14.1
+	// controller should treat them as same
+	reconcileEngineVersion(a, b)
+	compareTags(delta, a, b)
+	compareSecretReferenceChanges(delta, a, b)
+}
+
 // requeueWaitUntilCanModify returns a `ackrequeue.RequeueNeededAfter` struct
 // explaining the DB instance cannot be modified until it reaches an available
 // status.