build: update grpc to 1.34.0 (envoyproxy#14147)

Signed-off-by: Asra Ali <[email protected]>

Author: asraa

Diff for: bazel/dependency_imports.bzl

@@ -4,7 +4,7 @@ load("@envoy_build_tools//toolchains:rbe_toolchains_config.bzl", "rbe_toolchains
 load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe_exec_properties_dict", "custom_exec_properties")
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
-load("@upb//bazel:repository_defs.bzl", upb_bazel_version_repository = "bazel_version_repository")
+load("@upb//bazel:workspace_deps.bzl", "upb_deps")
 load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
 load("@config_validation_pip3//:requirements.bzl", config_validation_pip_install = "pip_install")
 load("@configs_pip3//:requirements.bzl", configs_pip_install = "pip_install")
@@ -26,7 +26,7 @@ def envoy_dependency_imports(go_version = GO_VERSION):
     gazelle_dependencies()
     apple_rules_dependencies()
     rust_repositories()
-    upb_bazel_version_repository(name = "upb_bazel_version")
+    upb_deps()
     antlr_dependencies(472)
     proxy_wasm_rust_sdk_dependencies()
 

Diff for: bazel/repositories.bzl

@@ -746,13 +746,24 @@ def _com_github_grpc_grpc():
         actual = "@com_github_grpc_grpc//test/core/tsi/alts/fake_handshaker:transport_security_common_proto",
     )
 
-def _upb():
-    external_http_archive(
-        name = "upb",
-        patches = ["@envoy//bazel:upb.patch"],
-        patch_args = ["-p1"],
+    native.bind(
+        name = "re2",
+        actual = "@com_googlesource_code_re2//:re2",
+    )
+
+    native.bind(
+        name = "upb_lib_descriptor",
+        actual = "@upb//:descriptor_upb_proto",
+    )
+
+    native.bind(
+        name = "upb_textformat_lib",
+        actual = "@upb//:textformat",
     )
 
+def _upb():
+    external_http_archive(name = "upb")
+
     native.bind(
         name = "upb_lib",
         actual = "@upb//:upb",

Diff for: bazel/repository_locations.bzl

@@ -223,14 +223,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "gRPC",
         project_desc = "gRPC C core library",
         project_url = "https://grpc.io",
-        # TODO(JimmyCYJ): Bump to release 1.27
-        # This sha on grpc:v1.25.x branch is specifically chosen to fix gRPC STS call credential options.
-        version = "d8f4928fa779f6005a7fe55a176bdb373b0f910f",
-        sha256 = "bbc8f020f4e85ec029b047fab939b8c81f3d67254b5c724e1003a2bc49ddd123",
+        version = "1.34.0",
+        sha256 = "7372a881122cd85a7224435a1d58bc5e11c88d4fb98a64b83f36f3d1c2f16d39",
         strip_prefix = "grpc-{version}",
-        urls = ["https://github.com/grpc/grpc/archive/{version}.tar.gz"],
+        urls = ["https://github.com/grpc/grpc/archive/v{version}.tar.gz"],
         use_category = ["dataplane_core", "controlplane"],
-        release_date = "2020-02-11",
+        release_date = "2020-12-01",
         cpe = "cpe:2.3:a:grpc:grpc:*",
     ),
     com_github_luajit_luajit = dict(
@@ -776,12 +774,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         project_name = "upb",
         project_desc = "A small protobuf implementation in C (gRPC dependency)",
         project_url = "https://github.com/protocolbuffers/upb",
-        version = "8a3ae1ef3e3e3f26b45dec735c5776737fc7247f",
-        sha256 = "e9f281c56ab1eb1f97a80ca8a83bb7ef73d230eabb8591f83876f4e7b85d9b47",
+        version = "382d5afc60e05470c23e8de19b19fc5ad231e732",
+        sha256 = "7992217989f3156f8109931c1fc6db3434b7414957cb82371552377beaeb9d6c",
         strip_prefix = "upb-{version}",
         urls = ["https://github.com/protocolbuffers/upb/archive/{version}.tar.gz"],
         use_category = ["controlplane"],
-        release_date = "2019-11-19",
+        release_date = "2020-08-03",
         cpe = "N/A",
     ),
     kafka_source = dict(

Diff for: bazel/upb.patch

@@ -117,11 +117,9 @@ void AsyncStreamImpl::onHeaders(Http::ResponseHeaderMapPtr&& headers, bool end_s
       onTrailers(Http::createHeaderMap<Http::ResponseTrailerMapImpl>(*headers));
       return;
     }
-    // Technically this should be
+    // Status is translated via Utility::httpToGrpcStatus per
     // https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md
-    // as given by Grpc::Utility::httpToGrpcStatus(), but the Google gRPC client treats
-    // this as WellKnownGrpcStatus::Canceled.
-    streamError(Status::WellKnownGrpcStatus::Canceled);
+    streamError(Utility::httpToGrpcStatus(http_response_status));
     return;
   }
   if (end_stream) {

Diff for: source/common/grpc/async_client_impl.cc

@@ -123,9 +123,10 @@ Network::TransportSocketFactoryPtr createTransportSocketFactoryHelper(
     tsi_handshaker* handshaker = nullptr;
     // Specifying target name as empty since TSI won't take care of validating peer identity
     // in this use case. The validation will be performed by TsiSocket with the validator.
-    tsi_result status =
-        alts_tsi_handshaker_create(options.get(), target_name, handshaker_service.c_str(),
-                                   is_upstream, nullptr /* interested_parties */, &handshaker);
+    // Leaving the max frame size as 0 (unspecified) sets the default max frame size of 128 KiB.
+    tsi_result status = alts_tsi_handshaker_create(
+        options.get(), target_name, handshaker_service.c_str(), is_upstream,
+        nullptr /* interested_parties */, &handshaker, 0 /* default max frame size */);
     CHandshakerPtr handshaker_ptr{handshaker};
 
     if (status != TSI_OK) {

Diff for: source/extensions/transport_sockets/alts/config.cc

@@ -80,11 +80,9 @@ TEST_P(GrpcClientIntegrationTest, HttpNon200Status) {
         {":status", std::to_string(http_response_status)}};
     stream->expectInitialMetadata(empty_metadata_);
     stream->expectTrailingMetadata(empty_metadata_);
-    // Technically this should be
-    // https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md
-    // as given by Grpc::Utility::httpToGrpcStatus(), but the Google gRPC client treats
-    // this as WellKnownGrpcStatus::Canceled.
-    stream->expectGrpcStatus(Status::WellKnownGrpcStatus::Canceled);
+    // Translate status per
+    // // https://github.com/grpc/grpc/blob/master/doc/http-grpc-status-mapping.md
+    stream->expectGrpcStatus(Utility::httpToGrpcStatus(http_response_status));
     stream->fake_stream_->encodeHeaders(reply_headers, true);
     dispatcher_helper_.runDispatcher();
   }

Diff for: test/common/grpc/grpc_client_integration_test.cc

@@ -70,6 +70,9 @@ class CapturingHandshakerService : public grpc::gcp::HandshakerService::Service
       }
       stream->Write(response);
       request.Clear();
+      if (response.has_status()) {
+        return grpc::Status::OK;
+      }
     }
     return grpc::Status::OK;
   }
@@ -79,7 +82,8 @@ class CapturingHandshakerService : public grpc::gcp::HandshakerService::Service
   grpc::gcp::RpcProtocolVersions server_versions;
 };
 
-class AltsIntegrationTestBase : public testing::TestWithParam<Network::Address::IpVersion>,
+class AltsIntegrationTestBase : public Event::TestUsingSimulatedTime,
+                                public testing::TestWithParam<Network::Address::IpVersion>,
                                 public HttpIntegrationTest {
 public:
   AltsIntegrationTestBase(const std::string& server_peer_identity,
@@ -117,7 +121,9 @@ class AltsIntegrationTestBase : public testing::TestWithParam<Network::Address::
         service = std::unique_ptr<grpc::Service>{capturing_handshaker_service_};
       } else {
         capturing_handshaker_service_ = nullptr;
-        service = grpc::gcp::CreateFakeHandshakerService();
+        // If max_expected_concurrent_rpcs is zero, the fake handshaker service will not track
+        // concurrent RPCs and abort if it exceeds the value.
+        service = grpc::gcp::CreateFakeHandshakerService(/* max_expected_concurrent_rpcs */ 0);
       }
 
       std::string server_address = Network::Test::getLoopbackAddressUrlString(version_) + ":0";
@@ -163,7 +169,7 @@ class AltsIntegrationTestBase : public testing::TestWithParam<Network::Address::
     HttpIntegrationTest::cleanupUpstreamAndDownstream();
     dispatcher_->clearDeferredDeleteList();
     if (fake_handshaker_server_ != nullptr) {
-      fake_handshaker_server_->Shutdown();
+      fake_handshaker_server_->Shutdown(timeSystem().systemTime());
     }
     fake_handshaker_server_thread_->join();
   }

Diff for: test/extensions/transport_sockets/alts/alts_integration_test.cc

@@ -86,19 +86,27 @@ TEST_F(TsiHandshakerTest, DoHandshake) {
 
   tsi_peer client_peer;
   EXPECT_EQ(TSI_OK, tsi_handshaker_result_extract_peer(client_result.get(), &client_peer));
-  EXPECT_EQ(1, client_peer.property_count);
+  EXPECT_EQ(2, client_peer.property_count);
   EXPECT_STREQ("certificate_type", client_peer.properties[0].name);
   absl::string_view client_certificate_type{client_peer.properties[0].value.data,
                                             client_peer.properties[0].value.length};
   EXPECT_EQ("FAKE", client_certificate_type);
+  EXPECT_STREQ("security_level", client_peer.properties[1].name);
+  absl::string_view client_security_level{client_peer.properties[1].value.data,
+                                          client_peer.properties[1].value.length};
+  EXPECT_EQ("TSI_SECURITY_NONE", client_security_level);
 
   tsi_peer server_peer;
   EXPECT_EQ(TSI_OK, tsi_handshaker_result_extract_peer(server_result.get(), &server_peer));
-  EXPECT_EQ(1, server_peer.property_count);
+  EXPECT_EQ(2, server_peer.property_count);
   EXPECT_STREQ("certificate_type", server_peer.properties[0].name);
   absl::string_view server_certificate_type{server_peer.properties[0].value.data,
                                             server_peer.properties[0].value.length};
   EXPECT_EQ("FAKE", server_certificate_type);
+  EXPECT_STREQ("security_level", server_peer.properties[1].name);
+  absl::string_view server_security_level{server_peer.properties[1].value.data,
+                                          server_peer.properties[1].value.length};
+  EXPECT_EQ("TSI_SECURITY_NONE", server_security_level);
 
   tsi_peer_destruct(&client_peer);
   tsi_peer_destruct(&server_peer);