From aa616eb6d1140d0483eb447d11d4fb8b34ccddec Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Wed, 19 May 2021 11:22:35 -0700 Subject: [PATCH 1/2] Revert "Update refs to release-1.2-rc1 (#547)" This reverts commit 30c008939ae8467ef71054e5437db9d2d6986d88. --- .github/workflows/build.yml | 4 +-- .github/workflows/validate.yml | 4 +-- .../java/io/dapr/examples/exception/README.md | 14 ++++++++++ .../io/dapr/examples/pubsub/http/README.md | 1 + .../java/io/dapr/examples/secrets/README.md | 26 +++++++++++++++++++ .../java/io/dapr/examples/state/README.md | 14 ++++++++++ pom.xml | 2 +- 7 files changed, 60 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee64c7bce1..3724d7efd8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,8 @@ jobs: DAPR_CLI_VER: 1.1.0-rc.1 DAPR_RUNTIME_VER: 1.1.0-rc.1 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh - DAPR_CLI_REF: e00080697f348c6123f67e16b22f3c5247d7ac99 - DAPR_REF: 57582853ea5db9b6991bdcf07de6f61b165aa960 + DAPR_CLI_REF: + DAPR_REF: 266eb0b5d300c576c3360c7f0582d795579ee457 OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }} OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }} GPG_KEY: ${{ secrets.GPG_KEY }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index a9b97460a1..4989467967 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -30,8 +30,8 @@ jobs: DAPR_CLI_VER: 1.1.0-rc.1 DAPR_RUNTIME_VER: 1.1.0-rc.1 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh - DAPR_CLI_REF: e00080697f348c6123f67e16b22f3c5247d7ac99 - DAPR_REF: 57582853ea5db9b6991bdcf07de6f61b165aa960 + DAPR_CLI_REF: + DAPR_REF: steps: - uses: actions/checkout@v2 - name: Set up OpenJDK ${{ env.JDK_VER }} diff --git a/examples/src/main/java/io/dapr/examples/exception/README.md b/examples/src/main/java/io/dapr/examples/exception/README.md index cc2ec29add..50549f6132 100644 --- a/examples/src/main/java/io/dapr/examples/exception/README.md +++ b/examples/src/main/java/io/dapr/examples/exception/README.md @@ -111,3 +111,17 @@ Once running, the OutputBindingExample should print the output as follows: ... ``` + +### Cleanup + +To stop the app run (or press `CTRL+C`): + + + +```bash +dapr stop --app-id exception_example +``` + + \ No newline at end of file diff --git a/examples/src/main/java/io/dapr/examples/pubsub/http/README.md b/examples/src/main/java/io/dapr/examples/pubsub/http/README.md index 061349aced..1e7fe7062c 100644 --- a/examples/src/main/java/io/dapr/examples/pubsub/http/README.md +++ b/examples/src/main/java/io/dapr/examples/pubsub/http/README.md @@ -334,6 +334,7 @@ name: Cleanup --> ```bash +dapr stop --app-id publisher dapr stop --app-id subscriber ``` diff --git a/examples/src/main/java/io/dapr/examples/secrets/README.md b/examples/src/main/java/io/dapr/examples/secrets/README.md index 45321e3c52..d2f8f301d5 100644 --- a/examples/src/main/java/io/dapr/examples/secrets/README.md +++ b/examples/src/main/java/io/dapr/examples/secrets/README.md @@ -209,6 +209,19 @@ Once running, the program should print the output as follows: == APP == {"testVal":"value"} ``` +To close the app either press `CTRL+C` or run + + + +```bash +dapr stop --app-id secrets1 +``` + + + + The example's `config.yaml` is as follows: ```yaml apiVersion: dapr.io/v1alpha1 @@ -252,6 +265,19 @@ Once running, the program should print the output as follows: == APP == PERMISSION_DENIED: access denied by policy to get "randomKey" from "vault" ``` +To close the app either press `CTRL+C` or run + + + +```bash +dapr stop --app-id secrets2 +``` + + + + To clean up and bring the vault container down, run + +```bash +dapr stop --app-id state_example +``` + + diff --git a/pom.xml b/pom.xml index a1c4349a52..407119b5d3 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 1.33.1 3.13.0 - https://raw.githubusercontent.com/dapr/dapr/57582853ea5db9b6991bdcf07de6f61b165aa960/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto 1.6.2 3.1.1 1.8 From 96896e55f9cb7d7b6b5685a02b2b5084ea1cf580 Mon Sep 17 00:00:00 2001 From: Artur Souza Date: Wed, 19 May 2021 11:30:07 -0700 Subject: [PATCH 2/2] Update CLI and daprd to 1.2.0 RCs. --- .github/workflows/build.yml | 8 ++++---- .github/workflows/validate.yml | 4 ++-- pom.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3724d7efd8..bf3dac0948 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,11 +22,11 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: 13.0.x - DAPR_CLI_VER: 1.1.0-rc.1 - DAPR_RUNTIME_VER: 1.1.0-rc.1 - DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh + DAPR_CLI_VER: 1.2.0-rc.1 + DAPR_RUNTIME_VER: 1.2.0-rc.3 + DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.2.0-rc.1/install/install.sh DAPR_CLI_REF: - DAPR_REF: 266eb0b5d300c576c3360c7f0582d795579ee457 + DAPR_REF: OSSRH_USER_TOKEN: ${{ secrets.OSSRH_USER_TOKEN }} OSSRH_PWD_TOKEN: ${{ secrets.OSSRH_PWD_TOKEN }} GPG_KEY: ${{ secrets.GPG_KEY }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 4989467967..8ee8ebc4cf 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -27,8 +27,8 @@ jobs: GOARCH: amd64 GOPROXY: https://proxy.golang.org JDK_VER: 13.0.x - DAPR_CLI_VER: 1.1.0-rc.1 - DAPR_RUNTIME_VER: 1.1.0-rc.1 + DAPR_CLI_VER: 1.2.0-rc.1 + DAPR_RUNTIME_VER: 1.2.0-rc.3 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/3dacfb672d55f1436c249057aaebbe597e1066f3/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/pom.xml b/pom.xml index 407119b5d3..c06cacd950 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 1.33.1 3.13.0 - https://raw.githubusercontent.com/dapr/dapr/v1.1.0-rc.1/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.2.0-rc.3/dapr/proto 1.6.2 3.1.1 1.8