CLOUDP-194639: Fix Auditing reconciliation

pkg/api/v1/auditing.go

@@ -1,24 +1,30 @@
 package v1
 
-import "go.mongodb.org/atlas/mongodbatlas"
+import (
+	"strings"
+
+	"go.mongodb.org/atlas/mongodbatlas"
+
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr"
+)
 
 // Auditing represents MongoDB Maintenance Windows
 type Auditing struct {
 	// Indicates whether the auditing system captures successful authentication attempts for audit filters using the "atype" : "authCheck" auditing event. For more information, see auditAuthorizationSuccess
 	// +optional
-	AuditAuthorizationSuccess *bool `json:"auditAuthorizationSuccess,omitempty"`
+	AuditAuthorizationSuccess bool `json:"auditAuthorizationSuccess,omitempty"`
 	// JSON-formatted audit filter used by the project
 	// +optional
 	AuditFilter string `json:"auditFilter,omitempty"`
 	// Denotes whether or not the project associated with the {GROUP-ID} has database auditing enabled.
 	// +optional
-	Enabled *bool `json:"enabled,omitempty"`
+	Enabled bool `json:"enabled,omitempty"`
 }
 
 func (a Auditing) ToAtlas() *mongodbatlas.Auditing {
 	return &mongodbatlas.Auditing{
-		AuditAuthorizationSuccess: a.AuditAuthorizationSuccess,
-		AuditFilter:               a.AuditFilter,
-		Enabled:                   a.Enabled,
+		AuditAuthorizationSuccess: toptr.MakePtr(a.AuditAuthorizationSuccess),
+		AuditFilter:               strings.Trim(a.AuditFilter, "\n"),
+		Enabled:                   toptr.MakePtr(a.Enabled),
 	}
 }

pkg/controller/atlasproject/auditing_test.go

@@ -0,0 +1,122 @@
+package atlasproject
+
+import (
+	"testing"
+
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr"
+
+	"github.com/stretchr/testify/assert"
+	"go.mongodb.org/atlas/mongodbatlas"
+
+	v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1"
+)
+
+func Test_auditingInSync(t *testing.T) {
+	type args struct {
+		atlas *mongodbatlas.Auditing
+		spec  *v1.Auditing
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "Atlas and Operator Auditing are empty",
+			args: args{
+				atlas: nil,
+				spec:  nil,
+			},
+			want: true,
+		},
+		{
+			name: "Atlas Auditing is empty and Operator doesn't",
+			args: args{
+				atlas: nil,
+				spec:  &v1.Auditing{Enabled: true},
+			},
+			want: false,
+		},
+		{
+			name: "Operator Auditing is empty and Atlas doesn't",
+			args: args{
+				atlas: &mongodbatlas.Auditing{Enabled: toptr.MakePtr(true)},
+				spec:  nil,
+			},
+			want: false,
+		},
+		{
+			name: "Operator Auditing has different config from Atlas",
+			args: args{
+				atlas: &mongodbatlas.Auditing{
+					AuditAuthorizationSuccess: toptr.MakePtr(false),
+					AuditFilter:               `{"atype":"authenticate","param":{"user":"auditReadOnly","db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					ConfigurationType:         "ReadOnly",
+					Enabled:                   toptr.MakePtr(true),
+				},
+				spec: &v1.Auditing{
+					AuditAuthorizationSuccess: true,
+					AuditFilter:               `{"atype":"authenticate","param":{"user":"auditReadOnly","db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					Enabled:                   true,
+				},
+			},
+			want: false,
+		},
+		{
+			name: "Operator Auditing has different config filter from Atlas",
+			args: args{
+				atlas: &mongodbatlas.Auditing{
+					AuditAuthorizationSuccess: toptr.MakePtr(false),
+					AuditFilter:               `{"atype":"authenticate","param":{"user":"auditReadOnly","db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					ConfigurationType:         "ReadOnly",
+					Enabled:                   toptr.MakePtr(true),
+				},
+				spec: &v1.Auditing{
+					AuditAuthorizationSuccess: false,
+					AuditFilter:               `{"atype":"authenticate","param":{"db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					Enabled:                   true,
+				},
+			},
+			want: false,
+		},
+		{
+			name: "Operator Auditing are Equal",
+			args: args{
+				atlas: &mongodbatlas.Auditing{
+					AuditAuthorizationSuccess: toptr.MakePtr(false),
+					AuditFilter:               `{"atype":"authenticate","param":{"user":"auditReadOnly","db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					ConfigurationType:         "ReadOnly",
+					Enabled:                   toptr.MakePtr(true),
+				},
+				spec: &v1.Auditing{
+					AuditAuthorizationSuccess: false,
+					AuditFilter:               `{"atype":"authenticate","param":{"user":"auditReadOnly","db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					Enabled:                   true,
+				},
+			},
+			want: true,
+		},
+		{
+			name: "Operator Auditing are Equal when filter has newline in the end",
+			args: args{
+				atlas: &mongodbatlas.Auditing{
+					AuditAuthorizationSuccess: toptr.MakePtr(false),
+					AuditFilter:               `{"atype":"authenticate","param":{"user":"auditReadOnly","db":"admin","mechanism":"SCRAM-SHA-1"}}`,
+					ConfigurationType:         "ReadOnly",
+					Enabled:                   toptr.MakePtr(true),
+				},
+				spec: &v1.Auditing{
+					AuditAuthorizationSuccess: false,
+					AuditFilter:               "{\"atype\":\"authenticate\",\"param\":{\"user\":\"auditReadOnly\",\"db\":\"admin\",\"mechanism\":\"SCRAM-SHA-1\"}}\n",
+					Enabled:                   true,
+				},
+			},
+			want: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equalf(t, tt.want, auditingInSync(tt.args.atlas, tt.args.spec), "auditingInSync(%v, %v)", tt.args.atlas, tt.args.spec)
+		})
+	}
+}

test/e2e/auditing_test.go

@@ -6,7 +6,6 @@ import (
 
 	v1 "github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1"
 	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/api/v1/status"
-	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/toptr"
 	"github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/actions"
 	"github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/data"
 	"github.com/mongodb/mongodb-atlas-kubernetes/test/e2e/model"
@@ -44,9 +43,9 @@ var _ = Describe("UserLogin", Label("auditing"), func() {
 				[]func(*model.TestDataProvider){},
 			).WithProject(data.DefaultProject()),
 			v1.Auditing{
-				AuditAuthorizationSuccess: toptr.MakePtr(false),
+				AuditAuthorizationSuccess: false,
 				AuditFilter:               exampleFilter(),
-				Enabled:                   toptr.MakePtr(true),
+				Enabled:                   true,
 			},
 		),
 	)