Merge branch 'master' into multi-app-run

Signed-off-by: Paul Yuknewicz <[email protected]>

.github/holopin.yml

@@ -0,0 +1,6 @@
+organization: dapr
+defaultSticker: clmjkxscc122740fl0mkmb7egi
+stickers:
+  -
+    id: clmjkxscc122740fl0mkmb7egi
+    alias: ghc2023

bindings/components/binding-cron.yaml

@@ -9,3 +9,5 @@ spec:
   metadata:
   - name: schedule
     value: "@every 10s" # valid cron schedule
+  - name: direction
+    value: "input"

bindings/components/binding-postgres.yaml

@@ -9,3 +9,5 @@ spec:
   metadata:
   - name: url # Required
     value: "user=postgres password=docker host=localhost port=5432 dbname=orders pool_min_conns=1 pool_max_conns=10"
+  - name: direction
+    value: "output"

bindings/go/http/batch/app.go

@@ -20,7 +20,7 @@ dapr run --app-id batch-http --app-port 6003 --dapr-http-port 3503 --dapr-grpc-p
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -56,7 +56,7 @@ func processBatch(w http.ResponseWriter, r *http.Request) {
 
 	defer fileContent.Close()
 
-	byteResult, _ := ioutil.ReadAll(fileContent)
+	byteResult, _ := io.ReadAll(fileContent)
 
 	var orders Orders
 

bindings/go/sdk/batch/app.go

@@ -21,7 +21,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -57,7 +57,7 @@ func processBatch(w http.ResponseWriter, r *http.Request) {
 
 	defer fileContent.Close()
 
-	byteResult, _ := ioutil.ReadAll(fileContent)
+	byteResult, _ := io.ReadAll(fileContent)
 
 	var orders Orders
 

configuration/go/http/order-processor/app.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -39,7 +39,7 @@ func main() {
 			fmt.Print("Could not get config item, err:" + err.Error())
 			os.Exit(1)
 		}
-		result, _ := ioutil.ReadAll(getResponse.Body)
+		result, _ := io.ReadAll(getResponse.Body)
 		fmt.Println("Configuration for "+item+":", string(result))
 	}
 
@@ -69,7 +69,7 @@ func subscribeToConfigUpdates(subscriptionId *string) {
 		fmt.Println("Error subscribing to config updates, err:" + err.Error())
 		os.Exit(1)
 	}
-	sub, err := ioutil.ReadAll(subscription.Body)
+	sub, err := io.ReadAll(subscription.Body)
 	if err != nil {
 		fmt.Print("Unable to read subscription id, err: " + err.Error())
 		os.Exit(1)
@@ -115,7 +115,7 @@ func unsubscribeFromConfigUpdates(subscriptionId string) {
 	if err != nil {
 		fmt.Println("Error unsubscribing from config updates, err:" + err.Error())
 	}
-	unsub, err := ioutil.ReadAll(unsubscribe.Body)
+	unsub, err := io.ReadAll(unsubscribe.Body)
 	if err != nil {
 		fmt.Print("Unable to read unsubscribe response, err: " + err.Error())
 	}
@@ -128,7 +128,7 @@ func unsubscribeFromConfigUpdates(subscriptionId string) {
 }
 
 func configUpdateHandler(w http.ResponseWriter, r *http.Request) {
-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		log.Panic(err)
 	}

cryptography/javascript/sdk/README.md

@@ -60,7 +60,7 @@ expected_stdout_lines:
   - "== APP == Encrypting federico-di-dio-photography-Q4g0Q-eVVEg-unsplash.jpg to encrypted.out"
   - "== APP == Encrypted the message to encrypted.out"
   - "== APP == == Decrypting message using streams"
-  - "== APP == Encrypting encrypted.out to decrypted.out"
+  - "== APP == Decrypting encrypted.out to decrypted.out.jpg"
   - "== APP == Decrypted the message to decrypted.out.jpg"
   - "Exited App successfully"
 expected_stderr_lines:

cryptography/javascript/sdk/crypto-quickstart/index.mjs

@@ -72,7 +72,7 @@ async function encryptDecryptStream(client) {
 
   // Decrypt the message
   console.log("== Decrypting message using streams");
-  console.log("Encrypting encrypted.out to decrypted.out");
+  console.log("Decrypting encrypted.out to decrypted.out.jpg");
   await pipeline(
     createReadStream("encrypted.out"),
     await client.crypto.decrypt({
@@ -84,4 +84,5 @@ async function encryptDecryptStream(client) {
   console.log("Decrypted the message to decrypted.out.jpg");
 }
 
+// Start the code
 await start();

cryptography/javascript/sdk/crypto-quickstart/package.json

@@ -12,9 +12,10 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
-        "@dapr/dapr": "3.1.0"
+        "@dapr/dapr": "~3.1.2"
     },
     "devDependencies": {
+        "@types/node": "^18.0.0",
         "eslint": "^8.42.0"
     }
 }

pub_sub/go/http/checkout/app.go

@@ -34,6 +34,8 @@ func main() {
 			log.Fatal(err.Error())
 		}
 
+		req.Header.Set("Content-Type", "application/json")
+
 		// Publish an event using Dapr pub/sub
 		res, err := client.Do(req)
 		if err != nil {
@@ -43,6 +45,6 @@ func main() {
 
 		fmt.Println("Published data:", order)
 
-		time.Sleep(1000)
+		time.Sleep(time.Second)
 	}
 }

pub_sub/go/http/order-processor/app.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -18,7 +19,7 @@ type JSONObj struct {
 }
 
 type Result struct {
-	Data string `json:"data"`
+	Data map[string]int `json:"data"`
 }
 
 func getOrder(w http.ResponseWriter, r *http.Request) {
@@ -40,7 +41,7 @@ func getOrder(w http.ResponseWriter, r *http.Request) {
 }
 
 func postOrder(w http.ResponseWriter, r *http.Request) {
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -49,7 +50,10 @@ func postOrder(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Fatal(err.Error())
 	}
-	fmt.Println("Subscriber received:", string(result.Data))
+	for k, v := range result.Data {
+		d := fmt.Sprintf(`Subscriber received: {"%s":%d}`, k, v)
+		fmt.Println(d)
+	}
 	obj, err := json.Marshal(data)
 	if err != nil {
 		log.Fatal(err.Error())
@@ -76,7 +80,7 @@ func main() {
 
 	// Start the server; this is a blocking call
 	err := http.ListenAndServe(":"+appPort, r)
-	if err != http.ErrServerClosed {
+	if !errors.Is(err, http.ErrServerClosed) {
 		log.Panic(err)
 	}
 }

pub_sub/go/sdk/checkout/app.go

@@ -33,6 +33,6 @@ func main() {
 
 		fmt.Println("Published data:", order)
 
-		time.Sleep(1000)
+		time.Sleep(time.Second)
 	}
 }

pub_sub/python/sdk/README.md

@@ -20,6 +20,8 @@ This section shows how to run both applications at once using [multi-app run tem
 
 1. Install dependencies: 
 
+1. Run the Python subscriber app (flask version) with Dapr: 
+
 <!-- STEP
 name: Install Python dependencies
 -->
@@ -33,8 +35,10 @@ pip3 install -r requirements.txt
 cd ..
 ```
 <!-- END_STEP -->
+
 2. Open a new terminal window and run the multi app run template:
 
+
 <!-- STEP
 name: Run multi app run template
 expected_stdout_lines:
@@ -84,6 +88,7 @@ The terminal console output should look similar to this:
 == APP - checkout-sdk == INFO:root:Published data: {"orderId": 9}
 == APP - order-processor-sdk == 127.0.0.1 - - [04/Sep/2023 11:15:27] "POST /orders HTTP/1.1" 200 -
 == APP - order-processor-sdk == Subscriber received : 9
+
 ```
 
 3. Stop and clean up application processes
@@ -132,4 +137,5 @@ dapr run --app-id checkout-sdk --resources-path ../../../components/ -- python3
 ```bash
 dapr stop --app-id checkout-sdk
 dapr stop --app-id order-processor-sdk
+dapr stop --app-id order-processor-sdk-fastapi
 ```

secrets_management/go/http/order-processor/app.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 )
@@ -25,6 +25,6 @@ func main() {
 		fmt.Print(err.Error())
 		os.Exit(1)
 	}
-	result, _ := ioutil.ReadAll(getResponse.Body)
+	result, _ := io.ReadAll(getResponse.Body)
 	fmt.Println("Fetched Secret: ", string(result))
 }

service_invocation/go/http/checkout/app.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -40,7 +40,7 @@ func main() {
 		}
 
 		// Read the response
-		result, err := ioutil.ReadAll(response.Body)
+		result, err := io.ReadAll(response.Body)
 		if err != nil {
 			log.Fatal(err)
 		}

service_invocation/go/http/order-processor/app.go

@@ -1,16 +1,17 @@
 package main
 
 import (
+	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 
 	"github.com/gorilla/mux"
 )
 
 func getOrder(w http.ResponseWriter, r *http.Request) {
-	data, err := ioutil.ReadAll(r.Body)
+	data, err := io.ReadAll(r.Body)
 	if err != nil {
 		log.Println("Error reading body:", err.Error())
 	}
@@ -26,10 +27,10 @@ func main() {
 	r := mux.NewRouter()
 	r.HandleFunc("/orders", getOrder).Methods("POST")
 
-	// Start the server listening on port 6001
+	// Start the server listening on port 6006
 	// This is a blocking call
 	err := http.ListenAndServe(":6006", r)
-	if err != http.ErrServerClosed {
+	if !errors.Is(err, http.ErrServerClosed) {
 		log.Println("Error starting HTTP server")
 	}
 }

state_management/go/http/order-processor/app.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http"
 	"os"
@@ -51,7 +51,7 @@ func main() {
 		if err != nil {
 			panic(err)
 		}
-		result, err := ioutil.ReadAll(getResponse.Body)
+		result, err := io.ReadAll(getResponse.Body)
 		if err != nil {
 			panic(err)
 		}

tutorials/distributed-calculator/README.md

@@ -8,7 +8,7 @@ This quickstart shows method invocation and state persistent capabilities of Dap
 - **Subtraction**: [.NET Core](https://docs.microsoft.com/en-us/dotnet/core/) application
 
 The front-end application consists of a server and a client written in [React](https://reactjs.org/). 
-Kudos to [greatbunny](https://github.com/greatbunny) whose [React calculator](https://github.com/greatbunny/calculator) is adapted here. 
+Kudos to `ahfarmer` whose [React calculator](https://github.com/ahfarmer/calculator) 
 
 The following architecture diagram illustrates the components that make up this quickstart: 
 
@@ -52,18 +52,6 @@ working_dir: "./go"
 
 <!-- END_STEP -->
 
-<!-- STEP
-name: "Build go app"
-working_dir: "./go"
--->
-
-- Build the app. Run:
-   ```bash
-   go build .
-   ```
-
-<!-- END_STEP -->
-
 <!-- STEP
 expected_stdout_lines:
 - "You're up and running! Both Dapr and your app logs will appear here."