merge envoy master

.azure-pipelines/linux.yml

@@ -57,7 +57,7 @@ jobs:
       # This will run on every commit/PR and will make sure the corpus generated by the fuzzers as well as fixed crashes
       # (on Fuzzit) is not crashing envoy. This will help find bugs BEFORE merging and not after.
       fuzzit:
-        CI_TARGET: 'bazel.fuzzit_regression'
+        CI_TARGET: 'bazel.fuzzit'
   timeoutInMinutes: 360
   pool:
     vmImage: 'Ubuntu 16.04'
@@ -86,7 +86,7 @@ jobs:
     env:
       ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
       ENVOY_RBE: "true"
-      BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote --jobs=$(RbeJobs) --curses=no"
+      BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --jobs=$(RbeJobs) --curses=no"
       BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
       BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
       GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
@@ -137,39 +137,3 @@ jobs:
       CIRCLE_SHA1: $(Build.SourceVersion)
       DOCKERHUB_USERNAME: $(DockerUsername)
       DOCKERHUB_PASSWORD: $(DockerPassword)
-
-- job: fuzzit_fuzzing
-  dependsOn: [] # this removes the implicit dependency on previous stage and causes this to run in parallel.
-  timeoutInMinutes: 360
-  # this runs on every push to master / merge to master. this will build the fuzzers and will update them on Fuzzit where
-  # they will run asynchronously. Essentially this will make sure that the latest master version is always being fuzzed
-  # continuously.
-  condition: and(succeeded(), ne(variables['FuzzitApiKey'], ''), eq(variables['Build.SourceBranch'], 'refs/heads/master'), ne(variables['Build.Reason'], 'PullRequest'))
-  pool:
-    vmImage: 'Ubuntu 16.04'
-  steps:
-    - bash: |
-        echo "disk space at beginning of build:"
-        df -h
-      displayName: "Check disk space at beginning"
-
-    - bash: |
-        sudo mkdir -p /etc/docker
-        echo '{
-          "ipv6": true,
-          "fixed-cidr-v6": "2001:db8:1::/64"
-        }' | sudo tee /etc/docker/daemon.json
-        sudo service docker restart
-      displayName: "Enable IPv6"
-
-    - script: ci/run_envoy_docker.sh 'ci/do_ci.sh bazel.fuzzit_fuzzing'
-      workingDirectory: $(Build.SourcesDirectory)
-      env:
-        FUZZIT_API_KEY: $(FuzzitApiKey)
-        ENVOY_DOCKER_BUILD_DIR: $(Build.StagingDirectory)
-        ENVOY_RBE: "true"
-        BAZEL_BUILD_EXTRA_OPTIONS: "--config=remote-ci --config=remote --jobs=$(RbeJobs) --curses=no"
-        BAZEL_REMOTE_CACHE: grpcs://remotebuildexecution.googleapis.com
-        BAZEL_REMOTE_INSTANCE: projects/envoy-ci/instances/default_instance
-        GCP_SERVICE_ACCOUNT_KEY: $(GcpServiceAccountKey)
-      displayName: "Fuzzit Regression"

.azure-pipelines/windows.yml

@@ -7,15 +7,15 @@ jobs:
 - job: Windows
   timeoutInMinutes: 360
   pool:
-    vmImage: 'windows-latest'
+    vmImage: "windows-latest"
 
   steps:
-  - powershell: |
-      .\ci\windows_ci_setup.ps1
-      Write-Host "##vso[task.prependpath]$env:TOOLS_BIN_DIR"
-    displayName: 'Install dependencies'
-    env:
-      TOOLS_BIN_DIR: $(Pipeline.Workspace)\bin
+    - powershell: |
+        .\ci\windows_ci_setup.ps1
+        Write-Host "##vso[task.prependpath]$env:TOOLS_BIN_DIR"
+      displayName: "Install dependencies"
+      env:
+        TOOLS_BIN_DIR: $(Pipeline.Workspace)\bin
 
-  - powershell: .\ci\windows_ci_steps.ps1
-    displayName: 'Run Windows CI'
+    - bash: ci/windows_ci_steps.sh
+      displayName: "Run Windows CI"

.bazelci/presubmit.yml

@@ -5,12 +5,10 @@ tasks:
     build_targets:
       - "//source/exe:envoy-static"
   rbe:
-    platform: rbe_ubuntu1604
+    platform: ubuntu1804
     test_targets:
       - "//test/..."
     test_flags:
       - "--config=remote-clang"
-  macos:
-    platform: macos
-    test_targets:
-      - "//test/..."
+      - "--config=remote-ci"
+      - "--jobs=75"

.bazelrc

@@ -19,7 +19,10 @@ build --action_env=BAZEL_LINKLIBS=-l%:libstdc++.a
 build --action_env=BAZEL_LINKOPTS=-lm
 build --host_javabase=@bazel_tools//tools/jdk:remote_jdk11
 build --javabase=@bazel_tools//tools/jdk:remote_jdk11
-build --copt=-fPIC
+build --enable_platform_specific_config
+
+# Enable position independent code, this option is not supported on Windows and default on on macOS.
+build:linux --copt=-fPIC
 
 # We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
 build --define absl=1
@@ -91,8 +94,6 @@ build:clang-msan --linkopt -fsanitize=memory
 build:clang-msan --copt -fsanitize-memory-track-origins=2
 
 # Clang with libc++
-# TODO(cmluciano) fix and re-enable _LIBCPP_VERSION testing for TCMALLOC in Envoy::Stats::TestUtil::hasDeterministicMallocStats
-# and update stats_integration_test with appropriate m_per_cluster value
 build:libc++ --config=clang
 build:libc++ --action_env=CXXFLAGS=-stdlib=libc++
 build:libc++ --action_env=LDFLAGS=-stdlib=libc++
@@ -139,8 +140,15 @@ build:remote --remote_download_toplevel
 build:remote-clang --config=remote
 build:remote-clang --config=rbe-toolchain-clang
 
+build:remote-clang-libc++ --config=remote
+build:remote-clang-libc++ --config=rbe-toolchain-clang-libc++
+
+build:remote-gcc --config=remote
+build:remote-gcc --config=rbe-toolchain-gcc
+
 # Docker sandbox
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build@sha256:3ca8acc35fdb57ab26e1bb5f9488f37095f45acd77a12602510410dbefa00b58
+# NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L7
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu@sha256:3ca8acc35fdb57ab26e1bb5f9488f37095f45acd77a12602510410dbefa00b58
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
@@ -152,12 +160,18 @@ build:docker-sandbox --experimental_enable_docker_sandbox
 build:docker-clang --config=docker-sandbox
 build:docker-clang --config=rbe-toolchain-clang
 
+build:docker-clang-libc++ --config=docker-sandbox
+build:docker-clang-libc++ --config=rbe-toolchain-clang-libc++
+
+build:docker-gcc --config=docker-sandbox
+build:docker-gcc --config=rbe-toolchain-gcc
+
 # CI configurations
 build:remote-ci --remote_cache=grpcs://remotebuildexecution.googleapis.com
 build:remote-ci --remote_executor=grpcs://remotebuildexecution.googleapis.com
 
 # Fuzz builds
-build:asan-fuzzer --config=asan
+build:asan-fuzzer --config=clang-asan
 build:asan-fuzzer --define=FUZZING_ENGINE=libfuzzer
 build:asan-fuzzer --copt=-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 build:asan-fuzzer --copt=-fsanitize=fuzzer-no-link

.circleci/config.yml

@@ -10,88 +10,87 @@ executors:
     working_directory: /source
 
 jobs:
-   release:
-     executor: ubuntu-build
-     environment:
-       BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
-     steps:
-       - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
-       - checkout
-       - run:
-           environment:
-             BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=enabled" # v8 + WAVM (build only).
-           command: ci/do_circle_ci.sh bazel.release.server_only
-       - run:
-           environment:
-             BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, WAVM segfaults in tests.
-           command: ci/do_circle_ci.sh bazel.release ${BAZEL_TEST_TARGETS}
-       - store_artifacts:
-           path: /build/envoy/generated
-           destination: /
+  release:
+    executor: ubuntu-build
+    environment:
+      BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
+    steps:
+      - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
+      - checkout
+      - run:
+          environment:
+            BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=enabled" # v8 + WAVM (build only).
+          command: ci/do_circle_ci.sh bazel.release.server_only
+      - run:
+          environment:
+            BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, WAVM segfaults in tests.
+          command: ci/do_circle_ci.sh bazel.release ${BAZEL_TEST_TARGETS}
+      - store_artifacts:
+          path: /build/envoy/generated
+          destination: /
 
-   asan:
-     executor: ubuntu-build
-     environment:
-       BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, ASan detects leaks in WAVM library.
-       BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
-     steps:
-       - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
-       - checkout
-       - run: ci/do_circle_ci.sh bazel.asan ${BAZEL_TEST_TARGETS}
-       - store_artifacts:
-           path: /build/envoy/generated
-           destination: /
+  asan:
+    executor: ubuntu-build
+    environment:
+      BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, ASan detects leaks in WAVM library.
+      BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
+    steps:
+      - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
+      - checkout
+      - run: ci/do_circle_ci.sh bazel.asan ${BAZEL_TEST_TARGETS}
+      - store_artifacts:
+          path: /build/envoy/generated
+          destination: /
 
-   coverage:
-     executor: ubuntu-build
-     environment:
-       BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, LSan detects leaks in WAVM library.
-       BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
-       VALIDATE_COVERAGE: 0
-     steps:
-       - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
-       - checkout
-       - run:
-           command:
-             ci/do_circle_ci.sh bazel.coverage ${BAZEL_TEST_TARGETS}
-           no_output_timeout: 60m
-       - store_artifacts:
-           path: /build/envoy/generated
-           destination: /
+  coverage:
+    executor: ubuntu-build
+    environment:
+      BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, LSan detects leaks in WAVM library.
+      BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
+      VALIDATE_COVERAGE: 0
+    steps:
+      - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
+      - checkout
+      - run:
+          command: ci/do_circle_ci.sh bazel.coverage ${BAZEL_TEST_TARGETS}
+          no_output_timeout: 60m
+      - store_artifacts:
+          path: /build/envoy/generated
+          destination: /
 
-   format:
-     executor: ubuntu-build
-     steps:
-       - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
-       - checkout
-       - run: pip install -r tools/requirements.txt
-       - run: ci/do_circle_ci.sh check_format
-       - run: ci/do_circle_ci.sh check_repositories
-       - run: ci/do_circle_ci.sh check_spelling
-       # TODO(PiotrSikora): re-enable once fixed.
-       # - run: ci/do_circle_ci.sh check_spelling_pedantic
+  format:
+    executor: ubuntu-build
+    steps:
+      - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
+      - checkout
+      - run: pip install -r tools/requirements.txt
+      - run: ci/do_circle_ci.sh check_format
+      - run: ci/do_circle_ci.sh check_repositories
+      - run: ci/do_circle_ci.sh check_spelling
+      # TODO(PiotrSikora): re-enable once fixed.
+      # - run: ci/do_circle_ci.sh check_spelling_pedantic
 
-   macos:
-     macos:
-       xcode: "11.0.0"
-     environment:
-       BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, WAVM segfaults in tests.
-       BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
-       CC: clang
-       CXX: clang++
-     steps:
-       - run: sudo sntp -sS time.apple.com
-       - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
-       - checkout
-       - restore_cache:
-           keys:
-             - macos-bazel-cache-{{ checksum "bazel/repository_locations.bzl" }}
-       - run: ci/mac_ci_setup.sh
-       - run: ci/mac_ci_steps.sh ${BAZEL_TEST_TARGETS}
-       - save_cache:
-           key: macos-bazel-cache-{{ checksum "bazel/repository_locations.bzl" }}
-           paths:
-             - /private/var/tmp/_bazel_distiller/
+  macos:
+    macos:
+      xcode: "11.0.0"
+    environment:
+      BAZEL_BUILD_EXTRA_OPTIONS: "--define wasm=v8" # v8 only, WAVM segfaults in tests.
+      BAZEL_TEST_TARGETS: "//test/extensions/access_loggers/wasm/... //test/extensions/filters/http/wasm/... //test/extensions/wasm/... //test/extensions/common/wasm/..."
+      CC: clang
+      CXX: clang++
+    steps:
+      - run: sudo sntp -sS time.apple.com
+      - run: rm -rf /home/circleci/project/.git # CircleCI git caching is likely broken
+      - checkout
+      - restore_cache:
+          keys:
+            - macos-bazel-cache-{{ checksum "bazel/repository_locations.bzl" }}
+      - run: ci/mac_ci_setup.sh
+      - run: ci/mac_ci_steps.sh ${BAZEL_TEST_TARGETS}
+      - save_cache:
+          key: macos-bazel-cache-{{ checksum "bazel/repository_locations.bzl" }}
+          paths:
+            - /private/var/tmp/_bazel_distiller/
 
 workflows:
   version: 2

.clang-tidy

@@ -66,6 +66,9 @@ CheckOptions:
   - key:             readability-identifier-naming.EnumCase
     value:           'CamelCase'
 
+  - key:             readability-identifier-naming.EnumConstantCase
+    value:           'CamelCase'
+
   - key:             readability-identifier-naming.ParameterCase
     value:           'lower_case'
 

VERSION

@@ -1 +1 @@
-1.12.0
+1.13.0-dev

api/bazel/repository_locations.bzl

@@ -4,8 +4,8 @@ BAZEL_SKYLIB_SHA256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc70
 OPENCENSUS_PROTO_GIT_SHA = "5cec5ea58c3efa81fa808f2bd38ce182da9ee731"  # Jul 25, 2019
 OPENCENSUS_PROTO_SHA256 = "faeb93f293ff715b0cb530d273901c0e2e99277b9ed1c0a0326bca9ec5774ad2"
 
-PGV_GIT_SHA = "fd7de029969b7c0ef8b754660b997399b6fd812a"  # Sep 4, 2019
-PGV_SHA256 = "55c6ad4a1b405938524ab55b18349c824d3fc6eaef580e1ef2a9dfe39f737b9e"
+PGV_GIT_SHA = "a18376249eb51cdd517f67fe8703897322812e6d"  # Nov 5, 2019
+PGV_SHA256 = "8e45a3582e7fa9d0005ad6ff1ed9208e793b847f1c455d2bbe5b1c580338ffaf"
 
 GOOGLEAPIS_GIT_SHA = "be480e391cc88a75cf2a81960ef79c80d5012068"  # Jul 24, 2019
 GOOGLEAPIS_SHA = "c1969e5b72eab6d9b6cfcff748e45ba57294aeea1d96fd04cd081995de0605c2"