update e2e test dapr dependency (dapr#2702)

* update e2e test dapr dependency * wip
QaColony · Jan 22, 2021 · 6f602f8 · 6f602f8
1 parent be08e55
commit 6f602f8
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/dapr/README.md b/dapr/README.md
@@ -31,8 +31,10 @@ make gen-proto
 Whenever there are breaking changes in the proto files, we need to update the e2e test apps to use the correct version of dapr dependencies. This can be done by navigating to the tests folder and running the commands:-
 
 ```
-./update_testapps_dependencies.sh
+# Use the last commit of dapr.
+./update_testapps_dependencies.sh be08e5520173beb93e5d5f047dbde405e78db658
 ```
+
 **Note**: On Windows, use the mingw tools to execute the bash script
 
 Check in all the go.mod files for the test apps that have now been modified to point to the latest dapr version.
diff --git a/tests/apps/pubsub-publisher/go.mod b/tests/apps/pubsub-publisher/go.mod
@@ -3,7 +3,7 @@ module app
 go 1.15
 
 require (
-	github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4
+	github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173
 	github.com/gorilla/mux v1.7.3
 	google.golang.org/grpc v1.34.0
 )

diff --git a/tests/apps/pubsub-publisher/go.sum b/tests/apps/pubsub-publisher/go.sum
@@ -210,8 +210,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz
 github.com/dapr/components-contrib v0.0.0-20200219164914-5b75f4d0fbc6/go.mod h1:AZi8IGs8LFdywJg/YGwDs7MAxJkvGa8RgHN4NoJSKt0=
 github.com/dapr/components-contrib v1.0.0-rc2.0.20210120162831-5018196c58a0/go.mod h1:wmTSIgXHIqYeFCoCJDZTbDDw86ZqP/SeGbyp4ZKS+Y0=
 github.com/dapr/dapr v0.4.1-0.20200228055659-71892bc0111e/go.mod h1:c60DJ9TdSdpbLjgqP55A5u4ZCYChFwa9UGYIXd9pmm4=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4 h1:qi9lgJh6lAPBLF0UIGYpLy8OhJSFjiQoMB5equhFsqs=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173 h1:3MZ9JpjBbSEV75VdCp21yeMZ+LilI15kab9dnjFD8zQ=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
 github.com/dapr/go-sdk v0.0.0-20200121181907-48249cda2fad/go.mod h1:yeOIFBz6+BigHpk4ASJbgQDVjQ8+00oCWrFyOAFdob8=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/tests/apps/service_invocation/go.mod b/tests/apps/service_invocation/go.mod
@@ -3,7 +3,7 @@ module app
 go 1.15
 
 require (
-	github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4
+	github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173
 	github.com/google/uuid v1.1.2
 	github.com/gorilla/mux v1.7.3
 	google.golang.org/grpc v1.33.1

diff --git a/tests/apps/service_invocation/go.sum b/tests/apps/service_invocation/go.sum
@@ -209,8 +209,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz
 github.com/dapr/components-contrib v0.0.0-20200219164914-5b75f4d0fbc6/go.mod h1:AZi8IGs8LFdywJg/YGwDs7MAxJkvGa8RgHN4NoJSKt0=
 github.com/dapr/components-contrib v1.0.0-rc2.0.20210120162831-5018196c58a0/go.mod h1:wmTSIgXHIqYeFCoCJDZTbDDw86ZqP/SeGbyp4ZKS+Y0=
 github.com/dapr/dapr v0.4.1-0.20200228055659-71892bc0111e/go.mod h1:c60DJ9TdSdpbLjgqP55A5u4ZCYChFwa9UGYIXd9pmm4=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4 h1:qi9lgJh6lAPBLF0UIGYpLy8OhJSFjiQoMB5equhFsqs=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173 h1:3MZ9JpjBbSEV75VdCp21yeMZ+LilI15kab9dnjFD8zQ=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
 github.com/dapr/go-sdk v0.0.0-20200121181907-48249cda2fad/go.mod h1:yeOIFBz6+BigHpk4ASJbgQDVjQ8+00oCWrFyOAFdob8=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/tests/apps/service_invocation_grpc/go.mod b/tests/apps/service_invocation_grpc/go.mod
@@ -3,7 +3,7 @@ module app
 go 1.15
 
 require (
-	github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4
+	github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173
 	go.opencensus.io v0.22.5
 	google.golang.org/grpc v1.33.1
 	google.golang.org/protobuf v1.25.0

diff --git a/tests/apps/service_invocation_grpc/go.sum b/tests/apps/service_invocation_grpc/go.sum
@@ -209,8 +209,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz
 github.com/dapr/components-contrib v0.0.0-20200219164914-5b75f4d0fbc6/go.mod h1:AZi8IGs8LFdywJg/YGwDs7MAxJkvGa8RgHN4NoJSKt0=
 github.com/dapr/components-contrib v1.0.0-rc2.0.20210120162831-5018196c58a0/go.mod h1:wmTSIgXHIqYeFCoCJDZTbDDw86ZqP/SeGbyp4ZKS+Y0=
 github.com/dapr/dapr v0.4.1-0.20200228055659-71892bc0111e/go.mod h1:c60DJ9TdSdpbLjgqP55A5u4ZCYChFwa9UGYIXd9pmm4=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4 h1:qi9lgJh6lAPBLF0UIGYpLy8OhJSFjiQoMB5equhFsqs=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173 h1:3MZ9JpjBbSEV75VdCp21yeMZ+LilI15kab9dnjFD8zQ=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
 github.com/dapr/go-sdk v0.0.0-20200121181907-48249cda2fad/go.mod h1:yeOIFBz6+BigHpk4ASJbgQDVjQ8+00oCWrFyOAFdob8=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/tests/apps/stateapp/go.mod b/tests/apps/stateapp/go.mod
@@ -3,7 +3,7 @@ module app
 go 1.15
 
 require (
-	github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4
+	github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173
 	github.com/gorilla/mux v1.7.3
 	google.golang.org/grpc v1.33.1
 )

diff --git a/tests/apps/stateapp/go.sum b/tests/apps/stateapp/go.sum
@@ -213,8 +213,8 @@ github.com/dancannon/gorethink v4.0.0+incompatible/go.mod h1:BLvkat9KmZc1efyYwhz
 github.com/dapr/components-contrib v0.0.0-20200219164914-5b75f4d0fbc6/go.mod h1:AZi8IGs8LFdywJg/YGwDs7MAxJkvGa8RgHN4NoJSKt0=
 github.com/dapr/components-contrib v1.0.0-rc2.0.20210120162831-5018196c58a0/go.mod h1:wmTSIgXHIqYeFCoCJDZTbDDw86ZqP/SeGbyp4ZKS+Y0=
 github.com/dapr/dapr v0.4.1-0.20200228055659-71892bc0111e/go.mod h1:c60DJ9TdSdpbLjgqP55A5u4ZCYChFwa9UGYIXd9pmm4=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4 h1:qi9lgJh6lAPBLF0UIGYpLy8OhJSFjiQoMB5equhFsqs=
-github.com/dapr/dapr v1.0.0-rc.2.0.20210122073344-d48d25e83cf4/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173 h1:3MZ9JpjBbSEV75VdCp21yeMZ+LilI15kab9dnjFD8zQ=
+github.com/dapr/dapr v1.0.0-rc.2.0.20210122165906-be08e5520173/go.mod h1:hmLcngbeNvuVn6Ukj+ZGv825otjiYbvvlHgdoZbtlXg=
 github.com/dapr/go-sdk v0.0.0-20200121181907-48249cda2fad/go.mod h1:yeOIFBz6+BigHpk4ASJbgQDVjQ8+00oCWrFyOAFdob8=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/tests/update_testapps_dependencies.sh b/tests/update_testapps_dependencies.sh
@@ -1,13 +1,17 @@
 #!/bin/bash
 
+[ -z "$1" ] && echo "Usage: $0 [LAST_DAPR_COMMIT]" && exit 1
+
+DAPR_CORE_COMMIT=$1
+
 # Update dapr dependencies for all e2e test apps
 cd ./apps
 appsroot=`pwd`
 appsdirName='apps'
 for appdir in * ; do
    if test -f "$appsroot/$appdir/go.mod"; then
       cd $appsroot/$appdir > /dev/null
-      go get -u github.com/dapr/dapr@d48d25e83cf4c85f566e9423340993dc517d8ac3
+      go get -u github.com/dapr/dapr@$DAPR_CORE_COMMIT
       go mod tidy
       echo "successfully updated dapr dependency for $appdir"
    fi