Merge from master to firebase

.travis.yml

@@ -1,25 +1,27 @@
 sudo: required
-dist: xenial
+
+dist: trusty
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.9
+    - g++-4.9
+    - wget
 
 branches:
   except:
   - stable
 
-lang: go
-
-go:
-  - 1.7.x
+language: cpp
 
 jdk:
   - oraclejdk8
 
 env:
-  - BAZEL_VERSION=0.4.3
-
-addons:
-  apt:
-    packages:
-      - wget
+  - BAZEL_VERSION=0.4.5
 
 cache:
   directories:
@@ -35,12 +37,12 @@ before_install:
   - sudo dpkg -i bazel_${BAZEL_VERSION}-linux-x86_64.deb
   - sudo apt-get -f install -qqy uuid-dev
   - cd ${TRAVIS_BUILD_DIR}
-  - mv .bazelrc .bazelrc.orig
-  - cat .bazelrc.travis .bazelrc.orig > .bazelrc
+  - mv tools/bazel.rc tools/bazel.rc.orig
+  - cat tools/bazel.rc.travis tools/bazel.rc.orig > tools/bazel.rc
 
 script:
   - script/check-style
-  - bazel --output_base=${HOME}/bazel/outbase test //...
+  - CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 bazel --output_base=${HOME}/bazel/outbase test //...
 
 notifications:
   slack: istio-dev:wEEEbaabdP5ieCgDOFetA9nX

BUILD

@@ -24,3 +24,7 @@ config_setting(
     },
     visibility = ["//visibility:public"],
 )
+
+load("@io_bazel_rules_go//go:def.bzl", "go_prefix")
+
+go_prefix("istio.io/proxy")

CONTRIBUTING.md

@@ -1,37 +1,5 @@
-# Contributing guidelines
+# Contribution guidelines
 
-So, you want to hack on the Istio Proxy? Yay!
-
-- [Contributor license agreements](#contributor-license-agreements)
-- [Contributing a patch](#contributing-a-patch)
-
-## Contributor license agreements
-
-We'd love to accept your patches! Before we can take them, you have to jump a
-few legal hurdles.
-
-Please fill out the [Google CLA](https://cla.developers.google.com).
-
-Once you are CLA'ed, we'll be able to accept your pull requests. This is necessary
-because you own the copyright to your changes, even after your contribution
-becomes part of this project. So this agreement simply gives us permission
-to use and redistribute your contributions as part of the project.
-
-***NOTE***: Only original source code from you and other people that have
-signed the CLA can be accepted into the repository. This policy does not
-apply to [third_party](third_party/) and [vendor](vendor/).
-
-## Contributing a patch
-
-If you're working on an existing issue, simply respond to the issue and express
-interest in working on it. This helps other people know that the issue is
-active, and hopefully prevents duplicated efforts.
-
-If you want to work on a new idea of relatively small scope:
-
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owners will respond to your issue promptly.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the repo, develop, and test your changes.
-1. Submit a pull request.
+So, you want to hack on the Istio proxy? Yay! Please refer to Istio's overall
+[contribution guidelines](https://github.com/istio/istio/blob/master/CONTRIBUTING.md)
+to find out how you can help.

Jenkinsfile

@@ -1,6 +1,6 @@
 #!groovy
 
-@Library('testutils')
+@Library('testutils@stable-3e4d089')
 
 import org.istio.testutils.Utilities
 import org.istio.testutils.GitUtilities
@@ -12,20 +12,17 @@ def utils = new Utilities()
 def bazel = new Bazel()
 
 mainFlow(utils) {
-  pullRequest(utils) {
-    node {
-      gitUtils.initialize()
-      // Proxy does build work correctly with Hazelcast.
-      // Must use .bazelrc.jenkins
-      bazel.setVars('', '')
-    }
-
-    if (utils.runStage('PRESUBMIT')) {
-      presubmit(gitUtils, bazel)
-    }
-    if (utils.runStage('POSTSUBMIT')) {
-      postsubmit(gitUtils, bazel, utils)
-    }
+  node {
+    gitUtils.initialize()
+    // Proxy does build work correctly with Hazelcast.
+    // Must use .bazelrc.jenkins
+    bazel.setVars('', '')
+  }
+  if (utils.runStage('PRESUBMIT')) {
+    presubmit(gitUtils, bazel)
+  }
+  if (utils.runStage('POSTSUBMIT')) {
+    postsubmit(gitUtils, bazel, utils)
   }
 }
 
@@ -62,4 +59,4 @@ def postsubmit(gitUtils, bazel, utils) {
       utils.publishDockerImages(images, tags, 'release')
     }
   }
-}
+}

README.md

@@ -22,12 +22,7 @@ Server Side Features:
 
 - *Monitoring & Logging*. The Proxy can report server-side metrics and logs to the Mixer.
 
-To learn more...
-
-- User guide coming soon!
-- [Contributing to the project](./CONTRIBUTING.md)
-
-### Filing issues
-
-If you have a question about an Istio proxy or have a problem using one, please
-[file an issue](https://github.com/istio/proxy/issues/new).
+Please see [istio.io](https://istio.io)
+to learn about the overall Istio project and how to get in touch with us. To learn how you can
+contribute to any of the Istio components, including the proxy, please 
+see the Istio [contribution guidelines](https://github.com/istio/istio/blob/master/CONTRIBUTING.md).

WORKSPACE

@@ -96,3 +96,19 @@ http_file(
     url = "https://storage.googleapis.com/istio-build/manager/ubuntu_xenial_debug-" + DEBUG_BASE_IMAGE_SHA + ".tar.gz",
     sha256 = DEBUG_BASE_IMAGE_SHA,
 )
+
+# Following go repositories are for building go integration test for mixer filter.
+git_repository(
+    name = "io_bazel_rules_go",
+    commit = "2d9f328a9723baf2d037ba9db28d9d0e30683938", # Apr 6, 2017 (buildifier fix)
+    remote = "https://github.com/bazelbuild/rules_go.git",
+)
+
+git_repository(
+    name = "org_pubref_rules_protobuf",
+    commit = "d42e895387c658eda90276aea018056fcdcb30e4", # Mar 07 2017 (gogo* support)
+    remote = "https://github.com/pubref/rules_protobuf",
+)
+
+load("//src/envoy/mixer/integration_test:repositories.bzl", "go_mixer_repositories")
+go_mixer_repositories()

contrib/endpoints/include/api_manager/method.h

@@ -89,6 +89,10 @@ class MethodInfo {
 
   // Get the names of url system parameters
   virtual const std::set<std::string> &system_query_parameter_names() const = 0;
+
+  // Get quota metric cost vector
+  virtual const std::vector<std::pair<std::string, int>> &metric_cost_vector()
+      const = 0;
 };
 
 }  // namespace api_manager

contrib/endpoints/repositories.bzl

@@ -214,7 +214,7 @@ def googleapis_repositories(protobuf_repo="@protobuf_git//", bind=True):
 
 licenses(["notice"])
 
-load("{}:protobuf.bzl", "cc_proto_library")
+load("@protobuf_git//:protobuf.bzl", "cc_proto_library")
 
 exports_files(glob(["google/**"]))
 
@@ -254,16 +254,18 @@ cc_proto_library(
         "google/api/control.proto",
         "google/api/documentation.proto",
         "google/api/endpoint.proto",
-        "google/api/experimental/authorization_config.proto",
-        "google/api/experimental/experimental.proto",
         "google/api/http.proto",
         "google/api/label.proto",
         "google/api/log.proto",
         "google/api/logging.proto",
         "google/api/metric.proto",
+        "google/api/experimental/experimental.proto",
+        "google/api/experimental/authorization_config.proto",
         "google/api/monitored_resource.proto",
         "google/api/monitoring.proto",
+        "google/api/quota.proto",
         "google/api/service.proto",
+        "google/api/source_info.proto",
         "google/api/system_parameter.proto",
         "google/api/usage.proto",
     ],
@@ -292,10 +294,9 @@ cc_proto_library(
 )
 """.format(protobuf_repo)
 
-
     native.new_git_repository(
         name = "googleapis_git",
-        commit = "412867fb105722fb9d2cd9af90af1f8f120de238",
+        commit = "2fe0050bd2a6d4c6ba798c0311f0b149b8997314",
         remote = "https://github.com/googleapis/googleapis.git",
         build_file_content = BUILD,
     )
@@ -326,7 +327,7 @@ def servicecontrol_client_repositories(bind=True):
 
     native.git_repository(
         name = "servicecontrol_client_git",
-        commit = "d739d755365c6a13d0b4164506fd593f53932f5d",
+        commit = "3d1a30d9221e700542eeaaf20eab69faddb63894",
         remote = "https://github.com/cloudendpoints/service-control-client-cxx.git",
     )
 
@@ -335,3 +336,11 @@ def servicecontrol_client_repositories(bind=True):
             name = "servicecontrol_client",
             actual = "@servicecontrol_client_git//:service_control_client_lib",
         )
+        native.bind(
+            name = "quotacontrol",
+            actual = "@servicecontrol_client_git//proto:quotacontrol",
+        )
+        native.bind(
+            name = "quotacontrol_genproto",
+            actual = "@servicecontrol_client_git//proto:quotacontrol_genproto",
+        )

contrib/endpoints/src/api_manager/BUILD

@@ -96,6 +96,8 @@ cc_library(
         "method_impl.cc",
         "path_matcher.cc",
         "path_matcher_node.cc",
+        "quota_control.cc",
+        "quota_control.h",
         "request_handler.cc",
     ],
     linkopts = select({

contrib/endpoints/src/api_manager/auth/service_account_token.h

@@ -68,6 +68,7 @@ class ServiceAccountToken {
 
     // JWT token for accessing the http endpoints defined in Firebase Rules.
     JWT_TOKEN_FOR_AUTHORIZATION_SERVICE,
+    JWT_TOKEN_FOR_QUOTA_CONTROL,
     JWT_TOKEN_TYPE_MAX,
   };
   // Set audience.  Only calcualtes JWT token with specified audience.

contrib/endpoints/src/api_manager/check_workflow.cc

@@ -19,6 +19,7 @@
 #include "contrib/endpoints/src/api_manager/check_security_rules.h"
 #include "contrib/endpoints/src/api_manager/check_service_control.h"
 #include "contrib/endpoints/src/api_manager/fetch_metadata.h"
+#include "contrib/endpoints/src/api_manager/quota_control.h"
 
 using ::google::api_manager::utils::Status;
 
@@ -36,6 +37,8 @@ void CheckWorkflow::RegisterAll() {
   Register(CheckServiceControl);
   // Check Security Rules.
   Register(CheckSecurityRules);
+  // Quota control
+  Register(QuotaControl);
 }
 
 void CheckWorkflow::Register(CheckHandler handler) {

contrib/endpoints/src/api_manager/config.cc

@@ -113,6 +113,23 @@ MethodInfoImpl *Config::GetOrCreateMethodInfoImpl(const string &name,
   return i->second.get();
 }
 
+bool Config::LoadQuotaRule(ApiManagerEnvInterface *env) {
+  for (const auto &rule : service_.quota().metric_rules()) {
+    auto method = utils::FindOrNull(method_map_, rule.selector());
+    if (method) {
+      for (auto &metric_cost : rule.metric_costs()) {
+        (*method)->add_metric_cost(metric_cost.first, metric_cost.second);
+      }
+    } else {
+      env->LogError("Metric rule with selector " + rule.selector() +
+                    "is mismatched.");
+      return false;
+    }
+  }
+
+  return true;
+}
+
 bool Config::LoadHttpMethods(ApiManagerEnvInterface *env,
                              PathMatcherBuilder *pmb) {
   std::set<std::string> all_urls, urls_with_options;
@@ -443,6 +460,9 @@ std::unique_ptr<Config> Config::Create(ApiManagerEnvInterface *env,
   if (!config->LoadBackends(env)) {
     return nullptr;
   }
+  if (!config->LoadQuotaRule(env)) {
+    return nullptr;
+  }
   return config;
 }
 

contrib/endpoints/src/api_manager/config.h

@@ -25,6 +25,7 @@
 #include "contrib/endpoints/src/api_manager/method_impl.h"
 #include "contrib/endpoints/src/api_manager/path_matcher.h"
 #include "contrib/endpoints/src/api_manager/proto/server_config.pb.h"
+#include "google/api/quota.pb.h"
 #include "google/api/service.pb.h"
 
 namespace google {
@@ -113,6 +114,8 @@ class Config {
   // Load SystemParameters info to MethodInfo.
   bool LoadSystemParameters(ApiManagerEnvInterface *env);
 
+  bool LoadQuotaRule(ApiManagerEnvInterface *env);
+
   // Gets the MethodInfoImpl creating it if necessary
   MethodInfoImpl *GetOrCreateMethodInfoImpl(const std::string &name,
                                             const std::string &api_name,