From 71392d19c9989c6c41a31cb0dddb790afc4920d2 Mon Sep 17 00:00:00 2001 From: "data-plane-api(CircleCI)" Date: Fri, 9 Oct 2020 21:23:47 +0000 Subject: [PATCH] Upstream envoyproxy/envoy-wasm. (#12546) Signed-off-by: John Plevyak Signed-off-by: Piotr Sikora Mirrored from https://github.com/envoyproxy/envoy @ 319a9a647f19036d831a75f68350c90e98bfc365 --- BUILD | 1 + .../access_loggers/wasm/v3/wasm.proto | 7 ++++-- .../filters/http/wasm/v3/wasm.proto | 5 +++- .../filters/network/wasm/v3/wasm.proto | 5 +++- envoy/extensions/stat_sinks/wasm/v3/BUILD | 12 ++++++++++ .../extensions/stat_sinks/wasm/v3/wasm.proto | 23 +++++++++++++++++++ envoy/extensions/wasm/v3/wasm.proto | 10 ++++---- versioning/BUILD | 1 + 8 files changed, 54 insertions(+), 10 deletions(-) create mode 100644 envoy/extensions/stat_sinks/wasm/v3/BUILD create mode 100644 envoy/extensions/stat_sinks/wasm/v3/wasm.proto diff --git a/BUILD b/BUILD index b13a579d..ed8743b7 100644 --- a/BUILD +++ b/BUILD @@ -237,6 +237,7 @@ proto_library( "//envoy/extensions/network/socket_interface/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", "//envoy/extensions/retry/priority/previous_priorities/v3:pkg", + "//envoy/extensions/stat_sinks/wasm/v3:pkg", "//envoy/extensions/transport_sockets/alts/v3:pkg", "//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg", "//envoy/extensions/transport_sockets/quic/v3:pkg", diff --git a/envoy/extensions/access_loggers/wasm/v3/wasm.proto b/envoy/extensions/access_loggers/wasm/v3/wasm.proto index cd9db590..413743a2 100644 --- a/envoy/extensions/access_loggers/wasm/v3/wasm.proto +++ b/envoy/extensions/access_loggers/wasm/v3/wasm.proto @@ -12,9 +12,12 @@ option java_outer_classname = "WasmProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; -// [[#not-implemented-hide:] +// [#protodoc-title: Wasm access log] +// [#extension: envoy.access_loggers.wasm] + // Custom configuration for an :ref:`AccessLog ` -// that calls into a WASM VM. +// that calls into a WASM VM. Configures the built-in *envoy.access_loggers.wasm* +// AccessLog. message WasmAccessLog { envoy.extensions.wasm.v3.PluginConfig config = 1; } diff --git a/envoy/extensions/filters/http/wasm/v3/wasm.proto b/envoy/extensions/filters/http/wasm/v3/wasm.proto index a812992a..55eba141 100644 --- a/envoy/extensions/filters/http/wasm/v3/wasm.proto +++ b/envoy/extensions/filters/http/wasm/v3/wasm.proto @@ -13,7 +13,10 @@ option java_outer_classname = "WasmProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; -// [[#not-implemented-hide:] +// [#protodoc-title: Wasm] +// [#extension: envoy.filters.http.wasm] +// Wasm :ref:`configuration overview `. + message Wasm { // General Plugin configuration. envoy.extensions.wasm.v3.PluginConfig config = 1; diff --git a/envoy/extensions/filters/network/wasm/v3/wasm.proto b/envoy/extensions/filters/network/wasm/v3/wasm.proto index 13158276..0c1ac6af 100644 --- a/envoy/extensions/filters/network/wasm/v3/wasm.proto +++ b/envoy/extensions/filters/network/wasm/v3/wasm.proto @@ -13,7 +13,10 @@ option java_outer_classname = "WasmProto"; option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; -// [[#not-implemented-hide:] +// [#protodoc-title: Wasm] +// [#extension: envoy.filters.network.wasm] +// Wasm :ref:`configuration overview `. + message Wasm { // General Plugin configuration. envoy.extensions.wasm.v3.PluginConfig config = 1; diff --git a/envoy/extensions/stat_sinks/wasm/v3/BUILD b/envoy/extensions/stat_sinks/wasm/v3/BUILD new file mode 100644 index 00000000..c37174bd --- /dev/null +++ b/envoy/extensions/stat_sinks/wasm/v3/BUILD @@ -0,0 +1,12 @@ +# 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") + +licenses(["notice"]) # Apache 2 + +api_proto_package( + deps = [ + "//envoy/extensions/wasm/v3:pkg", + "@com_github_cncf_udpa//udpa/annotations:pkg", + ], +) diff --git a/envoy/extensions/stat_sinks/wasm/v3/wasm.proto b/envoy/extensions/stat_sinks/wasm/v3/wasm.proto new file mode 100644 index 00000000..3fc5dae9 --- /dev/null +++ b/envoy/extensions/stat_sinks/wasm/v3/wasm.proto @@ -0,0 +1,23 @@ +syntax = "proto3"; + +package envoy.extensions.stat_sinks.wasm.v3; + +import "envoy/extensions/wasm/v3/wasm.proto"; + +import "udpa/annotations/status.proto"; +import "udpa/annotations/versioning.proto"; +import "validate/validate.proto"; + +option java_package = "io.envoyproxy.envoy.extensions.stat_sinks.wasm.v3"; +option java_outer_classname = "WasmProto"; +option java_multiple_files = true; +option (udpa.annotations.file_status).package_version_status = ACTIVE; + +// [#protodoc-title: Wasm] +// Wasm :ref:`configuration overview `. +// [#extension: envoy.stat_sinks.wasm] + +message Wasm { + // General Plugin configuration. + envoy.extensions.wasm.v3.PluginConfig config = 1; +} diff --git a/envoy/extensions/wasm/v3/wasm.proto b/envoy/extensions/wasm/v3/wasm.proto index c036603c..b42fb75a 100644 --- a/envoy/extensions/wasm/v3/wasm.proto +++ b/envoy/extensions/wasm/v3/wasm.proto @@ -16,8 +16,8 @@ option java_multiple_files = true; option (udpa.annotations.file_status).package_version_status = ACTIVE; // [#protodoc-title: Wasm] +// [#extension: envoy.bootstrap.wasm] -// [[#not-implemented-hide:] // Configuration for a Wasm VM. // [#next-free-field: 7] message VmConfig { @@ -51,7 +51,6 @@ message VmConfig { bool nack_on_code_cache_miss = 6; } -// [[#not-implemented-hide:] // Base Configuration for Wasm Plugins e.g. filters and services. // [#next-free-field: 6] message PluginConfig { @@ -66,9 +65,9 @@ message PluginConfig { string root_id = 2; // Configuration for finding or starting VM. - oneof vm_config { - VmConfig inline_vm_config = 3; - // In the future add referential VM configurations. + oneof vm { + VmConfig vm_config = 3; + // TODO: add referential VM configurations. } // Filter/service configuration used to configure or reconfigure a plugin @@ -86,7 +85,6 @@ message PluginConfig { bool fail_open = 5; } -// [[#not-implemented-hide:] // WasmService is configured as a built-in *envoy.wasm_service* :ref:`WasmService // ` This opaque configuration will be used to create a Wasm Service. message WasmService { diff --git a/versioning/BUILD b/versioning/BUILD index d5a15436..d44a5464 100644 --- a/versioning/BUILD +++ b/versioning/BUILD @@ -120,6 +120,7 @@ proto_library( "//envoy/extensions/network/socket_interface/v3:pkg", "//envoy/extensions/retry/host/omit_host_metadata/v3:pkg", "//envoy/extensions/retry/priority/previous_priorities/v3:pkg", + "//envoy/extensions/stat_sinks/wasm/v3:pkg", "//envoy/extensions/transport_sockets/alts/v3:pkg", "//envoy/extensions/transport_sockets/proxy_protocol/v3:pkg", "//envoy/extensions/transport_sockets/quic/v3:pkg",