From 8099f8043e6a44af7e7fc5cd8e12cf309a5be7af Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Thu, 14 Sep 2023 14:22:08 -0500 Subject: [PATCH 1/7] update dapr runtime to use v1.12.0-rc.1 Signed-off-by: Cassandra Coyle --- .github/env/global.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/env/global.env b/.github/env/global.env index 684bf5fee..e141ea330 100644 --- a/.github/env/global.env +++ b/.github/env/global.env @@ -1,5 +1,5 @@ DAPR_CLI_VERSION: 1.11.0 - DAPR_RUNTIME_VERSION: 1.11.0 + DAPR_RUNTIME_VERSION: 1.12.0-rc.1 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/ DAPR_DEFAULT_IMAGE_REGISTRY: ghcr MACOS_PYTHON_VERSION: 3.10 From 0b41f72c3d444ae43d5041c1bd764a84e0b61c01 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Wed, 20 Sep 2023 09:12:20 -0500 Subject: [PATCH 2/7] update to latest rc for runtime and cli Signed-off-by: Cassandra Coyle --- .github/env/global.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/env/global.env b/.github/env/global.env index e141ea330..15e1ac280 100644 --- a/.github/env/global.env +++ b/.github/env/global.env @@ -1,5 +1,5 @@ - DAPR_CLI_VERSION: 1.11.0 - DAPR_RUNTIME_VERSION: 1.12.0-rc.1 + DAPR_CLI_VERSION: 1.12.0-rc.1 + DAPR_RUNTIME_VERSION: 1.12.0-rc.3 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/ DAPR_DEFAULT_IMAGE_REGISTRY: ghcr MACOS_PYTHON_VERSION: 3.10 From 60accf9c08ad707cb0992bffc6fb9362d00e5bda Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Thu, 21 Sep 2023 12:03:01 -0500 Subject: [PATCH 3/7] try sleeping Signed-off-by: Cassandra Coyle --- configuration/go/sdk/order-processor/app.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configuration/go/sdk/order-processor/app.go b/configuration/go/sdk/order-processor/app.go index a2084ef94..edbd0bc23 100644 --- a/configuration/go/sdk/order-processor/app.go +++ b/configuration/go/sdk/order-processor/app.go @@ -54,5 +54,8 @@ func main() { } else { fmt.Println("App unsubscribed to config changes") } + + time.Sleep(10 * time.Second) + os.Exit(0) } From c2011ef8297fb5de124c7f62f86eca1539ca00aa Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Thu, 21 Sep 2023 13:31:18 -0500 Subject: [PATCH 4/7] pin redis version Signed-off-by: Cassandra Coyle --- .github/workflows/validate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index e284617d1..913457e0b 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -134,7 +134,7 @@ jobs: run: | helm repo add bitnami https://charts.bitnami.com/bitnami helm repo update - helm install redis bitnami/redis + helm install redis bitnami/redis --version 17.14.5 dapr init -k --runtime-version=${{ env.DAPR_RUNTIME_VERSION }} --wait || kubectl get pods --all-namespaces kubectl get nodes -o wide for pod in `dapr status -k | awk '/dapr/ {print $1}'`; do kubectl describe pod -l app=$pod -n dapr-system ; kubectl logs -l app=$pod -n dapr-system; done From 91713193093939a1291e08dc6f86977c7d05d2d7 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Thu, 21 Sep 2023 13:31:51 -0500 Subject: [PATCH 5/7] rm sleep Signed-off-by: Cassandra Coyle --- configuration/go/sdk/order-processor/app.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/configuration/go/sdk/order-processor/app.go b/configuration/go/sdk/order-processor/app.go index edbd0bc23..ac879c67f 100644 --- a/configuration/go/sdk/order-processor/app.go +++ b/configuration/go/sdk/order-processor/app.go @@ -55,7 +55,5 @@ func main() { fmt.Println("App unsubscribed to config changes") } - time.Sleep(10 * time.Second) - os.Exit(0) } From d66f11c029784dfe7f36e2fb19ddeaeca5d7d854 Mon Sep 17 00:00:00 2001 From: Cassandra Coyle Date: Fri, 22 Sep 2023 08:34:25 -0500 Subject: [PATCH 6/7] rm deprecated unsubscribe call Signed-off-by: Cassandra Coyle --- configuration/go/sdk/README.md | 1 - configuration/go/sdk/order-processor/app.go | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/configuration/go/sdk/README.md b/configuration/go/sdk/README.md index 587f6ba06..7cefa26c5 100644 --- a/configuration/go/sdk/README.md +++ b/configuration/go/sdk/README.md @@ -37,7 +37,6 @@ name: Run order-processor service expected_stdout_lines: - '== APP == Configuration for orderId2: {"Value":"102","Version":"","Metadata":null}' - '== APP == App subscribed to config changes with subscription id:' - - '== APP == App unsubscribed to config changes' - "Exited App successfully" expected_stderr_lines: output_match_mode: substring diff --git a/configuration/go/sdk/order-processor/app.go b/configuration/go/sdk/order-processor/app.go index ac879c67f..113cf6c91 100644 --- a/configuration/go/sdk/order-processor/app.go +++ b/configuration/go/sdk/order-processor/app.go @@ -46,14 +46,7 @@ func main() { } fmt.Println("App subscribed to config changes with subscription id: " + subscriptionID) - time.Sleep(10 * time.Second) - - err = client.UnsubscribeConfigurationItems(context.Background(), DAPR_CONFIGURATION_STORE, subscriptionID) - if err != nil { - fmt.Println("Error unsubscribing to config updates, err:" + err.Error()) - } else { - fmt.Println("App unsubscribed to config changes") - } + time.Sleep(5 * time.Second) os.Exit(0) } From 64d67ecc36e9f3db7dcf2fba94227116299f6651 Mon Sep 17 00:00:00 2001 From: Cassie Coyle Date: Fri, 22 Sep 2023 15:32:28 -0500 Subject: [PATCH 7/7] Update configuration/go/sdk/order-processor/app.go Co-authored-by: Josh van Leeuwen Signed-off-by: Cassie Coyle --- configuration/go/sdk/order-processor/app.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration/go/sdk/order-processor/app.go b/configuration/go/sdk/order-processor/app.go index 113cf6c91..8d7d07a9e 100644 --- a/configuration/go/sdk/order-processor/app.go +++ b/configuration/go/sdk/order-processor/app.go @@ -46,7 +46,7 @@ func main() { } fmt.Println("App subscribed to config changes with subscription id: " + subscriptionID) - time.Sleep(5 * time.Second) +<-ctx.Done() os.Exit(0) }