Skip to content

Commit 7deff4f

Browse files
greenie-msftAmulya VaroteAmulya VaroteAmulya Varotedlm
authored
Upmerge v1.5 to v1.6 20211227 (#2064)
* Added pub sub documentation * Changed port number in the command * Modified based on the review comments - 1 * Modified based on the review comments - 2 * Changed python commands * Changed python commands * Modified based on the review comments - 3 * Fix publish a topic examples Step 3 and 4 of the "How-To: Publish & subscribe" publishes to the wrong app id and pubsub. This commit fixes by changing the examples that write to the app-id "testpubsub" to "orderprocessing" and the pubsub "pubsub" to "order_pub_sub" * Wrap oauth links in ignore comment * Bumping tags to v1.5.0 * Update dapr versions for 1.5.1 hotfix * Correct the default component init timeout Signed-off-by: Amulya Varote <[email protected]> * Fix incorrect warning log-level Signed-off-by: Amulya Varote <[email protected]> * Added bindings documentation Signed-off-by: Amulya Varote <[email protected]> * Changed python commands Signed-off-by: Amulya Varote <[email protected]> * Changed image for bindings Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 2 Signed-off-by: Amulya Varote <[email protected]> * Reverted a small change Signed-off-by: Amulya Varote <[email protected]> * Added pub sub documentation Signed-off-by: Amulya Varote <[email protected]> * Changed port number in the command Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 2 Signed-off-by: Amulya Varote <[email protected]> * Changed python commands Signed-off-by: Amulya Varote <[email protected]> * Changed python commands Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 3 Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 2 Signed-off-by: Amulya Varote <[email protected]> * Wrap oauth links in ignore comment Signed-off-by: Amulya Varote <[email protected]> * Bumping tags to v1.5.0 Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments -3 Signed-off-by: Amulya Varote <[email protected]> * Modified a line based on the review comment Signed-off-by: Amulya Varote <[email protected]> * Fix publish a topic examples Step 3 and 4 of the "How-To: Publish & subscribe" publishes to the wrong app id and pubsub. This commit fixes by changing the examples that write to the app-id "testpubsub" to "orderprocessing" and the pubsub "pubsub" to "order_pub_sub" Signed-off-by: Amulya Varote <[email protected]> * Update dapr versions for 1.5.1 hotfix Signed-off-by: Amulya Varote <[email protected]> * Modified a line based on the review comment Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments Signed-off-by: Amulya Varote <[email protected]> * Added pub sub documentation Signed-off-by: Amulya Varote <[email protected]> * Changed port number in the command Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Added secrets store documentation Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 2 Signed-off-by: Amulya Varote <[email protected]> * Update daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md Signed-off-by: Amulya Varote <[email protected]> * Update daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 2 Signed-off-by: Amulya Varote <[email protected]> * Changed python commands Signed-off-by: Amulya Varote <[email protected]> * Changed python commands Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 3 Signed-off-by: Amulya Varote <[email protected]> * Fix publish a topic examples Step 3 and 4 of the "How-To: Publish & subscribe" publishes to the wrong app id and pubsub. This commit fixes by changing the examples that write to the app-id "testpubsub" to "orderprocessing" and the pubsub "pubsub" to "order_pub_sub" Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets for service invocation Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of secrets management Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of state management Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of pub sub Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Removed a line Signed-off-by: Amulya Varote <[email protected]> * resolved merge conflicts Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of secrets management Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of pub sub Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Removed a line Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of secrets management Signed-off-by: Amulya Varote <[email protected]> * Added full code snippets of pub sub Signed-off-by: Amulya Varote <[email protected]> * Modified based on the review comments - 1 Signed-off-by: Amulya Varote <[email protected]> * Solved merge conflicts Signed-off-by: Amulya Varote <[email protected]> * Modified go secrets code Signed-off-by: Amulya Varote <[email protected]> * Update daprdocs/content/en/developing-applications/building-blocks/secrets/howto-secrets.md Co-authored-by: Will <[email protected]> * Added DCO sign-off guidance for contributing to Dapr Signed-off-by: Nick Greenfield <[email protected]> * Address PR feedback Signed-off-by: Nick Greenfield <[email protected]> * Add DCO check to PR template Signed-off-by: Nick Greenfield <[email protected]> * simplify git command for DCO Signed-off-by: Will Tsai <[email protected]> * Fix header * Display state value instead of StateResponse object (#2046) Signed-off-by: Jun Tian <[email protected]> Co-authored-by: greenie-msft <[email protected]> * add ForcePathStyle support for s3 binding (#2054) Signed-off-by: rainfd <[email protected]> Co-authored-by: greenie-msft <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Remove requests dep (#2055) * Add DCO check to PR template Signed-off-by: Nick Greenfield <[email protected]> * Remove requests dep Signed-off-by: GitHub <[email protected]> Co-authored-by: Nick Greenfield <[email protected]> Co-authored-by: Yaron Schneider <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * update endpoint in s3 binding doc (#2049) * update endpoint in s3 binding doc Signed-off-by: lizzzcai <[email protected]> * fix jaeger link Signed-off-by: lizzzcai <[email protected]> * update endpoint example to match region Signed-off-by: lizzzcai <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Update autoscale-keda.md (#2047) Co-authored-by: greenie-msft <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Update service-mesh.md (#2044) Minor typo Co-authored-by: greenie-msft <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Added missing HTTP verb to the documentation dapr/dapr#4030 (#2045) Signed-off-by: GitHub <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * Update logs-troubleshooting.md (#2023) The label name `dapr-placement` has been changed to `dapr-placement-server`. Co-authored-by: Yaron Schneider <[email protected]> Co-authored-by: Mark Fussell <[email protected]> * update the DOTNET SDK Signed-off-by: Mark Fussell <[email protected]> Co-authored-by: Amulya Varote <[email protected]> Co-authored-by: Amulya Varote <[email protected]> Co-authored-by: Amulya Varote <[email protected]> Co-authored-by: David Millman <[email protected]> Co-authored-by: emctl <[email protected]> Co-authored-by: Bernd Verst <[email protected]> Co-authored-by: Will <[email protected]> Co-authored-by: Will Tsai <[email protected]> Co-authored-by: Aaron Crawfis <[email protected]> Co-authored-by: Jun Tian <[email protected]> Co-authored-by: RainFD <[email protected]> Co-authored-by: Mark Fussell <[email protected]> Co-authored-by: ChethanUK <[email protected]> Co-authored-by: Yaron Schneider <[email protected]> Co-authored-by: Lize <[email protected]> Co-authored-by: Andrew Cartwright <[email protected]> Co-authored-by: Shriroop Joshi <[email protected]> Co-authored-by: Christoph Hofmann <[email protected]> Co-authored-by: Will 保哥 <[email protected]> Co-authored-by: Mark Fussell <[email protected]>
1 parent 8029889 commit 7deff4f

File tree

22 files changed

+1364
-580
lines changed

22 files changed

+1364
-580
lines changed

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Thank you for helping make the Dapr documentation better!
22

33
**Please follow this checklist before submitting:**
4-
4+
- [ ] Commits are signed with Developer Certificate of Origin (DCO - [learn more](https://docs.dapr.io/contributing/contributing-overview/#developer-certificate-of-origin-signing-your-work))
55
- [ ] [Read the contribution guide](https://docs.dapr.io/contributing/contributing-docs/)
66
- [ ] Commands include options for Linux, MacOS, and Windows within codetabs
77
- [ ] New file and folder names are globally unique

daprdocs/content/en/concepts/service-mesh.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: >
77
How Dapr compares to and works with service meshes
88
---
99

10-
Dapr uses a sidecar architecture, running as a separate process alongside the application and includes features such as service invocation, network security, and distributed tracing. This often raises the question: how does Dapr compare to service mesh solutions such as [Linkerd](https://linkerd.io/), [Istio](https://istio.io/) and [Open Service Mesh](https://openservicemesh.io/) amoung others?
10+
Dapr uses a sidecar architecture, running as a separate process alongside the application and includes features such as service invocation, network security, and distributed tracing. This often raises the question: how does Dapr compare to service mesh solutions such as [Linkerd](https://linkerd.io/), [Istio](https://istio.io/) and [Open Service Mesh](https://openservicemesh.io/) among others?
1111

1212
## How Dapr and service meshes compare
1313
While Dapr and service meshes do offer some overlapping capabilities, **Dapr is not a service mesh**, where a service mesh is defined as a *networking* service mesh. Unlike a service mesh which is focused on networking concerns, Dapr is focused on providing building blocks that make it easier for developers to build applications as microservices. Dapr is developer-centric, versus service meshes which are infrastructure-centric.

daprdocs/content/en/contributing/contributing-overview.md

+38-2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ Before you submit an issue, make sure you've checked the following:
4343
- Many changes to the Dapr runtime may require changes to the API. In that case, the best place to discuss the potential feature is the main [Dapr repo](https://github.com/dapr/dapr).
4444
- Other examples could include bindings, state stores or entirely new components.
4545

46+
4647
## Pull Requests
4748

4849
All contributions come through pull requests. To submit a proposed change, follow this workflow:
@@ -53,18 +54,53 @@ All contributions come through pull requests. To submit a proposed change, follo
5354
1. Create your change
5455
- Code changes require tests
5556
1. Update relevant documentation for the change
56-
1. Commit and open a PR
57+
1. Commit with [DCO sign-off]({{< ref "contributing-overview.md#developer-certificate-of-origin-signing-your-work" >}}) and open a PR
5758
1. Wait for the CI process to finish and make sure all checks are green
5859
1. A maintainer of the project will be assigned, and you can expect a review within a few days
5960

61+
6062
#### Use work-in-progress PRs for early feedback
6163

6264
A good way to communicate before investing too much time is to create a "Work-in-progress" PR and share it with your reviewers. The standard way of doing this is to add a "[WIP]" prefix in your PR's title and assign the **do-not-merge** label. This will let people looking at your PR know that it is not well baked yet.
6365

64-
### Use of Third-party code
66+
## Use of Third-party code
6567

6668
- Third-party code must include licenses.
6769

70+
## Developer Certificate of Origin: Signing your work
71+
#### Every commit needs to be signed
72+
73+
The Developer Certificate of Origin (DCO) is a lightweight way for contributors to certify that they wrote or otherwise have the right to submit the code they are contributing to the project. Here is the full text of the [DCO](https://developercertificate.org/), reformatted for readability:
74+
```
75+
By making a contribution to this project, I certify that:
76+
(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
77+
(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
78+
(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
79+
(d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
80+
```
81+
Contributors sign-off that they adhere to these requirements by adding a `Signed-off-by` line to commit messages.
82+
83+
```
84+
This is my commit message
85+
Signed-off-by: Random J Developer <[email protected]>
86+
```
87+
Git even has a `-s` command line option to append this automatically to your commit message:
88+
```
89+
$ git commit -s -m 'This is my commit message'
90+
```
91+
92+
Each Pull Request is checked whether or not commits in a Pull Request do contain a valid Signed-off-by line.
93+
94+
#### I didn't sign my commit, now what?!
95+
96+
No worries - You can easily replay your changes, sign them and force push them!
97+
98+
```
99+
git checkout <branch-name>
100+
git commit --amend --no-edit --signoff
101+
git push --force-with-lease <remote-name> <branch-name>
102+
```
103+
68104
## Code of Conduct
69105

70106
Please see the [Dapr community code of conduct](https://github.com/dapr/community/blob/master/CODE-OF-CONDUCT.md).

0 commit comments

Comments
 (0)