fix tests

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

Author: pravinpushkar

pkg/standalone/common.go

@@ -19,12 +19,10 @@ import (
 	"runtime"
 
 	"github.com/dapr/cli/pkg/print"
+	"github.com/dapr/cli/utils"
 )
 
 const (
-	DefaultComponentsDirName = "components"
-	DefaultResourcesDirName  = "resources"
-
 	defaultDaprDirName    = ".dapr"
 	defaultDaprBinDirName = "bin"
 	defaultConfigFileName = "config.yaml"
@@ -48,11 +46,11 @@ func binaryFilePath(binaryDir string, binaryFilePrefix string) string {
 }
 
 func DefaultComponentsDirPath() string {
-	return path_filepath.Join(defaultDaprDirPath(), DefaultComponentsDirName)
+	return path_filepath.Join(defaultDaprDirPath(), utils.DefaultComponentsDirName)
 }
 
 func DefaultResourcesDirPath() string {
-	return path_filepath.Join(defaultDaprDirPath(), DefaultResourcesDirName)
+	return path_filepath.Join(defaultDaprDirPath(), utils.DefaultResourcesDirName)
 }
 
 // DefaultResourcesDirPrecedence returns the path to the resources directory if it exists, or otherwise the components directory.

tests/e2e/standalone/utils.go

@@ -28,8 +28,8 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/dapr/cli/pkg/standalone"
 	"github.com/dapr/cli/tests/e2e/common"
+	"github.com/dapr/cli/utils"
 )
 
 // getSocketCases return different unix socket paths for testing across Dapr commands.
@@ -143,7 +143,7 @@ func ensureDaprInstallation(t *testing.T) {
 	// Slim mode does not have any resources by default.
 	// Install the resources required by the tests.
 	if isSlimMode() {
-		err = createSlimComponents(filepath.Join(daprPath, standalone.DefaultResourcesDirName))
+		err = createSlimComponents(filepath.Join(daprPath, utils.DefaultResourcesDirName))
 		require.NoError(t, err, "failed to create resources directory for slim mode")
 	}
 }

utils/utils.go

@@ -41,6 +41,9 @@ const (
 	DOCKER ContainerRuntime = "docker"
 	PODMAN ContainerRuntime = "podman"
 
+	DefaultComponentsDirName = "components"
+	DefaultResourcesDirName  = "resources"
+
 	marinerImageVariantName = "mariner"
 
 	socketFormat = "%s/dapr-%s-%s.socket"