Merge pull request #2066 from akesser/bugfix/update-dbinstance-version

fix: add engine version for dbinstance update

pkg/clients/rds/common.go

@@ -46,6 +46,7 @@ const (
 	ErrNoPasswordUpToDate                                    = "cannot determine password up to date status"
 	ErrGetCachedPassword                                     = "cannot get cached password"
 	ErrRetrievePasswordForUpdate                             = "cannot retrieve password for update"
+	ErrDescribe                                              = "cannot describe dbinstance"
 )
 
 const (

pkg/controller/rds/dbinstance/setup.go

@@ -269,6 +269,16 @@ func (e *custom) preUpdate(ctx context.Context, cr *svcapitypes.DBInstance, obj
 		obj.StorageThroughput = nil
 	}
 
+	input := GenerateDescribeDBInstancesInput(cr)
+
+	out, err := e.client.DescribeDBInstancesWithContext(ctx, input)
+	if err != nil {
+		return errors.Wrap(err, dbinstance.ErrDescribe)
+	}
+	if !isEngineVersionUpToDate(cr, out) && cr.Spec.ForProvider.EngineVersion != nil {
+		obj.EngineVersion = cr.Spec.ForProvider.EngineVersion // add EngineVersion if changed and no downgrade
+	}
+
 	return nil
 }