Update Envoy to a2ebf092025e64f1b452a8bdaef13795677bceef (#2027)

Signed-off-by: Otto van der Schaaf <[email protected]>

Author: oschaaf

.bazelrc

@@ -270,11 +270,7 @@ build:plain-fuzzer --define=FUZZING_ENGINE=libfuzzer
 build:plain-fuzzer --define ENVOY_CONFIG_ASAN=1
 
 # Compile database generation config
-# We don't care about built binaries so always strip and use fastbuild.
-build:compdb -c fastbuild
-build:compdb --strip=always
 build:compdb --build_tag_filters=-nocompdb
-build:compdb --define=ENVOY_CONFIG_COMPILATION_DATABASE=1
 
 # Windows build quirks
 build:windows --action_env=TMPDIR

bazel/repositories.bzl

@@ -13,7 +13,7 @@ load(":aprutil.bzl", "aprutil_build_rule")
 load(":serf.bzl", "serf_build_rule")
 load(":closure_compiler.bzl", "closure_library_rules")
 
-ENVOY_COMMIT = "a2ebf092025e64f1b452a8bdaef13795677bceef"  # July 31st, 2020
+ENVOY_COMMIT = "c2b0d37ca5b40b71ce48984f2cf5984297b79a71"  # August 5th, 2020
 BROTLI_COMMIT = "d6d98957ca8ccb1ef45922e978bb10efca0ea541"
 HIREDIS_COMMIT = "0.14.1"  # July 24th, 2020
 JSONCPP_COMMIT = "1.9.3"  # July 24th, 2020
@@ -44,7 +44,7 @@ def mod_pagespeed_dependencies():
         name = "envoy",
         strip_prefix = "envoy-%s" % ENVOY_COMMIT,
         url = "https://github.com/envoyproxy/envoy/archive/%s.tar.gz" % ENVOY_COMMIT,
-        sha256 = "1fcb9ffa174e4d3d65c9c8b2805d9b4470c18051c60c0e80631d3e534ef0c6ab",
+        sha256 = "4877904623560ada549b92fd117c94727b3226a5482631a16d33a20ba19d5d23",
     )
 
     http_archive(

extensions_build_config.bzl

@@ -5,3 +5,8 @@ EXTENSIONS = {
     "envoy.filters.network.http_connection_manager": "//source/extensions/filters/network/http_connection_manager:config",
     "envoy.transport_sockets.raw_buffer": "//source/extensions/transport_sockets/raw_buffer:config",
 }
+
+# This can be used to extend the visibility rules for Envoy extensions
+# (//:extension_config and //:extension_library in //BUILD)
+# if downstream Envoy builds need to directly reference envoy extensions.
+ADDITIONAL_VISIBILITY = []

tools/gen_compilation_database.py

@@ -5,33 +5,25 @@
 import argparse
 import glob
 import json
+import logging
 import os
 import shlex
 import subprocess
 from pathlib import Path
 
 
-def runBazelBuildForCompilationDatabase(bazel_options, bazel_targets):
-  query = 'attr(include_prefix, ".+", kind(cc_library, deps({})))'.format(
-      ' union '.join(bazel_targets))
-  build_targets = subprocess.check_output(["bazel", "query", query]).decode().splitlines()
-  subprocess.check_call(["bazel", "build"] + bazel_options + build_targets)
-
-
 # This method is equivalent to https://github.com/grailbio/bazel-compilation-database/blob/master/generate.sh
 def generateCompilationDatabase(args):
-  # We need to download all remote outputs for generated source code, we don't care about built
-  # binaries so just always strip and use dynamic link to minimize download size.
+  # We need to download all remote outputs for generated source code. This option lives here to override those
+  # specified in bazelrc.
   bazel_options = shlex.split(os.environ.get("BAZEL_BUILD_OPTIONS", "")) + [
-      "-c", "fastbuild", "--build_tag_filters=-manual",
-      "--experimental_remote_download_outputs=all", "--strip=always"
+      "--config=compdb",
+      "--remote_download_outputs=all",
   ]
-  if args.run_bazel_build:
-    runBazelBuildForCompilationDatabase(bazel_options, args.bazel_targets)
 
   subprocess.check_call(["bazel", "build"] + bazel_options + [
       "--aspects=@bazel_compdb//:aspects.bzl%compilation_database_aspect",
-      "--output_groups=compdb_files"
+      "--output_groups=compdb_files,header_files"
   ] + args.bazel_targets)
 
   execroot = subprocess.check_output(["bazel", "info", "execution_root"] +
@@ -83,6 +75,9 @@ def modifyCompileCommand(target, args):
   if isHeader(target["file"]):
     options += " -Wno-pragma-once-outside-header -Wno-unused-const-variable"
     options += " -Wno-unused-function"
+    if not target["file"].startswith("external/"):
+      # *.h file is treated as C header by default while our headers files are all C++17.
+      options = "-x c++ -std=c++17 -fexceptions " + options
 
   target["command"] = " ".join([cc, options])
   return target
@@ -97,14 +92,11 @@ def fixCompilationDatabase(args, db):
 
 if __name__ == "__main__":
   parser = argparse.ArgumentParser(description='Generate JSON compilation database')
-  parser.add_argument('--run_bazel_build', action='store_true')
   parser.add_argument('--include_external', action='store_true')
   parser.add_argument('--include_genfiles', action='store_true')
   parser.add_argument('--include_headers', action='store_true')
   parser.add_argument('--vscode', action='store_true')
   # @@@
-  parser.add_argument('bazel_targets',
-                      nargs='*',
-                      default=["//..."])
+  parser.add_argument('bazel_targets', nargs='*', default=["//..."])
   args = parser.parse_args()
   fixCompilationDatabase(args, generateCompilationDatabase(args))