wasm: clarify how configuration is passed #10782
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,8 +21,6 @@ option (udpa.annotations.file_status).package_version_status = ACTIVE; | |
| // [#next-free-field: 6] | ||
| // [#not-implemented-hide:] pending implementation. | ||
| message VmConfig { | ||
| // An ID which will be used along with a hash of the wasm code (or the name of the registered Null | ||
| // VM plugin) to determine which VM will be used for the plugin. All plugins which use the same | ||
| // *vm_id* and code will use the same VM. May be left blank. Sharing a VM between plugins can | ||
|
|
@@ -36,7 +34,10 @@ message VmConfig { | |
| // The Wasm code that Envoy will execute. | ||
| config.core.v3.AsyncDataSource code = 3; | ||
|
|
||
| // The Wasm configuration used in initialization of a new VM | ||
| // (proxy_on_start). `google.protobuf.Struct` is serialized as JSON before | ||
| // passing it to the plugin. `google.protobuf.BytesValue` and | ||
| // `google.protobuf.StringValue` are passed directly without the wrapper. | ||
| google.protobuf.Any configuration = 4; | ||
|
|
||
| // Allow the wasm file to include pre-compiled code on VMs which support it. | ||
|
|
@@ -49,9 +50,6 @@ message VmConfig { | |
| // [#next-free-field: 6] | ||
| // [#not-implemented-hide:] pending implementation. | ||
| message PluginConfig { | ||
| // A unique name for a filters/services in a VM for use in identifying the filter/service if | ||
| // multiple filters/services are handled by the same *vm_id* and *group_name* and for | ||
| // logging/debugging. | ||
|
|
@@ -70,6 +68,9 @@ message PluginConfig { | |
|
|
||
| // Filter/service configuration used to configure or reconfigure a plugin | ||
| // (proxy_on_configuration). | ||
|
Member
There was a problem hiding this comment. Let's use name |
||
| // `google.protobuf.Struct` is serialized as JSON before | ||
| // passing it to the plugin. `google.protobuf.BytesValue` and | ||
| // `google.protobuf.StringValue` are passed directly without the wrapper. | ||
| google.protobuf.Any configuration = 5; | ||
| } | ||
|
|
||
|
|
@@ -78,9 +79,6 @@ message PluginConfig { | |
| // create a Wasm Service. | ||
| // [#not-implemented-hide:] pending implementation. | ||
| message WasmService { | ||
| // General plugin configuration. | ||
| PluginConfig config = 1; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,4 +17,3 @@ Extensions | |
| grpc_credential/grpc_credential | ||
| retry/retry | ||
| trace/trace | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's use name
proxy_on_vm_startinstead ofproxy_on_startfor consistency with https://github.com/proxy-wasm/spec/tree/master/abi-versions/vNEXTThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we leave the naming for later? It's guaranteed to churn endlessly and will only freeze when the code lands.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure