Skip to content

Commit

Permalink
Merge refs/heads/master into route_sanitizer_disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
soloio-bulldozer[bot] authored Apr 7, 2022
2 parents 600f329 + c687552 commit 1bb1988
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions changelog/v1.12.0-beta2/docs-links.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog:
- type: NON_USER_FACING
description: Fixes links for various issues raised in Slack.
2 changes: 1 addition & 1 deletion docs/content/introduction/architecture/concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Matchers currently support two types of requests:

- **Request Matchers** match on properties of HTTP requests. This includes the request path (`:path` header in HTTP 2.0), method (`:method` in HTTP 2.0) headers (their keys and optionally their values), and query parameters.

- **Event Matchers** match properties of HTTP events, as per the [CloudEvents specification](https://github.com/cloudevents/spec/blob/master/spec.md). The only property **Event Matcher** currently matches on is the *event-type* of an event (specified by the `x-event-type` request header).
- **Event Matchers** match properties of HTTP events, as per the [CloudEvents specification](https://github.com/cloudevents/spec/blob/main/cloudevents/spec.md). The only property **Event Matcher** currently matches on is the *event-type* of an event (specified by the `x-event-type` request header).

### Destinations

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions projects/gateway/api/v1/virtual_service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ An HTTP request is first matched to a virtual host based on its host header, the
If a request is not matched to any virtual host or a route therein, the target proxy will reply with a 404.
Unlike the [Gloo Virtual Host]({{< ref "/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/proxy.proto.sk.md" >}}/#virtualhost),
*Gateway* Virtual Hosts can **delegate** their routes to `RouteTables`.
Unlike the [Gloo Virtual Host]({{< versioned_link_path fromRoot="/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/proxy.proto.sk.md" >}}/#virtualhost),
_Gateway_ Virtual Hosts can delegate their routes to `RouteTables`.
*/
message VirtualHost {
Expand Down Expand Up @@ -192,7 +192,7 @@ message VirtualHost {
* - *Route* the request to a destination
* - Reply with a *Direct Response*
* - Send a *Redirect* response to the client
* - *Delegate* the action for the request to one or more top-level [`RouteTable`]({{< ref "/reference/api/github.com/solo-io/gloo/projects/gateway/api/v1/route_table.proto.sk.md" >}}) resources
* - *Delegate* the action for the request to one or more top-level [`RouteTable`]({{< versioned_link_path fromRoot="/reference/api/github.com/solo-io/gloo/projects/gateway/api/v1/route_table.proto.sk.md" >}}) resources
* DelegateActions can be used to delegate the behavior for a set out routes with a given *prefix* to
* top-level `RouteTable` resources.
*/
Expand Down
6 changes: 3 additions & 3 deletions projects/gateway/pkg/api/v1/virtual_service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1bb1988

Please sign in to comment.