Merge pull request #2292 from crossplane-contrib/backport-2267-to-release-0.57

[Backport release-0.57] feat(docdb/dbinstance):Adding preferred maintainence window into status at provider

Author: kkendzia

apis/docdb/v1alpha1/custom_types.go

@@ -62,7 +62,9 @@ type CustomDBInstanceParameters struct {
 }
 
 // CustomDBInstanceObservation for DBInstance
-type CustomDBInstanceObservation struct{}
+type CustomDBInstanceObservation struct {
+	PreferredMaintenanceWindow *string `json:"preferredMaintenanceWindow,omitempty"`
+}
 
 // CustomDBSubnetGroupParameters for DBSubnetGroupParameters
 type CustomDBSubnetGroupParameters struct {

apis/docdb/v1alpha1/zz_generated.deepcopy.go

@@ -13,3 +13,21 @@ spec:
         value: "my-cluster"
   providerConfigRef:
     name: example
+---
+apiVersion: docdb.aws.crossplane.io/v1alpha1
+kind: DBInstance
+metadata:
+  name: sample-test-docdb
+spec:
+  deletionPolicy: Delete
+  forProvider:
+    autoMinorVersionUpgrade: true
+    dbClusterIdentifier: sample-test
+    dbInstanceClass: db.t3.medium
+    engine: docdb
+    preferredMaintenanceWindow: wed:12:46-wed:13:16
+    region: ap-south-1
+  managementPolicies:
+    - '*'
+  providerConfigRef:
+    name: aws-local

examples/docdb/instance.yaml

@@ -592,6 +592,8 @@ spec:
                       Specifies the daily time range during which automated backups are created
                       if automated backups are enabled, as determined by the BackupRetentionPeriod.
                     type: string
+                  preferredMaintenanceWindow:
+                    type: string
                   publiclyAccessible:
                     description: |-
                       Not supported. Amazon DocumentDB does not currently support public endpoints.

package/crds/docdb.aws.crossplane.io_dbinstances.yaml

@@ -106,6 +106,10 @@ func postObserve(_ context.Context, cr *svcapitypes.DBInstance, resp *svcsdk.Des
 		return managed.ExternalObservation{}, err
 	}
 
+	if len(resp.DBInstances) > 0 {
+		cr.Status.AtProvider.PreferredMaintenanceWindow = resp.DBInstances[0].PreferredMaintenanceWindow
+	}
+
 	switch pointer.StringValue(cr.Status.AtProvider.DBInstanceStatus) {
 	case svcapitypes.DocDBInstanceStateAvailable:
 		cr.Status.SetConditions(xpv1.Available())

pkg/controller/docdb/dbinstance/setup.go

@@ -158,6 +158,12 @@ func withPreferredMaintenanceWindow(value string) docDBModifier {
 	}
 }
 
+func withStatusPreferredMaintenanceWindow(value string) docDBModifier {
+	return func(o *svcapitypes.DBInstance) {
+		o.Status.AtProvider.PreferredMaintenanceWindow = pointer.ToOrNilIfZeroValue(value)
+	}
+}
+
 func withPromotionTier(value int) docDBModifier {
 	return func(o *svcapitypes.DBInstance) {
 		o.Spec.ForProvider.PromotionTier = pointer.ToIntAsInt64(value)
@@ -501,6 +507,7 @@ func TestObserve(t *testing.T) {
 					withExternalName(testDBIdentifier),
 					withDBIdentifier(testDBIdentifier),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
 				),
 			},
 			want: want{
@@ -515,6 +522,7 @@ func TestObserve(t *testing.T) {
 						Port:    pointer.ToIntAsInt64(testPort),
 					}),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testPreferredMaintenanceWindow),
 				),
 				result: managed.ExternalObservation{
 					ResourceExists:    true,
@@ -1013,6 +1021,7 @@ func TestObserve(t *testing.T) {
 					withExternalName(testDBIdentifier),
 					withDBIdentifier(testDBIdentifier),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
 				),
 			},
 			want: want{
@@ -1026,6 +1035,7 @@ func TestObserve(t *testing.T) {
 						Port:    pointer.ToIntAsInt64(testPort),
 					}),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testPreferredMaintenanceWindow),
 				),
 				result: managed.ExternalObservation{
 					ResourceExists:    true,
@@ -1526,6 +1536,7 @@ func TestObserve(t *testing.T) {
 					withExternalName(testDBIdentifier),
 					withDBIdentifier(testDBIdentifier),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
 				),
 			},
 			want: want{
@@ -1539,6 +1550,7 @@ func TestObserve(t *testing.T) {
 						Port:    pointer.ToIntAsInt64(testPort),
 					}),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testPreferredMaintenanceWindow),
 				),
 				result: managed.ExternalObservation{
 					ResourceExists:    true,
@@ -2052,6 +2064,7 @@ func TestObserve(t *testing.T) {
 						Port:    pointer.ToIntAsInt64(testPort),
 					}),
 					withPreferredMaintenanceWindow(testOtherPreferredMaintenanceWindow),
+					withStatusPreferredMaintenanceWindow(testPreferredMaintenanceWindow),
 				),
 				result: managed.ExternalObservation{
 					ResourceExists:    true,