grpc 1.71.0 → 1.72.0

data/src/core/{lib/security/security_connector → credentials/transport}/alts/alts_security_connector.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/security/security_connector/alts/alts_security_connector.h"
+#include "src/core/credentials/transport/alts/alts_security_connector.h"
 
 #include <grpc/grpc.h>
 #include <grpc/grpc_security_constants.h>
@@ -35,6 +35,8 @@
 #include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
+#include "src/core/credentials/transport/alts/alts_credentials.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -45,11 +47,9 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/promise.h"
-#include "src/core/lib/security/context/security_context.h"
-#include "src/core/lib/security/credentials/alts/alts_credentials.h"
-#include "src/core/lib/security/credentials/credentials.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/transport/auth_context.h"
 #include "src/core/tsi/alts/handshaker/alts_tsi_handshaker.h"
 #include "src/core/tsi/transport_security.h"
 #include "src/core/util/debug_location.h"

data/src/core/{lib/security/security_connector → credentials/transport}/alts/alts_security_connector.h

@@ -16,14 +16,14 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H
-#define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_ALTS_SECURITY_CONNECTOR_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_ALTS_SECURITY_CONNECTOR_H
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/security/security_connector/security_connector.h"
+#include "src/core/credentials/transport/security_connector.h"
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/ref_counted_ptr.h"
@@ -75,4 +75,4 @@ RefCountedPtr<grpc_auth_context> grpc_alts_auth_context_from_tsi_peer(
 }  // namespace internal
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_ALTS_ALTS_SECURITY_CONNECTOR_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_ALTS_SECURITY_CONNECTOR_H

data/src/core/{lib/security/credentials → credentials/transport}/alts/check_gcp_environment.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
+#include "src/core/credentials/transport/alts/check_gcp_environment.h"
 
 #include <ctype.h>
 #include <grpc/support/alloc.h>

data/src/core/{lib/security/credentials → credentials/transport}/alts/check_gcp_environment.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
-#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_CHECK_GCP_ENVIRONMENT_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_CHECK_GCP_ENVIRONMENT_H
 
 namespace grpc_core {
 namespace internal {
@@ -54,4 +54,4 @@ bool check_bios_data(const char* bios_data);
 ///
 bool grpc_alts_is_running_on_gcp();
 
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_CHECK_GCP_ENVIRONMENT_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_CHECK_GCP_ENVIRONMENT_H

data/src/core/{lib/security/credentials → credentials/transport}/alts/check_gcp_environment_linux.cc

@@ -24,7 +24,7 @@
 #include <grpc/support/sync.h>
 #include <string.h>
 
-#include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
+#include "src/core/credentials/transport/alts/check_gcp_environment.h"
 
 #define GRPC_ALTS_EXPECT_NAME_GOOGLE "Google"
 #define GRPC_ALTS_EXPECT_NAME_GCE "Google Compute Engine"

data/src/core/{lib/security/credentials → credentials/transport}/alts/check_gcp_environment_no_op.cc

@@ -21,7 +21,7 @@
 #if !defined(GPR_LINUX) && !defined(GPR_WINDOWS)
 
 #include "absl/log/log.h"
-#include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
+#include "src/core/credentials/transport/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
 
 bool grpc_alts_is_running_on_gcp() {

data/src/core/{lib/security/credentials → credentials/transport}/alts/check_gcp_environment_windows.cc

@@ -27,7 +27,7 @@
 #include <tchar.h>
 #include <windows.h>
 
-#include "src/core/lib/security/credentials/alts/check_gcp_environment.h"
+#include "src/core/credentials/transport/alts/check_gcp_environment.h"
 #include "src/core/util/crash.h"
 
 namespace grpc_core {

data/src/core/{lib/security/credentials → credentials/transport}/alts/grpc_alts_credentials_client_options.cc

@@ -22,7 +22,7 @@
 #include <grpc/support/string_util.h>
 
 #include "absl/log/log.h"
-#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
+#include "src/core/credentials/transport/alts/grpc_alts_credentials_options.h"
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
 static grpc_alts_credentials_options* alts_client_options_copy(

data/src/core/{lib/security/credentials → credentials/transport}/alts/grpc_alts_credentials_options.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
+#include "src/core/credentials/transport/alts/grpc_alts_credentials_options.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>

data/src/core/{lib/security/credentials → credentials/transport}/alts/grpc_alts_credentials_options.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
-#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
 
 #include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
@@ -71,4 +71,4 @@ typedef struct grpc_alts_credentials_server_options {
 grpc_alts_credentials_options* grpc_alts_credentials_options_copy(
     const grpc_alts_credentials_options* options);
 
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_ALTS_GRPC_ALTS_CREDENTIALS_OPTIONS_H

data/src/core/{lib/security/credentials → credentials/transport}/alts/grpc_alts_credentials_server_options.cc

@@ -20,7 +20,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/security/credentials/alts/grpc_alts_credentials_options.h"
+#include "src/core/credentials/transport/alts/grpc_alts_credentials_options.h"
 #include "src/core/tsi/alts/handshaker/transport_security_common_api.h"
 
 static grpc_alts_credentials_options* alts_server_options_copy(

data/src/core/{lib/security/credentials → credentials/transport}/channel_creds_registry.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
-#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_CHANNEL_CREDS_REGISTRY_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_CHANNEL_CREDS_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -41,7 +41,7 @@ class ChannelCredsConfig : public RefCounted<ChannelCredsConfig> {
 
   virtual bool Equals(const ChannelCredsConfig& other) const = 0;
 
-  virtual Json ToJson() const = 0;
+  virtual std::string ToString() const = 0;
 };
 
 template <typename T = grpc_channel_credentials>
@@ -123,4 +123,4 @@ class ChannelCredsRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_CHANNEL_CREDS_REGISTRY_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_CHANNEL_CREDS_REGISTRY_H

data/src/core/{lib/security/credentials → credentials/transport}/channel_creds_registry_init.cc

@@ -30,13 +30,13 @@
 
 #include "absl/strings/string_view.h"
 #include "src/core/config/core_configuration.h"
-#include "src/core/lib/security/credentials/channel_creds_registry.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/credentials/fake/fake_credentials.h"
-#include "src/core/lib/security/credentials/google_default/google_default_credentials.h"  // IWYU pragma: keep
-#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
-#include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h"
-#include "src/core/lib/security/credentials/tls/tls_credentials.h"
+#include "src/core/credentials/call/call_credentials.h"
+#include "src/core/credentials/transport/channel_creds_registry.h"
+#include "src/core/credentials/transport/fake/fake_credentials.h"
+#include "src/core/credentials/transport/google_default/google_default_credentials.h"  // IWYU pragma: keep
+#include "src/core/credentials/transport/tls/grpc_tls_certificate_provider.h"
+#include "src/core/credentials/transport/tls/grpc_tls_credentials_options.h"
+#include "src/core/credentials/transport/tls/tls_credentials.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
@@ -65,7 +65,7 @@ class GoogleDefaultChannelCredsFactory : public ChannelCredsFactory<> {
    public:
     absl::string_view type() const override { return Type(); }
     bool Equals(const ChannelCredsConfig&) const override { return true; }
-    Json ToJson() const override { return Json::FromObject({}); }
+    std::string ToString() const override { return "{}"; }
   };
 
   static absl::string_view Type() { return "google_default"; }
@@ -116,22 +116,26 @@ class TlsChannelCredsFactory : public ChannelCredsFactory<> {
              refresh_interval_ == o.refresh_interval_;
     }
 
-    Json ToJson() const override {
+    std::string ToString() const override {
+      std::vector<std::string> parts;
       Json::Object obj;
+      parts.push_back("{");
       if (!certificate_file_.empty()) {
-        obj["certificate_file"] = Json::FromString(certificate_file_);
+        parts.push_back(absl::StrCat("certificate_file=", certificate_file_));
       }
       if (!private_key_file_.empty()) {
-        obj["private_key_file"] = Json::FromString(private_key_file_);
+        parts.push_back(absl::StrCat("private_key_file=", private_key_file_));
       }
       if (!ca_certificate_file_.empty()) {
-        obj["ca_certificate_file"] = Json::FromString(ca_certificate_file_);
+        parts.push_back(
+            absl::StrCat("ca_certificate_file=", ca_certificate_file_));
       }
       if (refresh_interval_ != kDefaultRefreshInterval) {
-        obj["refresh_interval"] =
-            Json::FromString(refresh_interval_.ToJsonString());
+        parts.push_back(
+            absl::StrCat("refresh_interval=", refresh_interval_.ToString()));
       }
-      return Json::FromObject(std::move(obj));
+      parts.push_back("}");
+      return absl::StrJoin(parts, ",");
     }
 
     const std::string& certificate_file() const { return certificate_file_; }
@@ -196,7 +200,7 @@ class InsecureChannelCredsFactory : public ChannelCredsFactory<> {
    public:
     absl::string_view type() const override { return Type(); }
     bool Equals(const ChannelCredsConfig&) const override { return true; }
-    Json ToJson() const override { return Json::FromObject({}); }
+    std::string ToString() const override { return "{}"; }
   };
 
   static absl::string_view Type() { return "insecure"; }
@@ -221,7 +225,7 @@ class FakeChannelCredsFactory : public ChannelCredsFactory<> {
    public:
     absl::string_view type() const override { return Type(); }
     bool Equals(const ChannelCredsConfig&) const override { return true; }
-    Json ToJson() const override { return Json::FromObject({}); }
+    std::string ToString() const override { return "{}"; }
   };
 
   static absl::string_view Type() { return "fake"; }

data/src/core/credentials/transport/composite/composite_channel_credentials.cc

@@ -0,0 +1,68 @@
+//
+// Copyright 2015-2016 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#include "src/core/credentials/transport/composite/composite_channel_credentials.h"
+
+#include <grpc/support/port_platform.h>
+
+#include <cstring>
+#include <memory>
+#include <vector>
+
+#include "absl/log/check.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "src/core/call/metadata_batch.h"
+#include "src/core/credentials/call/composite/composite_call_credentials.h"
+#include "src/core/lib/debug/trace.h"
+#include "src/core/lib/promise/try_seq.h"
+#include "src/core/util/ref_counted_ptr.h"
+
+grpc_core::UniqueTypeName grpc_composite_channel_credentials::Type() {
+  static grpc_core::UniqueTypeName::Factory kFactory("Composite");
+  return kFactory.Create();
+}
+
+grpc_core::RefCountedPtr<grpc_channel_security_connector>
+grpc_composite_channel_credentials::create_security_connector(
+    grpc_core::RefCountedPtr<grpc_call_credentials> call_creds,
+    const char* target, grpc_core::ChannelArgs* args) {
+  CHECK(inner_creds_ != nullptr);
+  CHECK(call_creds_ != nullptr);
+  // If we are passed a call_creds, create a call composite to pass it
+  // downstream.
+  if (call_creds != nullptr) {
+    return inner_creds_->create_security_connector(
+        grpc_core::MakeRefCounted<grpc_composite_call_credentials>(
+            call_creds_, std::move(call_creds)),
+        target, args);
+  } else {
+    return inner_creds_->create_security_connector(call_creds_, target, args);
+  }
+}
+
+grpc_channel_credentials* grpc_composite_channel_credentials_create(
+    grpc_channel_credentials* channel_creds, grpc_call_credentials* call_creds,
+    void* reserved) {
+  CHECK(channel_creds != nullptr && call_creds != nullptr &&
+        reserved == nullptr);
+  GRPC_TRACE_LOG(api, INFO)
+      << "grpc_composite_channel_credentials_create(channel_creds="
+      << channel_creds << ", call_creds=" << call_creds
+      << ", reserved=" << reserved << ")";
+  return new grpc_composite_channel_credentials(channel_creds->Ref(),
+                                                call_creds->Ref());
+}

data/src/core/{lib/security/credentials/composite/composite_credentials.h → credentials/transport/composite/composite_channel_credentials.h}

@@ -1,5 +1,4 @@
 //
-//
 // Copyright 2015 gRPC authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-//
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
-#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_COMPOSITE_COMPOSITE_CHANNEL_CREDENTIALS_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_COMPOSITE_COMPOSITE_CHANNEL_CREDENTIALS_H
 
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -31,17 +29,16 @@
 #include <vector>
 
 #include "absl/status/statusor.h"
+#include "src/core/credentials/call/call_credentials.h"
+#include "src/core/credentials/transport/security_connector.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/useful.h"
 
-// -- Composite channel credentials. --
-
 class grpc_composite_channel_credentials : public grpc_channel_credentials {
  public:
   grpc_composite_channel_credentials(
@@ -89,46 +86,4 @@ class grpc_composite_channel_credentials : public grpc_channel_credentials {
   grpc_core::RefCountedPtr<grpc_call_credentials> call_creds_;
 };
 
-// -- Composite call credentials. --
-
-class grpc_composite_call_credentials : public grpc_call_credentials {
- public:
-  using CallCredentialsList =
-      std::vector<grpc_core::RefCountedPtr<grpc_call_credentials>>;
-
-  grpc_composite_call_credentials(
-      grpc_core::RefCountedPtr<grpc_call_credentials> creds1,
-      grpc_core::RefCountedPtr<grpc_call_credentials> creds2);
-  ~grpc_composite_call_credentials() override = default;
-
-  void Orphaned() override { inner_.clear(); }
-
-  grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
-  GetRequestMetadata(grpc_core::ClientMetadataHandle initial_metadata,
-                     const GetRequestMetadataArgs* args) override;
-
-  grpc_security_level min_security_level() const override {
-    return min_security_level_;
-  }
-
-  const CallCredentialsList& inner() const { return inner_; }
-  std::string debug_string() override;
-
-  static grpc_core::UniqueTypeName Type();
-
-  grpc_core::UniqueTypeName type() const override { return Type(); }
-
- private:
-  int cmp_impl(const grpc_call_credentials* other) const override {
-    // TODO(yashykt): Check if we can do something better here
-    return grpc_core::QsortCompare(
-        static_cast<const grpc_call_credentials*>(this), other);
-  }
-
-  void push_to_inner(grpc_core::RefCountedPtr<grpc_call_credentials> creds,
-                     bool is_composite);
-  grpc_security_level min_security_level_;
-  CallCredentialsList inner_;
-};
-
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_COMPOSITE_COMPOSITE_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_COMPOSITE_COMPOSITE_CHANNEL_CREDENTIALS_H

data/src/core/{lib/security/credentials → credentials/transport}/fake/fake_credentials.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/security/credentials/fake/fake_credentials.h"
+#include "src/core/credentials/transport/fake/fake_credentials.h"
 
 #include <grpc/support/port_platform.h>
 #include <stdlib.h>
@@ -25,11 +25,11 @@
 #include <utility>
 
 #include "absl/strings/string_view.h"
+#include "src/core/call/metadata_batch.h"
+#include "src/core/credentials/transport/fake/fake_security_connector.h"
+#include "src/core/credentials/transport/security_connector.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/promise.h"
-#include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
-#include "src/core/lib/security/security_connector/security_connector.h"
-#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/util/ref_counted_ptr.h"
 
 // -- Fake transport security credentials. --
@@ -79,25 +79,3 @@ grpc_arg grpc_fake_transport_expected_targets_arg(char* expected_targets) {
       const_cast<char*>(GRPC_ARG_FAKE_SECURITY_EXPECTED_TARGETS),
       expected_targets);
 }
-
-// -- Metadata-only test credentials. --
-
-grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
-grpc_md_only_test_credentials::GetRequestMetadata(
-    grpc_core::ClientMetadataHandle initial_metadata,
-    const grpc_call_credentials::GetRequestMetadataArgs*) {
-  initial_metadata->Append(
-      key_.as_string_view(), value_.Ref(),
-      [](absl::string_view, const grpc_core::Slice&) { abort(); });
-  return grpc_core::Immediate(std::move(initial_metadata));
-}
-
-grpc_core::UniqueTypeName grpc_md_only_test_credentials::Type() {
-  static grpc_core::UniqueTypeName::Factory kFactory("MdOnlyTest");
-  return kFactory.Create();
-}
-
-grpc_call_credentials* grpc_md_only_test_credentials_create(
-    const char* md_key, const char* md_value) {
-  return new grpc_md_only_test_credentials(md_key, md_value);
-}

data/src/core/{lib/security/credentials → credentials/transport}/fake/fake_credentials.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
-#define GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_FAKE_FAKE_CREDENTIALS_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_FAKE_FAKE_CREDENTIALS_H
 
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
@@ -28,10 +28,10 @@
 #include <string>
 
 #include "absl/status/statusor.h"
+#include "src/core/credentials/transport/security_connector.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/promise/arena_promise.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/ref_counted_ptr.h"
@@ -89,36 +89,4 @@ grpc_server_credentials* grpc_fake_transport_security_server_credentials_create(
 // latter is present.
 grpc_arg grpc_fake_transport_expected_targets_arg(char* expected_targets);
 
-// --  Metadata-only Test credentials. --
-
-class grpc_md_only_test_credentials : public grpc_call_credentials {
- public:
-  grpc_md_only_test_credentials(const char* md_key, const char* md_value)
-      : grpc_call_credentials(GRPC_SECURITY_NONE),
-        key_(grpc_core::Slice::FromCopiedString(md_key)),
-        value_(grpc_core::Slice::FromCopiedString(md_value)) {}
-
-  void Orphaned() override {}
-
-  grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
-  GetRequestMetadata(grpc_core::ClientMetadataHandle initial_metadata,
-                     const GetRequestMetadataArgs* args) override;
-
-  std::string debug_string() override { return "MD only Test Credentials"; }
-
-  static grpc_core::UniqueTypeName Type();
-
-  grpc_core::UniqueTypeName type() const override { return Type(); }
-
- private:
-  int cmp_impl(const grpc_call_credentials* other) const override {
-    // TODO(yashykt): Check if we can do something better here
-    return grpc_core::QsortCompare(
-        static_cast<const grpc_call_credentials*>(this), other);
-  }
-
-  grpc_core::Slice key_;
-  grpc_core::Slice value_;
-};
-
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_CREDENTIALS_FAKE_FAKE_CREDENTIALS_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_FAKE_FAKE_CREDENTIALS_H

data/src/core/{lib/security/security_connector → credentials/transport}/fake/fake_security_connector.cc

@@ -16,7 +16,7 @@
 //
 //
 
-#include "src/core/lib/security/security_connector/fake/fake_security_connector.h"
+#include "src/core/credentials/transport/fake/fake_security_connector.h"
 
 #include <grpc/grpc_security_constants.h>
 #include <grpc/impl/channel_arg_names.h>
@@ -36,6 +36,8 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
+#include "src/core/credentials/transport/fake/fake_credentials.h"
+#include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/handshaker/handshaker.h"
 #include "src/core/handshaker/security/security_handshaker.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -46,10 +48,8 @@
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/promise/promise.h"
-#include "src/core/lib/security/context/security_context.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/credentials/fake/fake_credentials.h"
 #include "src/core/load_balancing/grpclb/grpclb.h"
+#include "src/core/transport/auth_context.h"
 #include "src/core/tsi/fake_transport_security.h"
 #include "src/core/tsi/transport_security_interface.h"
 #include "src/core/util/crash.h"

data/src/core/{lib/security/security_connector → credentials/transport}/fake/fake_security_connector.h

@@ -16,15 +16,15 @@
 //
 //
 
-#ifndef GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H
-#define GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H
+#ifndef GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_FAKE_FAKE_SECURITY_CONNECTOR_H
+#define GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_FAKE_FAKE_SECURITY_CONNECTOR_H
 #include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/port_platform.h>
 
+#include "src/core/credentials/transport/security_connector.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/security/security_connector/security_connector.h"
 #include "src/core/util/ref_counted_ptr.h"
 
 // Creates a fake connector that emulates real channel security.
@@ -39,4 +39,4 @@ grpc_core::RefCountedPtr<grpc_server_security_connector>
 grpc_fake_server_security_connector_create(
     grpc_core::RefCountedPtr<grpc_server_credentials> server_creds);
 
-#endif  // GRPC_SRC_CORE_LIB_SECURITY_SECURITY_CONNECTOR_FAKE_FAKE_SECURITY_CONNECTOR_H
+#endif  // GRPC_SRC_CORE_CREDENTIALS_TRANSPORT_FAKE_FAKE_SECURITY_CONNECTOR_H

data/src/core/{lib/security/credentials → credentials/transport}/google_default/credentials_generic.cc

@@ -23,8 +23,8 @@
 
 #include "absl/log/log.h"
 #include "absl/strings/str_cat.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/credentials/google_default/google_default_credentials.h"
+#include "src/core/credentials/call/call_credentials.h"
+#include "src/core/credentials/transport/google_default/google_default_credentials.h"
 #include "src/core/util/env.h"
 
 std::string grpc_get_well_known_google_credentials_file_path_impl(void) {