Merge branch 'master' into go-mod-update-operator-tls-opts

dapr · Jan 19, 2024 · 880e34e · 880e34e
2 parents 3d8044a + ffa8061
commit 880e34e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/...es/e2e/release-1.12/dapr-sidecar-master/0001-service-invocation-e2e-error-condition.patch b/...es/e2e/release-1.12/dapr-sidecar-master/0001-service-invocation-e2e-error-condition.patch
@@ -0,0 +1,24 @@
+diff --git a/tests/e2e/service_invocation/service_invocation_test.go b/tests/e2e/service_invocation/service_invocation_test.go
+index 6c1a455ec0..53545b4752 100644
+--- a/tests/e2e/service_invocation/service_invocation_test.go
++++ b/tests/e2e/service_invocation/service_invocation_test.go
+@@ -1493,8 +1493,7 @@ func TestNegativeCases(t *testing.T) {
+ 				// TODO: This doesn't return as an error, it should be handled more gracefully in dapr
+ 				require.False(t, testResults.MainCallSuccessful)
+ 				require.Equal(t, 500, status)
+-				require.Contains(t, string(testResults.RawBody), "failed to invoke")
+-				require.Contains(t, string(testResults.RawBody), "missing-service-0")
++				require.Contains(t, string(testResults.RawBody), "failed to resolve address for 'missing-service-0-dapr.dapr-tests.svc.cluster.local'")
+ 				require.Nil(t, err)
+ 			})
+
+@@ -1517,8 +1516,7 @@ func TestNegativeCases(t *testing.T) {
+ 				require.Nil(t, testResults.RawBody)
+ 				require.Nil(t, err)
+ 				require.NotNil(t, testResults.RawError)
+-				require.Contains(t, testResults.RawError, "failed to invoke")
+-				require.Contains(t, testResults.RawError, "missing-service-0")
++				require.Contains(t, testResults.RawError, "failed to resolve address for 'missing-service-0-dapr.dapr-tests.svc.cluster.local'")
+ 			})
+
+ 			t.Run("service_timeout_http", func(t *testing.T) {
diff --git a/tests/e2e/service_invocation/service_invocation_test.go b/tests/e2e/service_invocation/service_invocation_test.go
@@ -1493,8 +1493,7 @@ func TestNegativeCases(t *testing.T) {
 				// TODO: This doesn't return as an error, it should be handled more gracefully in dapr
 				require.False(t, testResults.MainCallSuccessful)
 				require.Equal(t, 500, status)
-				require.Contains(t, string(testResults.RawBody), "failed to invoke")
-				require.Contains(t, string(testResults.RawBody), "missing-service-0")
+				require.Contains(t, string(testResults.RawBody), "failed to resolve address for 'missing-service-0-dapr.dapr-tests.svc.cluster.local'")
 				require.Nil(t, err)
 			})
 
@@ -1517,8 +1516,7 @@ func TestNegativeCases(t *testing.T) {
 				require.Nil(t, testResults.RawBody)
 				require.Nil(t, err)
 				require.NotNil(t, testResults.RawError)
-				require.Contains(t, testResults.RawError, "failed to invoke")
-				require.Contains(t, testResults.RawError, "missing-service-0")
+				require.Contains(t, testResults.RawError, "failed to resolve address for 'missing-service-0-dapr.dapr-tests.svc.cluster.local'")
 			})
 
 			t.Run("service_timeout_http", func(t *testing.T) {