Skip to content

Commit 60b87f3

Browse files
committed
Be a bit more defensive in the error checks
1 parent a4fcbaf commit 60b87f3

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

internal/controller/argo.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,9 @@ func createOrUpdateArgoCD(client dynamic.Interface, fullClient kubernetes.Interf
473473
if errGet != nil {
474474
return fmt.Errorf("failed to get existing ArgoCD %s/%s: %v", namespace, name, errGet)
475475
}
476+
if oldArgo == nil || oldUnstructured == nil {
477+
return fmt.Errorf("getArgoCD returned nil ArgoCD object for %s/%s", namespace, name)
478+
}
476479
argo.SetResourceVersion(oldArgo.GetResourceVersion())
477480
obj, errConvert := runtime.DefaultUnstructuredConverter.ToUnstructured(argo)
478481
if errConvert != nil {
@@ -560,7 +563,10 @@ func getArgoCD(client dynamic.Interface, name, namespace string) (*argooperator.
560563
return nil, nil, err
561564
}
562565
err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstructuredArgo.UnstructuredContent(), argo)
563-
return argo, unstructuredArgo, err
566+
if err != nil {
567+
return nil, nil, err
568+
}
569+
return argo, unstructuredArgo, nil
564570
}
565571

566572
func newApplicationParameters(p *api.Pattern) []argoapi.HelmParameter {

0 commit comments

Comments
 (0)