Merge pull request envoyproxy#492 from jplevyak/wasm-config

Move wasm api v3 into extensions, remove unused v2 (not upstreamed).
lizan · Apr 24, 2020 · 3add410 · 3add410
2 parents 1a52eb6 + d192282
commit 3add410
Show file tree

Hide file tree

Showing 52 changed files with 211 additions and 433 deletions.
diff --git a/api/BUILD b/api/BUILD
@@ -101,7 +101,6 @@ proto_library(
         "//envoy/config/transport_socket/alts/v2alpha:pkg",
         "//envoy/config/transport_socket/raw_buffer/v2:pkg",
         "//envoy/config/transport_socket/tap/v2alpha:pkg",
-        "//envoy/config/wasm/v2:pkg",
         "//envoy/data/accesslog/v2:pkg",
         "//envoy/data/cluster/v2alpha:pkg",
         "//envoy/data/core/v2alpha:pkg",
@@ -150,7 +149,6 @@ proto_library(
         "//envoy/config/route/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "//envoy/config/trace/v3:pkg",
-        "//envoy/config/wasm/v3:pkg",
         "//envoy/data/accesslog/v3:pkg",
         "//envoy/data/cluster/v3:pkg",
         "//envoy/data/core/v3:pkg",
@@ -230,6 +228,7 @@ proto_library(
         "//envoy/extensions/transport_sockets/raw_buffer/v3:pkg",
         "//envoy/extensions/transport_sockets/tap/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
+        "//envoy/extensions/wasm/v3:pkg",
         "//envoy/service/accesslog/v3:pkg",
         "//envoy/service/auth/v3:pkg",
         "//envoy/service/cluster/v3:pkg",

diff --git a/api/envoy/config/accesslog/v2/BUILD b/api/envoy/config/accesslog/v2/BUILD
@@ -7,7 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "//envoy/config/wasm/v2:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/config/accesslog/v2/wasm.proto b/api/envoy/config/accesslog/v2/wasm.proto
diff --git a/api/envoy/config/bootstrap/v2/BUILD b/api/envoy/config/bootstrap/v2/BUILD
@@ -13,7 +13,6 @@ api_proto_package(
         "//envoy/config/metrics/v2:pkg",
         "//envoy/config/overload/v2alpha:pkg",
         "//envoy/config/trace/v2:pkg",
-        "//envoy/config/wasm/v2:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/config/bootstrap/v2/bootstrap.proto b/api/envoy/config/bootstrap/v2/bootstrap.proto
@@ -13,7 +13,6 @@ import "envoy/api/v2/listener.proto";
 import "envoy/config/metrics/v2/stats.proto";
 import "envoy/config/overload/v2alpha/overload.proto";
 import "envoy/config/trace/v2/http_tracer.proto";
-import "envoy/config/wasm/v2/wasm.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
@@ -34,7 +33,7 @@ option (udpa.annotations.file_status).package_version_status = FROZEN;
 // <config_overview_bootstrap>` for more detail.
 
 // Bootstrap :ref:`configuration overview <config_overview_v2_bootstrap>`.
-// [#next-free-field: 22]
+// [#next-free-field: 21]
 message Bootstrap {
   message StaticResources {
     // Static :ref:`Listeners <envoy_api_msg_Listener>`. These listeners are
@@ -171,9 +170,6 @@ message Bootstrap {
   // :ref:`use_tcp_for_dns_lookups <envoy_api_field_Cluster.use_tcp_for_dns_lookups>` are
   // specified.
   bool use_tcp_for_dns_lookups = 20;
-
-  // Configuration for an wasm service provider(s).
-  repeated wasm.v2.WasmService wasm_service = 21;
 }
 
 // Administration interface :ref:`operations documentation

diff --git a/api/envoy/config/bootstrap/v3/BUILD b/api/envoy/config/bootstrap/v3/BUILD
@@ -14,8 +14,8 @@ api_proto_package(
         "//envoy/config/metrics/v3:pkg",
         "//envoy/config/overload/v3:pkg",
         "//envoy/config/trace/v3:pkg",
-        "//envoy/config/wasm/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
+        "//envoy/extensions/wasm/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/config/bootstrap/v3/bootstrap.proto b/api/envoy/config/bootstrap/v3/bootstrap.proto
@@ -12,8 +12,8 @@ import "envoy/config/listener/v3/listener.proto";
 import "envoy/config/metrics/v3/stats.proto";
 import "envoy/config/overload/v3/overload.proto";
 import "envoy/config/trace/v3/http_tracer.proto";
-import "envoy/config/wasm/v3/wasm.proto";
 import "envoy/extensions/transport_sockets/tls/v3/cert.proto";
+import "envoy/extensions/wasm/v3/wasm.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
@@ -180,7 +180,7 @@ message Bootstrap {
   bool use_tcp_for_dns_lookups = 20;
 
   // Configuration for an wasm service provider(s).
-  repeated wasm.v3.WasmService wasm_service = 21;
+  repeated envoy.extensions.wasm.v3.WasmService wasm_service = 21;
 }
 
 // Administration interface :ref:`operations documentation

diff --git a/api/envoy/config/bootstrap/v4alpha/BUILD b/api/envoy/config/bootstrap/v4alpha/BUILD
@@ -13,8 +13,8 @@ api_proto_package(
         "//envoy/config/listener/v3:pkg",
         "//envoy/config/metrics/v3:pkg",
         "//envoy/config/overload/v3:pkg",
-        "//envoy/config/wasm/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v4alpha:pkg",
+        "//envoy/extensions/wasm/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/config/bootstrap/v4alpha/bootstrap.proto b/api/envoy/config/bootstrap/v4alpha/bootstrap.proto
@@ -11,8 +11,8 @@ import "envoy/config/core/v4alpha/socket_option.proto";
 import "envoy/config/listener/v3/listener.proto";
 import "envoy/config/metrics/v3/stats.proto";
 import "envoy/config/overload/v3/overload.proto";
-import "envoy/config/wasm/v3/wasm.proto";
 import "envoy/extensions/transport_sockets/tls/v4alpha/cert.proto";
+import "envoy/extensions/wasm/v3/wasm.proto";
 
 import "google/protobuf/duration.proto";
 import "google/protobuf/struct.proto";
@@ -172,7 +172,7 @@ message Bootstrap {
   bool use_tcp_for_dns_lookups = 20;
 
   // Configuration for an wasm service provider(s).
-  repeated wasm.v3.WasmService wasm_service = 21;
+  repeated envoy.extensions.wasm.v3.WasmService wasm_service = 21;
 }
 
 // Administration interface :ref:`operations documentation

diff --git a/api/envoy/config/wasm/v2/BUILD b/api/envoy/config/wasm/v2/BUILD
diff --git a/api/envoy/config/wasm/v2/wasm.proto b/api/envoy/config/wasm/v2/wasm.proto
diff --git a/api/envoy/config/wasm/v3/wasm.proto b/api/envoy/config/wasm/v3/wasm.proto
diff --git a/api/envoy/extensions/access_loggers/wasm/v3/BUILD b/api/envoy/extensions/access_loggers/wasm/v3/BUILD
@@ -6,8 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "//envoy/config/accesslog/v2:pkg",
-        "//envoy/config/wasm/v3:pkg",
+        "//envoy/extensions/wasm/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/extensions/access_loggers/wasm/v3/wasm.proto b/api/envoy/extensions/access_loggers/wasm/v3/wasm.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package envoy.extensions.access_loggers.wasm.v3;
 
-import "envoy/config/wasm/v3/wasm.proto";
+import "envoy/extensions/wasm/v3/wasm.proto";
 
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
@@ -18,8 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 // that calls into a WASM VM. Configures the built-in *envoy.access_loggers.wasm*
 // AccessLog.
 message WasmAccessLog {
-  option (udpa.annotations.versioning).previous_message_type =
-      "envoy.config.accesslog.v2.WasmAccessLog";
-
-  config.wasm.v3.PluginConfig config = 1;
+  envoy.extensions.wasm.v3.PluginConfig config = 1;
 }
diff --git a/api/envoy/extensions/filters/http/wasm/v3/BUILD b/api/envoy/extensions/filters/http/wasm/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "//envoy/config/wasm/v3:pkg",
+        "//envoy/extensions/wasm/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/extensions/filters/http/wasm/v3/wasm.proto b/api/envoy/extensions/filters/http/wasm/v3/wasm.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package envoy.extensions.filters.http.wasm.v3;
 
-import "envoy/config/wasm/v3/wasm.proto";
+import "envoy/extensions/wasm/v3/wasm.proto";
 
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
@@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 message Wasm {
   // General Plugin configuration.
-  config.wasm.v3.PluginConfig config = 1;
+  envoy.extensions.wasm.v3.PluginConfig config = 1;
 }
diff --git a/api/envoy/extensions/filters/network/wasm/v3/BUILD b/api/envoy/extensions/filters/network/wasm/v3/BUILD
@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "//envoy/config/wasm/v3:pkg",
+        "//envoy/extensions/wasm/v3:pkg",
         "@com_github_cncf_udpa//udpa/annotations:pkg",
     ],
 )
diff --git a/api/envoy/extensions/filters/network/wasm/v3/wasm.proto b/api/envoy/extensions/filters/network/wasm/v3/wasm.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package envoy.extensions.filters.network.wasm.v3;
 
-import "envoy/config/wasm/v3/wasm.proto";
+import "envoy/extensions/wasm/v3/wasm.proto";
 
 import "udpa/annotations/status.proto";
 import "udpa/annotations/versioning.proto";
@@ -18,5 +18,5 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE;
 
 message Wasm {
   // General Plugin configuration.
-  config.wasm.v3.PluginConfig config = 1;
+  envoy.extensions.wasm.v3.PluginConfig config = 1;
 }
diff --git a/api/envoy/config/wasm/v3/BUILD → api/envoy/extensions/wasm/v3/BUILD b/api/envoy/config/wasm/v3/BUILD → api/envoy/extensions/wasm/v3/BUILD