Merge branch 'master' into comp-md-secretstores.aws.parameterstore-2582

dapr · Jul 21, 2023 · b59cb24 · b59cb24
2 parents a14d8e0 + 608e4cb
commit b59cb24
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/middleware/http/wasm/benchmark_test.go b/middleware/http/wasm/benchmark_test.go
@@ -28,19 +28,19 @@ func BenchmarkNative(b *testing.B) {
 }
 
 func BenchmarkTinygo(b *testing.B) {
-	path := "./internal/e2e-guests/rewrite/main.wasm"
+	path := "file://internal/e2e-guests/rewrite/main.wasm"
 	benchmarkMiddleware(b, path)
 }
 
 // BenchmarkWat gives baseline performance for the same handler by
 // writing it directly in WebAssembly Text Format.
 func BenchmarkWat(b *testing.B) {
-	path := "./internal/testdata/rewrite.wasm"
-	benchmarkMiddleware(b, path)
+	url := "file://internal/testdata/rewrite.wasm"
+	benchmarkMiddleware(b, url)
 }
 
 func benchmarkMiddleware(b *testing.B, path string) {
-	md := metadata.Base{Properties: map[string]string{"path": path}}
+	md := metadata.Base{Properties: map[string]string{"url": path}}
 
 	l := logger.NewLogger(b.Name())
 	l.SetOutput(io.Discard)

diff --git a/nameresolution/consul/consul.go b/nameresolution/consul/consul.go
@@ -244,7 +244,7 @@ func getRegistrationConfig(cfg configSpec, props map[string]string) (*consul.Age
 				Name:     "Dapr Health Status",
 				CheckID:  fmt.Sprintf("daprHealth:%s", id),
 				Interval: "15s",
-				HTTP:     fmt.Sprintf("http://%s/v1.0/healthz", net.JoinHostPort(host, httpPort)),
+				HTTP:     fmt.Sprintf("http://%s/v1.0/healthz?appid=%s", net.JoinHostPort(host, httpPort), appID),
 			},
 		}
 	}

diff --git a/nameresolution/consul/consul_test.go b/nameresolution/consul/consul_test.go
@@ -538,7 +538,7 @@ func TestGetConfig(t *testing.T) {
 				assert.Equal(t, "Dapr Health Status", check.Name)
 				assert.Equal(t, "daprHealth:test-app-"+metadata.Properties[nr.HostAddress]+"-"+metadata.Properties[nr.DaprHTTPPort], check.CheckID)
 				assert.Equal(t, "15s", check.Interval)
-				assert.Equal(t, fmt.Sprintf("http://%s/v1.0/healthz", net.JoinHostPort(metadata.Properties[nr.HostAddress], metadata.Properties[nr.DaprHTTPPort])), check.HTTP)
+				assert.Equal(t, fmt.Sprintf("http://%s/v1.0/healthz?appid=%s", net.JoinHostPort(metadata.Properties[nr.HostAddress], metadata.Properties[nr.DaprHTTPPort]), metadata.Properties[nr.AppID]), check.HTTP)
 
 				// Metadata
 				assert.Equal(t, 1, len(actual.Registration.Meta))

diff --git a/state/requests.go b/state/requests.go
@@ -17,7 +17,7 @@ import (
 	"github.com/dapr/components-contrib/state/query"
 )
 
-// GetRequest is the object describing a state fetch request.
+// GetRequest is the object describing a state "fetch" request.
 type GetRequest struct {
 	Key      string            `json:"key"`
 	Metadata map[string]string `json:"metadata"`