Merge branch 'v1.10' into add-nats-streamName

Signed-off-by: Hannah Hunter <94493363+hhunter-ms@users.noreply.github.com>
2022-12-08 17:03:56 -06:00 · 2022-12-08 17:03:56 -06:00 · 7dc04870d2
parent a5077c41b4 616fa44034
commit 7dc04870d2
8 changed files with 32 additions and 29 deletions
--- a/daprdocs/config.toml
+++ b/daprdocs/config.toml
@ -27,7 +27,7 @@ disableKinds = ["taxonomy", "term"]

 # Google Analytics
 [services.googleAnalytics]
-id = "UA-149338238-3"
+id = "G-60C6Q1ETC1"

 # Mounts
 [module]
--- a/daprdocs/content/en/reference/arguments-annotations-overview.md
+++ b/daprdocs/content/en/reference/arguments-annotations-overview.md
@ -28,7 +28,7 @@ This table is meant to help users understand the equivalent options for running
 | `--enable-metrics` | not supported | | configuration spec | Enable prometheus metric (default true) |
 | `--enable-mtls` | not supported | | configuration spec | Enables automatic mTLS for daprd to daprd communication channels |
 | `--enable-profiling` | `--enable-profiling` | | `dapr.io/enable-profiling` | Enable profiling |
-| `--unix-domain-socket` | `--unix-domain-socket` | `-u` | `dapr.io/unix-domain-socket-path`  | On Linux, when communicating with the Dapr sidecar, use unix domain sockets for lower latency and greater throughput compared to TCP ports. Not available on Windows OS |
+| `--unix-domain-socket` | `--unix-domain-socket` | `-u` | `dapr.io/unix-domain-socket-path`  | The parent directory of socket file. On Linux, when communicating with the Dapr sidecar, use unix domain sockets for lower latency and greater throughput compared to TCP ports. Not available on Windows OS. |
 | `--log-as-json` | not supported | | `dapr.io/log-as-json` | Setting this parameter to `true` outputs logs in JSON format. Default is `false` |
 | `--log-level` | `--log-level` | | `dapr.io/log-level` | Sets the log level for the Dapr sidecar. Allowed values are `debug`, `info`, `warn`, `error`. Default is `info` |
 | `--enable-api-logging` | `--enable-api-logging` | | `dapr.io/enable-api-logging` | Enables API logging for the Dapr sidecar |
--- a/daprdocs/content/en/reference/components-reference/supported-bindings/cron.md
+++ b/daprdocs/content/en/reference/components-reference/supported-bindings/cron.md
@ -29,7 +29,7 @@ spec:

 | Field              | Required | Binding support |  Details | Example |
 |--------------------|:--------:|-------|--------|---------|
-| schedule | Y | Input/Output |  The valid cron schedule to use. See [this](#schedule-format) for more details | `"@every 15m"`
+| schedule | Y | Input|  The valid cron schedule to use. See [this](#schedule-format) for more details | `"@every 15m"`

 ### Schedule Format

@ -74,11 +74,7 @@ When running this code, note that the `/scheduled` endpoint is called every five

 ## Binding support

-This component supports both **input and output** binding interfaces.
-
-This component supports **output binding** with the following operations:
-
- `delete`
+This component supports **input** binding interface.

 ## Related links

--- a/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-jetstream.md
+++ b/daprdocs/content/en/reference/components-reference/supported-pubsub/setup-jetstream.md
@ -25,28 +25,30 @@ spec:
  - name: natsURL
    value: "nats://localhost:4222"
  - name: jwt # Optional. Used for decentralized JWT authentication.
-    value: "eyJhbGciOiJ...6yJV_adQssw5c" 
+    value: "eyJhbGciOiJ...6yJV_adQssw5c"
  - name: seedKey # Optional. Used for decentralized JWT authentication.
-    value: "SUACS34K232O...5Z3POU7BNIL4Y" 
+    value: "SUACS34K232O...5Z3POU7BNIL4Y"
  - name: tls_client_cert # Optional. Used for TLS Client authentication.
-    value: "/path/to/tls.crt" 
+    value: "/path/to/tls.crt"
  - name: tls_client_key # Optional. Used for TLS Client authentication.
-    value: "/path/to/tls.key" 
-  - name: name 
+    value: "/path/to/tls.key"
+  - name: token # Optional. Used for token based authentication.
+    value: "my-token"
+  - name: name
    value: "my-conn-name"
  - name: streamName
    value: "my-stream"
  - name: durableName 
    value: "my-durable"
-  - name: queueGroupName 
+  - name: queueGroupName
    value: "my-queue"
-  - name: startSequence 
+  - name: startSequence
    value: 1
  - name: startTime # In Unix format
    value: 1630349391
-  - name: deliverAll 
+  - name: deliverAll
    value: false
-  - name: flowControl 
+  - name: flowControl
    value: false
  - name: ackWait
    value: 10s
@ -75,6 +77,7 @@ spec:
 | seedKey         |    N     | NATS decentralized authentication seed key | `"SUACS34K232O...5Z3POU7BNIL4Y"` |
 | tls_client_cert |    N     | NATS TLS Client Authentication Certificate | `"/path/to/tls.crt"`             |
 | tls_client_key  |    N     | NATS TLS Client Authentication Key         | `"/path/to/tls.key"`             |
+| token           |    N     | [NATS token based authentication]          | `"my-token"`                     |
 | name            |    N     | NATS connection name                       | `"my-conn-name"`                 |
 | streamName      |    N     | Name of the JetStream Stream to bind to    | `"my-stream"`                    |
 | durableName     |    N     | [Durable name]                             | `"my-durable"`                   |
@ -156,3 +159,4 @@ nats -s localhost:4222 stream add myStream --subjects mySubject
 [Rate Limit]: https://docs.nats.io/jetstream/concepts/consumers#ratelimit
 [Hearbeat]: https://docs.nats.io/jetstream/concepts/consumers#hearbeat
 [Decentralized JWT Authentication/Authorization]: https://docs.nats.io/running-a-nats-service/configuration/securing_nats/auth_intro/jwt
+[NATS token based authentication]: https://docs.nats.io/running-a-nats-service/configuration/securing_nats/auth_intro/tokens
--- a/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mysql.md
+++ b/daprdocs/content/en/reference/components-reference/supported-state-stores/setup-mysql.md
@ -27,6 +27,8 @@ spec:
    value: "<SCHEMA NAME>"
  - name: tableName
    value: "<TABLE NAME>"
+  - name: timeoutInSeconds
+    value: "30"
  - name: pemPath # Required if pemContents not provided. Path to pem file.
    value: "<PEM PATH>"
  - name: pemContents # Required if pemPath not provided. Pem value.
@ -48,11 +50,12 @@ If you wish to use MySQL as an actor store, append the following to the yaml.

 | Field              | Required | Details | Example |
 |--------------------|:--------:|---------|---------|
-| connectionString   | Y        | The connection string to connect to MySQL. Do not add the schema to the connection string | [Non SSL connection](#non-ssl-connection): `"<user>:<password>@tcp(<server>:3306)/?allowNativePasswords=true"`, [Enforced SSL Connection](#enforced-ssl-connection):  `"<user>:<password>@tcp(<server>:3306)/?allowNativePasswords=true&tls=custom"`|
-| schemaName         | N        | The schema name to use. Will be created if schema does not exist. Defaults to `"dapr_state_store"`  | `"custom_schema"`, `"dapr_schema"` |
-| tableName          | N        | The table name to use. Will be created if table does not exist. Defaults to `"state"` | `"table_name"`, `"dapr_state"` |
-| pemPath            | N        | Full path to the PEM file to use for [enforced SSL Connection](#enforced-ssl-connection) required if pemContents is not provided. Cannot be used in K8s environment | `"/path/to/file.pem"`, `"C:\path\to\file.pem"` |
-| pemContents        | N        | Contents of PEM file to use for [enforced SSL Connection](#enforced-ssl-connection) required if pemPath is not provided. Can be used in K8s environment | `"pem value"` |
+| `connectionString`   | Y        | The connection string to connect to MySQL. Do not add the schema to the connection string | [Non SSL connection](#non-ssl-connection): `"<user>:<password>@tcp(<server>:3306)/?allowNativePasswords=true"`, [Enforced SSL Connection](#enforced-ssl-connection):  `"<user>:<password>@tcp(<server>:3306)/?allowNativePasswords=true&tls=custom"`|
+| `schemaName`         | N        | The schema name to use. Will be created if schema does not exist. Defaults to `"dapr_state_store"`  | `"custom_schema"`, `"dapr_schema"` |
+| `tableName`          | N        | The table name to use. Will be created if table does not exist. Defaults to `"state"` | `"table_name"`, `"dapr_state"` |
+| `timeoutInSeconds`   | N        | Timeout for all database operations. Defaults to `20` | `30` |
+| `pemPath`            | N        | Full path to the PEM file to use for [enforced SSL Connection](#enforced-ssl-connection) required if pemContents is not provided. Cannot be used in K8s environment | `"/path/to/file.pem"`, `"C:\path\to\file.pem"` |
+| `pemContents`        | N        | Contents of PEM file to use for [enforced SSL Connection](#enforced-ssl-connection) required if pemPath is not provided. Can be used in K8s environment | `"pem value"` |

 ## Setup MySQL

--- a/daprdocs/data/components/bindings/generic.yaml
+++ b/daprdocs/data/components/bindings/generic.yaml
@ -8,12 +8,12 @@
    output: true
 - component: Cron (Scheduler)
  link: cron
-  state: Alpha
+  state: Stable
  version: v1
-  since: "1.0"
+  since: "1.10"
  features:
    input: true
-    output: true
+    output: false
 - component: GraphQL
  link: graghql
  state: Alpha
@ -45,7 +45,7 @@
  since: "1.0"
  features:
    input: true
-    output: true
+    output: false
 - component: Local Storage
  link: localstorage
  state: Stable
--- a/daprdocs/data/components/secret_stores/generic.yaml
+++ b/daprdocs/data/components/secret_stores/generic.yaml
@ -1,8 +1,8 @@
 - component: HashiCorp Vault
  link: hashicorp-vault
-  state: Beta
+  state: Stable
  version: v1
-  since: "1.9"
+  since: "1.10"
  features:
    multipleKeyValuesPerSecret: true
 - component: Local environment variables
--- a/sdkdocs/js
+++ b/sdkdocs/js
@ -1 +1 @@
-Subproject commit 93b119798f533afa6601f480d6cfaf6a62c30388
+Subproject commit 184e8e14a5e89d8760be6fc0e953a6a6f96cf6b2