Applied latest changes of ApiManager (#203)

* Applied latest changes of ApiManager * Removed unnecessary codes * Removed unnecessary codes * Removed empty lines
cloudendpoints · Jun 22, 2017 · 4ec6cb5 · 4ec6cb5
1 parent ebc8cad
commit 4ec6cb5
Show file tree

Hide file tree

Showing 7 changed files with 422 additions and 17 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -26,7 +26,7 @@
 #
 # A Bazel (http://bazel.io) workspace for the Google Cloud Endpoints runtime.
 
-ISTIO_PROXY = "d07998ec42b5fe410d7d299ffd4579801ff6c705"
+ISTIO_PROXY = "b129798546b499db2966921f4ba4dc53bb56bd5c"
 ESP_TOOL = "ff0d6df7f56ca1c2b229aaadd8abe62cb1d508fb"
 
 git_repository(

diff --git a/src/nginx/config.cc b/src/nginx/config.cc
@@ -573,8 +573,10 @@ ngx_int_t ngx_esp_build_server_config(ngx_conf_t *cf, ngx_esp_loc_conf_t *lc,
   // the config file from nginx config will override the ones from
   // server_config.
   if (lc->endpoints_config.len > 0) {
-    auto init_service_configs = config.mutable_init_service_configs();
-    init_service_configs->Clear();
+    auto service_config_rollout = config.mutable_service_config_rollout();
+    auto traffic_percentages =
+        service_config_rollout->mutable_traffic_percentages();
+    traffic_percentages->clear();
 
     ngx_str_t file_name = lc->endpoints_config;
     if (ngx_conf_full_name(cf->cycle, &file_name, 1) != NGX_OK) {
@@ -585,10 +587,7 @@ ngx_int_t ngx_esp_build_server_config(ngx_conf_t *cf, ngx_esp_loc_conf_t *lc,
       return NGX_ERROR;
     }
 
-    auto service_config = init_service_configs->Add();
-    service_config->set_service_config_file_full_path(
-        ngx_str_to_std(file_name));
-    service_config->set_traffic_percentage(100.0);
+    (*traffic_percentages)[ngx_str_to_std(file_name)] = 100.0;
   }
 
   // Reserialize

diff --git a/src/nginx/module.cc b/src/nginx/module.cc
@@ -427,6 +427,14 @@ ngx_int_t ngx_esp_postconfiguration(ngx_conf_t *cf) {
         return NGX_ERROR;
       }
 
+      // Verify service configs loading status.
+      if (!lc->esp->LoadServiceRollouts().ok()) {
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "Failed to load service configuration files");
+        handle_endpoints_config_error(cf, lc);
+        return NGX_ERROR;
+      }
+
       // Verify we have service name.
       if (lc->esp->service_name().empty()) {
         ngx_conf_log_error(

diff --git a/src/nginx/t/BUILD b/src/nginx/t/BUILD
@@ -183,6 +183,7 @@ nginx_suite(
         "check_with_token.t",
         "config_extra_field.t",
         "config_missing.t",
+        "config_rollouts_managed.t",
         "cors.t",
         "cors_disabled.t",
         "fail_wrong_api_key.t",