From 3136f0fca0482200b03f89b356d2f963f8f6083a Mon Sep 17 00:00:00 2001
From: Urvashi Mohnani <umohnani@redhat.com>
Date: Mon, 29 Jan 2024 11:22:51 -0500
Subject: [PATCH] Don't require engine connection for farm

Don't require the need to connect to an engine/podman
machine when doing the farm create, ls, rm, and update
commands.
Connection to the engine is required for the farm build
command.

[NO NEW TESTS NEEDED]

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
---
 cmd/podman/farm/create.go | 15 +++++++++------
 cmd/podman/farm/list.go   | 16 +++++++++-------
 cmd/podman/farm/remove.go | 15 +++++++++------
 cmd/podman/farm/update.go | 15 +++++++++------
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/cmd/podman/farm/create.go b/cmd/podman/farm/create.go
index 7d8f5b38d1..0642405bf9 100644
--- a/cmd/podman/farm/create.go
+++ b/cmd/podman/farm/create.go
@@ -6,6 +6,7 @@ import (
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v4/cmd/podman/registry"
+	"github.com/containers/podman/v4/cmd/podman/validate"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/slices"
 )
@@ -16,12 +17,14 @@ var (
 	The "podman system connection add --farm" command can be used to add a new connection to a new or existing farm.`
 
 	createCommand = &cobra.Command{
-		Use:               "create NAME [CONNECTIONS...]",
-		Args:              cobra.MinimumNArgs(1),
-		Short:             "Create a new farm",
-		Long:              farmCreateDescription,
-		RunE:              create,
-		ValidArgsFunction: completion.AutocompleteNone,
+		Use:                "create NAME [CONNECTIONS...]",
+		Args:               cobra.MinimumNArgs(1),
+		Short:              "Create a new farm",
+		Long:               farmCreateDescription,
+		PersistentPreRunE:  validate.NoOp,
+		RunE:               create,
+		PersistentPostRunE: validate.NoOp,
+		ValidArgsFunction:  completion.AutocompleteNone,
 		Example: `podman farm create myfarm connection1
   podman farm create myfarm`,
 	}
diff --git a/cmd/podman/farm/list.go b/cmd/podman/farm/list.go
index eb13b6d48a..26742f2767 100644
--- a/cmd/podman/farm/list.go
+++ b/cmd/podman/farm/list.go
@@ -20,13 +20,15 @@ var (
 List all available farms. The output of the farms can be filtered
 and the output format can be changed to JSON or a user specified Go template.`
 	lsCommand = &cobra.Command{
-		Use:               "list [options]",
-		Aliases:           []string{"ls"},
-		Args:              validate.NoArgs,
-		Short:             "List all existing farms",
-		Long:              farmLsDescription,
-		RunE:              list,
-		ValidArgsFunction: completion.AutocompleteNone,
+		Use:                "list [options]",
+		Aliases:            []string{"ls"},
+		Args:               validate.NoArgs,
+		Short:              "List all existing farms",
+		Long:               farmLsDescription,
+		PersistentPreRunE:  validate.NoOp,
+		RunE:               list,
+		PersistentPostRunE: validate.NoOp,
+		ValidArgsFunction:  completion.AutocompleteNone,
 	}
 
 	// Temporary struct to hold cli values.
diff --git a/cmd/podman/farm/remove.go b/cmd/podman/farm/remove.go
index c801e407ff..6ee4708110 100644
--- a/cmd/podman/farm/remove.go
+++ b/cmd/podman/farm/remove.go
@@ -7,6 +7,7 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v4/cmd/podman/common"
 	"github.com/containers/podman/v4/cmd/podman/registry"
+	"github.com/containers/podman/v4/cmd/podman/validate"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
@@ -14,12 +15,14 @@ import (
 var (
 	farmRmDescription = `Remove one or more existing farms.`
 	rmCommand         = &cobra.Command{
-		Use:               "remove [options] [FARM...]",
-		Aliases:           []string{"rm"},
-		Short:             "Remove one or more farms",
-		Long:              farmRmDescription,
-		RunE:              rm,
-		ValidArgsFunction: common.AutoCompleteFarms,
+		Use:                "remove [options] [FARM...]",
+		Aliases:            []string{"rm"},
+		Short:              "Remove one or more farms",
+		Long:               farmRmDescription,
+		PersistentPreRunE:  validate.NoOp,
+		RunE:               rm,
+		PersistentPostRunE: validate.NoOp,
+		ValidArgsFunction:  common.AutoCompleteFarms,
 		Example: `podman farm rm myfarm1 myfarm2
   podman farm rm --all`,
 	}
diff --git a/cmd/podman/farm/update.go b/cmd/podman/farm/update.go
index 55c6a8d998..e145b0f8fb 100644
--- a/cmd/podman/farm/update.go
+++ b/cmd/podman/farm/update.go
@@ -8,6 +8,7 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v4/cmd/podman/common"
 	"github.com/containers/podman/v4/cmd/podman/registry"
+	"github.com/containers/podman/v4/cmd/podman/validate"
 	"github.com/spf13/cobra"
 	"golang.org/x/exp/slices"
 )
@@ -15,12 +16,14 @@ import (
 var (
 	farmUpdateDescription = `Update an existing farm by adding a connection, removing a connection, or changing it to the default farm.`
 	updateCommand         = &cobra.Command{
-		Use:               "update [options] FARM",
-		Short:             "Update an existing farm",
-		Long:              farmUpdateDescription,
-		RunE:              farmUpdate,
-		Args:              cobra.ExactArgs(1),
-		ValidArgsFunction: common.AutoCompleteFarms,
+		Use:                "update [options] FARM",
+		Short:              "Update an existing farm",
+		Long:               farmUpdateDescription,
+		PersistentPreRunE:  validate.NoOp,
+		RunE:               farmUpdate,
+		PersistentPostRunE: validate.NoOp,
+		Args:               cobra.ExactArgs(1),
+		ValidArgsFunction:  common.AutoCompleteFarms,
 		Example: `podman farm update --add con1 farm1
 	podman farm update --remove con2 farm2
 	podman farm update --default farm3`,