Merge remote-tracking branch 'upstream/master' into xds_logging

hejinlin · Oct 12, 2020 · 7d6b12f · 7d6b12f
2 parents 02436e3 + 0f71df8
commit 7d6b12f
Show file tree

Hide file tree

Showing 300 changed files with 2,925 additions and 2,334 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,7 +2,7 @@
 name: Report a bug
 about: Create a report to help us improve
 labels: kind/bug, priority/P2
-assignees: veblush
+assignees: donnadionne
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/cleanup_request.md b/.github/ISSUE_TEMPLATE/cleanup_request.md
@@ -2,7 +2,7 @@
 name: Request a cleanup
 about: Suggest a cleanup in our repository
 labels: kind/internal cleanup, priority/P2
-assignees: veblush
+assignees: donnadionne
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -2,7 +2,7 @@
 name: Request a feature
 about: Suggest an idea for this project
 labels: kind/enhancement, priority/P2
-assignees: veblush
+assignees: donnadionne
 
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
@@ -2,7 +2,7 @@
 name: Ask a question
 about: Ask a question
 labels: kind/question, priority/P3
-assignees: veblush
+assignees: donnadionne
 
 ---
 

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -8,4 +8,4 @@ If you know who should review your pull request, please remove the mentioning be
 
 -->
 
-@veblush
+@donnadionne
diff --git a/BUILD b/BUILD
@@ -80,11 +80,11 @@ config_setting(
 python_config_settings()
 
 # This should be updated along with build_handwritten.yaml
-g_stands_for = "geeky"
+g_stands_for = "gauntlet"
 
-core_version = "12.0.0"
+core_version = "13.0.0"
 
-version = "1.33.0-dev"
+version = "1.34.0-dev"
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",
@@ -223,7 +223,6 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpc++/support/sync_stream.h",
     "include/grpc++/support/time.h",
     "include/grpcpp/alarm.h",
-    "include/grpcpp/alarm_impl.h",
     "include/grpcpp/channel.h",
     "include/grpcpp/client_context.h",
     "include/grpcpp/completion_queue.h",
@@ -244,10 +243,8 @@ GRPCXX_PUBLIC_HDRS = [
     "include/grpcpp/impl/rpc_service_method.h",
     "include/grpcpp/impl/serialization_traits.h",
     "include/grpcpp/impl/server_builder_option.h",
-    "include/grpcpp/impl/server_builder_option_impl.h",
     "include/grpcpp/impl/server_builder_plugin.h",
     "include/grpcpp/impl/server_initializer.h",
-    "include/grpcpp/impl/server_initializer_impl.h",
     "include/grpcpp/impl/service_type.h",
     "include/grpcpp/resource_quota.h",
     "include/grpcpp/security/auth_context.h",
@@ -326,9 +323,10 @@ grpc_cc_library(
         "//conditions:default": [
             "grpc_lb_policy_cds",
             "grpc_lb_policy_eds",
-            "grpc_lb_policy_lrs",
+            "grpc_lb_policy_eds_drop",
             "grpc_lb_policy_xds_cluster_manager",
             "grpc_resolver_xds",
+            "grpc_xds_credentials",
         ],
     },
     standalone = True,
@@ -531,6 +529,7 @@ grpc_cc_library(
         "src/core/lib/gpr/tls_gcc.h",
         "src/core/lib/gpr/tls_msvc.h",
         "src/core/lib/gpr/tls_pthread.h",
+        "src/core/lib/gpr/tls_stdcpp.h",
         "src/core/lib/gpr/tmpfile.h",
         "src/core/lib/gpr/useful.h",
         "src/core/lib/gprpp/arena.h",
@@ -1398,9 +1397,12 @@ grpc_cc_library(
 )
 
 grpc_cc_library(
-    name = "grpc_lb_policy_lrs",
+    name = "grpc_lb_policy_eds_drop",
     srcs = [
-        "src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc",
+        "src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc",
+    ],
+    external_deps = [
+        "absl/strings",
     ],
     language = "c++",
     deps = [
@@ -1746,6 +1748,7 @@ grpc_cc_library(
         "src/core/lib/security/credentials/google_default/credentials_generic.cc",
         "src/core/lib/security/credentials/google_default/google_default_credentials.cc",
         "src/core/lib/security/credentials/iam/iam_credentials.cc",
+        "src/core/lib/security/credentials/insecure/insecure_credentials.cc",
         "src/core/lib/security/credentials/jwt/json_token.cc",
         "src/core/lib/security/credentials/jwt/jwt_credentials.cc",
         "src/core/lib/security/credentials/jwt/jwt_verifier.cc",
@@ -1758,6 +1761,7 @@ grpc_cc_library(
         "src/core/lib/security/credentials/tls/tls_credentials.cc",
         "src/core/lib/security/security_connector/alts/alts_security_connector.cc",
         "src/core/lib/security/security_connector/fake/fake_security_connector.cc",
+        "src/core/lib/security/security_connector/insecure/insecure_security_connector.cc",
         "src/core/lib/security/security_connector/load_system_roots_fallback.cc",
         "src/core/lib/security/security_connector/load_system_roots_linux.cc",
         "src/core/lib/security/security_connector/local/local_security_connector.cc",
@@ -1800,6 +1804,7 @@ grpc_cc_library(
         "src/core/lib/security/credentials/tls/tls_credentials.h",
         "src/core/lib/security/security_connector/alts/alts_security_connector.h",
         "src/core/lib/security/security_connector/fake/fake_security_connector.h",
+        "src/core/lib/security/security_connector/insecure/insecure_security_connector.h",
         "src/core/lib/security/security_connector/load_system_roots.h",
         "src/core/lib/security/security_connector/load_system_roots_linux.h",
         "src/core/lib/security/security_connector/local/local_security_connector.h",
@@ -1824,6 +1829,19 @@ grpc_cc_library(
     ],
 )
 
+grpc_cc_library(
+    name = "grpc_xds_credentials",
+    srcs = [
+        "src/core/lib/security/credentials/xds/xds_credentials.cc",
+    ],
+    hdrs = [
+        "src/core/lib/security/credentials/xds/xds_credentials.h",
+    ],
+    deps = [
+        "grpc_secure",
+    ],
+)
+
 grpc_cc_library(
     name = "grpc_mock_cel",
     hdrs = [
@@ -2357,7 +2375,6 @@ grpc_cc_library(
     language = "c++",
     public_hdrs = [
         "include/grpcpp/ext/channelz_service_plugin.h",
-        "include/grpcpp/ext/channelz_service_plugin_impl.h",
     ],
     deps = [
         ":grpc++",

diff --git a/BUILD.gn b/BUILD.gn
@@ -137,6 +137,7 @@ config("grpc_config") {
         "src/core/lib/gpr/tls_msvc.h",
         "src/core/lib/gpr/tls_pthread.cc",
         "src/core/lib/gpr/tls_pthread.h",
+        "src/core/lib/gpr/tls_stdcpp.h",
         "src/core/lib/gpr/tmpfile.h",
         "src/core/lib/gpr/tmpfile_msys.cc",
         "src/core/lib/gpr/tmpfile_posix.cc",
@@ -249,7 +250,7 @@ config("grpc_config") {
         "src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc",
         "src/core/ext/filters/client_channel/lb_policy/xds/cds.cc",
         "src/core/ext/filters/client_channel/lb_policy/xds/eds.cc",
-        "src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc",
+        "src/core/ext/filters/client_channel/lb_policy/xds/eds_drop.cc",
         "src/core/ext/filters/client_channel/lb_policy/xds/xds.h",
         "src/core/ext/filters/client_channel/lb_policy/xds/xds_cluster_manager.cc",
         "src/core/ext/filters/client_channel/lb_policy_factory.h",
@@ -981,6 +982,7 @@ config("grpc_config") {
         "src/core/lib/security/credentials/google_default/google_default_credentials.h",
         "src/core/lib/security/credentials/iam/iam_credentials.cc",
         "src/core/lib/security/credentials/iam/iam_credentials.h",
+        "src/core/lib/security/credentials/insecure/insecure_credentials.cc",
         "src/core/lib/security/credentials/jwt/json_token.cc",
         "src/core/lib/security/credentials/jwt/json_token.h",
         "src/core/lib/security/credentials/jwt/jwt_credentials.cc",
@@ -1001,10 +1003,14 @@ config("grpc_config") {
         "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h",
         "src/core/lib/security/credentials/tls/tls_credentials.cc",
         "src/core/lib/security/credentials/tls/tls_credentials.h",
+        "src/core/lib/security/credentials/xds/xds_credentials.cc",
+        "src/core/lib/security/credentials/xds/xds_credentials.h",
         "src/core/lib/security/security_connector/alts/alts_security_connector.cc",
         "src/core/lib/security/security_connector/alts/alts_security_connector.h",
         "src/core/lib/security/security_connector/fake/fake_security_connector.cc",
         "src/core/lib/security/security_connector/fake/fake_security_connector.h",
+        "src/core/lib/security/security_connector/insecure/insecure_security_connector.cc",
+        "src/core/lib/security/security_connector/insecure/insecure_security_connector.h",
         "src/core/lib/security/security_connector/load_system_roots.h",
         "src/core/lib/security/security_connector/load_system_roots_fallback.cc",
         "src/core/lib/security/security_connector/load_system_roots_linux.cc",
@@ -1269,7 +1275,6 @@ config("grpc_config") {
         "include/grpc++/support/sync_stream.h",
         "include/grpc++/support/time.h",
         "include/grpcpp/alarm.h",
-        "include/grpcpp/alarm_impl.h",
         "include/grpcpp/channel.h",
         "include/grpcpp/client_context.h",
         "include/grpcpp/completion_queue.h",
@@ -1339,10 +1344,8 @@ config("grpc_config") {
         "include/grpcpp/impl/rpc_service_method.h",
         "include/grpcpp/impl/serialization_traits.h",
         "include/grpcpp/impl/server_builder_option.h",
-        "include/grpcpp/impl/server_builder_option_impl.h",
         "include/grpcpp/impl/server_builder_plugin.h",
         "include/grpcpp/impl/server_initializer.h",
-        "include/grpcpp/impl/server_initializer_impl.h",
         "include/grpcpp/impl/service_type.h",
         "include/grpcpp/resource_quota.h",
         "include/grpcpp/security/auth_context.h",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,4 +8,4 @@ If you know who should review your pull request, please remove the mentioning be

		-->

		@veblush
		@donnadionne