feature(4890): removed confirmation from upgrade check for when force flag is set

Author: kaanyalti

internal/pkg/agent/cmd/upgrade.go

@@ -35,7 +35,7 @@ const (
 	flagForce          = "force"
 )
 
-var upgradeUnconfErr error = errors.New("upgrade not confirmed")
+var unsupportedUpgrade error = errors.New("upgrading fleet managed agents is not supported")
 
 func newUpgradeCommandWithArgs(_ []string, streams *cli.IOStreams) *cobra.Command {
 	cmd := &cobra.Command{
@@ -74,11 +74,8 @@ type upgradeInput struct {
 	args      []string
 	c         client.Client
 	agentInfo info.Agent
-	cFunc     confirmFunc
 }
 
-type confirmFunc func(string, bool) (bool, error)
-
 func upgradeCmd(streams *cli.IOStreams, cmd *cobra.Command, args []string) error {
 	c := client.New()
 	agentInfo, err := info.NewAgentInfoWithLog(cmd.Context(), "error", false)
@@ -91,12 +88,11 @@ func upgradeCmd(streams *cli.IOStreams, cmd *cobra.Command, args []string) error
 		args,
 		c,
 		agentInfo,
-		cli.Confirm,
 	}
 	return upgradeCmdWithClient(input)
 }
 
-func shouldUpgrade(cmd *cobra.Command, agentInfo info.Agent, cFunc confirmFunc) (bool, error) {
+func shouldUpgrade(cmd *cobra.Command, agentInfo info.Agent) (bool, error) {
 	if agentInfo.IsStandalone() {
 		return true, nil
 	}
@@ -111,16 +107,7 @@ func shouldUpgrade(cmd *cobra.Command, agentInfo info.Agent, cFunc confirmFunc)
 	}
 
 	if !force {
-		return false, fmt.Errorf("upgrading fleet managed agents is not supported")
-	}
-
-	cf, err := cFunc("Upgrading fleet managed agents is not supported. Would you still like to proceed?", false)
-	if err != nil {
-		return false, fmt.Errorf("failed while confirming action: %w", err)
-	}
-
-	if !cf {
-		return false, upgradeUnconfErr
+		return false, unsupportedUpgrade
 	}
 
 	return true, nil
@@ -132,7 +119,7 @@ func upgradeCmdWithClient(input *upgradeInput) error {
 	version := input.args[0]
 	sourceURI, _ := cmd.Flags().GetString(flagSourceURI)
 
-	su, err := shouldUpgrade(cmd, input.agentInfo, input.cFunc)
+	su, err := shouldUpgrade(cmd, input.agentInfo)
 	if !su {
 		return fmt.Errorf("aborting upgrade: %w", err)
 	}

internal/pkg/agent/cmd/upgrade_test.go

@@ -56,7 +56,6 @@ func TestUpgradeCmd(t *testing.T) {
 			args,
 			c,
 			mockAgentInfo,
-			nil,
 		}
 
 		// the upgrade command will hang until the server shut down
@@ -83,6 +82,7 @@ func TestUpgradeCmd(t *testing.T) {
 		// this makes sure all client assertions are done
 		<-clientCh
 	})
+
 	t.Run("fail if fleet managed and unprivileged", func(t *testing.T) {
 		var wg sync.WaitGroup
 		// Set up mock TCP server for gRPC connection
@@ -120,7 +120,6 @@ func TestUpgradeCmd(t *testing.T) {
 			args,
 			c,
 			mockAgentInfo,
-			nil,
 		}
 
 		term := make(chan int)
@@ -186,7 +185,6 @@ func TestUpgradeCmd(t *testing.T) {
 			args,
 			c,
 			mockAgentInfo,
-			nil,
 		}
 
 		term := make(chan int)
@@ -215,79 +213,8 @@ func TestUpgradeCmd(t *testing.T) {
 
 		wg.Wait()
 	})
-	t.Run("abort upgrade if fleet managed, privileged, --force is set, and user does not confirm", func(t *testing.T) {
-		var wg sync.WaitGroup
-		// Set up mock TCP server for gRPC connection
-		tcpServer, err := net.Listen("tcp", "127.0.0.1:")
-		require.NoError(t, err)
-		defer tcpServer.Close()
-
-		s := grpc.NewServer()
-
-		// Define mock server and agent information
-		mock := &mockServer{}
-		mockAgentInfo := mockinfo.NewAgent(t)
-		mockAgentInfo.EXPECT().IsStandalone().Return(false) // Simulate fleet-managed agent
-		mockAgentInfo.EXPECT().Unprivileged().Return(false) // Simulate privileged mode
-		cproto.RegisterElasticAgentControlServer(s, mock)
-
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			err := s.Serve(tcpServer)
-			assert.NoError(t, err)
-		}()
-
-		// Create client and command
-		c := client.New(client.WithAddress("http://" + tcpServer.Addr().String()))
-		args := []string{"8.13.0"} // Version argument
-		streams := cli.NewIOStreams()
-		cmd := newUpgradeCommandWithArgs(args, streams)
-		cmd.SetContext(context.Background())
-		err = cmd.Flags().Set("force", "true")
-		if err != nil {
-			log.Fatal(err)
-		}
 
-		commandInput := &upgradeInput{
-			streams,
-			cmd,
-			args,
-			c,
-			mockAgentInfo,
-			func(s string, b bool) (bool, error) {
-				return false, nil
-			},
-		}
-
-		term := make(chan int)
-		wg.Add(1)
-		// Execute upgrade command and validate shouldUpgrade error
-		go func() {
-			defer wg.Done()
-			err = upgradeCmdWithClient(commandInput)
-
-			// Expect an error because user does not confirm the upgrade
-			assert.Error(t, err)
-			assert.Contains(t, err.Error(), "upgrade not confirmed")
-
-			// Verify counter has not incremented since upgrade should not proceed
-			counter := atomic.LoadInt32(&mock.upgrades)
-			assert.Equal(t, int32(0), counter, "server should not have handled any upgrades")
-
-			close(term)
-		}()
-
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			<-term
-			s.Stop()
-		}()
-
-		wg.Wait()
-	})
-	t.Run("proceed with upgrade if fleet managed, privileged, --force is set, and user confirms upgrade", func(t *testing.T) {
+	t.Run("proceed with upgrade if fleet managed, privileged, --force is set", func(t *testing.T) {
 		var wg sync.WaitGroup
 		// Set up mock TCP server for gRPC connection
 		tcpServer, err := net.Listen("tcp", "127.0.0.1:")
@@ -328,9 +255,6 @@ func TestUpgradeCmd(t *testing.T) {
 			args,
 			c,
 			mockAgentInfo,
-			func(s string, b bool) (bool, error) {
-				return true, nil
-			},
 		}
 
 		term := make(chan int)