Ignore NetworkType param if no change, not consider diff when engine version diff in minor version (#91)

* Ignore NetworkType param if no change, not consider diff when engine version diff in minor version

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

Author: brucegucode

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2022-06-17T22:34:21Z"
+  build_date: "2022-06-20T19:21:08Z"
   build_hash: a45f3b900849ec03c5e16ed2778c0b8e2923ffee
-  go_version: go1.18.3
-  version: v0.19.0-5-ga45f3b9
+  go_version: go1.18.2
+  version: v0.19.1
 api_directory_checksum: 7567208aa7463aaa3c937e45107f520e6fc2946f
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.27

pkg/resource/db_instance/delta.go

@@ -17,6 +17,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
 
 	ackcondition "github.com/aws-controllers-k8s/runtime/pkg/condition"
 	ackrequeue "github.com/aws-controllers-k8s/runtime/pkg/requeue"
@@ -194,3 +195,16 @@ func (rm *resourceManager) restoreDbInstanceFromDbSnapshot(
 	}
 	return &resource{r.ko}, nil
 }
+
+// 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
+func reconcileEngineVersion(
+	a *resource,
+	b *resource,
+) {
+	if a != nil && b != nil && strings.HasPrefix(*b.ko.Spec.EngineVersion, *a.ko.Spec.EngineVersion) {
+		a.ko.Spec.EngineVersion = b.ko.Spec.EngineVersion
+	}
+}

pkg/resource/db_instance/hooks.go

@@ -9,4 +9,10 @@
     // reconciler will keep updating the dbinstance and constantly requeueing it.
     if a != nil && a.ko.Spec.AvailabilityZone == nil && b != nil && b.ko.Spec.AvailabilityZone != nil {
         a.ko.Spec.AvailabilityZone = b.ko.Spec.AvailabilityZone
-    }
+    }
+
+    // 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)

pkg/resource/db_instance/sdk.go

@@ -9,7 +9,7 @@
 
         // RDS will not compare diff value and accept any modify db call
         // for below values, MonitoringInterval, CACertificateIdentifier
-        // and user master password
+        // and user master password, NetworkType
         // hence if there is no delta between desired 
         // and latest, exclude it from ModifyDBInstanceRequest
         if !delta.DifferentAt("Spec.MonitoringInterval") {
@@ -21,3 +21,6 @@
         if !delta.DifferentAt("Spec.MasterUserPassword.Name") {
 		input.MasterUserPassword = nil
 	}
+        if !delta.DifferentAt("Spec.NetworkType") {
+                input.NetworkType = nil
+        }