Merge pull request #656 from mbaldessari/fix-argo

Robustness fixes

Author: openshift-merge-bot[bot]

internal/controller/argo.go

@@ -473,6 +473,9 @@ func createOrUpdateArgoCD(client dynamic.Interface, fullClient kubernetes.Interf
 		if errGet != nil {
 			return fmt.Errorf("failed to get existing ArgoCD %s/%s: %v", namespace, name, errGet)
 		}
+		if oldArgo == nil || oldUnstructured == nil {
+			return fmt.Errorf("getArgoCD returned nil ArgoCD object for %s/%s", namespace, name)
+		}
 		argo.SetResourceVersion(oldArgo.GetResourceVersion())
 		obj, errConvert := runtime.DefaultUnstructuredConverter.ToUnstructured(argo)
 		if errConvert != nil {
@@ -560,7 +563,10 @@ func getArgoCD(client dynamic.Interface, name, namespace string) (*argooperator.
 		return nil, nil, err
 	}
 	err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredArgo.UnstructuredContent(), argo)
-	return argo, unstructuredArgo, err
+	if err != nil {
+		return nil, nil, err
+	}
+	return argo, unstructuredArgo, nil
 }
 
 func newApplicationParameters(p *api.Pattern) []argoapi.HelmParameter {

internal/controller/argo_test.go

@@ -1032,7 +1032,7 @@ var _ = Describe("CreateOrUpdateArgoCD", func() {
 						"resourceVersion": "1",
 					},
 					"spec": map[string]any{
-						"networkPolicy": map[string]any{
+						"someCustomPlugin": map[string]any{
 							"enabled": true,
 						},
 						"imageUpdater": map[string]any{
@@ -1052,12 +1052,12 @@ var _ = Describe("CreateOrUpdateArgoCD", func() {
 			argoCD, err := dynamicClient.Resource(gvr).Namespace(namespace).Get(context.TODO(), name, metav1.GetOptions{})
 			Expect(err).ToNot(HaveOccurred())
 
-			// networkPolicy should be preserved — it is managed by gitops-operator
-			// not by patterns-operator, so the update must not strip it
-			networkPolicy, found, err := unstructured.NestedMap(argoCD.Object, "spec", "networkPolicy")
+			// someCustomPlugin should be preserved — it is not managed by
+			// patterns-operator, so the update must not strip it
+			someCustomPlugin, found, err := unstructured.NestedMap(argoCD.Object, "spec", "someCustomPlugin")
 			Expect(err).ToNot(HaveOccurred())
-			Expect(found).To(BeTrue(), "networkPolicy should be preserved after update")
-			Expect(networkPolicy["enabled"]).To(BeTrue())
+			Expect(found).To(BeTrue(), "someCustomPlugin should be preserved after update")
+			Expect(someCustomPlugin["enabled"]).To(BeTrue())
 
 			// imageUpdater should also be preserved
 			imageUpdater, found, err := unstructured.NestedMap(argoCD.Object, "spec", "imageUpdater")