review comments

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

Author: pravinpushkar

pkg/standalone/common.go

@@ -22,11 +22,12 @@ import (
 )
 
 const (
-	defaultDaprDirName       = ".dapr"
-	defaultDaprBinDirName    = "bin"
-	defaultComponentsDirName = "components"
-	defaultResourcesDirName  = "resources"
-	defaultConfigFileName    = "config.yaml"
+	DefaultComponentsDirName = "components"
+	DefaultResourcesDirName  = "resources"
+
+	defaultDaprDirName    = ".dapr"
+	defaultDaprBinDirName = "bin"
+	defaultConfigFileName = "config.yaml"
 )
 
 func defaultDaprDirPath() string {
@@ -47,11 +48,11 @@ func binaryFilePath(binaryDir string, binaryFilePrefix string) string {
 }
 
 func DefaultComponentsDirPath() string {
-	return path_filepath.Join(defaultDaprDirPath(), defaultComponentsDirName)
+	return path_filepath.Join(defaultDaprDirPath(), DefaultComponentsDirName)
 }
 
 func DefaultResourcesDirPath() string {
-	return path_filepath.Join(defaultDaprDirPath(), defaultResourcesDirName)
+	return path_filepath.Join(defaultDaprDirPath(), DefaultResourcesDirName)
 }
 
 // DefaultResourcesDirPrecedence returns the path to the resources directory if it exists, or otherwise the components directory.
@@ -72,7 +73,8 @@ func DefaultConfigFilePath() string {
 // TODO: Remove this function when `--components-path` flag is removed.
 func emptyAndCopyFiles(src, dest string) error {
 	if _, err := os.Stat(src); err != nil {
-		return err
+		// if the src directory does not exist, return nil, because there is nothing to copy from.
+		return nil
 	}
 	files, err := os.ReadDir(dest)
 	if err != nil {

tests/e2e/standalone/componentsDir_to_resourcesDir_mig_test.go renamed to tests/e2e/standalone/upgrade_test.go

@@ -14,7 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// TODO: Remove the test when `--components-path` flag is removed.
+// 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 (

tests/e2e/standalone/utils.go

@@ -28,6 +28,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/dapr/cli/pkg/standalone"
 	"github.com/dapr/cli/tests/e2e/common"
 )
 
@@ -139,11 +140,11 @@ func ensureDaprInstallation(t *testing.T) {
 		require.NoError(t, err, "failed to stat dapr installation")
 	}
 
-	// Slim mode does not have any components by default.
-	// Install the components required by the tests.
+	// Slim mode does not have any resources by default.
+	// Install the resources required by the tests.
 	if isSlimMode() {
-		err = createSlimComponents(filepath.Join(daprPath, "resources"))
-		require.NoError(t, err, "failed to create components")
+		err = createSlimComponents(filepath.Join(daprPath, standalone.DefaultResourcesDirName))
+		require.NoError(t, err, "failed to create resources directory for slim mode")
 	}
 }