Simplify namespace selector for ResourceRefNamespaced (#762)

Author: fabritsius

pkg/api/v1/atlasproject_types.go

@@ -160,15 +160,7 @@ func (p *AtlasProject) UpdateStatus(conditions []status.Condition, options ...st
 }
 
 func (p *AtlasProject) X509SecretObjectKey() *client.ObjectKey {
-	if p.Spec.X509CertRef != nil {
-		namespace := p.Spec.X509CertRef.Namespace
-		if namespace == "" {
-			namespace = p.Namespace
-		}
-		key := kube.ObjectKey(namespace, p.Spec.X509CertRef.Name)
-		return &key
-	}
-	return nil
+	return p.Spec.X509CertRef.GetObject(p.Namespace)
 }
 
 // ************************************ Builder methods *************************************************

pkg/api/v1/common/common.go

@@ -46,10 +46,7 @@ func (rn *ResourceRefNamespaced) GetObject(parentNamespace string) *client.Objec
 		return nil
 	}
 
-	ns := rn.Namespace
-	if rn.Namespace != "" {
-		ns = parentNamespace
-	}
+	ns := SelectNamespace(rn.Namespace, parentNamespace)
 	key := kube.ObjectKey(ns, rn.Name)
 	return &key
 }
@@ -72,3 +69,15 @@ func (rn *ResourceRefNamespaced) ReadPassword(kubeClient client.Client, parentNa
 	}
 	return "", nil
 }
+
+// SelectNamespace returns first non-empty namespace from the list
+// "", "", "first", "second" => "first"
+func SelectNamespace(namespaces ...string) string {
+	for _, namespace := range namespaces {
+		if namespace != "" {
+			return namespace
+		}
+	}
+
+	return ""
+}

pkg/api/v1/project/integration.go

@@ -82,7 +82,7 @@ func (i Integration) ToAtlas(c client.Client, defaultNS string) (result *mongodb
 			return
 		}
 
-		*target, err = passwordField.ReadPassword(c, getNamespace(passwordField.Namespace, defaultNS))
+		*target, err = passwordField.ReadPassword(c, defaultNS)
 		storeError(err, errors)
 	}
 
@@ -114,14 +114,3 @@ func storeError(err error, errors *[]error) {
 		*errors = append(*errors, err)
 	}
 }
-
-// getNamespace returns first non-empty namespace from the list
-func getNamespace(namespaces ...string) string {
-	for _, namespace := range namespaces {
-		if namespace != "" {
-			return namespace
-		}
-	}
-
-	return ""
-}