Move more security fields

Author: Julien-Ben

api/v1/mdb/mongodb_security_types.go

@@ -19,6 +19,23 @@ type Security struct {
 	CertificatesSecretsPrefix string `json:"certsSecretPrefix"`
 }
 
+func newSecurity() *Security {
+	return &Security{TLSConfig: &TLSConfig{}}
+}
+
+func EnsureSecurity(sec *Security) *Security {
+	if sec == nil {
+		sec = newSecurity()
+	}
+	if sec.TLSConfig == nil {
+		sec.TLSConfig = &TLSConfig{}
+	}
+	if sec.Roles == nil {
+		sec.Roles = make([]MongoDbRole, 0)
+	}
+	return sec
+}
+
 // MemberCertificateSecretName returns the name of the secret containing the member TLS certs.
 func (s *Security) MemberCertificateSecretName(defaultName string) string {
 	if s.CertificatesSecretsPrefix != "" {
@@ -170,6 +187,10 @@ type Authentication struct {
 	RequiresClientTLSAuthentication bool `json:"requireClientTLSAuthentication,omitempty"`
 }
 
+func newAuthentication() *Authentication {
+	return &Authentication{Modes: []AuthMode{}}
+}
+
 // +kubebuilder:validation:Enum=X509;SCRAM;SCRAM-SHA-1;MONGODB-CR;SCRAM-SHA-256;LDAP;OIDC
 type AuthMode string
 
@@ -455,3 +476,7 @@ func (m *MongoDB) IsOIDCEnabled() bool {
 	}
 	return m.Spec.Security.Authentication.IsOIDCEnabled()
 }
+
+func (m *MongoDB) GetAuthenticationModes() []string {
+	return m.Spec.Security.Authentication.GetModes()
+}

api/v1/mdb/mongodb_types.go

@@ -935,37 +935,12 @@ func NewOpsManagerConfig() *PrivateCloudConfig {
 	return &PrivateCloudConfig{}
 }
 
-func EnsureSecurity(sec *Security) *Security {
-	if sec == nil {
-		sec = newSecurity()
-	}
-	if sec.TLSConfig == nil {
-		sec.TLSConfig = &TLSConfig{}
-	}
-	if sec.Roles == nil {
-		sec.Roles = make([]MongoDbRole, 0)
-	}
-	return sec
-}
-
-func newAuthentication() *Authentication {
-	return &Authentication{Modes: []AuthMode{}}
-}
-
-func newSecurity() *Security {
-	return &Security{TLSConfig: &TLSConfig{}}
-}
-
 // BuildConnectionString returns a string with a connection string for this resource.
 func (m *MongoDB) BuildConnectionString(username, password string, scheme connectionstring.Scheme, connectionParams map[string]string) string {
 	builder := NewMongoDBConnectionStringBuilder(*m, nil)
 	return builder.BuildConnectionString(username, password, scheme, connectionParams)
 }
 
-func (m *MongoDB) GetAuthenticationModes() []string {
-	return m.Spec.Security.Authentication.GetModes()
-}
-
 func (m *MongoDB) CalculateFeatureCompatibilityVersion() string {
 	return fcv.CalculateFeatureCompatibilityVersion(m.Spec.Version, m.Status.FeatureCompatibilityVersion, m.Spec.FeatureCompatibilityVersion)
 }