CLOUDP-136888: Add Project Settings (#716)

fabritsius · web-flow · commit 8117a87f78e0 · 2022-10-24T10:49:17.000+04:00
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -88,6 +88,7 @@ jobs:
             "multinamespaced",
             "networkpeering",
             "privatelink",
+            "project-settings",
             "x509auth",
           ]
 
@@ -217,4 +218,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: logs
-          path: test/e2e/output/**
+          path: test/e2e/output/**
diff --git a/config/crd/bases/atlas.mongodb.com_atlasbackuppolicies.yaml b/config/crd/bases/atlas.mongodb.com_atlasbackuppolicies.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -116,9 +115,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/atlas.mongodb.com_atlasbackupschedules.yaml b/config/crd/bases/atlas.mongodb.com_atlasbackupschedules.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -115,9 +114,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml b/config/crd/bases/atlas.mongodb.com_atlasdatabaseusers.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -213,9 +212,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/atlas.mongodb.com_atlasdeployments.yaml b/config/crd/bases/atlas.mongodb.com_atlasdeployments.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -520,6 +519,8 @@ spec:
                     type: string
                   noTableScan:
                     type: boolean
+                  oplogMinRetentionHours:
+                    type: string
                   oplogSizeMB:
                     format: int64
                     type: integer
@@ -798,9 +799,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/config/crd/bases/atlas.mongodb.com_atlasprojects.yaml b/config/crd/bases/atlas.mongodb.com_atlasprojects.yaml
@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -498,6 +497,20 @@ spec:
                       type: string
                   type: object
                 type: array
+              settings:
+                description: Settings allow to set Project Settings for the project
+                properties:
+                  isCollectDatabaseSpecificsStatisticsEnabled:
+                    type: boolean
+                  isDataExplorerEnabled:
+                    type: boolean
+                  isPerformanceAdvisorEnabled:
+                    type: boolean
+                  isRealtimePerformancePanelEnabled:
+                    type: boolean
+                  isSchemaAdvisorEnabled:
+                    type: boolean
+                type: object
               withDefaultAlertsSettings:
                 default: true
                 description: Flag that indicates whether to create the new project
@@ -776,9 +789,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []
diff --git a/go.mod b/go.mod
@@ -19,10 +19,11 @@ require (
 	github.com/pborman/uuid v1.2.1
 	github.com/sethvargo/go-password v0.2.0
 	github.com/stretchr/testify v1.8.0
-	go.mongodb.org/atlas v0.16.0
+	go.mongodb.org/atlas v0.18.0
 	go.mongodb.org/mongo-driver v1.10.2
 	go.uber.org/zap v1.23.0
 	google.golang.org/api v0.96.0
+	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.25.0
 	k8s.io/apimachinery v0.25.0
@@ -105,7 +106,6 @@ require (
 	google.golang.org/grpc v1.47.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 	k8s.io/apiextensions-apiserver v0.25.0 // indirect
 	k8s.io/component-base v0.25.0 // indirect
 	k8s.io/klog/v2 v2.70.1 // indirect
diff --git a/go.sum b/go.sum
@@ -176,7 +176,6 @@ github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5F
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
-github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -427,8 +426,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.mongodb.org/atlas v0.16.0 h1:IqnDuK3XAZUgJ5lPHc4v4z4B8F6mvsS37O4ck7tOYVc=
-go.mongodb.org/atlas v0.16.0/go.mod h1:lQhRHIxc6jQHEK3/q9WLu/SdBkPj2fQYhjLGUF6Z3U8=
+go.mongodb.org/atlas v0.18.0 h1:hDEBykn31FlW0KKMt3xsGyqOrx+jkxB9jCO4GLhH6M0=
+go.mongodb.org/atlas v0.18.0/go.mod h1:GUuW7/ZrHzCO0o47aiqhokN0N6i0GM3yraRyHIBTykU=
 go.mongodb.org/mongo-driver v1.10.2 h1:4Wk3cnqOrQCn0P92L3/mmurMxzdvWWs5J9jinAVKD+k=
 go.mongodb.org/mongo-driver v1.10.2/go.mod h1:z4XpeoU6w+9Vht+jAFyLgVrD+jGSQQe0+CBWFHNiHt8=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
diff --git a/pkg/api/v1/atlasdeployment_types.go b/pkg/api/v1/atlasdeployment_types.go
@@ -289,7 +289,24 @@ type ComputeSpec struct {
 	MaxInstanceSize string `json:"maxInstanceSize,omitempty"`
 }
 
-type ProcessArgs mongodbatlas.ProcessArgs
+type ProcessArgs struct {
+	DefaultReadConcern               string `json:"defaultReadConcern,omitempty"`
+	DefaultWriteConcern              string `json:"defaultWriteConcern,omitempty"`
+	MinimumEnabledTLSProtocol        string `json:"minimumEnabledTlsProtocol,omitempty"`
+	FailIndexKeyTooLong              *bool  `json:"failIndexKeyTooLong,omitempty"`
+	JavascriptEnabled                *bool  `json:"javascriptEnabled,omitempty"`
+	NoTableScan                      *bool  `json:"noTableScan,omitempty"`
+	OplogSizeMB                      *int64 `json:"oplogSizeMB,omitempty"`
+	SampleSizeBIConnector            *int64 `json:"sampleSizeBIConnector,omitempty"`
+	SampleRefreshIntervalBIConnector *int64 `json:"sampleRefreshIntervalBIConnector,omitempty"`
+	OplogMinRetentionHours           string `json:"oplogMinRetentionHours,omitempty"`
+}
+
+func (specArgs ProcessArgs) ToAtlas() (*mongodbatlas.ProcessArgs, error) {
+	result := &mongodbatlas.ProcessArgs{}
+	err := compat.JSONCopy(result, specArgs)
+	return result, err
+}
 
 func (specArgs ProcessArgs) IsEqual(newArgs interface{}) bool {
 	specV := reflect.ValueOf(specArgs)
diff --git a/pkg/api/v1/atlasdeployment_types_test.go b/pkg/api/v1/atlasdeployment_types_test.go
@@ -44,6 +44,7 @@ func init() {
 	excludedClusterFieldsTheirs["links"] = true
 	excludedClusterFieldsTheirs["createDate"] = true
 	excludedClusterFieldsTheirs["versionReleaseSystem"] = true
+	excludedClusterFieldsTheirs["serverlessBackupOptions"] = true
 }
 
 func TestCompatibility(t *testing.T) {
diff --git a/pkg/api/v1/atlasproject_types.go b/pkg/api/v1/atlasproject_types.go
@@ -87,6 +87,10 @@ type AtlasProjectSpec struct {
 	// Auditing represents MongoDB Maintenance Windows
 	// +optional
 	Auditing *Auditing `json:"auditing,omitempty"`
+
+	// Settings allow to set Project Settings for the project
+	// +optional
+	Settings *ProjectSettings `json:"settings,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/pkg/api/v1/project_settings.go b/pkg/api/v1/project_settings.go
@@ -0,0 +1,21 @@
+package v1
+
+import (
+	"go.mongodb.org/atlas/mongodbatlas"
+
+	"github.com/mongodb/mongodb-atlas-kubernetes/pkg/util/compat"
+)
+
+type ProjectSettings struct {
+	IsCollectDatabaseSpecificsStatisticsEnabled *bool `json:"isCollectDatabaseSpecificsStatisticsEnabled,omitempty"`
+	IsDataExplorerEnabled                       *bool `json:"isDataExplorerEnabled,omitempty"`
+	IsPerformanceAdvisorEnabled                 *bool `json:"isPerformanceAdvisorEnabled,omitempty"`
+	IsRealtimePerformancePanelEnabled           *bool `json:"isRealtimePerformancePanelEnabled,omitempty"`
+	IsSchemaAdvisorEnabled                      *bool `json:"isSchemaAdvisorEnabled,omitempty"`
+}
+
+func (s ProjectSettings) ToAtlas() (*mongodbatlas.ProjectSettings, error) {
+	result := &mongodbatlas.ProjectSettings{}
+	err := compat.JSONCopy(result, s)
+	return result, err
+}
diff --git a/pkg/api/v1/status/condition.go b/pkg/api/v1/status/condition.go
@@ -44,6 +44,7 @@ const (
 	IntegrationReadyType            ConditionType = "ThirdPartyIntegrationReady"
 	EncryptionAtRestReadyType       ConditionType = "EncryptionAtRestReady"
 	AuditingReadyType               ConditionType = "AuditingReady"
+	ProjectSettingsReadyType        ConditionType = "ProjectSettingsReady"
 )
 
 // AtlasDeployment condition types
diff --git a/pkg/api/v1/zz_generated.deepcopy.go b/pkg/api/v1/zz_generated.deepcopy.go
diff --git a/pkg/controller/atlasdeployment/atlasdeployment_controller.go b/pkg/controller/atlasdeployment/atlasdeployment_controller.go
@@ -439,22 +439,26 @@ func (r *AtlasDeploymentReconciler) handleAdvancedOptions(ctx *workflow.Context,
 	context := context.Background()
 	atlasArgs, _, err := ctx.Client.Clusters.GetProcessArgs(context, project.Status.ID, deploymentName)
 	if err != nil {
-		return workflow.Terminate(workflow.Internal, "cannot get process args")
+		return workflow.Terminate(workflow.DeploymentAdvancedOptionsReady, "cannot get process args")
 	}
 
 	if deployment.Spec.ProcessArgs == nil {
 		return workflow.OK()
 	}
 
 	if !deployment.Spec.ProcessArgs.IsEqual(atlasArgs) {
-		options := mongodbatlas.ProcessArgs(*deployment.Spec.ProcessArgs)
-		args, resp, err := ctx.Client.Clusters.UpdateProcessArgs(context, project.Status.ID, deploymentName, &options)
+		options, err := deployment.Spec.ProcessArgs.ToAtlas()
+		if err != nil {
+			return workflow.Terminate(workflow.DeploymentAdvancedOptionsReady, "cannot convert process args to atlas")
+		}
+
+		args, resp, err := ctx.Client.Clusters.UpdateProcessArgs(context, project.Status.ID, deploymentName, options)
 		ctx.Log.Debugw("ProcessArgs Update", "args", args, "resp", resp.Body, "err", err)
 		if err != nil {
-			return workflow.Terminate(workflow.Internal, "cannot update process args")
+			return workflow.Terminate(workflow.DeploymentAdvancedOptionsReady, "cannot update process args")
 		}
 
-		workflow.InProgress(workflow.DeploymentAdvancedOptionsAreNotReady, "deployment Advanced Configuration Options are being updated")
+		workflow.InProgress(workflow.DeploymentAdvancedOptionsReady, "deployment Advanced Configuration Options are being updated")
 	}
 
 	return workflow.OK()
diff --git a/pkg/controller/atlasproject/atlasproject_controller.go b/pkg/controller/atlasproject/atlasproject_controller.go
@@ -253,6 +253,11 @@ func (r *AtlasProjectReconciler) ensureProjectResources(ctx *workflow.Context, p
 	}
 	r.EventRecorder.Event(project, "Normal", string(status.AuditingReadyType), "")
 
+	if result = ensureProjectSettings(ctx, projectID, project); !result.IsOk() {
+		return result
+	}
+	r.EventRecorder.Event(project, "Normal", string(status.ProjectSettingsReadyType), "")
+
 	return workflow.OK()
 }
 
diff --git a/pkg/controller/atlasproject/project_settings.go b/pkg/controller/atlasproject/project_settings.go
diff --git a/pkg/controller/atlasproject/project_settings_test.go b/pkg/controller/atlasproject/project_settings_test.go
diff --git a/pkg/controller/workflow/reason.go b/pkg/controller/workflow/reason.go
diff --git a/test/e2e/api/atlas/atlas.go b/test/e2e/api/atlas/atlas.go
diff --git a/test/e2e/project_settings_test.go b/test/e2e/project_settings_test.go

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ func init() {`
`44`	`44`	`excludedClusterFieldsTheirs["links"] = true`
`45`	`45`	`excludedClusterFieldsTheirs["createDate"] = true`
`46`	`46`	`excludedClusterFieldsTheirs["versionReleaseSystem"] = true`
	`47`	`+ excludedClusterFieldsTheirs["serverlessBackupOptions"] = true`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`func TestCompatibility(t *testing.T) {`