fixup! Introduce WatcherHelper

Author: pchila

.mockery.yaml

@@ -40,3 +40,10 @@ packages:
   github.com/elastic/elastic-agent/internal/pkg/agent/application/upgrade:
     interfaces:
       WatcherHelper:
+        config:
+          inpackage: True
+          with-expecter: True
+          dir: "{{.InterfaceDirRelative}}"
+          mockname: "{{.Mock}}{{.InterfaceName}}"
+          outpkg: "{{.PackageName}}"
+          filename: "mocks_test.go"

internal/pkg/agent/application/upgrade/mocks_test.go

@@ -33,7 +33,6 @@ import (
 	"github.com/elastic/elastic-agent/pkg/core/logger"
 	"github.com/elastic/elastic-agent/pkg/core/logger/loggertest"
 	infomocks "github.com/elastic/elastic-agent/testing/mocks/internal_/pkg/agent/application/info"
-	upgrademocks "github.com/elastic/elastic-agent/testing/mocks/internal_/pkg/agent/application/upgrade"
 	ackermocks "github.com/elastic/elastic-agent/testing/mocks/internal_/pkg/fleetapi/acker"
 	clientmocks "github.com/elastic/elastic-agent/testing/mocks/pkg/control/v2/client"
 )
@@ -1036,7 +1035,7 @@ func TestIsSameReleaseVersion(t *testing.T) {
 func TestManualRollback(t *testing.T) {
 	log, _ := loggertest.New(t.Name())
 	mockAgentInfo := infomocks.NewAgent(t)
-	upgrader, err := NewUpgrader(log, &artifact.Config{}, &configuration.UpgradeConfig{}, mockAgentInfo, upgrademocks.NewWatcherHelper(t))
+	upgrader, err := NewUpgrader(log, &artifact.Config{}, &configuration.UpgradeConfig{}, mockAgentInfo, NewMockWatcherHelper(t))
 	require.NoError(t, err, "error creating upgrader")
 
 	upgrader.Upgrade(t.Context(), "", true, "", nil, nil, true, false)

internal/pkg/agent/application/upgrade/upgrade_test.go

@@ -262,31 +262,7 @@ func (Dev) RegenerateMocks() error {
 		return fmt.Errorf("generating mocks: %w", err)
 	}
 
-	// change CWD
-	workingDir, err := os.Getwd()
-	if err != nil {
-		return fmt.Errorf("retrieving CWD: %w", err)
-	}
-	// restore the working directory when exiting the function
-	defer func() {
-		err := os.Chdir(workingDir)
-		if err != nil {
-			panic(fmt.Errorf("failed to restore working dir %q: %w", workingDir, err))
-		}
-	}()
-
-	mPath, err := mocksPath()
-	if err != nil {
-		return fmt.Errorf("retrieving mocks path: %w", err)
-	}
-
-	err = os.Chdir(mPath)
-	if err != nil {
-		return fmt.Errorf("changing current directory to %q: %w", mPath, err)
-	}
-
-	mg.Deps(devtools.AddLicenseHeaders)
-	mg.Deps(devtools.GoImports)
+	mg.Deps(devtools.Format)
 	return nil
 }