XdsSecurityTest: Rework infrastructure (#30138)

* XdsSecurityTest: Rework infrastructure

* Reviewer comments

* Comment

* Add TODO

test/cpp/end2end/xds/xds_end2end_test.cc

@@ -41,6 +41,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "absl/strings/str_replace.h"
+#include "absl/time/time.h"
 #include "absl/types/optional.h"
 
 #include <grpc/grpc.h>
@@ -280,7 +281,7 @@ class XdsSecurityTest : public XdsEnd2endTest {
     builder.AddCertificateProviderPlugin("file_plugin", "file_watcher",
                                          absl::StrJoin(fields, ",\n"));
     InitClient(builder);
-    CreateAndStartBackends(1);
+    CreateAndStartBackends(2);
     root_cert_ = ReadFile(kCaCertPath);
     bad_root_cert_ = ReadFile(kBadClientCertPath);
     identity_pair_ = ReadTlsIdentityPair(kClientKeyPath, kClientCertPath);
@@ -321,7 +322,20 @@ class XdsSecurityTest : public XdsEnd2endTest {
       const std::vector<StringMatcher>& san_matchers,
       const std::vector<std::string>& expected_authenticated_identity,
       bool test_expects_failure = false) {
+    // Change the backend and use a unique service name to use so that we know
+    // that the CDS update was applied.
+    std::string service_name = absl::StrCat(
+        "eds_service_name",
+        absl::FormatTime("%H%M%E3S", absl::Now(), absl::LocalTimeZone()));
+    backend_index_ = (backend_index_ + 1) % 2;
+    EdsResourceArgs args({
+        {"locality0",
+         CreateEndpointsForBackends(backend_index_, backend_index_ + 1)},
+    });
+    balancer_->ads_service()->SetEdsResource(
+        BuildEdsResource(args, service_name.c_str()));
     auto cluster = default_cluster_;
+    cluster.mutable_eds_cluster_config()->set_service_name(service_name);
     if (!identity_instance_name.empty() || !root_instance_name.empty()) {
       auto* transport_socket = cluster.mutable_transport_socket();
       transport_socket->set_name("envoy.transport_sockets.tls");
@@ -356,59 +370,46 @@ class XdsSecurityTest : public XdsEnd2endTest {
     }
     balancer_->ads_service()->SetCdsResource(cluster);
     // The updates might take time to have an effect, so use a retry loop.
-    constexpr int kRetryCount = 100;
-    int num_tries = 0;
-    for (; num_tries < kRetryCount; num_tries++) {
-      // Restart the servers to force a reconnection so that previously
-      // connected subchannels are not used for the RPC.
-      ShutdownBackend(0);
-      StartBackend(0);
     if (test_expects_failure) {
-        if (SendRpc().ok()) {
+      SendRpcsUntil(
-          gpr_log(GPR_ERROR, "RPC succeeded. Failure expected. Trying again.");
+          DEBUG_LOCATION,
-          continue;
+          [&](const RpcResult& result) {
+            if (result.status.ok()) {
+              gpr_log(GPR_ERROR,
+                      "RPC succeeded. Failure expected. Trying again.");
+              return true;
             }
-      } else {
-        WaitForBackend(DEBUG_LOCATION, 0, [](const RpcResult& result) {
-          if (!result.status.ok()) {
             EXPECT_EQ(result.status.error_code(), StatusCode::UNAVAILABLE);
-            // TODO(yashkt): Rework this test suite such that the caller
+            // TODO(yashkt): Change individual test cases to expect the exact
-            // explicitly indicates which failure they're allowed to see here,
+            // error message here.
-            // rather than blindly allowing every possibility in every test.
+            return false;
-            // TODO(roth): Plumb a better error out of the handshakers
+          },
-            // as part of https://github.com/grpc/grpc/issues/22883.
+          /* timeout_ms= */ 20 * 1000);
-            EXPECT_THAT(
+    } else {
-                result.status.error_message(),
+      backends_[backend_index_]->backend_service()->ResetCounters();
-                ::testing::MatchesRegex(
+      SendRpcsUntil(
-                    "connections to all backends failing; last error: "
+          DEBUG_LOCATION,
-                    "(UNKNOWN: Failed to connect to remote host: Connection "
+          [&](const RpcResult& result) {
-                    "(refused|reset by peer)|UNAVAILABLE: Failed to connect "
+            // Make sure that we are hitting the correct backend.
-                    "to remote host: FD shutdown|UNKNOWN: Tls handshake failed|"
+            // TODO(yashykt): Even if we haven't moved to the correct backend
-                    "UNAVAILABLE: Socket closed|UNAVAILABLE: Broken pipe)"));
+            // and are still using the previous update, we should still check
-          }
+            // for the status and make sure that it fits our expectations.
-        });
+            if (backends_[backend_index_]->backend_service()->request_count() ==
-        Status status = SendRpc();
+                0) {
-        if (!status.ok()) {
+              return true;
-          gpr_log(GPR_ERROR, "RPC failed. code=%d message=%s Trying again.",
+            }
-                  status.error_code(), status.error_message().c_str());
+            EXPECT_TRUE(result.status.ok())
-          continue;
+                << "code=" << result.status.error_code()
-        }
+                << " message=" << result.status.error_message();
-        if (backends_[0]->backend_service()->last_peer_identity() !=
+            // Check that the identity is as expected.
-            expected_authenticated_identity) {
+            EXPECT_EQ(backends_[backend_index_]
-          gpr_log(
+                          ->backend_service()
-              GPR_ERROR,
+                          ->last_peer_identity(),
-              "Expected client identity does not match. (actual) %s vs "
+                      expected_authenticated_identity);
-              "(expected) %s Trying again.",
+            return false;
-              absl::StrJoin(
+          },
-                  backends_[0]->backend_service()->last_peer_identity(), ",")
+          /* timeout_ms= */ 20 * 1000, RpcOptions());
-                  .c_str(),
-              absl::StrJoin(expected_authenticated_identity, ",").c_str());
-          continue;
-        }
-      }
-      break;
     }
-    EXPECT_LT(num_tries, kRetryCount);
   }
 
   std::string root_cert_;
@@ -425,6 +426,7 @@ class XdsSecurityTest : public XdsEnd2endTest {
   StringMatcher bad_san_2_;
   std::vector<std::string> authenticated_identity_;
   std::vector<std::string> fallback_authenticated_identity_;
+  int backend_index_ = 0;
 };
 
 TEST_P(XdsSecurityTest, UnknownTransportSocket) {