Merge pull request #1566 from cicoyle/wf-rsrc-path2

[1.16] wf resource path

Author: cicoyle

cmd/buildinfo.go

@@ -19,6 +19,7 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/pkg/print"
 	"github.com/dapr/cli/pkg/standalone"
 )
@@ -31,7 +32,7 @@ var BuildInfoCmd = &cobra.Command{
 dapr build-info
 `,
 	Run: func(cmd *cobra.Command, args []string) {
-		out, err := standalone.GetBuildInfo(daprRuntimePath, cliVersion)
+		out, err := standalone.GetBuildInfo(runtime.GetDaprRuntimePath(), cliVersion)
 		if err != nil {
 			print.FailureStatusEvent(os.Stderr, "Error getting build info: %s", err.Error())
 			os.Exit(1)

cmd/dapr.go

@@ -21,6 +21,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/cmd/scheduler"
 	"github.com/dapr/cli/cmd/workflow"
 	"github.com/dapr/cli/pkg/api"
@@ -62,11 +63,10 @@ const (
 )
 
 var (
-	cliVersion      string
-	versionFlag     bool
-	daprVer         daprVersion
-	logAsJSON       bool
-	daprRuntimePath string
+	cliVersion  string
+	versionFlag bool
+	daprVer     daprVersion
+	logAsJSON   bool
 )
 
 // Execute adds all child commands to the root command.
@@ -93,7 +93,7 @@ func initConfig() {
 		print.EnableJSONFormat()
 	}
 	// err intentionally ignored since daprd may not yet be installed.
-	runtimeVer, _ := standalone.GetRuntimeVersion(daprRuntimePath)
+	runtimeVer, _ := standalone.GetRuntimeVersion(runtime.GetDaprRuntimePath())
 
 	daprVer = daprVersion{
 		// Set in Execute() method in this file before initConfig() is called by cmd.Execute().
@@ -108,8 +108,8 @@ func initConfig() {
 
 func init() {
 	RootCmd.Flags().BoolVarP(&versionFlag, "version", "v", false, "version for dapr")
-	RootCmd.PersistentFlags().StringVarP(&daprRuntimePath, "runtime-path", "", "", "The path to the dapr runtime installation directory")
 	RootCmd.PersistentFlags().BoolVarP(&logAsJSON, "log-as-json", "", false, "Log output in JSON format")
+	runtime.Register(RootCmd)
 
 	RootCmd.AddCommand(scheduler.SchedulerCmd)
 	RootCmd.AddCommand(workflow.WorkflowCmd)

cmd/dashboard.go

@@ -23,6 +23,7 @@ import (
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
 
+	"github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/pkg/kubernetes"
 	"github.com/dapr/cli/pkg/print"
 	"github.com/dapr/cli/pkg/standalone"
@@ -83,7 +84,7 @@ dapr dashboard -k -p 0
 `,
 	Run: func(cmd *cobra.Command, args []string) {
 		if dashboardVersionCmd {
-			dashboardVer, err := standalone.GetDashboardVersion(daprRuntimePath)
+			dashboardVer, err := standalone.GetDashboardVersion(runtime.GetDaprRuntimePath())
 			if err != nil {
 				print.FailureStatusEvent(os.Stderr, "Failed to get Dapr install directory: %v", err)
 				os.Exit(1)
@@ -195,7 +196,7 @@ dapr dashboard -k -p 0
 			<-portForward.GetStop()
 		} else {
 			// Standalone mode.
-			dashboardCmd, err := standalone.NewDashboardCmd(daprRuntimePath, dashboardLocalPort)
+			dashboardCmd, err := standalone.NewDashboardCmd(runtime.GetDaprRuntimePath(), dashboardLocalPort)
 			if err != nil {
 				print.FailureStatusEvent(os.Stderr, "Failed to get Dapr install	directory: %v", err)
 			} else {

cmd/init.go

@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	"github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/pkg/kubernetes"
 	"github.com/dapr/cli/pkg/print"
 	"github.com/dapr/cli/pkg/standalone"
@@ -107,7 +108,7 @@ dapr init --runtime-path <path-to-install-directory>
 			imageRegistryURI := ""
 			var err error
 
-			if len(strings.TrimSpace(daprRuntimePath)) != 0 {
+			if len(strings.TrimSpace(runtime.GetDaprRuntimePath())) != 0 {
 				print.FailureStatusEvent(os.Stderr, "--runtime-path is only valid for self-hosted mode")
 				os.Exit(1)
 			}
@@ -178,7 +179,7 @@ dapr init --runtime-path <path-to-install-directory>
 				schedulerHostPort = nil
 			}
 
-			err := standalone.Init(runtimeVersion, dashboardVersion, dockerNetwork, slimMode, imageRegistryURI, fromDir, containerRuntime, imageVariant, daprRuntimePath, &schedulerVolume, schedulerHostPort)
+			err := standalone.Init(runtimeVersion, dashboardVersion, dockerNetwork, slimMode, imageRegistryURI, fromDir, containerRuntime, imageVariant, runtime.GetDaprRuntimePath(), &schedulerVolume, schedulerHostPort)
 			if err != nil {
 				print.FailureStatusEvent(os.Stderr, err.Error())
 				os.Exit(1)

cmd/run.go

@@ -33,6 +33,7 @@ import (
 
 	daprRuntime "github.com/dapr/dapr/pkg/runtime"
 
+	cmdruntime "github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/pkg/kubernetes"
 	"github.com/dapr/cli/pkg/metadata"
 	"github.com/dapr/cli/pkg/print"
@@ -159,7 +160,7 @@ dapr run --run-file /path/to/directory -k
 			fmt.Println(print.WhiteBold("WARNING: no application command found."))
 		}
 
-		daprDirPath, err := standalone.GetDaprRuntimePath(daprRuntimePath)
+		daprDirPath, err := standalone.GetDaprRuntimePath(cmdruntime.GetDaprRuntimePath())
 		if err != nil {
 			print.FailureStatusEvent(os.Stderr, "Failed to get Dapr install directory: %v", err)
 			os.Exit(1)
@@ -206,7 +207,7 @@ dapr run --run-file /path/to/directory -k
 			AppHealthThreshold: appHealthThreshold,
 			EnableAPILogging:   enableAPILogging,
 			APIListenAddresses: apiListenAddresses,
-			DaprdInstallPath:   daprRuntimePath,
+			DaprdInstallPath:   cmdruntime.GetDaprRuntimePath(),
 		}
 
 		// placement-host-address flag handling: only set pointer if flag was explicitly changed

cmd/runtime/runtime.go

@@ -0,0 +1,28 @@
+/*
+Copyright 2025 The Dapr Authors
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package runtime
+
+import "github.com/spf13/cobra"
+
+var (
+	daprRuntimePath string
+)
+
+func Register(cmd *cobra.Command) {
+	cmd.PersistentFlags().StringVarP(&daprRuntimePath, "runtime-path", "", "", "The path to the dapr runtime installation directory")
+}
+
+func GetDaprRuntimePath() string {
+	return daprRuntimePath
+}

cmd/uninstall.go

@@ -21,6 +21,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
+	cmdruntime "github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/pkg/kubernetes"
 	"github.com/dapr/cli/pkg/print"
 	"github.com/dapr/cli/pkg/standalone"
@@ -70,7 +71,7 @@ dapr uninstall --runtime-path <path-to-install-directory>
 		var err error
 
 		if uninstallKubernetes {
-			if len(strings.TrimSpace(daprRuntimePath)) != 0 {
+			if len(strings.TrimSpace(cmdruntime.GetDaprRuntimePath())) != 0 {
 				print.FailureStatusEvent(os.Stderr, "--runtime-path is only valid for self-hosted mode")
 				os.Exit(1)
 			}
@@ -84,7 +85,7 @@ dapr uninstall --runtime-path <path-to-install-directory>
 			}
 			print.InfoStatusEvent(os.Stdout, "Removing Dapr from your machine...")
 			dockerNetwork := viper.GetString("network")
-			err = standalone.Uninstall(uninstallAll, dockerNetwork, uninstallContainerRuntime, daprRuntimePath)
+			err = standalone.Uninstall(uninstallAll, dockerNetwork, uninstallContainerRuntime, cmdruntime.GetDaprRuntimePath())
 		}
 
 		if err != nil {

pkg/version/version_test.go

@@ -210,6 +210,7 @@ func TestGetVersionsGithub(t *testing.T) {
 	}
 	m := http.NewServeMux()
 	s := http.Server{Addr: ":12345", Handler: m, ReadHeaderTimeout: time.Duration(5) * time.Second}
+	defer s.Close()
 
 	for _, tc := range tests {
 		body := tc.ResponseBody
@@ -319,6 +320,7 @@ entries:
 	}
 	m := http.NewServeMux()
 	s := http.Server{Addr: ":12346", Handler: m, ReadHeaderTimeout: time.Duration(5) * time.Second}
+	defer s.Close()
 
 	for _, tc := range tests {
 		body := tc.ResponseBody

pkg/workflow/dclient/dclient.go

@@ -27,6 +27,13 @@ import (
 	"github.com/dapr/kit/ptr"
 )
 
+type Options struct {
+	KubernetesMode bool
+	Namespace      string
+	AppID          string
+	RuntimePath    string
+}
+
 type Client struct {
 	Dapr             client.Client
 	Cancel           context.CancelFunc
@@ -35,44 +42,54 @@ type Client struct {
 	TableName        *string
 }
 
-func DaprClient(ctx context.Context, kubernetesMode bool, namespace, appID string) (*Client, error) {
+func DaprClient(ctx context.Context, opts Options) (*Client, error) {
 	client.SetLogger(nil)
 
 	var client *Client
 	var err error
-	if kubernetesMode {
-		client, err = kube(namespace, appID)
+	if opts.KubernetesMode {
+		client, err = kube(opts)
 	} else {
-		client, err = stand(ctx, appID)
+		client, err = stand(ctx, opts)
 	}
 
 	return client, err
 }
 
-func stand(ctx context.Context, appID string) (*Client, error) {
+func stand(ctx context.Context, opts Options) (*Client, error) {
 	list, err := standalone.List()
 	if err != nil {
 		return nil, err
 	}
 
 	var proc *standalone.ListOutput
 	for _, c := range list {
-		if c.AppID == appID {
+		if c.AppID == opts.AppID {
 			proc = &c
 			break
 		}
 	}
 
 	if proc == nil {
-		return nil, fmt.Errorf("Dapr app with id '%s' not found", appID)
+		return nil, fmt.Errorf("Dapr app with id '%s' not found", opts.AppID)
+	}
+
+	if len(proc.ResourcePaths) == 0 {
+		var daprDirPath string
+		daprDirPath, err = standalone.GetDaprRuntimePath(opts.RuntimePath)
+		if err != nil {
+			return nil, err
+		}
+
+		proc.ResourcePaths = []string{standalone.GetDaprComponentsPath(daprDirPath)}
 	}
 
-	comps, err := loader.NewLocalLoader(appID, proc.ResourcePaths).Load(ctx)
+	comps, err := loader.NewLocalLoader(opts.AppID, proc.ResourcePaths).Load(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	c, err := clientFromComponents(comps, appID, strconv.Itoa(proc.GRPCPort))
+	c, err := clientFromComponents(comps, opts.AppID, strconv.Itoa(proc.GRPCPort))
 	if err != nil {
 		return nil, err
 	}
@@ -81,22 +98,22 @@ func stand(ctx context.Context, appID string) (*Client, error) {
 	return c, nil
 }
 
-func kube(namespace string, appID string) (*Client, error) {
-	list, err := kubernetes.List(namespace)
+func kube(opts Options) (*Client, error) {
+	list, err := kubernetes.List(opts.Namespace)
 	if err != nil {
 		return nil, err
 	}
 
 	var pod *kubernetes.ListOutput
 	for _, p := range list {
-		if p.AppID == appID {
+		if p.AppID == opts.AppID {
 			pod = &p
 			break
 		}
 	}
 
 	if pod == nil {
-		return nil, fmt.Errorf("Dapr app with id '%s' not found in namespace %s", appID, namespace)
+		return nil, fmt.Errorf("Dapr app with id '%s' not found in namespace %s", opts.AppID, opts.Namespace)
 	}
 
 	config, _, err := kubernetes.GetKubeConfigClient()
@@ -111,7 +128,7 @@ func kube(namespace string, appID string) (*Client, error) {
 
 	portForward, err := kubernetes.NewPortForward(
 		config,
-		namespace,
+		opts.Namespace,
 		pod.PodName,
 		"localhost",
 		port,
@@ -136,7 +153,7 @@ func kube(namespace string, appID string) (*Client, error) {
 		return nil, err
 	}
 
-	c, err := clientFromComponents(comps.Items, appID, pod.DaprGRPCPort)
+	c, err := clientFromComponents(comps.Items, opts.AppID, pod.DaprGRPCPort)
 	if err != nil {
 		portForward.Stop()
 	}

pkg/workflow/events.go

@@ -16,6 +16,7 @@ package workflow
 import (
 	"context"
 
+	"github.com/dapr/cli/cmd/runtime"
 	"github.com/dapr/cli/pkg/workflow/dclient"
 	"github.com/dapr/durabletask-go/workflow"
 )
@@ -30,7 +31,12 @@ type RaiseEventOptions struct {
 }
 
 func RaiseEvent(ctx context.Context, opts RaiseEventOptions) error {
-	cli, err := dclient.DaprClient(ctx, opts.KubernetesMode, opts.Namespace, opts.AppID)
+	cli, err := dclient.DaprClient(ctx, dclient.Options{
+		KubernetesMode: opts.KubernetesMode,
+		Namespace:      opts.Namespace,
+		AppID:          opts.AppID,
+		RuntimePath:    runtime.GetDaprRuntimePath(),
+	})
 	if err != nil {
 		return err
 	}
@@ -55,7 +61,12 @@ type SuspendOptions struct {
 }
 
 func Suspend(ctx context.Context, opts SuspendOptions) error {
-	cli, err := dclient.DaprClient(ctx, opts.KubernetesMode, opts.Namespace, opts.AppID)
+	cli, err := dclient.DaprClient(ctx, dclient.Options{
+		KubernetesMode: opts.KubernetesMode,
+		Namespace:      opts.Namespace,
+		AppID:          opts.AppID,
+		RuntimePath:    runtime.GetDaprRuntimePath(),
+	})
 	if err != nil {
 		return err
 	}
@@ -75,7 +86,12 @@ type ResumeOptions struct {
 }
 
 func Resume(ctx context.Context, opts ResumeOptions) error {
-	cli, err := dclient.DaprClient(ctx, opts.KubernetesMode, opts.Namespace, opts.AppID)
+	cli, err := dclient.DaprClient(ctx, dclient.Options{
+		KubernetesMode: opts.KubernetesMode,
+		Namespace:      opts.Namespace,
+		AppID:          opts.AppID,
+		RuntimePath:    runtime.GetDaprRuntimePath(),
+	})
 	if err != nil {
 		return err
 	}
@@ -95,7 +111,12 @@ type TerminateOptions struct {
 }
 
 func Terminate(ctx context.Context, opts TerminateOptions) error {
-	cli, err := dclient.DaprClient(ctx, opts.KubernetesMode, opts.Namespace, opts.AppID)
+	cli, err := dclient.DaprClient(ctx, dclient.Options{
+		KubernetesMode: opts.KubernetesMode,
+		Namespace:      opts.Namespace,
+		AppID:          opts.AppID,
+		RuntimePath:    runtime.GetDaprRuntimePath(),
+	})
 	if err != nil {
 		return err
 	}