grpc 1.31.0.pre1 → 1.33.0.pre1

data/src/core/ext/filters/client_channel/xds/xds_api.h

@@ -1,345 +0,0 @@
-/*
- *
- * Copyright 2018 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.
- *
- */
-
-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_API_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_API_H
-
-#include <grpc/support/port_platform.h>
-
-#include <stdint.h>
-
-#include <set>
-
-#include "absl/container/inlined_vector.h"
-#include "absl/types/optional.h"
-
-#include <grpc/slice_buffer.h>
-
-#include "re2/re2.h"
-#include "src/core/ext/filters/client_channel/server_address.h"
-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
-
-namespace grpc_core {
-
-class XdsClient;
-
-class XdsApi {
- public:
-  static const char* kLdsTypeUrl;
-  static const char* kRdsTypeUrl;
-  static const char* kCdsTypeUrl;
-  static const char* kEdsTypeUrl;
-
-  struct RdsUpdate {
-    // TODO(donnadionne): When we can use absl::variant<>, consider using that
-    // for: PathMatcher, HeaderMatcher, cluster_name and weighted_clusters
-    struct RdsRoute {
-      // Matchers for this route.
-      struct Matchers {
-        struct PathMatcher {
-          enum class PathMatcherType {
-            PATH,    // path stored in string_matcher field
-            PREFIX,  // prefix stored in string_matcher field
-            REGEX,   // regex stored in regex_matcher field
-          };
-          PathMatcherType type;
-          std::string string_matcher;
-          std::unique_ptr<RE2> regex_matcher;
-          bool operator==(const PathMatcher& other) const {
-            if (type != other.type) return false;
-            if (type == PathMatcherType::REGEX) {
-              // Should never be null.
-              if (regex_matcher == nullptr || other.regex_matcher == nullptr) {
-                return false;
-              }
-              return regex_matcher->pattern() == other.regex_matcher->pattern();
-            }
-            return string_matcher == other.string_matcher;
-          }
-          std::string ToString() const;
-        };
-        struct HeaderMatcher {
-          enum class HeaderMatcherType {
-            EXACT,    // value stored in string_matcher field
-            REGEX,    // uses regex_match field
-            RANGE,    // uses range_start and range_end fields
-            PRESENT,  // uses present_match field
-            PREFIX,   // prefix stored in string_matcher field
-            SUFFIX,   // suffix stored in string_matcher field
-          };
-          std::string name;
-          HeaderMatcherType type;
-          int64_t range_start;
-          int64_t range_end;
-          std::string string_matcher;
-          std::unique_ptr<RE2> regex_match;
-          bool present_match;
-          // invert_match field may or may not exisit, so initialize it to
-          // false.
-          bool invert_match = false;
-          bool operator==(const HeaderMatcher& other) const {
-            return (name == other.name && type == other.type &&
-                    range_start == other.range_start &&
-                    range_end == other.range_end &&
-                    string_matcher == other.string_matcher &&
-                    present_match == other.present_match &&
-                    invert_match == other.invert_match);
-          }
-          std::string ToString() const;
-        };
-        PathMatcher path_matcher;
-        std::vector<HeaderMatcher> header_matchers;
-        absl::optional<uint32_t> fraction_per_million;
-        bool operator==(const Matchers& other) const {
-          return (path_matcher == other.path_matcher &&
-                  header_matchers == other.header_matchers &&
-                  fraction_per_million == other.fraction_per_million);
-        }
-        std::string ToString() const;
-      };
-      Matchers matchers;
-      // Action for this route.
-      std::string cluster_name;
-      struct ClusterWeight {
-        std::string name;
-        uint32_t weight;
-
-        bool operator==(const ClusterWeight& other) const {
-          return (name == other.name && weight == other.weight);
-        }
-        std::string ToString() const;
-      };
-      std::vector<ClusterWeight> weighted_clusters;
-
-      bool operator==(const RdsRoute& other) const {
-        return (matchers == other.matchers &&
-                cluster_name == other.cluster_name &&
-                weighted_clusters == other.weighted_clusters);
-      }
-      std::string ToString() const;
-    };
-
-    std::vector<RdsRoute> routes;
-
-    bool operator==(const RdsUpdate& other) const {
-      return routes == other.routes;
-    }
-    std::string ToString() const;
-  };
-
-  // TODO(roth): When we can use absl::variant<>, consider using that
-  // here, to enforce the fact that only one of the two fields can be set.
-  struct LdsUpdate {
-    // The name to use in the RDS request.
-    std::string route_config_name;
-    // The name to use in the CDS request. Present if the LDS response has it
-    // inlined.
-    absl::optional<RdsUpdate> rds_update;
-
-    bool operator==(const LdsUpdate& other) const {
-      return route_config_name == other.route_config_name &&
-             rds_update == other.rds_update;
-    }
-  };
-
-  using LdsUpdateMap = std::map<std::string /*server_name*/, LdsUpdate>;
-
-  using RdsUpdateMap = std::map<std::string /*route_config_name*/, RdsUpdate>;
-
-  struct CdsUpdate {
-    // The name to use in the EDS request.
-    // If empty, the cluster name will be used.
-    std::string eds_service_name;
-    // The LRS server to use for load reporting.
-    // If not set, load reporting will be disabled.
-    // If set to the empty string, will use the same server we obtained the CDS
-    // data from.
-    absl::optional<std::string> lrs_load_reporting_server_name;
-  };
-
-  using CdsUpdateMap = std::map<std::string /*cluster_name*/, CdsUpdate>;
-
-  class PriorityListUpdate {
-   public:
-    struct LocalityMap {
-      struct Locality {
-        bool operator==(const Locality& other) const {
-          return *name == *other.name && serverlist == other.serverlist &&
-                 lb_weight == other.lb_weight && priority == other.priority;
-        }
-
-        // This comparator only compares the locality names.
-        struct Less {
-          bool operator()(const Locality& lhs, const Locality& rhs) const {
-            return XdsLocalityName::Less()(lhs.name, rhs.name);
-          }
-        };
-
-        RefCountedPtr<XdsLocalityName> name;
-        ServerAddressList serverlist;
-        uint32_t lb_weight;
-        uint32_t priority;
-      };
-
-      bool Contains(const RefCountedPtr<XdsLocalityName>& name) const {
-        return localities.find(name) != localities.end();
-      }
-
-      size_t size() const { return localities.size(); }
-
-      std::map<RefCountedPtr<XdsLocalityName>, Locality, XdsLocalityName::Less>
-          localities;
-    };
-
-    bool operator==(const PriorityListUpdate& other) const;
-    bool operator!=(const PriorityListUpdate& other) const {
-      return !(*this == other);
-    }
-
-    void Add(LocalityMap::Locality locality);
-
-    const LocalityMap* Find(uint32_t priority) const;
-
-    bool Contains(uint32_t priority) const {
-      return priority < priorities_.size();
-    }
-    bool Contains(const RefCountedPtr<XdsLocalityName>& name);
-
-    bool empty() const { return priorities_.empty(); }
-    size_t size() const { return priorities_.size(); }
-
-    // Callers should make sure the priority list is non-empty.
-    uint32_t LowestPriority() const {
-      return static_cast<uint32_t>(priorities_.size()) - 1;
-    }
-
-   private:
-    absl::InlinedVector<LocalityMap, 2> priorities_;
-  };
-
-  // There are two phases of accessing this class's content:
-  // 1. to initialize in the control plane combiner;
-  // 2. to use in the data plane combiner.
-  // So no additional synchronization is needed.
-  class DropConfig : public RefCounted<DropConfig> {
-   public:
-    struct DropCategory {
-      bool operator==(const DropCategory& other) const {
-        return name == other.name &&
-               parts_per_million == other.parts_per_million;
-      }
-
-      std::string name;
-      const uint32_t parts_per_million;
-    };
-
-    using DropCategoryList = absl::InlinedVector<DropCategory, 2>;
-
-    void AddCategory(std::string name, uint32_t parts_per_million) {
-      drop_category_list_.emplace_back(
-          DropCategory{std::move(name), parts_per_million});
-      if (parts_per_million == 1000000) drop_all_ = true;
-    }
-
-    // The only method invoked from the data plane combiner.
-    bool ShouldDrop(const std::string** category_name) const;
-
-    const DropCategoryList& drop_category_list() const {
-      return drop_category_list_;
-    }
-
-    bool drop_all() const { return drop_all_; }
-
-    bool operator==(const DropConfig& other) const {
-      return drop_category_list_ == other.drop_category_list_;
-    }
-    bool operator!=(const DropConfig& other) const { return !(*this == other); }
-
-   private:
-    DropCategoryList drop_category_list_;
-    bool drop_all_ = false;
-  };
-
-  struct EdsUpdate {
-    PriorityListUpdate priority_list_update;
-    RefCountedPtr<DropConfig> drop_config;
-  };
-
-  using EdsUpdateMap = std::map<std::string /*eds_service_name*/, EdsUpdate>;
-
-  struct ClusterLoadReport {
-    XdsClusterDropStats::DroppedRequestsMap dropped_requests;
-    std::map<RefCountedPtr<XdsLocalityName>, XdsClusterLocalityStats::Snapshot,
-             XdsLocalityName::Less>
-        locality_stats;
-    grpc_millis load_report_interval;
-  };
-  using ClusterLoadReportMap = std::map<
-      std::pair<std::string /*cluster_name*/, std::string /*eds_service_name*/>,
-      ClusterLoadReport>;
-
-  XdsApi(XdsClient* client, TraceFlag* tracer, const XdsBootstrap::Node* node);
-
-  // Creates an ADS request.
-  // Takes ownership of \a error.
-  grpc_slice CreateAdsRequest(const std::string& type_url,
-                              const std::set<absl::string_view>& resource_names,
-                              const std::string& version,
-                              const std::string& nonce, grpc_error* error,
-                              bool populate_node);
-
-  // Parses the ADS response and outputs the validated update for either CDS or
-  // EDS. If the response can't be parsed at the top level, \a type_url will
-  // point to an empty string; otherwise, it will point to the received data.
-  grpc_error* ParseAdsResponse(
-      const grpc_slice& encoded_response,
-      const std::string& expected_server_name,
-      const std::set<absl::string_view>& expected_route_configuration_names,
-      const std::set<absl::string_view>& expected_cluster_names,
-      const std::set<absl::string_view>& expected_eds_service_names,
-      absl::optional<LdsUpdate>* lds_update,
-      absl::optional<RdsUpdate>* rds_update, CdsUpdateMap* cds_update_map,
-      EdsUpdateMap* eds_update_map, std::string* version, std::string* nonce,
-      std::string* type_url);
-
-  // Creates an LRS request querying \a server_name.
-  grpc_slice CreateLrsInitialRequest(const std::string& server_name);
-
-  // Creates an LRS request sending a client-side load report.
-  grpc_slice CreateLrsRequest(ClusterLoadReportMap cluster_load_report_map);
-
-  // Parses the LRS response and returns \a
-  // load_reporting_interval for client-side load reporting. If there is any
-  // error, the output config is invalid.
-  grpc_error* ParseLrsResponse(const grpc_slice& encoded_response,
-                               bool* send_all_clusters,
-                               std::set<std::string>* cluster_names,
-                               grpc_millis* load_reporting_interval);
-
- private:
-  XdsClient* client_;
-  TraceFlag* tracer_;
-  const XdsBootstrap::Node* node_;
-  const std::string build_version_;
-  const std::string user_agent_name_;
-};
-
-}  // namespace grpc_core
-
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_API_H */

data/src/core/ext/filters/client_channel/xds/xds_channel.h

@@ -1,46 +0,0 @@
-/*
- *
- * Copyright 2018 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.
- *
- */
-
-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_H
-
-#include <grpc/support/port_platform.h>
-
-#include <grpc/impl/codegen/grpc_types.h>
-
-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
-#include "src/core/lib/iomgr/error.h"
-
-namespace grpc_core {
-
-/// Makes any necessary modifications to \a args for use in the xds
-/// balancer channel.
-///
-/// Takes ownership of \a args.
-///
-/// Caller takes ownership of the returned args.
-grpc_channel_args* ModifyXdsChannelArgs(grpc_channel_args* args);
-
-grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,
-                               const grpc_channel_args& args,
-                               grpc_error** error);
-
-}  // namespace grpc_core
-
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_H \
-        */

data/src/core/ext/filters/client_channel/xds/xds_channel_secure.cc

@@ -1,106 +0,0 @@
-/*
- *
- * Copyright 2018 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 <grpc/support/port_platform.h>
-
-#include "src/core/ext/filters/client_channel/xds/xds_channel.h"
-
-#include <string.h>
-
-#include "absl/container/inlined_vector.h"
-
-#include <grpc/grpc_security.h>
-#include <grpc/support/alloc.h>
-#include <grpc/support/string_util.h>
-
-#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/server_address.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/iomgr/sockaddr_utils.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/credentials/fake/fake_credentials.h"
-#include "src/core/lib/security/transport/target_authority_table.h"
-#include "src/core/lib/slice/slice_internal.h"
-
-namespace grpc_core {
-
-grpc_channel_args* ModifyXdsChannelArgs(grpc_channel_args* args) {
-  absl::InlinedVector<const char*, 1> args_to_remove;
-  absl::InlinedVector<grpc_arg, 2> args_to_add;
-  // Substitute the channel credentials with a version without call
-  // credentials: the load balancer is not necessarily trusted to handle
-  // bearer token credentials.
-  grpc_channel_credentials* channel_credentials =
-      grpc_channel_credentials_find_in_args(args);
-  RefCountedPtr<grpc_channel_credentials> creds_sans_call_creds;
-  if (channel_credentials != nullptr) {
-    creds_sans_call_creds =
-        channel_credentials->duplicate_without_call_credentials();
-    GPR_ASSERT(creds_sans_call_creds != nullptr);
-    args_to_remove.emplace_back(GRPC_ARG_CHANNEL_CREDENTIALS);
-    args_to_add.emplace_back(
-        grpc_channel_credentials_to_arg(creds_sans_call_creds.get()));
-  }
-  grpc_channel_args* result = grpc_channel_args_copy_and_add_and_remove(
-      args, args_to_remove.data(), args_to_remove.size(), args_to_add.data(),
-      args_to_add.size());
-  // Clean up.
-  grpc_channel_args_destroy(args);
-  return result;
-}
-
-grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,
-                               const grpc_channel_args& args,
-                               grpc_error** error) {
-  grpc_channel_credentials* creds = nullptr;
-  RefCountedPtr<grpc_channel_credentials> creds_to_unref;
-  if (!bootstrap.server().channel_creds.empty()) {
-    for (size_t i = 0; i < bootstrap.server().channel_creds.size(); ++i) {
-      if (bootstrap.server().channel_creds[i].type == "google_default") {
-        creds = grpc_google_default_credentials_create();
-        break;
-      } else if (bootstrap.server().channel_creds[i].type == "fake") {
-        creds = grpc_fake_transport_security_credentials_create();
-        break;
-      }
-    }
-    if (creds == nullptr) {
-      *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-          "no supported credential types found");
-      return nullptr;
-    }
-    creds_to_unref.reset(creds);
-  } else {
-    creds = grpc_channel_credentials_find_in_args(&args);
-    if (creds == nullptr) {
-      // Built with security but parent channel is insecure.
-      return grpc_insecure_channel_create(bootstrap.server().server_uri.c_str(),
-                                          &args, nullptr);
-    }
-  }
-  const char* arg_to_remove = GRPC_ARG_CHANNEL_CREDENTIALS;
-  grpc_channel_args* new_args =
-      grpc_channel_args_copy_and_remove(&args, &arg_to_remove, 1);
-  grpc_channel* channel = grpc_secure_channel_create(
-      creds, bootstrap.server().server_uri.c_str(), new_args, nullptr);
-  grpc_channel_args_destroy(new_args);
-  return channel;
-}
-
-}  // namespace grpc_core