CLOUDP-146481: Convert OplogMinRetentionHours field properly (#778)

Author: fabritsius

pkg/api/v1/atlasdeployment_types.go

@@ -17,7 +17,10 @@ limitations under the License.
 package v1
 
 import (
+	"fmt"
 	"reflect"
+	"regexp"
+	"strconv"
 
 	"go.mongodb.org/atlas/mongodbatlas"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -306,10 +309,28 @@ type ProcessArgs struct {
 
 func (specArgs ProcessArgs) ToAtlas() (*mongodbatlas.ProcessArgs, error) {
 	result := &mongodbatlas.ProcessArgs{}
+	if err := convertOplogMinRetentionHours(&specArgs, result); err != nil {
+		return nil, err
+	}
+
 	err := compat.JSONCopy(result, specArgs)
 	return result, err
 }
 
+func convertOplogMinRetentionHours(specArgs *ProcessArgs, atlasArgs *mongodbatlas.ProcessArgs) error {
+	if specArgs != nil && specArgs.OplogMinRetentionHours != "" {
+		OplogMinRetentionHours, err := strconv.ParseFloat(specArgs.OplogMinRetentionHours, 64)
+		if err != nil {
+			return err
+		}
+
+		atlasArgs.OplogMinRetentionHours = &OplogMinRetentionHours
+		specArgs.OplogMinRetentionHours = ""
+	}
+
+	return nil
+}
+
 func (specArgs ProcessArgs) IsEqual(newArgs interface{}) bool {
 	specV := reflect.ValueOf(specArgs)
 	newV := reflect.Indirect(reflect.ValueOf(newArgs))
@@ -330,21 +351,30 @@ func (specArgs ProcessArgs) IsEqual(newArgs interface{}) bool {
 			if specValue.IsNil() {
 				continue
 			}
+			specValue = specValue.Elem()
+		}
+
+		if newValue.Kind() == reflect.Ptr {
 			if newValue.IsNil() {
 				return false
 			}
-			specValue = specValue.Elem()
 			newValue = newValue.Elem()
 		}
 
-		if specValue.Interface() != newValue.Interface() {
+		if stringValue(specValue.Interface()) != stringValue(newValue.Interface()) {
 			return false
 		}
 	}
 
 	return true
 }
 
+var TrailingZerosRegex = regexp.MustCompile(`\.[0]*$`)
+
+func stringValue(v interface{}) string {
+	return TrailingZerosRegex.ReplaceAllString(fmt.Sprint(v), "")
+}
+
 // Check compatibility with library type.
 var _ = ComputeSpec(mongodbatlas.Compute{})
 

pkg/api/v1/atlasdeployment_types_test.go

@@ -179,4 +179,28 @@ func TestIsEqual(t *testing.T) {
 
 	areTheyEqual = operatorArgs.IsEqual(atlasArgs)
 	assert.False(t, areTheyEqual, "should NOT be equal if Operator has more args")
+
+	atlasArgs.OplogSizeMB = toptr.MakePtr[int64](8)
+
+	areTheyEqual = operatorArgs.IsEqual(atlasArgs)
+	assert.True(t, areTheyEqual, "should become equal")
+
+	operatorArgs.OplogMinRetentionHours = "2.0"
+	atlasArgs.OplogMinRetentionHours = toptr.MakePtr[float64](2)
+
+	areTheyEqual = operatorArgs.IsEqual(atlasArgs)
+	assert.True(t, areTheyEqual, "should be equal when OplogMinRetentionHours field is the same")
+}
+
+func TestToAtlas(t *testing.T) {
+	operatorArgs := ProcessArgs{
+		JavascriptEnabled:      toptr.MakePtr(true),
+		OplogMinRetentionHours: "2.0",
+	}
+
+	atlasArgs, err := operatorArgs.ToAtlas()
+	assert.NoError(t, err, "no errors should occur")
+
+	areTheyEqual := operatorArgs.IsEqual(atlasArgs)
+	assert.True(t, areTheyEqual, "should be equal after conversion")
 }