review comments

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

Author: pravinpushkar

pkg/standalone/common.go

@@ -70,34 +70,35 @@ func DefaultConfigFilePath() string {
 
 // emptyAndCopyFiles copies files from src to dest. It deletes the existing files in dest before copying from src.
 // TODO: Remove this function when `--components-path` flag is removed.
-func moveFilesFromComponentsToResourcesDir(componentsDirPath, resourcesDirPath string) error {
-	if _, err := os.Stat(componentsDirPath); err == nil {
-		files, err := os.ReadDir(resourcesDirPath)
+func emptyAndCopyFiles(src, dest string) error {
+	if _, err := os.Stat(src); err != nil {
+		return err
+	}
+	files, err := os.ReadDir(dest)
+	if err != nil {
+		return err
+	}
+	for _, file := range files {
+		err = os.Remove(dest + "/" + file.Name())
 		if err != nil {
 			return err
 		}
+	}
+	files, err = os.ReadDir(src)
+	if err != nil {
+		return err
+	}
+	if len(files) > 0 {
+		print.InfoStatusEvent(os.Stdout, "Moving files from %q to %q", src, dest)
 		for _, file := range files {
-			err = os.Remove(resourcesDirPath + "/" + file.Name())
+			content, err := os.ReadFile(src + "/" + file.Name())
 			if err != nil {
 				return err
 			}
-		}
-		files, err = os.ReadDir(componentsDirPath)
-		if err != nil {
-			return err
-		}
-		if len(files) > 0 {
-			print.InfoStatusEvent(os.Stdout, "Moving files from %q to %q", componentsDirPath, resourcesDirPath)
-			for _, file := range files {
-				content, err := os.ReadFile(componentsDirPath + "/" + file.Name())
-				if err != nil {
-					return err
-				}
-				// #nosec G306
-				err = os.WriteFile(resourcesDirPath+"/"+file.Name(), content, 0o644)
-				if err != nil {
-					return err
-				}
+			// #nosec G306
+			err = os.WriteFile(dest+"/"+file.Name(), content, 0o644)
+			if err != nil {
+				return err
 			}
 		}
 	}

pkg/standalone/standalone.go

@@ -295,9 +295,9 @@ func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMod
 		if isAirGapInit {
 			dockerContainerNames = []string{DaprPlacementContainerName}
 		}
+		var ok bool
 		for _, container := range dockerContainerNames {
 			containerName := utils.CreateContainerName(container, dockerNetwork)
-			var ok bool
 			ok, err = confirmContainerIsRunningOrExists(containerName, true, runtimeCmd)
 			if err != nil {
 				return err
@@ -309,7 +309,7 @@ func Init(runtimeVersion, dashboardVersion string, dockerNetwork string, slimMod
 		print.InfoStatusEvent(os.Stdout, "Use `%s ps` to check running containers.", runtimeCmd)
 	}
 	// TODO: remove below method when components-path flag is removed.
-	err = moveFilesFromComponentsToResourcesDir(DefaultComponentsDirPath(), DefaultResourcesDirPath())
+	err = emptyAndCopyFiles(DefaultComponentsDirPath(), DefaultResourcesDirPath())
 	if err != nil {
 		return err
 	}
@@ -707,7 +707,7 @@ func makeDefaultResourcesDir() error {
 	if os.IsNotExist(err) {
 		errDir := os.MkdirAll(resourcesDir, 0o755)
 		if errDir != nil {
-			return fmt.Errorf("error creating default components folder: %w", errDir)
+			return fmt.Errorf("error creating default resources folder: %w", errDir)
 		}
 	}
 

tests/e2e/standalone/componentsDir_to_resourcesDir_mig_test.go

@@ -14,6 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// TODO: Remove the test when `--components-path` flag is removed.
 package standalone_test
 
 import (