Update resource-path

Signed-off-by: hueifeng <695979933@qq.com>

Author: hueifeng

cmd/run.go

@@ -114,13 +114,13 @@ dapr run --app-id myapp --app-port 3000 --app-protocol grpc -- go run main.go
 			Protocol:           protocol,
 			PlacementHostAddr:  viper.GetString("placement-host-address"),
 			ComponentsPath:     componentsPath,
+			ResourcesPath:      resourcesPath,
 			AppSSL:             appSSL,
 			MetricsPort:        metricsPort,
 			MaxRequestBodySize: maxRequestBodySize,
 			HTTPReadBufferSize: readBufferSize,
 			UnixDomainSocket:   unixDomainSocket,
 			EnableAPILogging:   enableAPILogging,
-			ResourcesPath:      resourcesPath,
 		})
 		if err != nil {
 			print.FailureStatusEvent(os.Stderr, err.Error())

pkg/standalone/run.go

@@ -127,7 +127,7 @@ func (config *RunConfig) validate() error {
 		return err
 	}
 
-	if DefaultComponentsDirPath() == config.ComponentsPath {
+	if DefaultComponentsDirPath() != config.ResourcesPath {
 		config.ComponentsPath = ""
 	}
 
@@ -226,7 +226,6 @@ func newDaprMeta() (*DaprMeta, error) {
 func (config *RunConfig) getArgs() []string {
 	args := []string{}
 
-	fmt.Printf("哈哈: %s\n", config.ResourcesPath)
 	schema := reflect.ValueOf(*config)
 	for i := 0; i < schema.NumField(); i++ {
 		valueField := schema.Field(i).Interface()
@@ -261,7 +260,6 @@ func (config *RunConfig) getArgs() []string {
 	if print.IsJSONLogEnabled() {
 		args = append(args, "--log-as-json")
 	}
-	fmt.Println(args)
 	return args
 }
 

pkg/standalone/run_test.go

@@ -91,7 +91,7 @@ func assertCommonArgs(t *testing.T, basicConfig *RunConfig, output *RunOutput) {
 	assertArgumentEqual(t, "metrics-port", "9001", output.DaprCMD.Args)
 	assertArgumentEqual(t, "dapr-http-max-request-size", "-1", output.DaprCMD.Args)
 	assertArgumentEqual(t, "dapr-http-read-buffer-size", "-1", output.DaprCMD.Args)
-	assertArgumentEqual(t, "spec-resources-path", DefaultComponentsDirPath(), output.DaprCMD.Args)
+	assertArgumentEqual(t, "resources-path", DefaultComponentsDirPath(), output.DaprCMD.Args)
 }
 
 func assertAppEnv(t *testing.T, config *RunConfig, output *RunOutput) {
@@ -147,7 +147,7 @@ func TestRun(t *testing.T) {
 		ProfilePort:        9090,
 		Protocol:           "http",
 		ComponentsPath:     DefaultComponentsDirPath(),
-		SpecResourcesPath:  DefaultComponentsDirPath(),
+		ResourcesPath:      DefaultComponentsDirPath(),
 		AppSSL:             true,
 		MetricsPort:        9001,
 		MaxRequestBodySize: -1,