Merge latest changes from master

.travis.yml

@@ -1,6 +1,10 @@
 sudo: required
 dist: xenial
 
+branches:
+  except:
+  - stable
+
 lang: go
 
 go:

script/release-binary

@@ -36,12 +36,11 @@ gsutil stat "${DST}/${BINARY_NAME}" \
   || echo 'Building a new binary.'
 
 # Build the binary
-bazel build --config=release //src/envoy/mixer:envoy_tar
+bazel build -c dbg //src/envoy/mixer:envoy_tar
 BAZEL_TARGET="bazel-bin/src/envoy/mixer/envoy_tar.tar.gz"
-ln "${BAZEL_TARGET}" "${BINARY_NAME}"
+cp -f "${BAZEL_TARGET}" "${BINARY_NAME}"
 sha256sum "${BINARY_NAME}" > "${SHA256_NAME}"
 
 # Copy it to the bucket.
 echo "Copying ${BINARY_NAME} ${SHA256_NAME} to ${DST}/"
 gsutil cp "${BINARY_NAME}" "${SHA256_NAME}" "${DST}/"
-

src/envoy/mixer/http_control.cc

@@ -38,12 +38,6 @@ const std::string kAttrNameResponseTime = "response.time";
 const std::string kAttrNameOriginIp = "origin.ip";
 const std::string kAttrNameOriginHost = "origin.host";
 
-const std::string kEnvNameSourceService = "SOURCE_SERVICE";
-const std::string kEnvNameTargetService = "TARGET_SERVICE";
-
-const std::string kAttrNameSourceService = "source.service";
-const std::string kAttrNameTargetService = "target.service";
-
 Attributes::Value StringValue(const std::string& str) {
   Attributes::Value v;
   v.type = Attributes::Value::STRING;
@@ -134,27 +128,21 @@ void FillRequestInfoAttributes(const AccessLog::RequestInfo& info,
 
 }  // namespace
 
-HttpControl::HttpControl(const std::string& mixer_server) {
+HttpControl::HttpControl(const std::string& mixer_server,
+                         std::map<std::string, std::string>&& attributes)
+    : config_attributes_(std::move(attributes)) {
   ::istio::mixer_client::MixerClientOptions options;
   options.mixer_server = mixer_server;
   mixer_client_ = ::istio::mixer_client::CreateMixerClient(options);
-
-  auto source_service = getenv(kEnvNameSourceService.c_str());
-  if (source_service) {
-    source_service_ = source_service;
-  }
-  auto target_service = getenv(kEnvNameTargetService.c_str());
-  if (target_service) {
-    target_service_ = target_service;
-  }
 }
 
 void HttpControl::FillCheckAttributes(const HeaderMap& header_map,
                                       Attributes* attr) {
   FillRequestHeaderAttributes(header_map, attr);
 
-  SetStringAttribute(kAttrNameSourceService, source_service_, attr);
-  SetStringAttribute(kAttrNameTargetService, target_service_, attr);
+  for (const auto& attribute : config_attributes_) {
+    SetStringAttribute(attribute.first, attribute.second, attr);
+  }
 }
 
 void HttpControl::Check(HttpRequestDataPtr request_data, HeaderMap& headers,

src/envoy/mixer/http_control.h

@@ -37,7 +37,8 @@ typedef std::shared_ptr<HttpRequestData> HttpRequestDataPtr;
 class HttpControl final : public Logger::Loggable<Logger::Id::http> {
  public:
   // The constructor.
-  HttpControl(const std::string& mixer_server);
+  HttpControl(const std::string& mixer_server,
+              std::map<std::string, std::string>&& attributes);
 
   // Make mixer check call.
   void Check(HttpRequestDataPtr request_data, HeaderMap& headers,
@@ -55,10 +56,8 @@ class HttpControl final : public Logger::Loggable<Logger::Id::http> {
 
   // The mixer client
   std::unique_ptr<::istio::mixer_client::MixerClient> mixer_client_;
-  // Source service
-  std::string source_service_;
-  // Target service
-  std::string target_service_;
+  // The attributes read from the config file.
+  std::map<std::string, std::string> config_attributes_;
 };
 
 }  // namespace Mixer

src/envoy/mixer/http_filter.cc

@@ -96,7 +96,15 @@ class Config : public Logger::Loggable<Logger::Id::http> {
           __func__);
     }
 
-    http_control_ = std::make_shared<HttpControl>(mixer_server);
+    std::map<std::string, std::string> attributes;
+    if (config.hasObject("attributes")) {
+      for (const std::string& attr : config.getStringArray("attributes")) {
+        attributes[attr] = config.getString(attr);
+      }
+    }
+
+    http_control_ =
+        std::make_shared<HttpControl>(mixer_server, std::move(attributes));
     log().debug("Called Mixer::Config contructor with mixer_server: ",
                 mixer_server);
   }

src/envoy/repositories.bzl

@@ -629,6 +629,6 @@ cc_test(
     native.new_git_repository(
         name = "envoy_git",
         remote = "https://github.com/lyft/envoy.git",
-        commit = "02c6fc97b4c21d25ab596a25208fbe283e927f6a",
+        commit = "fa1d9680d809668fef2ec9386769c79486029f04",
         build_file_content = BUILD,
     )