Merge branch 'master' into behavior-on-invalid-http-message

Signed-off-by: Erica Manno <[email protected]>

.azure-pipelines/pipelines.yml

@@ -123,8 +123,7 @@ jobs:
 
   - job: docker
     displayName: "Linux multi-arch docker"
-    dependsOn: ["release","release_arm64"]
-    condition: and(succeeded(), eq(variables['PostSubmit'], 'true'), ne(variables['Build.Reason'], 'PullRequest'))
+    dependsOn: ["release", "release_arm64"]
     pool:
       vmImage: "ubuntu-18.04"
     steps:
@@ -153,6 +152,11 @@ jobs:
           AZP_SHA1: $(Build.SourceVersion)
           DOCKERHUB_USERNAME: $(DockerUsername)
           DOCKERHUB_PASSWORD: $(DockerPassword)
+      - task: PublishBuildArtifacts@1
+        inputs:
+          pathtoPublish: "$(Build.StagingDirectory)/build_images"
+          artifactName: docker
+        condition: always()
 
   - job: macOS
     dependsOn: ["format"]

.bazelrc

@@ -23,6 +23,8 @@ build --enable_platform_specific_config
 build:linux --copt=-fPIC
 build:linux --cxxopt=-std=c++17
 build:linux --conlyopt=-fexceptions
+build:linux --fission=dbg,opt
+build:linux --features=per_object_debug_info
 
 # We already have absl in the build, define absl=1 to tell googletest to use absl for backtrace.
 build --define absl=1
@@ -182,6 +184,11 @@ build:rbe-toolchain-msvc-cl --platforms=@rbe_windows_msvc_cl//config:platform
 build:rbe-toolchain-msvc-cl --crosstool_top=@rbe_windows_msvc_cl//cc:toolchain
 build:rbe-toolchain-msvc-cl --extra_toolchains=@rbe_windows_msvc_cl//config:cc-toolchain
 
+build:rbe-toolchain-clang-cl --host_platform=@rbe_windows_clang_cl//config:platform
+build:rbe-toolchain-clang-cl --platforms=@rbe_windows_clang_cl//config:platform
+build:rbe-toolchain-clang-cl --crosstool_top=@rbe_windows_clang_cl//cc:toolchain
+build:rbe-toolchain-clang-cl --extra_toolchains=@rbe_windows_clang_cl//config:cc-toolchain
+
 build:remote --spawn_strategy=remote,sandboxed,local
 build:remote --strategy=Javac=remote,sandboxed,local
 build:remote --strategy=Closure=remote,sandboxed,local
@@ -213,11 +220,16 @@ build:remote-msan --config=rbe-toolchain-clang-libc++
 build:remote-msan --config=rbe-toolchain-msan
 
 build:remote-msvc-cl --config=remote-windows
+build:remote-msvc-cl --config=msvc-cl
 build:remote-msvc-cl --config=rbe-toolchain-msvc-cl
 
+build:remote-clang-cl --config=remote-windows
+build:remote-clang-cl --config=clang-cl
+build:remote-clang-cl --config=rbe-toolchain-clang-cl
+
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:923df85a4ba7f30dcd0cb6b0c6d8d604f0e20f48
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:f741613fc395cc489a630122eeb5e611b3cb1a5e
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker

.circleci/config.yml

@@ -5,7 +5,7 @@ executors:
     description: "A regular build executor based on ubuntu image"
     docker:
       # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/master/toolchains/rbe_toolchains_config.bzl#L8
-      - image: envoyproxy/envoy-build-ubuntu:923df85a4ba7f30dcd0cb6b0c6d8d604f0e20f48
+      - image: envoyproxy/envoy-build-ubuntu:f741613fc395cc489a630122eeb5e611b3cb1a5e
     resource_class: xlarge
     working_directory: /source
 

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:923df85a4ba7f30dcd0cb6b0c6d8d604f0e20f48
+FROM gcr.io/envoy-ci/envoy-build:f741613fc395cc489a630122eeb5e611b3cb1a5e
 
 ARG USERNAME=vscode
 ARG USER_UID=501

.gitignore

@@ -1,6 +1,7 @@
 /bazel-*
 BROWSE
 /build
+/build_*
 *.bzlc
 .cache
 .clangd
@@ -34,3 +35,4 @@ user.bazelrc
 CMakeLists.txt
 cmake-build-debug
 /linux
+bazel.output.txt

CODEOWNERS

@@ -133,3 +133,5 @@ extensions/upstreams/http @alyssawilk @snowp @mattklein123
 extensions/upstreams/http/http @alyssawilk @snowp @mattklein123
 extensions/upstreams/http/tcp @alyssawilk @mattklein123
 extensions/upstreams/http/default @alyssawilk @snowp @mattklein123
+# OAuth2
+extensions/filters/http/oauth2 @rgs1 @derekargueta @snowp

CONTRIBUTING.md

@@ -344,7 +344,7 @@ should only be done to correct a DCO mistake.
 
 ## Triggering CI re-run without making changes
 
-To rerun failed tasks in CI, add a comment with the the line
+To rerun failed tasks in CI, add a comment with the line
 
 ```
 /retest

api/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
@@ -190,6 +190,7 @@ proto_library(
         "//envoy/extensions/filters/http/ip_tagging/v3:pkg",
         "//envoy/extensions/filters/http/jwt_authn/v3:pkg",
         "//envoy/extensions/filters/http/lua/v3:pkg",
+        "//envoy/extensions/filters/http/oauth2/v3alpha:pkg",
         "//envoy/extensions/filters/http/on_demand/v3:pkg",
         "//envoy/extensions/filters/http/original_src/v3:pkg",
         "//envoy/extensions/filters/http/ratelimit/v3:pkg",

api/envoy/admin/v2alpha/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/admin/v3/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/admin/v3/server_info.proto

@@ -54,7 +54,7 @@ message ServerInfo {
   CommandLineOptions command_line_options = 6;
 }
 
-// [#next-free-field: 34]
+// [#next-free-field: 35]
 message CommandLineOptions {
   option (udpa.annotations.versioning).previous_message_type =
       "envoy.admin.v2alpha.CommandLineOptions";
@@ -176,4 +176,7 @@ message CommandLineOptions {
 
   // See :option:`--bootstrap-version` for details.
   uint32 bootstrap_version = 29;
+
+  // See :option:`--enable-fine-grain-logging` for details.
+  bool enable_fine_grain_logging = 34;
 }

api/envoy/api/v2/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/auth/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/cluster.proto

@@ -448,7 +448,7 @@ message Cluster {
     // connections to upstream hosts whenever hosts are added or removed from the cluster.
     bool close_connections_on_host_set_change = 6;
 
-    //Common Configuration for all consistent hashing load balancers (MaglevLb, RingHashLb, etc.)
+    // Common Configuration for all consistent hashing load balancers (MaglevLb, RingHashLb, etc.)
     ConsistentHashingLbConfig consistent_hashing_lb_config = 7;
   }
 

api/envoy/api/v2/cluster/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/core/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/endpoint/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/listener/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/ratelimit/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/api/v2/route/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/config/accesslog/v2/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/config/accesslog/v3/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/config/bootstrap/v2/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/config/bootstrap/v3/BUILD

@@ -1,4 +1,4 @@
-# DO NOT EDIT. This file is generated by tools/proto_sync.py.
+# DO NOT EDIT. This file is generated by tools/proto_format/proto_sync.py.
 
 load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 

api/envoy/config/bootstrap/v3/bootstrap.proto

@@ -305,10 +305,35 @@ message ClusterManager {
 // Envoy process watchdog configuration. When configured, this monitors for
 // nonresponsive threads and kills the process after the configured thresholds.
 // See the :ref:`watchdog documentation <operations_performance_watchdog>` for more information.
-// [#next-free-field: 7]
+// [#next-free-field: 8]
 message Watchdog {
   option (udpa.annotations.versioning).previous_message_type = "envoy.config.bootstrap.v2.Watchdog";
 
+  message WatchdogAction {
+    // The events are fired in this order: KILL, MULTIKILL, MEGAMISS, MISS.
+    // Within an event type, actions execute in the order they are configured.
+    // For KILL/MULTIKILL there is a default PANIC that will run after the
+    // registered actions and kills the process if it wasn't already killed.
+    // It might be useful to specify several debug actions, and possibly an
+    // alternate FATAL action.
+    enum WatchdogEvent {
+      UNKNOWN = 0;
+      KILL = 1;
+      MULTIKILL = 2;
+      MEGAMISS = 3;
+      MISS = 4;
+    }
+
+    // Extension specific configuration for the action.
+    core.v3.TypedExtensionConfig config = 1;
+
+    WatchdogEvent event = 2 [(validate.rules).enum = {defined_only: true}];
+  }
+
+  // Register actions that will fire on given WatchDog events.
+  // See *WatchDogAction* for priority of events.
+  repeated WatchdogAction actions = 7;
+
   // The duration after which Envoy counts a nonresponsive thread in the
   // *watchdog_miss* statistic. If not specified the default is 200ms.
   google.protobuf.Duration miss_timeout = 1;