Merge branch 'master' into multipleredis

Signed-off-by: Bernd Verst <[email protected]>
dapr · Oct 25, 2022 · 1608281 · 1608281
2 parents 395172a + 595e448
commit 1608281
Show file tree

Hide file tree

Showing 191 changed files with 12,632 additions and 19,955 deletions.
diff --git a/.build-tools/component-folders.json b/.build-tools/component-folders.json
@@ -22,6 +22,7 @@
         "configuration/redis/internal",
         "pubsub/aws",
         "pubsub/azure",
+        "pubsub/azure/servicebus",
         "pubsub/gcp",
         "secretstores/alicloud",
         "secretstores/aws",

diff --git a/.build-tools/go.mod b/.build-tools/go.mod
@@ -13,7 +13,6 @@ require (
 	github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.8.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/.build-tools/go.sum b/.build-tools/go.sum
@@ -16,12 +16,9 @@ github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJ
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709 h1:Ko2LQMrRU+Oy/+EDBwX7eZ2jp3C47eDBB8EIhKTun+I=
 github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -32,8 +29,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
 	"name": "Dapr Components Contributor Environment",
-	"image": "ghcr.io/dapr/dapr-dev:0.1.8",
+	"image": "ghcr.io/dapr/dapr-dev:0.1.9",
 	"containerEnv": {
 		// Uncomment to overwrite devcontainer .kube/config and .minikube certs with the localhost versions
 		// each time the devcontainer starts, if the respective .kube-localhost/config and .minikube-localhost
@@ -9,7 +9,9 @@
 
 		// Uncomment to disable docker-in-docker and automatically proxy default /var/run/docker.sock to
 		// the localhost bind-mount /var/run/docker-host.sock.
-		// "BIND_LOCALHOST_DOCKER": "true"
+		// "BIND_LOCALHOST_DOCKER": "true",
+
+		"GOLANG_PROTOBUF_REGISTRATION_CONFLICT": "true"
 	},
 	"extensions": [
 		"golang.go",

diff --git a/.github/infrastructure/conformance/hashicorp/setup-hashicorp-vault-secrets.sh b/.github/infrastructure/conformance/hashicorp/setup-hashicorp-vault-secrets.sh
@@ -15,7 +15,8 @@ for attempt in `seq $MAX_ATTEMPTS`; do
     # conformance tests / contents from tests/conformance/secrets.json
     if vault status && 
         vault kv put secret/dapr/conftestsecret conftestsecret=abcd &&
-        vault kv put secret/dapr/secondsecret secondsecret=efgh;
+        vault kv put secret/dapr/secondsecret secondsecret=efgh &&
+        vault kv put secret/dapr/multiplekeyvaluessecret first=1 second=2 third=3;
     then
         echo ✅ secrets set;
         sleep 1;

diff --git a/.github/infrastructure/docker-compose-postgresql.yml b/.github/infrastructure/docker-compose-postgresql.yml
@@ -1,11 +1,24 @@
 version: '2'
 services:
   db:
-    image: postgres
+    image: postgres:15
     restart: always
     ports:
       - "5432:5432"
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: example
       POSTGRES_DB: dapr_test
+  # Uncomment for local development
+  #pgadmin:
+  #  image: dpage/pgadmin4
+  #  restart: always
+  #  ports:
+  #    - "9001:9001"
+  #  depends_on:
+  #    - db
+  #  environment:
+  #    - "PGADMIN_LISTEN_PORT=9001"
+  #    - "[email protected]"
+  #    - "PGADMIN_DEFAULT_PASSWORD=example"
+  #    - "PGADMIN_DISABLE_POSTFIX=1"