few more refactoring

Signed-off-by: Pravin Pushkar <[email protected]>

Author: pravinpushkar

cmd/run.go

@@ -377,7 +377,7 @@ func init() {
 	RunCmd.Flags().StringVarP(&logLevel, "log-level", "", "info", "The log verbosity. Valid values are: debug, info, warn, error, fatal, or panic")
 	RunCmd.Flags().IntVarP(&maxConcurrency, "app-max-concurrency", "", -1, "The concurrency level of the application, otherwise is unlimited")
 	RunCmd.Flags().StringVarP(&protocol, "app-protocol", "P", "http", "The protocol (gRPC or HTTP) Dapr uses to talk to the application")
-	RunCmd.Flags().StringVarP(&componentsPath, "components-path", "d", standalone.DefaultResourcesDirPrecedence(), "The path for components directory")
+	RunCmd.Flags().StringVarP(&componentsPath, "components-path", "d", standalone.GetResourcesDir(), "The path for resources directory")
 	RunCmd.Flags().StringVarP(&resourcesPath, "resources-path", "", "", "The path for resources directory")
 	// TODO: Remove below line once the flag is removed in the future releases.
 	// By marking this as deprecated, the flag will be hidden from the help menu, but will continue to work. It will show a warning message when used.

pkg/standalone/common.go

@@ -53,9 +53,9 @@ func DefaultResourcesDirPath() string {
 	return path_filepath.Join(defaultDaprDirPath(), utils.DefaultResourcesDirName)
 }
 
-// DefaultResourcesDirPrecedence returns the path to the resources directory if it exists, or otherwise the components directory.
-// TODO: Remove this function and use `DefaultResourcesDirPath` when `--components-path` flag is removed.
-func DefaultResourcesDirPrecedence() string {
+// GetResourcesDir returns the path to the resources directory if it exists, otherwise it returns the path of components directory.
+// TODO: Remove this function and replace all its usage with above defined `DefaultResourcesDirPath` when `--components-path` flag is removed.
+func GetResourcesDir() string {
 	defaultResourcesDirPath := DefaultResourcesDirPath()
 	if _, err := os.Stat(defaultResourcesDirPath); os.IsNotExist(err) {
 		return DefaultComponentsDirPath()

pkg/standalone/run_test.go

@@ -56,9 +56,9 @@ func assertArgumentNotEqual(t *testing.T, key string, expectedValue string, args
 }
 
 func setupRun(t *testing.T) {
-	componentsDir := DefaultResourcesDirPath()
+	resourcesDir := DefaultResourcesDirPath()
 	configFile := DefaultConfigFilePath()
-	err := os.MkdirAll(componentsDir, 0o700)
+	err := os.MkdirAll(resourcesDir, 0o700)
 	assert.Equal(t, nil, err, "Unable to setup components dir before running test")
 	file, err := os.Create(configFile)
 	file.Close()
@@ -87,7 +87,7 @@ func assertCommonArgs(t *testing.T, basicConfig *RunConfig, output *RunOutput) {
 	assertArgumentEqual(t, "app-max-concurrency", "-1", output.DaprCMD.Args)
 	assertArgumentEqual(t, "app-protocol", "http", output.DaprCMD.Args)
 	assertArgumentEqual(t, "app-port", "3000", output.DaprCMD.Args)
-	assertArgumentEqual(t, "components-path", DefaultResourcesDirPrecedence(), output.DaprCMD.Args)
+	assertArgumentEqual(t, "components-path", GetResourcesDir(), output.DaprCMD.Args)
 	assertArgumentEqual(t, "app-ssl", "", output.DaprCMD.Args)
 	assertArgumentEqual(t, "metrics-port", "9001", output.DaprCMD.Args)
 	assertArgumentEqual(t, "dapr-http-max-request-size", "-1", output.DaprCMD.Args)
@@ -148,7 +148,7 @@ func TestRun(t *testing.T) {
 		EnableProfiling:    false,
 		ProfilePort:        9090,
 		Protocol:           "http",
-		ComponentsPath:     DefaultResourcesDirPrecedence(),
+		ComponentsPath:     GetResourcesDir(),
 		AppSSL:             true,
 		MetricsPort:        9001,
 		MaxRequestBodySize: -1,

pkg/standalone/standalone.go

@@ -664,7 +664,7 @@ func createComponentsAndConfiguration(wg *sync.WaitGroup, errorChan chan<- error
 	}
 	var err error
 
-	// Make default components directory.
+	// Make default resources directory.
 	resourcesDir := DefaultResourcesDirPath()
 
 	err = createRedisPubSub(redisHost, resourcesDir)

tests/e2e/standalone/upgrade_test.go

@@ -15,9 +15,7 @@ limitations under the License.
 */
 
 // TODO: Remove the test file when `--components-path` flag is removed.
-
 // This file contains tests for the migration of components directory to resources directory.
-// It covers the test flow for scenario when user does: (1) dapr uninstall (2) upgrades dapr cli (3) dapr init (4) dapr run.
 package standalone_test
 
 import (
@@ -28,6 +26,7 @@ import (
 
 	"github.com/dapr/cli/tests/e2e/common"
 	"github.com/dapr/cli/tests/e2e/spawn"
+	"github.com/dapr/cli/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -38,11 +37,12 @@ var (
 	defaultResourcesDirPath  = ""
 )
 
+// It covers the test flow for scenario when user does: (1) dapr uninstall (2) upgrades dapr cli (3) dapr init (4) dapr run.
 func TestCompToResrcDirMig(t *testing.T) {
 	homeDir, err := os.UserHomeDir()
 	assert.NoError(t, err, "cannot get user home directory")
-	defaultComponentsDirPath = filepath.Join(homeDir, ".dapr", "components")
-	defaultResourcesDirPath = filepath.Join(homeDir, ".dapr", "resources")
+	defaultComponentsDirPath = filepath.Join(homeDir, ".dapr", utils.DefaultComponentsDirName)
+	defaultResourcesDirPath = filepath.Join(homeDir, ".dapr", utils.DefaultResourcesDirName)
 	// Ensure a clean environment.
 	must(t, cmdUninstall, "failed to uninstall Dapr")