fix: messed up merge

Signed-off-by: Xeckt <[email protected]>
opiproject · Jun 26, 2024 · 3819622 · 3819622
1 parent 3cdf7d4
commit 3819622
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 17 deletions.
diff --git a/sztp-agent/cmd/daemon_test.go b/sztp-agent/cmd/daemon_test.go
@@ -21,9 +21,7 @@ func TestDaemonCommand(t *testing.T) {
 			want: &cobra.Command{
 				Use:   "daemon",
 				Short: "Run the daemon command",
-				RunE: func(c *cobra.Command, _ []string) error {
-					err := c.Help()
-					cobra.CheckErr(err)
+				RunE: func(_ *cobra.Command, _ []string) error {
 					return nil
 				},
 			},

diff --git a/sztp-agent/cmd/disable_test.go b/sztp-agent/cmd/disable_test.go
@@ -21,9 +21,7 @@ func TestDisableCommand(t *testing.T) {
 			want: &cobra.Command{
 				Use:   "disable",
 				Short: "Run the disable command",
-				RunE: func(c *cobra.Command, _ []string) error {
-					err := c.Help()
-					cobra.CheckErr(err)
+				RunE: func(_ *cobra.Command, _ []string) error {
 					return nil
 				},
 			},

diff --git a/sztp-agent/cmd/enable_test.go b/sztp-agent/cmd/enable_test.go
@@ -21,9 +21,7 @@ func TestEnableCommand(t *testing.T) {
 			want: &cobra.Command{
 				Use:   "enable",
 				Short: "Run the enable command",
-				RunE: func(c *cobra.Command, _ []string) error {
-					err := c.Help()
-					cobra.CheckErr(err)
+				RunE: func(_ *cobra.Command, _ []string) error {
 					return nil
 				},
 			},

diff --git a/sztp-agent/cmd/run.go b/sztp-agent/cmd/run.go
@@ -59,8 +59,6 @@ func Run() *cobra.Command {
 					return fmt.Errorf("must not be folder: %q", filePath)
 				}
 			}
-			err := c.Help()
-			cobra.CheckErr(err)
 			a := secureagent.NewAgent(bootstrapURL, serialNumber, dhcpLeaseFile, devicePassword, devicePrivateKey, deviceEndEntityCert, bootstrapTrustAnchorCert)
 			return a.RunCommand()
 		},

diff --git a/sztp-agent/cmd/run_test.go b/sztp-agent/cmd/run_test.go
@@ -21,9 +21,7 @@ func TestRunCommand(t *testing.T) {
 			want: &cobra.Command{
 				Use:   "run",
 				Short: "Exec the run command",
-				RunE: func(c *cobra.Command, _ []string) error {
-					err := c.Help()
-					cobra.CheckErr(err)
+				RunE: func(_ *cobra.Command, _ []string) error {
 					return nil
 				},
 			},

diff --git a/sztp-agent/cmd/status_test.go b/sztp-agent/cmd/status_test.go
@@ -21,9 +21,7 @@ func TestStatusCommand(t *testing.T) {
 			want: &cobra.Command{
 				Use:   "status",
 				Short: "Run the status command",
-				RunE: func(c *cobra.Command, _ []string) error {
-					err := c.Help()
-					cobra.CheckErr(err)
+				RunE: func(_ *cobra.Command, _ []string) error {
 					return nil
 				},
 			},