Merge pull request dapr#769 from berndverst/release-1.3

berndverst · web-flow · commit 70e149d25214 · 2021-07-21T12:40:01.000-07:00
Cherry Pick: Run command: fix bool args passed to daprd (dapr#768)
diff --git a/pkg/standalone/run.go b/pkg/standalone/run.go
@@ -136,12 +136,12 @@ func getDaprCommand(appID string, daprHTTPPort int, daprGRPCPort int, appPort in
 
 		args = append(
 			args,
-			"--enable-profiling", "true",
+			"--enable-profiling",
 			"--profile-port", strconv.Itoa(profilePort))
 	}
 
 	if appSSL {
-		args = append(args, "--app-ssl", "true")
+		args = append(args, "--app-ssl")
 	}
 
 	cmd := exec.Command(daprCMD, args...)
diff --git a/pkg/standalone/run_test.go b/pkg/standalone/run_test.go
@@ -106,7 +106,7 @@ func TestRun(t *testing.T) {
 		assertArgumentEqual(t, "app-protocol", "http", output.DaprCMD.Args)
 		assertArgumentEqual(t, "app-port", "3000", output.DaprCMD.Args)
 		assertArgumentEqual(t, "components-path", DefaultComponentsDirPath(), output.DaprCMD.Args)
-		assertArgumentEqual(t, "app-ssl", "true", output.DaprCMD.Args)
+		assertArgumentEqual(t, "app-ssl", "", output.DaprCMD.Args)
 		assertArgumentEqual(t, "metrics-port", "9001", output.DaprCMD.Args)
 		if runtime.GOOS == "windows" {
 			assertArgumentEqual(t, "placement-host-address", "localhost:6050", output.DaprCMD.Args)

Original file line number	Diff line number	Diff line change
`@@ -136,12 +136,12 @@ func getDaprCommand(appID string, daprHTTPPort int, daprGRPCPort int, appPort in`
`136`	`136`
`137`	`137`	`args = append(`
`138`	`138`	`args,`
`139`		`- "--enable-profiling", "true",`
	`139`	`+ "--enable-profiling",`
`140`	`140`	`"--profile-port", strconv.Itoa(profilePort))`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`if appSSL {`
`144`		`- args = append(args, "--app-ssl", "true")`
	`144`	`+ args = append(args, "--app-ssl")`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`cmd := exec.Command(daprCMD, args...)`