From 21cf1e3db57e68bbd591b7be97518f99ccc6501c Mon Sep 17 00:00:00 2001 From: Will Tsai Date: Fri, 3 Sep 2021 16:35:17 -0700 Subject: [PATCH 01/14] editing Docsy theme config file to add user feedback buttons to website (issue #1644) --- daprdocs/config.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/daprdocs/config.toml b/daprdocs/config.toml index a6286e75d..4da64bfda 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -190,6 +190,10 @@ url_latest_version = "https://docs.dapr.io" sidebar_menu_compact = true navbar_logo = true sidebar_search_disable = true +[params.ui.feedback] +enable = true +yes = 'Glad to hear it! Please tell us how we can improve.' +no = 'Sorry to hear that. Please tell us how we can improve.' # Links ## End user relevant links. These will show up on left side of footer and in the community page if you have one. From dc3eb2c17cb62965799b097cb148138a71d79833 Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Wed, 15 Sep 2021 18:22:46 -0400 Subject: [PATCH 02/14] Adding attributes from the CloudEvents spec and a slightly better routing example --- .../pubsub/howto-route-messages.md | 294 ++++++++++++++++-- 1 file changed, 264 insertions(+), 30 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index f860036de..51967caa0 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -42,14 +42,14 @@ metadata: name: myevent-subscription spec: pubsubname: pubsub - topic: deathStarStatus + topic: transactions routes: rules: - - match: event.type == "rebels.attacking.v3" - path: /dsstatus.v3 - - match: event.type == "rebels.attacking.v2" - path: /dsstatus.v2 - default: /dsstatus + - match: event.type == "withdraw.v3" + path: /withdraw.v3 + - match: event.type == "withdraw.v2" + path: /withdraw.v2 + default: /withdraw scopes: - app1 - app2 @@ -59,7 +59,7 @@ scopes: Alternatively, the programattic approach varies slightly in that the `routes` structure is returned instead of `route`. The JSON structure matches the declarative YAML. -{{< tabs Python Node Go PHP>}} +{{< tabs Python Node "C#" Go PHP>}} {{% codetab %}} ```python @@ -77,19 +77,19 @@ def subscribe(): subscriptions = [ { 'pubsubname': 'pubsub', - 'topic': 'deathStarStatus', + 'topic': 'transactions', 'routes': { 'rules': [ { - 'match': 'event.type == "rebels.attacking.v3"', - 'path': '/dsstatus.v3' + 'match': 'event.type == "withdraw.v3"', + 'path': '/withdraw.v3' }, { - 'match': 'event.type == "rebels.attacking.v2"', - 'path': '/dsstatus.v2' + 'match': 'event.type == "withdraw.v2"', + 'path': '/withdraw.v2' }, ], - 'default': '/dsstatus' + 'default': '/withdraw' } }] return jsonify(subscriptions) @@ -116,19 +116,19 @@ app.get('/dapr/subscribe', (req, res) => { res.json([ { pubsubname: "pubsub", - topic: "deathStarStatus", + topic: "transactions", routes: { rules: [ { - match: 'event.type == "rebels.attacking.v3"', - path: '/dsstatus.v3' + match: 'event.type == "withdraw.v3"', + path: '/withdraw.v3' }, { - match: 'event.type == "rebels.attacking.v2"', - path: '/dsstatus.v2' + match: 'event.type == "withdraw.v2"', + path: '/withdraw.v2' }, ], - default: '/dsstatus' + default: '/withdraw' } } ]); @@ -143,6 +143,34 @@ app.listen(port, () => console.log(`consumer app listening on port ${port}!`)) ``` {{% /codetab %}} +{{% codetab %}} +```csharp + [Topic("pubsub", "transactions", "event.type ==\"withdraw.v3\"", 1)] + [HttpPost("withdraw.v3")] + public async Task> WithdrawV2(TransactionV3 transaction, [FromServices] DaprClient daprClient) + { + // Logic + return account; + } + + [Topic("pubsub", "transactions", "event.type ==\"withdraw.v2\"", 2)] + [HttpPost("withdraw.v2")] + public async Task> WithdrawV2(TransactionV2 transaction, [FromServices] DaprClient daprClient) + { + // Logic + return account; + } + + [Topic("pubsub", "transactions")] + [HttpPost("withdraw")] + public async Task> WithdrawV2(Transaction transaction, [FromServices] DaprClient daprClient) + { + // Logic + return account; + } +``` +{{% /codetab %}} + {{% codetab %}} ```golang package main @@ -180,19 +208,19 @@ func configureSubscribeHandler(w http.ResponseWriter, _ *http.Request) { t := []subscription{ { PubsubName: "pubsub", - Topic: "deathStarStatus", + Topic: "transactions", Routes: routes{ Rules: []rule{ { - Match: `event.type == "rebels.attacking.v3"`, - Path: "/dsstatus.v3", + Match: `event.type == "withdraw.v3"`, + Path: "/withdraw.v3", }, { - Match: `event.type == "rebels.attacking.v2"`, - Path: "/dsstatus.v2", + Match: `event.type == "withdraw.v2"`, + Path: "/withdraw.v2", }, }, - Default: "/dsstatus", + Default: "/withdraw", }, }, } @@ -216,12 +244,12 @@ func main() { require_once __DIR__.'/vendor/autoload.php'; $app = \Dapr\App::create(configure: fn(\DI\ContainerBuilder $builder) => $builder->addDefinitions(['dapr.subscriptions' => [ - new \Dapr\PubSub\Subscription(pubsubname: 'pubsub', topic: 'deathStarStatus', routes: ( + new \Dapr\PubSub\Subscription(pubsubname: 'pubsub', topic: 'transactions', routes: ( rules: => [ - ('match': 'event.type == "rebels.attacking.v3"', path: '/dsstatus.v3'), - ('match': 'event.type == "rebels.attacking.v2"', path: '/dsstatus.v2'), + ('match': 'event.type == "withdraw.v3"', path: '/withdraw.v3'), + ('match': 'event.type == "withdraw.v2"', path: '/withdraw.v2'), ] - default: '/dsstatus')), + default: '/withdraw')), ]])); $app->post('/dsstatus', function( #[\Dapr\Attributes\FromBody] @@ -238,7 +266,213 @@ $app->start(); {{< /tabs >}} -In these examples, depending on the type of the event (`event.type`), the application will be called on `/dsstatus.v3`, `/dsstatus.v2` or `/dsstatus`. The expressions are written as [Common Expression Language (CEL)](https://opensource.google/projects/cel) where `event` represents the cloud event. Any of the attributes from the [CloudEvents core specification](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#required-attributes) can be referenced in the expression. One caveat is that it is only possible to access the attributes inside `event.data` if it is nested JSON +In these examples, depending on the type of the event (`event.type`), the application will be called on `/dsstatus.v3`, `/dsstatus.v2` or `/dsstatus`. The expressions are written as [Common Expression Language (CEL)](https://opensource.google/projects/cel) where `event` represents the cloud event. Any of the attributes from the [CloudEvents core specification](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#required-attributes) can be referenced in the expression. + +For reference, the following attributes are from the CloudEvents specification. + +### Event Data + +#### data + +As defined by the term Data, CloudEvents MAY include domain-specific information about the occurrence. When present, this information will be encapsulated within `data`. + +- Description: The event payload. This specification does not place any restriction on the type of this information. It is encoded into a media format which is specified by the `datacontenttype` attribute (e.g. application/json), and adheres to the `dataschema` format when those respective attributes are present. +- Constraints: + - OPTIONAL + +{{% alert title="Limitation" color="warning" %}} +Currently, it is only possible to access the attributes inside data if it is nested JSON values and not JSON escaped in a string. +{{% /alert %}} + +### REQUIRED Attributes + +The following attributes are REQUIRED to be present in all CloudEvents: + +#### id + +- Type: `String` +- Description: Identifies the event. Producers MUST ensure that `source` + `id` + is unique for each distinct event. If a duplicate event is re-sent (e.g. due + to a network error) it MAY have the same `id`. Consumers MAY assume that + Events with identical `source` and `id` are duplicates. +- Constraints: + - REQUIRED + - MUST be a non-empty string + - MUST be unique within the scope of the producer +- Examples: + - An event counter maintained by the producer + - A UUID + +#### source + +- Type: `URI-reference` +- Description: Identifies the context in which an event happened. Often this + will include information such as the type of the event source, the + organization publishing the event or the process that produced the event. The + exact syntax and semantics behind the data encoded in the URI is defined by + the event producer. + + Producers MUST ensure that `source` + `id` is unique for each distinct event. + + An application MAY assign a unique `source` to each distinct producer, which + makes it easy to produce unique IDs since no other producer will have the same + source. The application MAY use UUIDs, URNs, DNS authorities or an + application-specific scheme to create unique `source` identifiers. + + A source MAY include more than one producer. In that case the producers MUST + collaborate to ensure that `source` + `id` is unique for each distinct event. + +- Constraints: + - REQUIRED + - MUST be a non-empty URI-reference + - An absolute URI is RECOMMENDED +- Examples + - Internet-wide unique URI with a DNS authority. + - https://github.com/cloudevents + - mailto:cncf-wg-serverless@lists.cncf.io + - Universally-unique URN with a UUID: + - urn:uuid:6e8bc430-9c3a-11d9-9669-0800200c9a66 + - Application-specific identifiers + - /cloudevents/spec/pull/123 + - /sensors/tn-1234567/alerts + - 1-555-123-4567 + +#### specversion + +- Type: `String` +- Description: The version of the CloudEvents specification which the event + uses. This enables the interpretation of the context. Compliant event + producers MUST use a value of `1.0` when referring to this version of the + specification. + + Currently, this attribute will only have the 'major' and 'minor' version + numbers included in it. This allows for 'patch' changes to the specification + to be made without changing this property's value in the serialization. + Note: for 'release candidate' releases a suffix might be used for testing + purposes. + +- Constraints: + - REQUIRED + - MUST be a non-empty string + +#### type + +- Type: `String` +- Description: This attribute contains a value describing the type of event + related to the originating occurrence. Often this attribute is used for + routing, observability, policy enforcement, etc. The format of this is + producer defined and might include information such as the version of the + `type` - see + [Versioning of CloudEvents in the Primer](primer.md#versioning-of-cloudevents) + for more information. +- Constraints: + - REQUIRED + - MUST be a non-empty string + - SHOULD be prefixed with a reverse-DNS name. The prefixed domain dictates the + organization which defines the semantics of this event type. +- Examples + - com.github.pull_request.opened + - com.example.object.deleted.v2 + +### OPTIONAL Attributes + +The following attributes are OPTIONAL to appear in CloudEvents. See the +[Notational Conventions](#notational-conventions) section for more information +on the definition of OPTIONAL. + +#### datacontenttype + +- Type: `String` per [RFC 2046](https://tools.ietf.org/html/rfc2046) +- Description: Content type of `data` value. This attribute enables `data` to + carry any type of content, whereby format and encoding might differ from that + of the chosen event format. For example, an event rendered using the + [JSON envelope](./json-format.md#3-envelope) format might carry an XML payload + in `data`, and the consumer is informed by this attribute being set to + "application/xml". The rules for how `data` content is rendered for different + `datacontenttype` values are defined in the event format specifications; for + example, the JSON event format defines the relationship in + [section 3.1](./json-format.md#31-handling-of-data). + + For some binary mode protocol bindings, this field is directly mapped to the + respective protocol's content-type metadata property. Normative rules for the + binary mode and the content-type metadata mapping can be found in the + respective protocol + + In some event formats the `datacontenttype` attribute MAY be omitted. For + example, if a JSON format event has no `datacontenttype` attribute, then it is + implied that the `data` is a JSON value conforming to the "application/json" + media type. In other words: a JSON-format event with no `datacontenttype` is + exactly equivalent to one with `datacontenttype="application/json"`. + + When translating an event message with no `datacontenttype` attribute to a + different format or protocol binding, the target `datacontenttype` SHOULD be + set explicitly to the implied `datacontenttype` of the source. + +- Constraints: + - OPTIONAL + - If present, MUST adhere to the format specified in + [RFC 2046](https://tools.ietf.org/html/rfc2046) +- For Media Type examples see + [IANA Media Types](http://www.iana.org/assignments/media-types/media-types.xhtml) + +#### dataschema + +- Type: `URI` +- Description: Identifies the schema that `data` adheres to. Incompatible + changes to the schema SHOULD be reflected by a different URI. See + [Versioning of CloudEvents in the Primer](primer.md#versioning-of-cloudevents) + for more information. +- Constraints: + - OPTIONAL + - If present, MUST be a non-empty URI + +#### subject + +- Type: `String` +- Description: This describes the subject of the event in the context of the + event producer (identified by `source`). In publish-subscribe scenarios, a + subscriber will typically subscribe to events emitted by a `source`, but the + `source` identifier alone might not be sufficient as a qualifier for any + specific event if the `source` context has internal sub-structure. + + Identifying the subject of the event in context metadata (opposed to only in + the `data` payload) is particularly helpful in generic subscription filtering + scenarios where middleware is unable to interpret the `data` content. In the + above example, the subscriber might only be interested in blobs with names + ending with '.jpg' or '.jpeg' and the `subject` attribute allows for + constructing a simple and efficient string-suffix filter for that subset of + events. + +- Constraints: + - OPTIONAL + - If present, MUST be a non-empty string +- Example: + - A subscriber might register interest for when new blobs are created inside a + blob-storage container. In this case, the event `source` identifies the + subscription scope (storage container), the `type` identifies the "blob + created" event, and the `id` uniquely identifies the event instance to + distinguish separate occurrences of a same-named blob having been created; + the name of the newly created blob is carried in `subject`: + - `source`: https://example.com/storage/tenant/container + - `subject`: mynewfile.jpg + +#### time + +- Type: `Timestamp` +- Description: Timestamp of when the occurrence happened. If the time of the + occurrence cannot be determined then this attribute MAY be set to some other + time (such as the current time) by the CloudEvents producer, however all + producers for the same `source` MUST be consistent in this respect. In other + words, either they all use the actual time of the occurrence or they all use + the same algorithm to determine the value used. +- Constraints: + - OPTIONAL + - If present, MUST adhere to the format specified in + [RFC 3339](https://tools.ietf.org/html/rfc3339) + +{{% alert title="Limitation" color="warning" %}} +Currently, comparisons to time (e.g. before or after "now") are not supported. +{{% /alert %}} ## Next steps From cebe13ff747898175ff7371e3b16bbae7b081d50 Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Wed, 15 Sep 2021 19:08:45 -0400 Subject: [PATCH 03/14] Tweaks per PR --- .../building-blocks/pubsub/howto-route-messages.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index 51967caa0..b69926997 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -94,7 +94,7 @@ def subscribe(): }] return jsonify(subscriptions) -@app.route('/dsstatus', methods=['POST']) +@app.route('/withdraw', methods=['POST']) def ds_subscriber(): print(request.json, flush=True) return json.dumps({'success':True}), 200, {'ContentType':'application/json'} @@ -134,7 +134,7 @@ app.get('/dapr/subscribe', (req, res) => { ]); }) -app.post('/dsstatus', (req, res) => { +app.post('/withdraw', (req, res) => { console.log(req.body); res.sendStatus(200); }); @@ -147,7 +147,7 @@ app.listen(port, () => console.log(`consumer app listening on port ${port}!`)) ```csharp [Topic("pubsub", "transactions", "event.type ==\"withdraw.v3\"", 1)] [HttpPost("withdraw.v3")] - public async Task> WithdrawV2(TransactionV3 transaction, [FromServices] DaprClient daprClient) + public async Task> WithdrawV3(TransactionV3 transaction, [FromServices] DaprClient daprClient) { // Logic return account; @@ -163,7 +163,7 @@ app.listen(port, () => console.log(`consumer app listening on port ${port}!`)) [Topic("pubsub", "transactions")] [HttpPost("withdraw")] - public async Task> WithdrawV2(Transaction transaction, [FromServices] DaprClient daprClient) + public async Task> Withdraw(Transaction transaction, [FromServices] DaprClient daprClient) { // Logic return account; @@ -251,7 +251,7 @@ $app = \Dapr\App::create(configure: fn(\DI\ContainerBuilder $builder) => $builde ] default: '/withdraw')), ]])); -$app->post('/dsstatus', function( +$app->post('/withdraw', function( #[\Dapr\Attributes\FromBody] \Dapr\PubSub\CloudEvent $cloudEvent, \Psr\Log\LoggerInterface $logger @@ -266,7 +266,7 @@ $app->start(); {{< /tabs >}} -In these examples, depending on the type of the event (`event.type`), the application will be called on `/dsstatus.v3`, `/dsstatus.v2` or `/dsstatus`. The expressions are written as [Common Expression Language (CEL)](https://opensource.google/projects/cel) where `event` represents the cloud event. Any of the attributes from the [CloudEvents core specification](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#required-attributes) can be referenced in the expression. +In these examples, depending on the type of the event (`event.type`), the application will be called on `/withdraw.v3`, `/withdraw.v2` or `/withdraw`. The expressions are written as [Common Expression Language (CEL)](https://opensource.google/projects/cel) where `event` represents the cloud event. Any of the attributes from the [CloudEvents core specification](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#required-attributes) can be referenced in the expression. For reference, the following attributes are from the CloudEvents specification. @@ -396,7 +396,7 @@ on the definition of OPTIONAL. For some binary mode protocol bindings, this field is directly mapped to the respective protocol's content-type metadata property. Normative rules for the binary mode and the content-type metadata mapping can be found in the - respective protocol + respective protocol. In some event formats the `datacontenttype` attribute MAY be omitted. For example, if a JSON format event has no `datacontenttype` attribute, then it is From d2651cd3f267c23b01d942e1b863ab5fa3f27ee5 Mon Sep 17 00:00:00 2001 From: Will Tsai Date: Mon, 20 Sep 2021 12:11:59 -0700 Subject: [PATCH 04/14] updates to daprdocs, concepts, getting-started index pages --- daprdocs/content/en/_index.md | 195 ++++++++++++------ daprdocs/content/en/concepts/_index.md | 11 +- daprdocs/content/en/getting-started/_index.md | 2 + daprdocs/static/images/homepage/javalang.png | Bin 0 -> 6561 bytes 4 files changed, 144 insertions(+), 64 deletions(-) create mode 100644 daprdocs/static/images/homepage/javalang.png diff --git a/daprdocs/content/en/_index.md b/daprdocs/content/en/_index.md index da87a5014..5243416f2 100644 --- a/daprdocs/content/en/_index.md +++ b/daprdocs/content/en/_index.md @@ -7,16 +7,19 @@ no_list: true Welcome to the Dapr documentation site! -### Sections + +{{% alert title="What is Dapr?" color="primary" %}} +Dapr is a portable, event-driven runtime that makes it easy for any developer to build resilient, +stateless and stateful applications that run on the cloud and edge and embraces the diversity of +languages and developer frameworks. Leveraging the benefits of a sidecar architecture, Dapr helps +you tackle the challenges that come with building microservices and keeps your code platform agnostic. +{{< button text="Get started" page="getting-started" >}} +{{% /alert %}} + + +### Start developing with Dapr
-
-
-
Concepts
-

Learn about Dapr, including its main features and capabilities.

- -
-
Getting started
@@ -24,6 +27,26 @@ Welcome to the Dapr documentation site!
+
+
+
Quickstarts
+

A collection of tutorials with code samples to get you started quickly with Dapr.

+ +
+
+
+
+
Concepts
+

Learn about Dapr, including its main features and capabilities.

+ +
+
+
+ + +### Learn more about Dapr + +
Developing applications
@@ -31,9 +54,13 @@ Welcome to the Dapr documentation site!
-
-
-
+
+
+
Building blocks
+

Capabilities that solve common development challenges for distributed applications.

+ +
+
Operations
@@ -41,6 +68,12 @@ Welcome to the Dapr documentation site!
+
+ + +### Additional info + +
Reference
@@ -58,64 +91,100 @@ Welcome to the Dapr documentation site!
-### Tooling +### Tooling and resources -
- - Visual studio code icon - -
-
IDE Integrations
-

Learn how to get up and running with Dapr in your preferred integrated development environment.

+
+
+
+
+ Visual studio code icon + IDE Integrations +
+

+ Learn how to get up and running with Dapr in your preferred integrated development environment. +

+ +
-
- - Code icon - -
-
Language SDKs
-

Create Dapr applications in your preferred language using the Dapr SDKs.

-
- +
+
+
+
+
+ Code icon + Language SDKs +
+

+ Create Dapr applications in your preferred language using the Dapr SDKs. +

+ +
+
+
+
+
+
+
+
.NET logo - -
-
.NET
-
+ .NET +
+

+ Learn more about the .NET SDK. +

+
-
- +
+
+
+
Python logo - -
-
Python
-
-
-
- - Java logo - -
-
Java
-
-
-
- - Go logo - -
-
Go
-
-
-
- - PHP logo - -
-
PHP
-
+ Python + +

+ Learn more about the Python SDK. +

+
-
+
+
+
+
+
+ Java logo + Java +
+

+ Learn more about the Java SDK. +

+ +
+
+
+
+
+ Go logo + Go +
+

+ Learn more about the Go SDK. +

+ +
+
+
+
+
+ PHP logo + PHP +
+

+ Learn more about the PHP SDK. +

+ +
+
+
\ No newline at end of file diff --git a/daprdocs/content/en/concepts/_index.md b/daprdocs/content/en/concepts/_index.md index e685e646b..739c90be0 100644 --- a/daprdocs/content/en/concepts/_index.md +++ b/daprdocs/content/en/concepts/_index.md @@ -4,4 +4,13 @@ title: "Dapr concepts" linkTitle: "Concepts" weight: 10 description: "Learn about Dapr including its main features and capabilities" ---- \ No newline at end of file +--- + +Welcome to the Dapr concepts guide! + + +{{% alert title="Getting started with Dapr" color="primary" %}} +If you are ready to jump in and start developing with Dapr, please +visit the [getting started section]({{}}). +{{< button text="Install Dapr" page="getting-started" >}} +{{% /alert %}} \ No newline at end of file diff --git a/daprdocs/content/en/getting-started/_index.md b/daprdocs/content/en/getting-started/_index.md index f82e9faca..238fed7b3 100644 --- a/daprdocs/content/en/getting-started/_index.md +++ b/daprdocs/content/en/getting-started/_index.md @@ -11,6 +11,7 @@ Welcome to the Dapr getting started guide! {{% alert title="Dapr Concepts" color="primary" %}} If you are looking for an introductory overview of Dapr and learn more about basic Dapr terminology, it is recommended to visit the [concepts section]({{}}). +{{< button text="Learn more" page="concepts" >}} {{% /alert %}} This guide will walk you through a series of steps to install, initialize and start using Dapr. The recommended way to get started with Dapr is to setup a local development environment (also referred to as [_self-hosted_ mode]({{< ref self-hosted >}})) which includes the Dapr CLI, Dapr sidecar binaries, and some default components that can help you start using Dapr quickly. @@ -23,3 +24,4 @@ The following steps in this guide are: 1. Explore Dapr quickstarts {{< button text="First step: Install the Dapr CLI >>" page="install-dapr-cli" >}} +

\ No newline at end of file diff --git a/daprdocs/static/images/homepage/javalang.png b/daprdocs/static/images/homepage/javalang.png new file mode 100644 index 0000000000000000000000000000000000000000..b6786a19405e6b6169c846d58625e71dedb055cd GIT binary patch literal 6561 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 THGBOs00000NkvXXu0mjf^ttv3 literal 0 HcmV?d00001 From df1d8e7d661f51c478681da98faaf0c5ff632a37 Mon Sep 17 00:00:00 2001 From: Javier Vela Date: Tue, 21 Sep 2021 18:14:28 +0200 Subject: [PATCH 05/14] azure queue add missing param decodeBase64 --- .../components-reference/supported-bindings/storagequeues.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/daprdocs/content/en/reference/components-reference/supported-bindings/storagequeues.md b/daprdocs/content/en/reference/components-reference/supported-bindings/storagequeues.md index 2c6f79d75..502eb78d0 100644 --- a/daprdocs/content/en/reference/components-reference/supported-bindings/storagequeues.md +++ b/daprdocs/content/en/reference/components-reference/supported-bindings/storagequeues.md @@ -30,6 +30,8 @@ spec: value: "myqueue" - name: ttlInSeconds value: "60" + - name: decodeBase64 + value: "false" ``` {{% alert title="Warning" color="warning" %}} @@ -44,6 +46,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr | storageAccessKey | Y | Input/Output | The Azure Storage access key | `"accessKey"` | | queue | Y | Input/Output | The name of the Azure Storage queue | `"myqueue"` | | ttlInSeconds | N | Output | Parameter to set the default message time to live. If this parameter is omitted, messages will expire after 10 minutes. See [also](#specifying-a-ttl-per-message) | `"60"` | +| decodeBase64 | N | Output | Configuration to decode base64 file content before saving to Blob Storage. (In case of saving a file with binary content). `true` is the only allowed positive value. Other positive variations like `"True", "1"` are not acceptable. Defaults to `false` | `true`, `false` | ## Binding support From a927dd10286ce404c65481fc49aae88b2c76f02c Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Fri, 24 Sep 2021 18:10:00 -0400 Subject: [PATCH 06/14] * Tweaking the example to match what was demoed during the 9/21/2021 community call * Added example CEL expressions * Added link to 9/21/2021 community call youtube video * Added section headers for the right nav --- .../pubsub/howto-route-messages.md | 147 +++++++++++------- 1 file changed, 90 insertions(+), 57 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index b69926997..d0dd2c702 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -42,14 +42,14 @@ metadata: name: myevent-subscription spec: pubsubname: pubsub - topic: transactions + topic: inventory routes: rules: - - match: event.type == "withdraw.v3" - path: /withdraw.v3 - - match: event.type == "withdraw.v2" - path: /withdraw.v2 - default: /withdraw + - match: event.type == "widget" + path: /widgets + - match: event.type == "gadget" + path: /gadgets + default: /products scopes: - app1 - app2 @@ -77,24 +77,24 @@ def subscribe(): subscriptions = [ { 'pubsubname': 'pubsub', - 'topic': 'transactions', + 'topic': 'inventory', 'routes': { 'rules': [ { - 'match': 'event.type == "withdraw.v3"', - 'path': '/withdraw.v3' + 'match': 'event.type == "widget"', + 'path': '/widgets' }, { - 'match': 'event.type == "withdraw.v2"', - 'path': '/withdraw.v2' + 'match': 'event.type == "gadget"', + 'path': '/gadgets' }, ], - 'default': '/withdraw' + 'default': '/products' } }] return jsonify(subscriptions) -@app.route('/withdraw', methods=['POST']) +@app.route('/products', methods=['POST']) def ds_subscriber(): print(request.json, flush=True) return json.dumps({'success':True}), 200, {'ContentType':'application/json'} @@ -113,30 +113,30 @@ app.use(bodyParser.json({ type: 'application/*+json' })); const port = 3000 app.get('/dapr/subscribe', (req, res) => { - res.json([ - { - pubsubname: "pubsub", - topic: "transactions", - routes: { - rules: [ - { - match: 'event.type == "withdraw.v3"', - path: '/withdraw.v3' - }, - { - match: 'event.type == "withdraw.v2"', - path: '/withdraw.v2' - }, - ], - default: '/withdraw' - } - } - ]); + res.json([ + { + pubsubname: "pubsub", + topic: "inventory", + routes: { + rules: [ + { + match: 'event.type == "widget"', + path: '/widgets' + }, + { + match: 'event.type == "gadget"', + path: '/gadgets' + }, + ], + default: '/products' + } + } + ]); }) -app.post('/withdraw', (req, res) => { - console.log(req.body); - res.sendStatus(200); +app.post('/products', (req, res) => { + console.log(req.body); + res.sendStatus(200); }); app.listen(port, () => console.log(`consumer app listening on port ${port}!`)) @@ -145,25 +145,25 @@ app.listen(port, () => console.log(`consumer app listening on port ${port}!`)) {{% codetab %}} ```csharp - [Topic("pubsub", "transactions", "event.type ==\"withdraw.v3\"", 1)] - [HttpPost("withdraw.v3")] - public async Task> WithdrawV3(TransactionV3 transaction, [FromServices] DaprClient daprClient) + [Topic("pubsub", "inventory", "event.type ==\"widget\"", 1)] + [HttpPost("widgets")] + public async Task> HandleWidget(Widget transaction, [FromServices] DaprClient daprClient) { // Logic return account; } - [Topic("pubsub", "transactions", "event.type ==\"withdraw.v2\"", 2)] - [HttpPost("withdraw.v2")] - public async Task> WithdrawV2(TransactionV2 transaction, [FromServices] DaprClient daprClient) + [Topic("pubsub", "inventory", "event.type ==\"gadget\"", 2)] + [HttpPost("gadgets")] + public async Task> HandleGadget(Gadget transaction, [FromServices] DaprClient daprClient) { // Logic return account; } - [Topic("pubsub", "transactions")] - [HttpPost("withdraw")] - public async Task> Withdraw(Transaction transaction, [FromServices] DaprClient daprClient) + [Topic("pubsub", "inventory")] + [HttpPost("products")] + public async Task> HandleProduct(Product transaction, [FromServices] DaprClient daprClient) { // Logic return account; @@ -208,19 +208,19 @@ func configureSubscribeHandler(w http.ResponseWriter, _ *http.Request) { t := []subscription{ { PubsubName: "pubsub", - Topic: "transactions", + Topic: "inventory", Routes: routes{ Rules: []rule{ { - Match: `event.type == "withdraw.v3"`, - Path: "/withdraw.v3", + Match: `event.type == "widget"`, + Path: "/widgets", }, { - Match: `event.type == "withdraw.v2"`, - Path: "/withdraw.v2", + Match: `event.type == "gadget"`, + Path: "/gadgets", }, }, - Default: "/withdraw", + Default: "/products", }, }, } @@ -244,14 +244,14 @@ func main() { require_once __DIR__.'/vendor/autoload.php'; $app = \Dapr\App::create(configure: fn(\DI\ContainerBuilder $builder) => $builder->addDefinitions(['dapr.subscriptions' => [ - new \Dapr\PubSub\Subscription(pubsubname: 'pubsub', topic: 'transactions', routes: ( + new \Dapr\PubSub\Subscription(pubsubname: 'pubsub', topic: 'inventory', routes: ( rules: => [ - ('match': 'event.type == "withdraw.v3"', path: '/withdraw.v3'), - ('match': 'event.type == "withdraw.v2"', path: '/withdraw.v2'), + ('match': 'event.type == "widget"', path: '/widgets'), + ('match': 'event.type == "gadget"', path: '/gadgets'), ] - default: '/withdraw')), + default: '/products')), ]])); -$app->post('/withdraw', function( +$app->post('/products', function( #[\Dapr\Attributes\FromBody] \Dapr\PubSub\CloudEvent $cloudEvent, \Psr\Log\LoggerInterface $logger @@ -266,7 +266,34 @@ $app->start(); {{< /tabs >}} -In these examples, depending on the type of the event (`event.type`), the application will be called on `/withdraw.v3`, `/withdraw.v2` or `/withdraw`. The expressions are written as [Common Expression Language (CEL)](https://opensource.google/projects/cel) where `event` represents the cloud event. Any of the attributes from the [CloudEvents core specification](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#required-attributes) can be referenced in the expression. +## Common Expression Language (CEL) + +In these examples, depending on the type of the event (`event.type`), the application will be called on `/widgets`, `/gadgets` or `/products`. The expressions are written as [Common Expression Language (CEL)](https://github.com/google/cel-spec) where `event` represents the cloud event. Any of the attributes from the [CloudEvents core specification](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#required-attributes) can be referenced in the expression. + +### Example expressions + +Match "important" messages + +```javascript +has(event.data.important) && event.data.important == true +``` + +Match deposits greater than $10000 + +```javascript +event.type == "deposit" && event.data.amount > 10000 +``` + +Match multiple versions of a message + +```javascript +event.type == "mymessage.v1" +``` +```javascript +event.type == "mymessage.v2" +``` + +## CloudEvent attributes For reference, the following attributes are from the CloudEvents specification. @@ -476,7 +503,13 @@ Currently, comparisons to time (e.g. before or after "now") are not supported. ## Next steps -- Try the [Pub/Sub quickstart sample](https://github.com/dapr/quickstarts/tree/master/pub-sub) +Watch [this video](https://www.youtube.com/watch?v=QqJgRmbH82I&t=1063s) on how to use message routing with pub/sub. + +

+ +

+ +- Try the [Pub/Sub routing sample](https://github.com/dapr/samples/tree/master/pub-sub-routing) - Learn about [topic scoping]({{< ref pubsub-scopes.md >}}) - Learn about [message time-to-live]({{< ref pubsub-message-ttl.md >}}) - Learn [how to configure Pub/Sub components with multiple namespaces]({{< ref pubsub-namespaces.md >}}) From 82a460195bb0aab8b4855b0a6099bedf037bd81c Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Fri, 24 Sep 2021 18:19:29 -0700 Subject: [PATCH 07/14] Move access control community call video to the bottom of the page under a Community Call Demo section. --- .../en/operations/configuration/invoke-allowlist.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/daprdocs/content/en/operations/configuration/invoke-allowlist.md b/daprdocs/content/en/operations/configuration/invoke-allowlist.md index 791c9fe08..288e3e5fd 100644 --- a/daprdocs/content/en/operations/configuration/invoke-allowlist.md +++ b/daprdocs/content/en/operations/configuration/invoke-allowlist.md @@ -10,12 +10,6 @@ Access control enables the configuration of policies that restrict what operatio An access control policy is specified in configuration and be applied to Dapr sidecar for the *called* application. Example access policies are shown below and access to the called app is based on the matched policy action. You can provide a default global action for all calling applications and if no access control policy is specified, the default behavior is to allow all calling applications to access to the called app. -Watch this [video](https://youtu.be/j99RN_nxExA?t=1108) on how to apply access control list for service invocation. - -
- -
- ## Concepts **TrustDomain** - A "trust domain" is a logical group to manage trust relationships. Every application is assigned a trust domain which can be specified in the access control list policy spec. If no policy spec is defined or an empty trust domain is specified, then a default value "public" is used. This trust domain is used to generate the identity of the application in the TLS cert. @@ -357,3 +351,10 @@ spec: - name: python image: dapriosamples/hello-k8s-python:edge ``` + +## Community call demo +Watch this [video](https://youtu.be/j99RN_nxExA?t=1108) on how to apply access control list for service invocation. + +
+ +
\ No newline at end of file From c44a9406041ae69d677e9a69c2531b288104ba38 Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Sat, 25 Sep 2021 10:59:07 -0400 Subject: [PATCH 08/14] Moving the community call demo video to its own section --- .../building-blocks/pubsub/howto-route-messages.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index d0dd2c702..7c8d28a77 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -501,14 +501,16 @@ on the definition of OPTIONAL. Currently, comparisons to time (e.g. before or after "now") are not supported. {{% /alert %}} -## Next steps +## Community call demo -Watch [this video](https://www.youtube.com/watch?v=QqJgRmbH82I&t=1063s) on how to use message routing with pub/sub. +Watch [this video](https://www.youtube.com/watch?v=QqJgRmbH82I&t=1063s) on how to use message routing with pub/sub:

+## Next steps + - Try the [Pub/Sub routing sample](https://github.com/dapr/samples/tree/master/pub-sub-routing) - Learn about [topic scoping]({{< ref pubsub-scopes.md >}}) - Learn about [message time-to-live]({{< ref pubsub-message-ttl.md >}}) From ca8887a83aa50760126632488635d65798762e9d Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Sat, 25 Sep 2021 11:10:55 -0400 Subject: [PATCH 09/14] Fixing broken cloudevents links --- .../building-blocks/pubsub/howto-route-messages.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index 7c8d28a77..75433a8b1 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -390,7 +390,7 @@ The following attributes are REQUIRED to be present in all CloudEvents: routing, observability, policy enforcement, etc. The format of this is producer defined and might include information such as the version of the `type` - see - [Versioning of CloudEvents in the Primer](primer.md#versioning-of-cloudevents) + [Versioning of CloudEvents in the Primer](https://github.com/cloudevents/spec/blob/v1.0.1/primer.md#versioning-of-cloudevents) for more information. - Constraints: - REQUIRED @@ -404,7 +404,7 @@ The following attributes are REQUIRED to be present in all CloudEvents: ### OPTIONAL Attributes The following attributes are OPTIONAL to appear in CloudEvents. See the -[Notational Conventions](#notational-conventions) section for more information +[Notational Conventions](https://github.com/cloudevents/spec/blob/v1.0.1/spec.md#notational-conventions) section for more information on the definition of OPTIONAL. #### datacontenttype @@ -413,12 +413,12 @@ on the definition of OPTIONAL. - Description: Content type of `data` value. This attribute enables `data` to carry any type of content, whereby format and encoding might differ from that of the chosen event format. For example, an event rendered using the - [JSON envelope](./json-format.md#3-envelope) format might carry an XML payload + [JSON envelope](https://github.com/cloudevents/spec/blob/v1.0.1/json-format.md#3-envelope) format might carry an XML payload in `data`, and the consumer is informed by this attribute being set to "application/xml". The rules for how `data` content is rendered for different `datacontenttype` values are defined in the event format specifications; for example, the JSON event format defines the relationship in - [section 3.1](./json-format.md#31-handling-of-data). + [section 3.1](https://github.com/cloudevents/spec/blob/v1.0.1/json-format.md#31-handling-of-data). For some binary mode protocol bindings, this field is directly mapped to the respective protocol's content-type metadata property. Normative rules for the @@ -447,7 +447,7 @@ on the definition of OPTIONAL. - Type: `URI` - Description: Identifies the schema that `data` adheres to. Incompatible changes to the schema SHOULD be reflected by a different URI. See - [Versioning of CloudEvents in the Primer](primer.md#versioning-of-cloudevents) + [Versioning of CloudEvents in the Primer](https://github.com/cloudevents/spec/blob/v1.0.1/primer.md#versioning-of-cloudevents) for more information. - Constraints: - OPTIONAL From 8f43af5199d1dc9e16a502cc39148847da51f3f4 Mon Sep 17 00:00:00 2001 From: Phil Kedy Date: Sat, 25 Sep 2021 11:16:05 -0400 Subject: [PATCH 10/14] Updating C# example --- .../building-blocks/pubsub/howto-route-messages.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md index 75433a8b1..5fac6c647 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-route-messages.md @@ -147,26 +147,26 @@ app.listen(port, () => console.log(`consumer app listening on port ${port}!`)) ```csharp [Topic("pubsub", "inventory", "event.type ==\"widget\"", 1)] [HttpPost("widgets")] - public async Task> HandleWidget(Widget transaction, [FromServices] DaprClient daprClient) + public async Task> HandleWidget(Widget widget, [FromServices] DaprClient daprClient) { // Logic - return account; + return stock; } [Topic("pubsub", "inventory", "event.type ==\"gadget\"", 2)] [HttpPost("gadgets")] - public async Task> HandleGadget(Gadget transaction, [FromServices] DaprClient daprClient) + public async Task> HandleGadget(Gadget gadget, [FromServices] DaprClient daprClient) { // Logic - return account; + return stock; } [Topic("pubsub", "inventory")] [HttpPost("products")] - public async Task> HandleProduct(Product transaction, [FromServices] DaprClient daprClient) + public async Task> HandleProduct(Product product, [FromServices] DaprClient daprClient) { // Logic - return account; + return stock; } ``` {{% /codetab %}} From 019ad846ea664f4cd8a42c925d1caec46a742e22 Mon Sep 17 00:00:00 2001 From: Lorenzo Montanari Date: Mon, 27 Sep 2021 14:52:36 +0200 Subject: [PATCH 11/14] Some fixes in secrets_api docs - Fixed some formattation issues - Removed erroneous backslashes from command snippets --- daprdocs/content/en/reference/api/secrets_api.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daprdocs/content/en/reference/api/secrets_api.md b/daprdocs/content/en/reference/api/secrets_api.md index e0a447535..84c39467d 100644 --- a/daprdocs/content/en/reference/api/secrets_api.md +++ b/daprdocs/content/en/reference/api/secrets_api.md @@ -95,14 +95,14 @@ Code | Description ### Examples ```shell -curl http://localhost:3500/v1.0/secrets/vault/db-secret \ +curl http://localhost:3500/v1.0/secrets/vault/db-secret ``` ```shell -curl http://localhost:3500/v1.0/secrets/vault/db-secret?metadata.version_id=15&metadata.version_stage=AAA \ +curl http://localhost:3500/v1.0/secrets/vault/db-secret?metadata.version_id=15&metadata.version_stage=AAA ``` -> Note, in case of deploying into namespace other than default`, the above query will also have to include the namespace metadata (e.g. `production` below) +> Note, in case of deploying into namespace other than default, the above query will also have to include the namespace metadata (e.g. `production` below) ```shell curl http://localhost:3500/v1.0/secrets/vault/db-secret?metadata.version_id=15&?metadata.namespace=production @@ -165,7 +165,7 @@ Code | Description ### Examples ```shell -curl http://localhost:3500/v1.0/secrets/vault/bulk \ +curl http://localhost:3500/v1.0/secrets/vault/bulk ``` ```json From 823448b34e26595089e7d0918bb80340489e6bf2 Mon Sep 17 00:00:00 2001 From: Will Tsai Date: Thu, 30 Sep 2021 08:50:20 -0700 Subject: [PATCH 12/14] adding new layouts/partials/feedback.html config to override docsy theme feedback widget settings --- daprdocs/layouts/partials/feedback.html | 62 +++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 daprdocs/layouts/partials/feedback.html diff --git a/daprdocs/layouts/partials/feedback.html b/daprdocs/layouts/partials/feedback.html new file mode 100644 index 000000000..811b3c879 --- /dev/null +++ b/daprdocs/layouts/partials/feedback.html @@ -0,0 +1,62 @@ + +
+ + + + + + +
+ From 1aef16edfc5ef65412c422ad1a32ce454a020ed0 Mon Sep 17 00:00:00 2001 From: Bernd Verst <4535280+berndverst@users.noreply.github.com> Date: Thu, 30 Sep 2021 15:53:39 -0700 Subject: [PATCH 13/14] Deny iFrame embeds --- daprdocs/staticwebapp.config.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 daprdocs/staticwebapp.config.json diff --git a/daprdocs/staticwebapp.config.json b/daprdocs/staticwebapp.config.json new file mode 100644 index 000000000..df65c3647 --- /dev/null +++ b/daprdocs/staticwebapp.config.json @@ -0,0 +1,6 @@ +{ + "globalHeaders": { + "X-Frame-Options": "DENY" + } +} + From 7e1a8acc3ef8c7c8dc718a0bb4e1acef104c3824 Mon Sep 17 00:00:00 2001 From: Bernd Verst <4535280+berndverst@users.noreply.github.com> Date: Thu, 30 Sep 2021 16:23:04 -0700 Subject: [PATCH 14/14] Deny iFrame embeds --- daprdocs/staticwebapp.config.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 daprdocs/staticwebapp.config.json diff --git a/daprdocs/staticwebapp.config.json b/daprdocs/staticwebapp.config.json new file mode 100644 index 000000000..df65c3647 --- /dev/null +++ b/daprdocs/staticwebapp.config.json @@ -0,0 +1,6 @@ +{ + "globalHeaders": { + "X-Frame-Options": "DENY" + } +} +