Fix DBInstance for updating PI and add tests (#95)

Fixes aws-controllers-k8s/community#1346

Description of changes:
Updating `EnablePerformanceInsights` caused the `DBInstance` to cycle continuously, as it tried to reconcile the server side default values and handle the asynchronous status updates. Rather than relying on a requeue error to wait for the status to update, this pull request modifies the `DBInstance` custom code to set `ResourceSynced = false` on the resource (for the runtime logic to cause the requeue instead). Furthermore, we remove the server side defaulted values from the diff if they have not been updated in the desired spec.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: RedbackThomson

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2022-06-22T22:42:22Z"
+  build_date: "2022-06-23T23:45:42Z"
   build_hash: 4b54669d709a0eb2c1fab659e329060350a40e84
-  go_version: go1.17.5
+  go_version: go1.18.3
   version: v0.19.2
-api_directory_checksum: 891cddd4b051d5b865abddeb1a19760b9fbdcd37
+api_directory_checksum: b0c5acd3d10a1214f5cc46d2fb8b887d9ecc2fe4
 api_version: v1alpha1
 aws_sdk_go_version: v1.44.27
 generator_config_info:
-  file_checksum: 25009e8400a5efd62efed790fd4b5015466a2dc9
+  file_checksum: 48d07f9a7b6ea79f8398bcd10254d912cd90cb6d
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/db_instance.go

@@ -153,10 +153,10 @@ resources:
         template_path: hooks/db_instance/sdk_update_post_set_output.go.tpl
       sdk_delete_pre_build_request:
         template_path: hooks/db_instance/sdk_delete_pre_build_request.go.tpl
-      delta_pre_compare:
-        template_path: hooks/db_instance/delta_pre_compare.go.tpl
       sdk_file_end:
         template_path: hooks/db_instance/sdk_file_end.go.tpl
+      delta_pre_compare:
+        code: customPreCompare(a, b)
     exceptions:
       terminal_codes:
         - InvalidParameter
@@ -168,13 +168,20 @@ resources:
         is_immutable: true
       DBInstanceIdentifier:
         is_primary_key: true
+      DBInstanceStatus:
+        print:
+          name: "STATUS"
       MasterUserPassword:
         is_secret: true
       KmsKeyId:
         references:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+      BackupTarget:
+        late_initialize: {}
+      NetworkType:
+        late_initialize: {}
       # Used by restore db instance from db snapshot
       DBSnapshotIdentifier:
         from:

apis/v1alpha1/generator.yaml

@@ -16,7 +16,11 @@ spec:
     singular: dbinstance
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .status.dbInstanceStatus
+      name: STATUS
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: DBInstance is the Schema for the DBInstances API

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

@@ -153,10 +153,10 @@ resources:
         template_path: hooks/db_instance/sdk_update_post_set_output.go.tpl
       sdk_delete_pre_build_request:
         template_path: hooks/db_instance/sdk_delete_pre_build_request.go.tpl
-      delta_pre_compare:
-        template_path: hooks/db_instance/delta_pre_compare.go.tpl
       sdk_file_end:
         template_path: hooks/db_instance/sdk_file_end.go.tpl
+      delta_pre_compare:
+        code: customPreCompare(a, b)
     exceptions:
       terminal_codes:
         - InvalidParameter
@@ -168,13 +168,20 @@ resources:
         is_immutable: true
       DBInstanceIdentifier:
         is_primary_key: true
+      DBInstanceStatus:
+        print:
+          name: "STATUS"
       MasterUserPassword:
         is_secret: true
       KmsKeyId:
         references:
           resource: Key
           service_name: kms
           path: Status.ACKResourceMetadata.ARN
+      BackupTarget:
+        late_initialize: {}
+      NetworkType:
+        late_initialize: {}
       # Used by restore db instance from db snapshot
       DBSnapshotIdentifier:
         from:

generator.yaml

@@ -0,0 +1,71 @@
+module github.com/aws-controllers-k8s/rds-controller
+
+go 1.17
+
+replace github.com/aws-controllers-k8s/runtime => ../runtime
+
+require (
+	github.com/aws-controllers-k8s/kms-controller v0.0.15
+	github.com/aws-controllers-k8s/runtime v0.18.4
+	github.com/aws/aws-sdk-go v1.44.27
+	github.com/go-logr/logr v1.2.0
+	github.com/spf13/pflag v1.0.5
+	k8s.io/api v0.23.0
+	k8s.io/apimachinery v0.23.0
+	k8s.io/client-go v0.23.0
+	sigs.k8s.io/controller-runtime v0.11.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cenkalti/backoff/v4 v4.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/go-logr/zapr v1.2.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/google/uuid v1.1.2 // indirect
+	github.com/googleapis/gnostic v0.5.5 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/itchyny/gojq v0.12.6 // indirect
+	github.com/itchyny/timefmt-go v0.1.3 // indirect
+	github.com/jaypipes/envutil v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_model v0.2.0 // indirect
+	github.com/prometheus/common v0.28.0 // indirect
+	github.com/prometheus/procfs v0.6.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.19.1 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	k8s.io/apiextensions-apiserver v0.23.0 // indirect
+	k8s.io/component-base v0.23.0 // indirect
+	k8s.io/klog/v2 v2.30.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
+	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
+	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
+	sigs.k8s.io/yaml v1.3.0 // indirect
+)